From 419b7c6bbd0a3a1eb02d140ed8f204b1acf6afe7 Mon Sep 17 00:00:00 2001 From: David Leung Date: Mon, 1 Apr 2019 09:48:12 +0800 Subject: [PATCH 01/76] wasm-pack: init at 0.8.1 wasm-pack is a workflow tool maintained by the Rust and WebAssembly Working Group to make working with Rust-generated WebAssembly packages easier to work with. --- pkgs/development/tools/wasm-pack/default.nix | 36 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/tools/wasm-pack/default.nix diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix new file mode 100644 index 00000000000..b2bee738344 --- /dev/null +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkgconfig +, openssl +}: + +rustPlatform.buildRustPackage rec { + name = "wasm-pack-${version}"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "rustwasm"; + repo = "wasm-pack"; + rev = "v${version}"; + sha256 = "1z66m16n4r16zqmnv84a5jndr5x6mdqdq4b1wq929sablwqd2rl4"; + }; + + cargoSha256 = "1xdx0gjqd4zyhnp72hz88rdmgry1m7rcw2j73lh67vp08z74y54y"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ]; + + # Tests fetch external resources and build artifacts. + # Disabled to work with sandboxing + doCheck = false; + + meta = with stdenv.lib; { + description = "A utility that builds rust-generated WebAssembly package"; + homepage = https://github.com/rustwasm/wasm-pack; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = [ maintainers.dhkl ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2653ad8ae41..a3c424f2975 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23317,6 +23317,8 @@ in vttest = callPackage ../tools/misc/vttest { }; + wasm-pack = callPackage ../development/tools/wasm-pack { }; + wavegain = callPackage ../applications/audio/wavegain { }; wcalc = callPackage ../applications/misc/wcalc { }; From f975bbae114682523197385e820b4f51dcd04cf6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 12 Apr 2019 17:17:19 +0200 Subject: [PATCH 02/76] nixos/hostapd: escape interface names for hostapd Same problem as described in acbadcdbba3e768a936c88e45a843bd72ecf247c. When using multiple interfaces for wifi with `networking.wlanInterfaces` and the interface for `hostapd` contains a dash, this will fail as systemd escapes dashes in its device names. --- nixos/modules/services/networking/hostapd.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 3fbc08e9060..7add48308f8 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: # TODO: # @@ -12,6 +12,8 @@ let cfg = config.services.hostapd; + escapedInterface = utils.escapeSystemdPath cfg.interface; + configFile = pkgs.writeText "hostapd.conf" '' interface=${cfg.interface} driver=${cfg.driver} @@ -157,8 +159,8 @@ in { description = "hostapd wireless AP"; path = [ pkgs.hostapd ]; - after = [ "sys-subsystem-net-devices-${cfg.interface}.device" ]; - bindsTo = [ "sys-subsystem-net-devices-${cfg.interface}.device" ]; + after = [ "sys-subsystem-net-devices-${escapedInterface}.device" ]; + bindsTo = [ "sys-subsystem-net-devices-${escapedInterface}.device" ]; requiredBy = [ "network-link-${cfg.interface}.service" ]; serviceConfig = From 83c9b6ee391785648956aec5af8aa4cec382d433 Mon Sep 17 00:00:00 2001 From: Dan Elkouby Date: Tue, 23 Apr 2019 12:33:19 +0300 Subject: [PATCH 03/76] nginx: use fullchain.pem for ssl_trusted_certificate Some ACME clients do not generate full.pem, which is the same as fullchain.pem + the certificate key (key.pem), which is not necessary for verifying OCSP staples. --- nixos/modules/services/web-servers/nginx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 3a154ab75ba..c486d6c8613 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -16,11 +16,11 @@ let } // (optionalAttrs vhostConfig.enableACME { sslCertificate = "${acmeDirectory}/${serverName}/fullchain.pem"; sslCertificateKey = "${acmeDirectory}/${serverName}/key.pem"; - sslTrustedCertificate = "${acmeDirectory}/${serverName}/full.pem"; + sslTrustedCertificate = "${acmeDirectory}/${serverName}/fullchain.pem"; }) // (optionalAttrs (vhostConfig.useACMEHost != null) { sslCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/fullchain.pem"; sslCertificateKey = "${acmeDirectory}/${vhostConfig.useACMEHost}/key.pem"; - sslTrustedCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/full.pem"; + sslTrustedCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/fullchain.pem"; }) ) cfg.virtualHosts; enableIPv6 = config.networking.enableIPv6; From 47f62b4821dcc2582540d08a831a8786ccf51e38 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sat, 27 Apr 2019 19:08:05 +0200 Subject: [PATCH 04/76] grafana_reporter: Fix library function name --- nixos/modules/services/monitoring/grafana-reporter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/grafana-reporter.nix b/nixos/modules/services/monitoring/grafana-reporter.nix index 149026d2018..827cf6322cf 100644 --- a/nixos/modules/services/monitoring/grafana-reporter.nix +++ b/nixos/modules/services/monitoring/grafana-reporter.nix @@ -52,7 +52,7 @@ in { wantedBy = ["multi-user.target"]; after = ["network.target"]; serviceConfig = let - args = lib.concatSepString " " [ + args = lib.concatStringsSep " " [ "-proto ${cfg.grafana.protocol}://" "-ip ${cfg.grafana.addr}:${toString cfg.grafana.port}" "-port :${toString cfg.port}" From da284dbd465c0a35b6a8d29f7e5493b3d54ae8ae Mon Sep 17 00:00:00 2001 From: wucke13 Date: Tue, 30 Apr 2019 11:18:01 +0200 Subject: [PATCH 05/76] s-tar: 1.5.3 -> 1.6 --- pkgs/tools/archivers/s-tar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/tools/archivers/s-tar/default.nix index de25d00cf21..d5349900756 100644 --- a/pkgs/tools/archivers/s-tar/default.nix +++ b/pkgs/tools/archivers/s-tar/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "s-tar-${version}"; - version = "1.5.3"; + version = "1.6"; src = fetchurl { url = "mirror://sourceforge/s-tar/star-${version}.tar.bz2"; - sha256 = "0nsg3adv8lwqsbizicgmyxx8w26d1f4almprkcb08cd87s1l40q7"; + sha256 = "0xpp8gf0ghwdgncdwx17fpadxislwrj48gcm42851hz6p8p6c60v"; }; preConfigure = "rm configure"; From b775493d239e52269bc8be32644a73ba39952b00 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 29 Apr 2019 20:04:17 -0500 Subject: [PATCH 06/76] obfs4: init at 0.0.10 --- pkgs/tools/networking/obfs4/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/networking/obfs4/default.nix diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix new file mode 100644 index 00000000000..005abb0968b --- /dev/null +++ b/pkgs/tools/networking/obfs4/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchgit, buildGoModule }: + +buildGoModule rec { + pname = "obfs4"; + version = "0.0.10"; + + src = fetchgit { + url = meta.repositories.git; + rev = "refs/tags/${pname}proxy-${version}"; + sha256 = "05aqmw8x8s0yqyqmdj5zcsq06gsbcmrlcd52gaqm20m1pg9503ad"; + }; + + modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv"; + + meta = with lib; { + description = "A pluggable transport proxy"; + homepage = https://www.torproject.org/projects/obfsproxy; + repositories.git = https://git.torproject.org/pluggable-transports/obfs4.git; + maintainers = with maintainers; [ phreedom thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 962fcd90f08..49c2cd2eed1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4785,6 +4785,8 @@ in obexd = callPackage ../tools/bluetooth/obexd { }; + obfs4 = callPackage ../tools/networking/obfs4 { }; + oci-image-tool = callPackage ../tools/misc/oci-image-tool { }; ocproxy = callPackage ../tools/networking/ocproxy { }; From 63a13cce7c628b2df4b848f9819312bbf999d400 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 29 Apr 2019 20:13:46 -0500 Subject: [PATCH 07/76] tor-browser-bundle: use obfs4proxy --- .../networking/browsers/tor-browser-bundle/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 2c6940e037c..834be5cd302 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -34,7 +34,7 @@ , rsync # Pluggable transports -, obfsproxy +, obfs4 # Customization , extraPrefs ? "" @@ -171,9 +171,9 @@ stdenv.mkDerivation rec { EOF # Configure pluggable transports - cat >>$TBDATA_PATH/torrc-defaults < Date: Wed, 1 May 2019 12:12:15 +0200 Subject: [PATCH 08/76] gitlab-runner: 11.9.2 -> 11.10.1 --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index c75baf454b3..a8f4336cf71 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.9.2"; + version = "11.10.1"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "10zmaywq1vzch4a6zdvnm9kgil9ankc9napix9s9fw45wc0lw01p"; + sha256 = "120gpyim54mc8z84gzpbms5hkg2xg4sgzdvkrn1fis9myvd55bav"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "0845ylhb3i3jmi5q6aaix4hw9zdb83v5fhvif0xvvi2m7irg06lf"; + sha256 = "0qfqsi1fm94sxv7g975fw0av871f677rp48yv8q5669ipm16n9qk"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "00k4myca2djd6h3i83vjndahm5q1rnlkq0p69dhl5jbldwy614ph"; + sha256 = "1nxv783rdzdwm0qq3li893p7q3n8gg7abla2961f3n735gjlnibx"; }; patches = [ ./fix-shell-path.patch ]; From f81957227b23ef26189dccc52245ba53e1d9e20d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 04:13:39 -0700 Subject: [PATCH 09/76] memcached: 1.5.13 -> 1.5.14 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/memcached/versions --- pkgs/servers/memcached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 493bcde6a14..2fd18f381d9 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.13"; + version = "1.5.14"; name = "memcached-${version}"; src = fetchurl { url = "https://memcached.org/files/${name}.tar.gz"; - sha256 = "0qsdkjrns4f02lmabq8c7mzl5n4382q2p6a0dvmsjdcpjisagqb1"; + sha256 = "1agj198rm5kc64z8qxck65kdzvw30pdfxalygipnryw0lwlxynww"; }; configureFlags = [ From b8c99fb0eb04b0f4cf921f2ee5ee1596cc41c136 Mon Sep 17 00:00:00 2001 From: klntsky Date: Wed, 1 May 2019 16:22:25 +0300 Subject: [PATCH 10/76] pax-rs: fix missing Cargo.lock --- maintainers/maintainer-list.nix | 2 +- pkgs/development/tools/pax-rs/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4f6e9b1084f..7d2955d02f6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2555,7 +2555,7 @@ klntsky = { email = "klntsky@gmail.com"; name = "Vladimir Kalnitsky"; - github = "8084"; + github = "klntsky"; }; kmeakin = { email = "karlwfmeakin@gmail.com"; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index 3a4f35c0412..7c52a13b7e7 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -26,7 +26,7 @@ buildRustPackage rec { }; cargo-lock = fetchurl { - url = "https://gist.github.com/8084/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock"; + url = "https://gist.github.com/klntsky/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock"; sha256 = "0ff1b64b99cbca1cc2ceabcd2e4f7bc3411e3a2a9fbb9db2204d9240fe38ddeb"; }; in From 02cd2b00e75ffe9f0ddc78136e79d45860cf4389 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 1 May 2019 13:19:30 +0200 Subject: [PATCH 11/76] emby: Drop package and module and refer to jellyfin --- nixos/doc/manual/release-notes/rl-1909.xml | 11 ++++ nixos/modules/misc/ids.nix | 4 +- nixos/modules/module-list.nix | 1 - nixos/modules/services/misc/emby.nix | 76 ---------------------- pkgs/servers/emby/default.nix | 52 --------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 7 files changed, 14 insertions(+), 133 deletions(-) delete mode 100644 nixos/modules/services/misc/emby.nix delete mode 100644 pkgs/servers/emby/default.nix diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index b16297da7ce..ead8f3abd8b 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -91,6 +91,17 @@ the module for some time and so was removed as cleanup. + + + The module has been removed, see + instead for a free software fork of Emby. + + See the Jellyfin documentation: + + Migrating from Emby to Jellyfin + + + diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index e78673514e3..cd6bb9019b1 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -266,7 +266,7 @@ caddy = 239; taskd = 240; factorio = 241; - emby = 242; + # emby = 242; # unusued, removed 2019-05-01 graylog = 243; sniproxy = 244; nzbget = 245; @@ -567,7 +567,7 @@ caddy = 239; taskd = 240; factorio = 241; - emby = 242; + # emby = 242; # unused, removed 2019-05-01 sniproxy = 244; nzbget = 245; mosquitto = 246; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 56c44a43c6e..22efd028f7c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -392,7 +392,6 @@ ./services/misc/dysnomia.nix ./services/misc/disnix.nix ./services/misc/docker-registry.nix - ./services/misc/emby.nix ./services/misc/errbot.nix ./services/misc/etcd.nix ./services/misc/exhibitor.nix diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix deleted file mode 100644 index 0ad4a3f7376..00000000000 --- a/nixos/modules/services/misc/emby.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.emby; -in -{ - options = { - services.emby = { - enable = mkEnableOption "Emby Media Server"; - - user = mkOption { - type = types.str; - default = "emby"; - description = "User account under which Emby runs."; - }; - - group = mkOption { - type = types.str; - default = "emby"; - description = "Group under which emby runs."; - }; - - dataDir = mkOption { - type = types.path; - default = "/var/lib/emby/ProgramData-Server"; - description = "Location where Emby stores its data."; - }; - }; - }; - - config = mkIf cfg.enable { - systemd.services.emby = { - description = "Emby Media Server"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - preStart = '' - if [ -d ${cfg.dataDir} ] - then - for plugin in ${cfg.dataDir}/plugins/* - do - echo "Correcting permissions of plugin: $plugin" - chmod u+w $plugin - done - else - echo "Creating initial Emby data directory in ${cfg.dataDir}" - mkdir -p ${cfg.dataDir} - chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir} - fi - ''; - - serviceConfig = { - Type = "simple"; - User = cfg.user; - Group = cfg.group; - PermissionsStartOnly = "true"; - ExecStart = "${pkgs.emby}/bin/emby -programdata ${cfg.dataDir}"; - Restart = "on-failure"; - }; - }; - - users.users = mkIf (cfg.user == "emby") { - emby = { - group = cfg.group; - uid = config.ids.uids.emby; - }; - }; - - users.groups = mkIf (cfg.group == "emby") { - emby = { - gid = config.ids.gids.emby; - }; - }; - }; -} diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix deleted file mode 100644 index 12b0dde0c9b..00000000000 --- a/pkgs/servers/emby/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg }: - -stdenv.mkDerivation rec { - name = "emby-${version}"; - version = "3.5.3.0"; - - # We are fetching a binary here, however, a source build is possible. - # See -> https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=emby-server-git#n43 - # Though in my attempt it failed with this error repeatedly - # The type 'Attribute' is defined in an assembly that is not referenced. You must add a reference to assembly 'netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'. - # This may also need msbuild (instead of xbuild) which isn't in nixpkgs - # See -> https://github.com/NixOS/nixpkgs/issues/29817 - src = fetchurl { - url = "https://github.com/MediaBrowser/Emby.Releases/releases/download/${version}/embyserver-netcore_${version}.zip"; - sha256 = "0311af3q813cx0ykbdk9vkmnyqi2l8rx66jnvdkw927q6invnnpj"; - }; - - buildInputs = [ - unzip - makeWrapper - ]; - - propagatedBuildInputs = [ - dotnet-sdk - sqlite - ]; - - preferLocalBuild = true; - - buildPhase = '' - rm -rf {electron,runtimes} - ''; - - installPhase = '' - install -dm 755 "$out/opt/emby-server" - cp -r * "$out/opt/emby-server" - - makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ - sqlite - ]}" \ - --add-flags "$out/opt/emby-server/EmbyServer.dll -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" - ''; - - meta = with stdenv.lib; { - description = "MediaBrowser - Bring together your videos, music, photos, and live television"; - homepage = https://emby.media/; - license = licenses.gpl2; - maintainers = with maintainers; [ fadenb ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ada0de74be7..6d9d81c935a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -85,6 +85,7 @@ mapAliases ({ emacsMelpa = emacs25PackagesNg; # for backward compatibility emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18 + emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01 enblendenfuse = enblend-enfuse; # 2015-09-30 evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 904fc2a01a7..4ab18b0bfc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1437,8 +1437,6 @@ in elm-github-install = callPackage ../tools/package-management/elm-github-install { }; - emby = callPackage ../servers/emby { }; - enca = callPackage ../tools/text/enca { }; ent = callPackage ../tools/misc/ent { }; From a3af5be304c85f790cac9060f5b269f754d44548 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 09:48:06 -0700 Subject: [PATCH 12/76] opencascade-occt: 7.3.0p2 -> 7.3.0p3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opencascade-occt/versions --- pkgs/development/libraries/opencascade-occt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix index d57c10b41e9..2d1e0ffb200 100644 --- a/pkgs/development/libraries/opencascade-occt/default.nix +++ b/pkgs/development/libraries/opencascade-occt/default.nix @@ -11,7 +11,7 @@ , doxygen }: -let version = "7.3.0p2"; +let version = "7.3.0p3"; commit = "V${builtins.replaceStrings ["."] ["_"] version}"; in stdenv.mkDerivation { @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { name = "occt-${commit}.tar.gz"; url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - sha256 = "0nc9k1nqpj0n99pr7qkva79irmqhh007dffwghiyzs031zhd7i6w"; + sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; }; nativeBuildInputs = [ cmake ]; From 9402d2a01bcc64e3920460b121a14b5d4dcb7d03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 10:22:12 -0700 Subject: [PATCH 13/76] osl: 1.10.2 -> 1.10.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openshadinglanguage/versions --- pkgs/development/compilers/osl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index ddfd5d0a3fd..a498eafd425 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this name = "openshadinglanguage-${version}"; - version = "1.10.2"; + version = "1.10.4"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenShadingLanguage"; - rev = "Release-1.10.2"; - sha256 = "1549hav5nd67a3cmhbalyaqhs39dh7w0nilf91pypnadrl1g03k7"; + rev = "Release-1.10.4"; + sha256 = "0qarxlm139y5sb9dd9rrljb2xnz8mvyfj497via6yqgwy90zr26g"; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; From 70c2e3633acda0d444ba7e36f58175293ab89545 Mon Sep 17 00:00:00 2001 From: royneary Date: Wed, 1 May 2019 23:44:44 +0200 Subject: [PATCH 14/76] gitAndTools.git-bug: 0.4.0 -> 0.5.0 --- .../git-and-tools/git-bug/default.nix | 6 +- .../git-and-tools/git-bug/deps.nix | 75 ++++++++----------- 2 files changed, 36 insertions(+), 45 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index eabc9258e29..758f49bc64f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "git-bug-${version}"; - version = "0.4.0"; - rev = "2ab2412771d58a1b1f3bfeb5a6e9da2e683b0e12"; + version = "0.5.0"; + rev = "8d7a2c076a38c89085fd3191a2998efb659650c2"; goPackagePath = "github.com/MichaelMure/git-bug"; src = fetchFromGitHub { inherit rev; owner = "MichaelMure"; repo = "git-bug"; - sha256 = "1zyvyg0p5h71wvyxrzkr1bwddxm3x8p44n6wh9ccfdxp8d2k6k25"; + sha256 = "1l86m0y360lmpmpw2id0k7zc2nyq1irr26k2ik06lxhzvpbyajz6"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix b/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix index 77d79602a9c..a914f462e3e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix @@ -5,8 +5,17 @@ fetch = { type = "git"; url = "https://github.com/99designs/gqlgen"; - rev = "636435b68700211441303f1a5ed92f3768ba5774"; - sha256 = "0d4sr6kpyn3zq3kpvk8lizy7hdpcw3fjmv7fbv2m1k9w8fzjawrz"; + rev = "010a79b66f08732cb70d133dcab297a8ee895572"; + sha256 = "1z9rh02bysmk1hfnffq3qa0ahyfv93i3cfkra0b6x2hqj2104444"; + }; + } + { + goPackagePath = "github.com/MichaelMure/gocui"; + fetch = { + type = "git"; + url = "https://github.com/MichaelMure/gocui"; + rev = "d753c235dd8582d55e99bbb7f7fe453fb3fd3a19"; + sha256 = "1bgyjlikb0da3090bwwxdhy5s20h6x6lsrg63jhwwpsy2785p483"; }; } { @@ -72,15 +81,6 @@ sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; }; } - { - goPackagePath = "github.com/go-test/deep"; - fetch = { - type = "git"; - url = "https://github.com/go-test/deep"; - rev = "6592d9cc0a499ad2d5f574fde80a2b5c5cc3b4f5"; - sha256 = "0f4rbdl6qmlq4bzh0443i634bm675bbrkyzwp8wkc1yhdl9qsij7"; - }; - } { goPackagePath = "github.com/golang/protobuf"; fetch = { @@ -90,15 +90,6 @@ sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; }; } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "3af367b6b30c263d47e8895973edcca9a49cf029"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } { goPackagePath = "github.com/gorilla/context"; fetch = { @@ -153,15 +144,6 @@ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; }; } - { - goPackagePath = "github.com/jroimartin/gocui"; - fetch = { - type = "git"; - url = "https://github.com/jroimartin/gocui"; - rev = "c055c87ae801372cd74a0839b972db4f7697ae5f"; - sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; - }; - } { goPackagePath = "github.com/mattn/go-colorable"; fetch = { @@ -324,6 +306,24 @@ sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; }; } + { + goPackagePath = "github.com/theckman/goconstraint"; + fetch = { + type = "git"; + url = "https://github.com/theckman/goconstraint"; + rev = "93babf24513d0e8277635da8169fcc5a46ae3f6a"; + sha256 = "1ngc5zc409smdbl5yj84ynzzcqk3g070bxwhl9jy03bz0ic4sfxc"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } { goPackagePath = "github.com/vektah/gqlgen"; fetch = { @@ -338,8 +338,8 @@ fetch = { type = "git"; url = "https://github.com/vektah/gqlparser"; - rev = "14e83ae06ec152e6d0afb9766a00e0c0918aa8fc"; - sha256 = "162j259402pa2wb4645z6gplx5g1a2sfk393k2svwgws3bg2bws2"; + rev = "e805d08bb209b1accdea76bd2327811858d81985"; + sha256 = "0cw7pm3z3ydsyfs95wd1fsi6f7sb5i2bhvw8gq1l7m2gd430872p"; }; } { @@ -383,8 +383,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "a434f64ace81347eff0fb4a32bc80a235e0ad762"; - sha256 = "0zngnxrxjync4caz6ikmv5v0cn895iqhqmzqg9qddfm5bvl2a2my"; + rev = "7e5bf9270d7061560865b8847c378236480f47e3"; + sha256 = "1772rb2p40fy4n62nl61l3m3p2vzm3aycxgaz46lpmzzci7yii6a"; }; } { @@ -405,13 +405,4 @@ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } - { - goPackagePath = "gotest.tools"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotest.tools"; - rev = "b6e20af1ed078cd01a6413b734051a292450b4cb"; - sha256 = "11k6hmfhaf0qxpddp3i5kfpacdx51q6pv4n1kn3jnf1hjs0yny2k"; - }; - } ] \ No newline at end of file From 29678b9b7dee4d255b7a5c74bdebecabfeac903c Mon Sep 17 00:00:00 2001 From: royneary Date: Thu, 2 May 2019 00:47:30 +0200 Subject: [PATCH 15/76] gitAndTools.git-bug: fix --version output --- .../version-management/git-and-tools/git-bug/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index 758f49bc64f..fb2b5a317a9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -15,6 +15,13 @@ buildGoPackage rec { goDeps = ./deps.nix; + buildFlagsArray = '' + -ldflags= + -X ${goPackagePath}/commands.GitCommit=${rev} + -X ${goPackagePath}/commands.GitLastTag=${version} + -X ${goPackagePath}/commands.GitExactTag=${version} + ''; + postInstall = '' cd go/src/${goPackagePath} install -D -m 0644 misc/bash_completion/git-bug "$bin/etc/bash_completion.d/git-bug" From f24f72e60b369968aa796d5409c49f4282300836 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 29 Apr 2019 22:56:47 -0500 Subject: [PATCH 16/76] nixos tor: use obfs4proxy, make transport list customizable --- nixos/modules/services/security/tor.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 61b751bb518..6f4852c3ba1 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -81,7 +81,7 @@ let ${optionalString (elem cfg.relay.role ["bridge" "private-bridge"]) '' BridgeRelay 1 - ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed + ServerTransportPlugin ${concatStringsSep "," cfg.relay.bridgeTransports} exec ${obfs4}/bin/obfs4proxy managed ExtORPort auto ${optionalString (cfg.relay.role == "private-bridge") '' ExtraInfoStatistics 0 @@ -355,7 +355,7 @@ in Regular bridge. Works like a regular relay, but doesn't list you in the public relay directory and - hides your Tor node behind obfsproxy. + hides your Tor node behind obfs4proxy. @@ -424,6 +424,13 @@ in ''; }; + bridgeTransports = mkOption { + type = types.listOf types.str; + default = ["obfs4"]; + example = ["obfs2" "obfs3" "obfs4" "scramblesuit"]; + description = "List of pluggable transports"; + }; + nickname = mkOption { type = types.str; default = "anonymous"; From 322a287867d78aa024a6533c5d416d2e88cc4ad5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 22:28:51 -0700 Subject: [PATCH 17/76] python37Packages.google_cloud_storage: 1.14.0 -> 1.15.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-google-cloud-storage/versions --- .../python-modules/google_cloud_storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index 9d6461168d4..aab9f827da0 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "aef243b533144c11c9ff750565c43dffe5445debb143697002edb6205f64a437"; + sha256 = "13b9ah54z6g3w8p74a1anmyz84nrxy27snqv6vp95wsizp8zwsyn"; }; checkInputs = [ pytest mock ]; From 0a46fab9cb0c7c2601725890b9ba7e3002981d6f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 00:33:58 -0700 Subject: [PATCH 18/76] gitAndTools.pre-commit: 1.15.1 -> 1.15.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pre-commit/versions --- .../version-management/git-and-tools/pre-commit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix index abbec433c02..8c4c4ea8773 100644 --- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix @@ -1,12 +1,12 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "1.15.1"; + version = "1.15.2"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "1c4a6g3x44xkr75196m2qhb7fbm0lv40yv312g4hkl00mq713abm"; + sha256 = "1if44rfzmrw9m2k47kiplccby1lfdrlq82jlz4p91wwqc1vs4xi5"; }; propagatedBuildInputs = [ From 1039e9a9c9b2bfa7405d5eb26e91e87c4006f95b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 01:07:31 -0700 Subject: [PATCH 19/76] python37Packages.pyatspi: 2.32.0 -> 2.32.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pyatspi/versions --- pkgs/development/python-modules/pyatspi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 20b39131135..693477d20c0 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.32.0"; + version = "2.32.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jfmm5684sfb035ihvla75gxz4cls5d2vnf0s02y6dw7s12zbb8a"; + sha256 = "1283cbwd2kacgdij96xk26721f6amyzdhy2py11kdj5cprdlm5c4"; }; nativeBuildInputs = [ pkgconfig ]; From 35c8b6ea332050eb5e4721e4b2c7768512031c55 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 02:03:45 -0700 Subject: [PATCH 20/76] python37Packages.pytest-tornado: 0.6.0 -> 0.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pytest-tornado/versions --- pkgs/development/python-modules/pytest-tornado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index 53e1fce493d..c03590f8de8 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-tornado"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0ndwjsad901km7zw8xxj3igjff651hg1pjcmv5vqx458xhnmbfqw"; + sha256 = "0jv7jhq6ddhsmnz67vc76r4kwac9k5a142968zppyw9av6qalbl4"; }; # package has no tests From 4cd1ee93ab53b367eb0c5befcf38fc9090bce6b2 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 15 Apr 2019 16:49:47 +0200 Subject: [PATCH 21/76] twemoji-color-font: 11.2.0 -> 12.0.1 --- pkgs/data/fonts/twemoji-color-font/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index d7963f6395a..009aab0c1be 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { owner = "eosrei"; repo = "twemoji-color-font"; rev = "v${meta.version}"; - sha256 = "07yawvbdkk15d7ac9dj7drs1rqln9sba1fd6jx885ms7ww2sfm7r"; + sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2"; }; nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - version = "11.2.0"; + version = "12.0.1"; description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags"; longDescription = '' A color and B&W emoji SVGinOT font built from the Twitter Emoji for From 367b046b8c6c6c6700bb7847d62e9c8e84677f05 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 2 May 2019 11:53:59 +0200 Subject: [PATCH 22/76] twemoji-color-font: automatically construct "name" --- pkgs/data/fonts/twemoji-color-font/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index 009aab0c1be..52d11bfd622 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { - name = "twemoji-color-font-${meta.version}"; + pname = "twemoji-color-font"; + version = "12.0.1"; src = fetchFromGitHub { owner = "eosrei"; repo = "twemoji-color-font"; - rev = "v${meta.version}"; + rev = "v${version}"; sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2"; }; @@ -21,7 +22,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - version = "12.0.1"; description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags"; longDescription = '' A color and B&W emoji SVGinOT font built from the Twitter Emoji for From 961b0c77b7ad4373a73e3c1566aec8f5d13c80dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 04:19:04 -0700 Subject: [PATCH 23/76] python37Packages.twilio: 6.26.1 -> 6.26.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-twilio/versions --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 9c20226fea0..f8fbf8e49f4 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.26.1"; + version = "6.26.2"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "1ly22ah487jkq0my1l3c6hbx24fgganjhxrlrcw5jfc80qmgd3hd"; + sha256 = "0z0ahbckh5calwgkmd493znixclhjjrly8jfymhwlw6g0g79kavw"; }; buildInputs = [ nose mock ]; From cf6a8043601ce881686e1b0891e6bf3fc89a1476 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 04:41:19 -0700 Subject: [PATCH 24/76] python37Packages.vega: 2.0.1 -> 2.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-vega/versions --- pkgs/development/python-modules/vega/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 25acc4f88bc..adbcf539494 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "vega"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "097jlh1xarnqmcnym5jkfa6rg2f0i6b17v9pck2242axgyi692rm"; + sha256 = "0lshwsvi242m0ybrqjvbag73x1mrb31w2jq3lnklqyzry153xfdb"; }; buildInputs = [ pytest ]; From dd0c105b87a9c4bdf670a2ac4cce4acc3ca61a42 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 2 May 2019 13:43:07 +0200 Subject: [PATCH 25/76] dropbox-cli: Fix and add Nautilus extension MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …since this is actually dropbox-nautilus project. In one of the previous updates, the source code responsible for finding dropboxd was changed, rendering our sed replacement not working. That triggered the installer which in turn failed on the unavailability of gobject-introspection typelibs. And when that was fixed, we got bitten by our lazy packaging putting a broken code into the installer. This is a proper fix for all the issues, except for making typelibs available to the installer since we shall use Nix instead. --- pkgs/applications/networking/dropbox/cli.nix | 68 +++++++++++++------ .../networking/dropbox/fix-cli-paths.patch | 11 +++ 2 files changed, 59 insertions(+), 20 deletions(-) create mode 100644 pkgs/applications/networking/dropbox/fix-cli-paths.patch diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 73977b82047..2b6645b2c8a 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -1,4 +1,15 @@ -{ stdenv, pkgconfig, fetchurl, python3, dropbox }: +{ stdenv +, substituteAll +, pkgconfig +, fetchurl +, python3 +, dropbox +, gtk3 +, gnome3 +, gdk_pixbuf +, gobject-introspection +}: + let version = "2019.02.14"; dropboxd = "${dropbox}/bin/dropbox"; @@ -6,35 +17,52 @@ in stdenv.mkDerivation { name = "dropbox-cli-${version}"; + outputs = [ "out" "nautilusExtension" ]; + src = fetchurl { url = "https://linux.dropboxstatic.com/packages/nautilus-dropbox-${version}.tar.bz2"; sha256 = "09yg7q45sycl88l3wq0byz4a9k6sxx3m0r3szinvisfay9wlj35f"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python3 ]; + strictDeps = true; - phases = "unpackPhase installPhase"; + patches = [ + (substituteAll { + src = ./fix-cli-paths.patch; + inherit dropboxd; + }) + ]; - installPhase = '' - mkdir -p "$out/bin/" "$out/share/applications" - cp data/dropbox.desktop "$out/share/applications" - cp -a data/icons "$out/share/icons" - find "$out/share/icons" -type f \! -name '*.png' -delete - substitute "dropbox.in" "$out/bin/dropbox" \ - --replace '@PACKAGE_VERSION@' ${version} \ - --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \ - --replace '@IMAGEDATA16@' '"too-lazy-to-fix"' \ - --replace '@IMAGEDATA64@' '"too-lazy-to-fix"' - sed -i 's:db_path = .*:db_path = "${dropboxd}":' $out/bin/dropbox - chmod +x "$out/bin/"* - patchShebangs "$out/bin" - ''; + nativeBuildInputs = [ + pkgconfig + gobject-introspection + gdk_pixbuf + # only for build, the install command also wants to use GTK through introspection + # but we are using Nix for installation so we will not need that. + (python3.withPackages (ps: with ps; [ + docutils + pygobject3 + ])) + ]; + + buildInputs = [ + python3 + gtk3 + gnome3.nautilus + ]; + + configureFlags = [ + "--with-nautilus-extension-dir=${placeholder ''nautilusExtension''}/lib/nautilus/extensions-3.0" + ]; + + makeFlags = [ + "EMBLEM_DIR=${placeholder ''nautilusExtension''}/share/nautilus-dropbox/emblems" + ]; meta = { - homepage = http://dropbox.com; + homepage = https://www.dropbox.com; description = "Command line client for the dropbox daemon"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; # NOTE: Dropbox itself only works on linux, so this is ok. platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/dropbox/fix-cli-paths.patch b/pkgs/applications/networking/dropbox/fix-cli-paths.patch new file mode 100644 index 00000000000..84cd8014e1e --- /dev/null +++ b/pkgs/applications/networking/dropbox/fix-cli-paths.patch @@ -0,0 +1,11 @@ +--- a/dropbox.in ++++ b/dropbox.in +@@ -71,7 +71,7 @@ + + PARENT_DIR = os.path.expanduser("~") + DROPBOX_DIST_PATH = "%s/.dropbox-dist" % PARENT_DIR +-DROPBOXD_PATH = os.path.join(DROPBOX_DIST_PATH, "dropboxd") ++DROPBOXD_PATH = "@dropboxd@" + DESKTOP_FILE = "@DESKTOP_FILE_DIR@/dropbox.desktop" + + enc = locale.getpreferredencoding() From 942a86de9f67192aa7df238d5ef16958ce492f98 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 05:18:50 -0700 Subject: [PATCH 26/76] qbs: 1.12.2 -> 1.13.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qbs/versions --- pkgs/development/tools/build-managers/qbs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 3c5a485e36f..196a5d2a7fc 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "qbs-${version}"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "0spkkq7nmh27rbx61p23fzkxffx3qdhjqw95pqgsbc76xczd45sv"; + sha256 = "12zzbhddsgfxyzglknvim0bb7rrnifawnx18g35g1105ybfak607"; }; nativeBuildInputs = [ qmake ]; From deb593bac51421324880030cbb3f3acf513e43c6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 09:56:29 -0700 Subject: [PATCH 27/76] samplv1: 0.9.6 -> 0.9.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/samplv1/versions --- pkgs/applications/audio/samplv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 1a131539460..5d2b1645473 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "16a5xix9pn0gl3fr6bv6zl1l9vrzgvy1q7xd8yxzfr3vi5s8x4z9"; + sha256 = "1vgmcjccpgqqlmmwfg6m91nph81p2xaxydjx82n4l1yrr9lidn9h"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; From c82b7fdd5e72f482d3ef4126ca9b05ac58eb5fbb Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Thu, 2 May 2019 19:04:38 +0200 Subject: [PATCH 28/76] mdds: 1.3.1 -> 1.4.3 Changelog: https://gitlab.com/mdds/mdds/blob/1.4.3/CHANGELOG --- pkgs/development/libraries/mdds/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 3b0a0441cc4..16502ca4e61 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, boost }: stdenv.mkDerivation rec { - version = "1.3.1"; - name = "mdds-${version}"; + pname = "mdds"; + version = "1.4.3"; src = fetchurl { - url = "https://kohei.us/files/mdds/src/mdds-${version}.tar.bz2"; - sha256 = "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w"; + url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; + sha256 = "10cw6irdm6d15nxnys2v5akp8yz52qijpcjvw0frwq7nz5d3vki5"; }; postInstall = '' - mkdir -p "$out/lib/pkgconfig" - cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" + mkdir -p "$out/lib/pkgconfig" + cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" ''; checkInputs = [ boost ]; From 121cf3ca1ca4849501372041a806b6a36f9737a3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 10:24:35 -0700 Subject: [PATCH 29/76] shaarli: 0.10.3 -> 0.10.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/shaarli/versions --- pkgs/servers/web-apps/shaarli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 3083512e1b4..ebca3eae450 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "1jcjkyhqwh1pv0a98bidf8az6mc34l4snnsl6lc7m2gxr55099j8"; + sha256 = "00m41x3nlxcc8dspin61zx7lrv1hjzacjadm34afqrb21yxdp84f"; }; outputs = [ "out" "doc" ]; From c6e9b160786cd2e0bb63503997bfe8afb1bbcf67 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 05:39:22 -0700 Subject: [PATCH 30/76] qpdf: 8.4.0 -> 8.4.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qpdf/versions --- pkgs/development/libraries/qpdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 30383dda50c..156a8c4c15c 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.4.0"; +let version = "8.4.1"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r"; + sha256 = "1fsfy38dnm9cy1j40jw5x8vn84l6f2kgb68rdjl0wxignfw05z87"; }; nativeBuildInputs = [ perl ]; From 6f69939c9aed602fafb82986ed20263231b56c51 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 05:48:08 -0700 Subject: [PATCH 31/76] qmidinet: 0.5.3 -> 0.5.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qmidinet/versions --- pkgs/applications/audio/qmidinet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 21bcd158f7a..b596e74a264 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.5.3"; + version = "0.5.4"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "0li6iz1anm8pzz7j12yrfyxlyslsfsksmz0kk0iapa4yx3kifn10"; + sha256 = "1il4b8v3azb33yg4fy78npi56xlkz4n60f17sgvckyxb2yj57jwq"; }; hardeningDisable = [ "format" ]; From 58d1128052a40ea51d58ff1302b4952474c59e03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 07:20:33 -0700 Subject: [PATCH 32/76] riot-web: 1.0.7 -> 1.0.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/riot-web/versions --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 9f8818efd98..9c15f8a750a 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1zg9hwvbanmv2yymjcxjzk2bwvv8707i30vrs0gr213iz6i4abg5"; + sha256 = "010m8b4lfnfi70d4v205wk3i4xhnsz7zkrdqrvw3si14xqy6192r"; }; installPhase = '' From 43235b77f1b36237b04d27cfb519c21d5b3ff12d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 07:45:46 -0700 Subject: [PATCH 33/76] rspamd: 1.9.1 -> 1.9.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rspamd/versions --- pkgs/servers/mail/rspamd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index f14d36f1efb..d4eb0922082 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -14,13 +14,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "120944v0n2qh30ri5604h4xz38jm94f6s00gwhsjvs1sfm6csapz"; + sha256 = "1ygyqlm8x8d54g829pmd3x3qp4rsxj8nq25kgzrpkw73spi7bkkq"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; From e1d7d482bab965127a3b46ca8cf8987de2a5d886 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 06:17:05 -0700 Subject: [PATCH 34/76] qtractor: 0.9.6 -> 0.9.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qtractor/versions --- pkgs/applications/audio/qtractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 703ce5c5cf9..6c1f561ad74 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "06sa4wl8zr0k8dnjiil0gjwnhrkq95h50xv56ih1y8jgyzxchaxp"; + sha256 = "0z97c8h0m7070bfq0qsbf8hwzwcqjs7dln7na4mngyhc6vqkg63s"; }; nativeBuildInputs = [ From a0e953768a8b4207ba31bdd66db76ea7d29a0d91 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 13:22:12 -0700 Subject: [PATCH 35/76] sysstat: 12.1.3 -> 12.1.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sysstat/versions --- pkgs/os-specific/linux/sysstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 96bffc63a27..67dda1e5bd2 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-12.1.3"; + name = "sysstat-12.1.4"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "1am1a6mwi91921rrq8ivgczdsl4gdz91zxkx7vnrzfjm4zw8njam"; + sha256 = "0vd1v3kdgsfi82mskh18pyv4bb1rjzzai13vga1ms3nkjvv8lqkg"; }; buildInputs = [ gettext ]; From eff5e589de806dc7f5a19b307b466d715f2e645d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 13:29:21 -0700 Subject: [PATCH 36/76] synthv1: 0.9.6 -> 0.9.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/synthv1/versions --- pkgs/applications/audio/synthv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 48579694699..170045704ef 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1hcngk7mxfrqf8v3r759x3wd0p02nc3q83j8m3k58p408y3mx7nr"; + sha256 = "0i70wm430fvksi3g985farrkhgb7mwhi7j06dl66cdj1n12jzzk7"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; From 1fc56f7789650e93df737066f9b9405299673a55 Mon Sep 17 00:00:00 2001 From: pacien Date: Thu, 2 May 2019 22:41:01 +0200 Subject: [PATCH 37/76] riot-web: add pacien as maintainer --- .../networking/instant-messengers/riot/riot-web.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 9c15f8a750a..4a678668811 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = http://riot.im/; - maintainers = with stdenv.lib.maintainers; [ bachp ]; + maintainers = with stdenv.lib.maintainers; [ bachp pacien ]; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; hydraPlatforms = []; From 11a185b61f3fdc4a7f844f8660735c136a30ee60 Mon Sep 17 00:00:00 2001 From: Renaud Date: Thu, 2 May 2019 22:42:16 +0200 Subject: [PATCH 38/76] softether_4_25: restrict to x86_64-linux --- pkgs/servers/softether/4.25.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix index 04053174f4e..7eaa5b3e8a0 100644 --- a/pkgs/servers/softether/4.25.nix +++ b/pkgs/servers/softether/4.25.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = https://www.softether.org/; license = licenses.gpl2; maintainers = [ maintainers.rick68 ]; - platforms = filter (p: p != "aarch64-linux") platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From 13f7105a8c301b0478222cb951ec7b7e8691105e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 05:27:51 -0700 Subject: [PATCH 39/76] qjackctl: 0.5.6 -> 0.5.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qjackctl/versions --- pkgs/applications/audio/qjackctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 089fffdc0e8..018dd39580f 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.5.6"; + version = "0.5.7"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "0wlmbb9m7cf3wr7c2h2hji18592x2b119m7mx85wksjs6rjaq2mj"; + sha256 = "1g6a5j74p45yisl28bw4fcc9nr6b710ikk459p4mp6djh9gs8v95"; }; buildInputs = [ From 3b11620157772fae074d6fb2859a99b3991c2c83 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 05:55:30 -0700 Subject: [PATCH 40/76] qownnotes: 19.4.1 -> 19.4.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qownnotes/versions --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index c65315ad5bd..859cab7235a 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qownnotes"; - version = "19.4.1"; + version = "19.4.5"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "c0232dda44591033c2ed29ce0a52ba3539b2f2180d1862a18dd4f677063896cb"; + sha256 = "13yafcdqkl46awq2mxr1c5skydi44iwgcmfkx3wrhq85ird25cpy"; }; nativeBuildInputs = [ qmake qttools ]; From 083176a6e6d652532dc12dbdcae5d007ef76213c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 05:43:57 -0700 Subject: [PATCH 41/76] qsampler: 0.5.4 -> 0.5.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qsampler/versions --- pkgs/applications/audio/qsampler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index aef0d013e9f..b09aa835c9f 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "qsampler-${version}"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { url = "mirror://sourceforge/qsampler/${name}.tar.gz"; - sha256 = "1hk0j63zzdyji5dd89spbyw79i74n28zjryyy0a4gsaq0m7j2dry"; + sha256 = "1li2p8zknrdr62wlaassfvgski0rlbr3lvrzywbh32dq8j50w8zf"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; From a872d68060f1887e1cd95a35a6e2feb90e276b58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 14:50:09 -0700 Subject: [PATCH 42/76] translate-shell: 0.9.6.9 -> 0.9.6.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/translate-shell/versions --- pkgs/applications/misc/translate-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 5d50238a9f0..9fb8469cf27 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "translate-shell"; - version = "0.9.6.9"; + version = "0.9.6.10"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v${version}"; - sha256 = "1xyf0vdxmbgqcgsr1gvgwh1q4fh080h68radkim6pfcwzffliszm"; + sha256 = "1dmh3flldfhnqfay3a6c5hanqcjwrmbly1bq8mlk022qfi1fv33y"; }; buildInputs = [ makeWrapper ]; From aed27facc0ce00e1ef7174ca72da0de15223ac99 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Thu, 2 May 2019 23:51:11 +0200 Subject: [PATCH 43/76] fpm: 1.9.3 -> 1.11.0, use bundlerApp --- .../tools/package-management/fpm/Gemfile.lock | 16 +++--- pkgs/tools/package-management/fpm/default.nix | 7 +-- pkgs/tools/package-management/fpm/gemset.nix | 50 +++++++++++++++---- 3 files changed, 52 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/tools/package-management/fpm/Gemfile.lock index e0c12dcce31..1045c7b495a 100644 --- a/pkgs/tools/package-management/fpm/Gemfile.lock +++ b/pkgs/tools/package-management/fpm/Gemfile.lock @@ -3,23 +3,23 @@ GEM specs: arr-pm (0.0.10) cabin (> 0) - backports (3.10.3) + backports (3.14.0) cabin (0.9.0) - childprocess (0.8.0) + childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) clamp (1.0.1) - dotenv (2.2.1) - ffi (1.9.18) - fpm (1.9.3) + dotenv (2.7.2) + ffi (1.10.0) + fpm (1.11.0) arr-pm (~> 0.0.10) backports (>= 2.6.2) cabin (>= 0.6.0) - childprocess + childprocess (= 0.9.0) clamp (~> 1.0.0) ffi json (>= 1.7.7, < 2.0) pleaserun (~> 0.0.29) - ruby-xz + ruby-xz (~> 0.2.3) stud insist (1.0.0) io-like (0.3.0) @@ -44,4 +44,4 @@ DEPENDENCIES fpm BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/tools/package-management/fpm/default.nix b/pkgs/tools/package-management/fpm/default.nix index 4a18bfb5345..905c686fede 100644 --- a/pkgs/tools/package-management/fpm/default.nix +++ b/pkgs/tools/package-management/fpm/default.nix @@ -1,14 +1,15 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv rec { - inherit ruby; +bundlerApp { pname = "fpm"; gemdir = ./.; + exes = [ "fpm" ]; meta = with lib; { description = "Tool to build packages for multiple platforms with ease"; homepage = https://github.com/jordansissel/fpm; license = licenses.mit; + maintainers = with maintainers; [ manveru ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix index 26450bc3612..13d1669e540 100644 --- a/pkgs/tools/package-management/fpm/gemset.nix +++ b/pkgs/tools/package-management/fpm/gemset.nix @@ -1,6 +1,8 @@ { arr-pm = { dependencies = ["cabin"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg"; @@ -9,14 +11,18 @@ version = "0.0.10"; }; backports = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1agsk23kfr194s690jnrpijh9pf3hq4a9yy66j1wzzj2x19ss9y0"; + sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn"; type = "gem"; }; - version = "3.10.3"; + version = "3.14.0"; }; cabin = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0b3b8j3iqnagjfn1261b9ncaac9g44zrx1kcg81yg4z9i513kici"; @@ -26,14 +32,18 @@ }; childprocess = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "081hxbgrqjxha0jz0p0wkncdqawdvlsxb3awsx195g0pgkpqrcms"; + sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; type = "gem"; }; - version = "0.8.0"; + version = "0.9.0"; }; clamp = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0jb6l4scp69xifhicb5sffdixqkw8wgkk9k2q57kh2y36x1px9az"; @@ -42,31 +52,39 @@ version = "1.0.1"; }; dotenv = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv"; + sha256 = "13cis6bf06hmz744xrsl163p6gb78xcm8g8q4pcabsy5ywyv6kag"; type = "gem"; }; - version = "2.2.1"; + version = "2.7.2"; }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.18"; + version = "1.10.0"; }; fpm = { dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yvp9cifzfrxv3pr1kvcvvnyrcz8vxf6yd43hg5blaick50sbm23"; + sha256 = "0khzsiqzswxpql6w2ws9dawb27zgv4nmgrjszydmm0xpv6h21jrm"; type = "gem"; }; - version = "1.9.3"; + version = "1.11.0"; }; insist = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bw3bdwns14mapbgb8cbjmr0amvwz8y72gyclq04xp43wpp5jrvg"; @@ -75,6 +93,8 @@ version = "1.0.0"; }; io-like = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "04nn0s2wmgxij3k760h3r8m1dgih5dmd9h4v1nn085yi824i5z6k"; @@ -83,6 +103,8 @@ version = "0.3.0"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; @@ -91,6 +113,8 @@ version = "1.8.6"; }; mustache = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; @@ -100,6 +124,8 @@ }; pleaserun = { dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p"; @@ -109,6 +135,8 @@ }; ruby-xz = { dependencies = ["ffi" "io-like"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw"; @@ -117,6 +145,8 @@ version = "0.2.3"; }; stud = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qpb57cbpm9rwgsygqxifca0zma87drnlacv49cqs2n5iyi6z8kb"; From bca4fdd0c9f52b14064ff438a0edf4fd47ced67a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 15:47:34 -0700 Subject: [PATCH 44/76] typora: 0.9.68 -> 0.9.70 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/typora/versions --- pkgs/applications/editors/typora/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index deb4974a9b1..03a8a55c780 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "typora"; - version = "0.9.68"; + version = "0.9.70"; src = fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "09hkmnh9avzb7nc8i67vhbv6nc1v90kk88aq01mpmyibpdqp03zp"; + sha256 = "08bgllbvgrpdkk9bryj4s16n274ps4igwrzdvsdbyw8wpp44vcy2"; }; nativeBuildInputs = [ From d0cc03e8a3f62acd8f7802f157335416718831cc Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 3 May 2019 00:55:30 +0200 Subject: [PATCH 45/76] riot-desktop: 1.0.7 -> 1.0.8 --- .../instant-messengers/riot/riot-desktop-package.json | 2 +- .../networking/instant-messengers/riot/riot-desktop.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index ee6a40e5860..f195a0cb955 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.0.7", + "version": "1.0.8", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 3db537938da..35ee3252c27 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -4,12 +4,12 @@ with (import ./yarn2nix.nix { inherit pkgs; }); let executableName = "riot-desktop"; - version = "1.0.7"; + version = "1.0.8"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "1sq6vnyas2ab3phaiyby4fkpp0nwvl67xwxnr2pzfm0dkjxl9r58"; + sha256 = "1krp608wxff1siih8zknc425n0qb6qjzf854fnp7qyjp1cnfc9sb"; }; in mkYarnPackage rec { From 2e9c8649f74c85d9ee114e564dffb05a5e00fbf0 Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 3 May 2019 00:59:48 +0200 Subject: [PATCH 46/76] riot: add maintainer note --- .../networking/instant-messengers/riot/riot-desktop.nix | 3 +++ .../networking/instant-messengers/riot/riot-web.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 35ee3252c27..6209dc4b0bf 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,5 +1,8 @@ { pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron, riot-web }: +# Note for maintainers: +# Versions of `riot-web` and `riot-desktop` should be kept in sync. + with (import ./yarn2nix.nix { inherit pkgs; }); let diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 4a678668811..d46c886a156 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchurl, writeText, conf ? null }: +# Note for maintainers: +# Versions of `riot-web` and `riot-desktop` should be kept in sync. + let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; From 7893a6e2c09eb923f2c7c5eda9a864ec756890bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 16:24:30 -0700 Subject: [PATCH 47/76] unrar: 5.7.4 -> 5.7.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/unrar/versions --- pkgs/tools/archivers/unrar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index a5d1e7b05ef..2a51e4d7bc9 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unrar-${version}"; - version = "5.7.4"; + version = "5.7.5"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "1d77wwgapwjxxshhinhk51skdd6v6xdsx34jjcjg6cj6zlwd0baq"; + sha256 = "1vp2pc1n5qhri0zr7fszlpjz8niw9x4cl47wbd9v323sm3dgvhp1"; }; postPatch = '' From 765a58918b55b40da5db45a60a63bb0f0e091170 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 17:18:15 -0700 Subject: [PATCH 48/76] vnstat: 2.1 -> 2.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vnstat/versions --- pkgs/applications/networking/vnstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 289d1dffc96..b384efc5fe8 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "vnstat-${version}"; - version = "2.1"; + version = "2.2"; src = fetchurl { - sha256 = "0yk0x6bg9f36dsslhayyyi8fg04yvzjzqkjmlrcsrv6nnggchb6i"; + sha256 = "0b7020rlc568pz6vkiy28kl8493z88wzrn18wv9b0iq2bv1pn2n6"; url = "https://humdi.net/vnstat/${name}.tar.gz"; }; From 0d2b66dff20609e9d8888558def28a173aa85099 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 May 2019 19:29:32 -0500 Subject: [PATCH 49/76] liburing: bump, fix version (1.0.0pre92_7b989f3) I accidentally got the number of commits wrong in the previous prerelease version string. This is now fixed. Generally, this would result in functions like builtins.compareVersions to give incorrect results, so 'nix-env -u' doesn't work. But I'm justifying it here, because: most people use it as a library, so the hash change is all that matters. Plus, I only authored this a week or so ago in upstream, so this change is fast enough that I think people will be fine with it and can work around, especially since it's unreleased in any stable channel. This also bumps the library to the newest version, which contains some bugfixes, and now installs the manpages into the $man output for us. Signed-off-by: Austin Seipp --- pkgs/development/libraries/liburing/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 143919d148e..c90e0ee009e 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre821_${builtins.substring 0 7 src.rev}"; + version = "1.0.0pre92_${builtins.substring 0 7 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "39e0ebd4fc66046bf733a47aaa899a556093ebc6"; - sha256 = "00c72fizxmwxd2jzmlzi4l82cw7h75lfpkkwzwcjpw9zdg9w0ci7"; + rev = "7b989f34191302011b5b49bf5b26b36862d54056"; + sha256 = "12kfqvwzxksmsm8667a1g4vxr6xsaq63cz9wrfhwq6hrsv3ynydc"; }; enableParallelBuilding = true; @@ -19,13 +19,12 @@ stdenv.mkDerivation rec { [ "prefix=$(out)" "includedir=$(dev)/include" "libdir=$(lib)/lib" + "mandir=$(man)/share/man" ]; - # Copy the examples into $out and man pages into $man. This should be handled - # by the build system in the future and submitted upstream. + # Copy the examples into $out. postInstall = '' - mkdir -p $out/bin $man/share/man/man2/ - cp -R ./man/* $man/share/man/man2 + mkdir -p $out/bin cp ./examples/io_uring-cp examples/io_uring-test $out/bin ''; From 7c6679d787d5d551b4906829e2406e33c04e35d9 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Fri, 3 May 2019 02:54:50 +0800 Subject: [PATCH 50/76] rustup: 1.18.1 -> 1.18.2 --- pkgs/development/tools/rust/rustup/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 3eb0760b222..d6c5718d3ec 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,25 +1,25 @@ { stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform -, pkgconfig, curl, Security }: +, pkgconfig, curl, Security, CoreServices }: rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup.rs"; rev = version; - sha256 = "0932n708ikxzjv7y78zcrnnnps3rgimsnpaximhm9vmjjnkdgm7x"; + sha256 = "0lyn06vzp5406sjng7msifigkal2lafppqjbdnigx8yvgxqgd06f"; }; - cargoSha256 = "0kw8a9prqjf939g0h8ryyhlm1n84fwdycvl0nkykkwlfqd6hh9hb"; + cargoSha256 = "0yxjy1kls80fcpwskklmihkqva16s6mawa8rdxc3zz8g588am03c"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--features no-self-update" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6fe00d164ef..5664c7f7731 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7856,7 +7856,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; rustup = callPackage ../development/tools/rust/rustup { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; From b85cbd96c29ad36d16bb0547e31a34e3c1f688d2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 1 May 2019 15:05:03 +0200 Subject: [PATCH 51/76] =?UTF-8?q?gnomeExtensions.gsconnect:=2021=20?= =?UTF-8?q?=E2=86=92=2023?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/andyholmes/gnome-shell-extension-gsconnect/releases/tag/v22 --- pkgs/desktops/gnome-3/extensions/gsconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 75c34b4b99d..dd2a02b6be8 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-gsconnect-${version}"; - version = "21"; + version = "23"; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "0ikkb2rly3h4qglswn15vs8f2kl727gpri5c9x3jiy27ylag7yav"; + sha256 = "011asrhkly9zhvnng2mh9v06yw39fx244pmqz5yk9rd9m4c32xid"; }; patches = [ From a8293a0848b4632f85e2352347ff669b4ee5a2de Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 3 May 2019 04:17:56 +0200 Subject: [PATCH 52/76] common-updater-scripts: fix fallback version detection parseDrvName returns a set containing version attribute, not our customizable key. --- pkgs/common-updater/scripts/update-source-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 75433fe4c59..2d0c16aa2f4 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -97,7 +97,7 @@ if [ -z "$oldUrl" ]; then fi drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"') -oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).${versionKey}" | tr -d '"') +oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"') if [ -z "$drvName" -o -z "$oldVersion" ]; then die "Couldn't evaluate name and version from '$attr.name'!" From 9f4ae182c1013a12137c1a7aa658518e4688b4f6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 3 May 2019 04:28:28 +0200 Subject: [PATCH 53/76] =?UTF-8?q?sublime3-dev:=203203=20=E2=86=92=203208?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Build 3208 21 April 2019 Mac: Added a workaround for a macOS OpenGL driver bug in 10.14.4 Build 3206 5 April 2019 Performance improvements Build 3205 3 April 2019 Improved scrolling logic in some scenarios Linux: Fixed compatibility with old Linux distributions Build 3204 2 April 2019 Mac: Added a workaround for a MacOS issue with DisplayLink adapters Linux: Tweaked the way text scaling is handled Improved file indexing behavior in some scenarios Fixed block carets changing the way text selection works --- pkgs/applications/editors/sublime/3/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix index 9d7539b5b65..ebceb4a8b35 100644 --- a/pkgs/applications/editors/sublime/3/packages.nix +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -5,10 +5,10 @@ let in rec { sublime3-dev = common { - buildVersion = "3203"; + buildVersion = "3208"; dev = true; - x32sha256 = "004hnlm2dvcfagf3bkbfqxlnkgqk46jrm8w9yagpjwkpdy76mgyx"; - x64sha256 = "0dp4vi39s2gq5a7snz0byrf44i0csbzwq6hn7i2zqa6rpvfywa1d"; + x32sha256 = "09k04fjryc0dc6173i6nwhi5xaan89n4lp0n083crvkqwp0qlf2i"; + x64sha256 = "12pn3yfm452m75dlyl0lyf82956j8raz2dglv328m81hbafflrj8"; } {}; sublime3 = common { From 6e90393eadfda850024604082e651f02c7638600 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 2 May 2019 22:04:46 -0500 Subject: [PATCH 54/76] looking-glass-client: fix build spice-protocol removed the spice/error_codes.h header file [1], which looking-glass-client was still using. [1] https://gitlab.freedesktop.org/spice/spice-protocol/commit/334cef51d03134a50d85827ea3c2ebc1ebb09e1c --- .../virtualization/looking-glass-client/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index ca8e4985016..afb2088c6a6 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , cmake, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig , libX11, freefont_ttf, nettle, libconfig }: @@ -21,6 +21,15 @@ stdenv.mkDerivation rec { libX11 freefont_ttf nettle libconfig cmake ]; + patches = [ + # Fix obsolete spice header usage. Remove with the next release. See https://github.com/gnif/LookingGlass/pull/126 + (fetchpatch { + url = "https://github.com/gnif/LookingGlass/commit/2567447b24b28458ba0f09c766a643ad8d753255.patch"; + sha256 = "04j2h75rpxd71szry15f31r6s0kgk96i8q9khdv9q3i2fvkf242n"; + stripLen = 1; + }) + ]; + enableParallelBuilding = true; sourceRoot = "source/client"; From d67494972d1b59b1992031aebeb27e07c1520da9 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Thu, 18 Apr 2019 18:51:35 -0400 Subject: [PATCH 55/76] nixos/nvidia: Add NVIDIA optimus option to allow external GPUs Without this option - NVIDIA refuses to use an external GPU. --- nixos/modules/hardware/video/nvidia.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 80ea7bc5d5c..9f2360f41c6 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -79,6 +79,14 @@ in ''; }; + hardware.nvidia.optimus_prime.allowExternalGpu = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Configure X to allow external NVIDIA GPUs when using optimus. + ''; + }; + hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkOption { type = lib.types.string; default = ""; @@ -134,6 +142,7 @@ in deviceSection = optionalString optimusCfg.enable '' BusID "${optimusCfg.nvidiaBusId}" + ${optionalString optimusCfg.allowExternalGpu "Option \"AllowExternalGpus\""} ''; screenSection = '' From fecdbd9a4931b8d3c5d09e5fc9a484aff671b818 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 3 May 2019 01:46:03 -0500 Subject: [PATCH 56/76] cockroachdb: 2.1.6 -> 19.1.0 Signed-off-by: Austin Seipp --- pkgs/servers/sql/cockroachdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index ca25b5a9168..241ca9235c6 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { name = "cockroach-${version}"; - version = "2.1.6"; + version = "19.1.0"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "1sry2qvcar7yn80y2azh0lmz4yp12r27hq3w8nyqz2gw36k9k8q4"; + sha256 = "1kb93jxgxc54c23v72ka116b2j7m82c1jghm7njd64qkbbcgrkkw"; }; inherit nativeBuildInputs buildInputs; From 0d5e0da42dcaeb6b8b88ae0dda15f5f013795e54 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 3 May 2019 01:51:44 -0500 Subject: [PATCH 57/76] tor: 0.3.5.7 -> 0.4.0.5 https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-0.4.0.5 --- pkgs/tools/security/tor/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 1bda80dab45..b3b71a16eb8 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -14,11 +14,12 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.5.7"; + pname = "tor"; + version = "0.4.0.5"; src = fetchurl { - url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "17l31p58rsd30w4b6r4d8pbr84z3y7awahvjxbpmnlxc47y8f20v"; + url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; + sha256 = "0vk9j3ybz5dwwbmqrdj1bjcsxy76pc8frmfvflkdzwfkvkqcp8mm"; }; outputs = [ "out" "geoip" ]; From bcff2e14e1b3470e922ca6cf58bab179cf7607ac Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 3 May 2019 09:44:03 +0800 Subject: [PATCH 58/76] krunner-pass: fix the build --- pkgs/tools/security/krunner-pass/default.nix | 29 ++++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/security/krunner-pass/default.nix b/pkgs/tools/security/krunner-pass/default.nix index dac6df56a79..57174148160 100644 --- a/pkgs/tools/security/krunner-pass/default.nix +++ b/pkgs/tools/security/krunner-pass/default.nix @@ -1,15 +1,10 @@ -{ mkDerivation, stdenv, - fetchFromGitHub, - cmake, extra-cmake-modules, gnumake, +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, extra-cmake-modules +, kauth, krunner +, pass, pass-otp ? null }: - pass, pass-otp ? null, krunner, -}: -let +mkDerivation rec { pname = "krunner-pass"; version = "1.3.0"; -in -mkDerivation rec { - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "akermu"; @@ -19,22 +14,26 @@ mkDerivation rec { }; buildInputs = [ - pass - pass-otp - krunner + kauth krunner + pass pass-otp ]; - nativeBuildInputs = [cmake extra-cmake-modules gnumake]; + nativeBuildInputs = [ cmake extra-cmake-modules ]; patches = [ + (fetchpatch { + url = https://github.com/peterhoeg/krunner-pass/commit/be2695f4ae74b0cccec8294defcc92758583d96b.patch; + sha256 = "098dqnal57994p51p2srfzg4lgcd6ybp29h037llr9cdv02hdxvl"; + name = "fix_build.patch"; + }) ./pass-path.patch ]; CXXFLAGS = [ - ''-DNIXPKGS_PASS=\"${stdenv.lib.getBin pass}/bin/pass\"'' + ''-DNIXPKGS_PASS=\"${lib.getBin pass}/bin/pass\"'' ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)"; homepage = https://github.com/akermu/krunner-pass; license = licenses.gpl3; From 590503475063d0f7e97edf9d57d6194deaa999b3 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 3 May 2019 10:09:05 +0200 Subject: [PATCH 59/76] vimPlugins: update (#60850) --- pkgs/misc/vim-plugins/generated.nix | 160 ++++++++++++++-------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 6625502a163..d327b7e16fa 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-04-26"; + version = "2019-05-02"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "737ed31de5be0c50502d820421726b8a707d1a58"; - sha256 = "16641pvxs98s4jvry3dkap3nijzxganc5fn241mhzd954s2k6wwp"; + rev = "7f0954b89ef7c43e5fb7b6490665e9814c8205b2"; + sha256 = "0pgqgswggf037y49a2yr1p5k3fbw6lq4v9v7ipj6h9y9iklbqzhr"; }; }; @@ -392,12 +392,12 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2019-03-29"; + version = "2019-04-29"; src = fetchFromGitHub { owner = "chemzqm"; repo = "denite-git"; - rev = "c86a6b2b22ac16544a8bccbefb608604f9252349"; - sha256 = "19rx46xd9hi7z1n9adxa9yf4ljv38jhwinplsszwlpcq518ac4i6"; + rev = "b6a0c7d08a1477a1607ba8be3a33c1352f93d79d"; + sha256 = "001848nr3pdzv6z2c9a262n63gcln1dr98qamkr5c5khxc1da322"; }; }; @@ -516,23 +516,23 @@ let dhall-vim = buildVimPluginFrom2Nix { pname = "dhall-vim"; - version = "2018-12-26"; + version = "2019-05-01"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "54a0f463d098abf72c76a233a6a3f0f9dd069dfe"; - sha256 = "0yacjv7kv79yilsyij43m378shzln0qra5c3nc5g2mc2i9hxcial"; + rev = "20d2fa23dddc11d694d62c957e4aa7287dba63d3"; + sha256 = "0718acz3qwrnjy1d76bar825dhbjj7mm5vrkgwxhyvdljx5w0hxs"; }; }; direnv-vim = buildVimPluginFrom2Nix { pname = "direnv-vim"; - version = "2019-04-25"; + version = "2019-04-30"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv.vim"; - rev = "15c0d2c91d65f95f90c30d21d9ea11bc8ee51def"; - sha256 = "1k9ipwiayp5i31slr1119az0wylqsnaf5zz04x7bcpclaaajgzfk"; + rev = "5e75084465ad37dd0a4d4b1198b5ffa8978ae4e1"; + sha256 = "0vabsv98vwdjns3dliplg7x8ssyrin44af9jl248kdzkqw5fx445"; }; }; @@ -606,12 +606,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-04-18"; + version = "2019-05-02"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "b0b5f19042685cd3ec3b3f388f64aaed489889db"; - sha256 = "0rikl448c1ps3phivb0xpx8a085wk5fz2xj1b6n24g88xfay1psm"; + rev = "2920687e537c6aa771a3d24986f7a09359558dbe"; + sha256 = "0x5kslnv82v5hczaywjpbigyqf4n6g2kbr8k9m76c3ajb9p5k13r"; }; }; @@ -695,12 +695,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2019-02-22"; + version = "2019-04-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "b31512e2a2d062ee4b6eb38864594c83f1ad2c2f"; - sha256 = "18wqg6czxwbbydssq6azqcl4llb5lf4phivdas4nqnlgg9hnp5ga"; + rev = "ac4e7bfb36c88d27799c080218cea3bb833bdbd9"; + sha256 = "10m6v1jrry4fhrbkgb8kkdjasl0pz2qgr9khxl94nlg42fxb1r20"; }; }; @@ -739,12 +739,12 @@ let goyo-vim = buildVimPluginFrom2Nix { pname = "goyo-vim"; - version = "2019-02-20"; + version = "2019-04-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "goyo.vim"; - rev = "057fe68e442e7d4ffa45a3c992389e19e64abc7c"; - sha256 = "1yx2i1daqmz99apzh8x69xvg4iav0c97rm7n5y1q07z9rbz4j554"; + rev = "012290431a834752d2fce3dfc197dba3d7d1d0f8"; + sha256 = "0vqd75c2a5yjmiakv26cgd9wkqwzfbi93qm1vw9g2j5s96dcwa6a"; }; }; @@ -893,12 +893,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-04-05"; + version = "2019-04-28"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "914754a04e0ea0882b3172230199fd771b02dc95"; - sha256 = "0wj0fgvbvwhgx0ij9lrka5an2xc8gy6pq7add8ildk25fls23ig4"; + rev = "69aa410afaefbecbcaac2a8254af7bed290d6927"; + sha256 = "0wd29y66k12rndh1zf3wfdz3gqv25dahf0m61rg3zii6dcyk0qsd"; fetchSubmodules = true; }; }; @@ -949,12 +949,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-01-18"; + version = "2019-05-02"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "83ae633be323a7fb5baf77e493232cf3358d02bf"; - sha256 = "1y0iwz3wwcds4b2cll893l17i14ih5dwq1njxjbq9sd0694dadz7"; + rev = "78b1cc9e715f509a7e9f157e0d7a0e02b7e5125e"; + sha256 = "0j2i09shwi8fcqfh7m48m4d6bi5pzfgn8mf6iw53v4ah2cdp2m93"; }; }; @@ -1862,12 +1862,12 @@ let typescript-vim = buildVimPluginFrom2Nix { pname = "typescript-vim"; - version = "2019-04-11"; + version = "2019-05-03"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "f50fed442f8e75e714efeaf015225af9eaf67cf4"; - sha256 = "077h668k4z94kvpijmivq3mf6884b96fz5v53rlzxrx80431biww"; + rev = "7704fac2c765aaf975ad4034933bf63113dd4a64"; + sha256 = "1cjqqbaaa2ns1c916skqcgqy9yv7l9b457bfay5gv1p364y35msk"; }; }; @@ -1939,12 +1939,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-04-15"; + version = "2019-04-30"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "d8ca3b52b07529f4a55da451291fe0ca8e18d02d"; - sha256 = "153pmg4x0yrc9npwjk9zyzd347r2xkr3r72nmhh1cfy0n0lg10gg"; + rev = "b68c4fdbd32b7ccf3b4e52e69106021f9bc54878"; + sha256 = "0xikbqljpn3br0pbf8iigp3lc0qwxl4gcj6zg4y5gr8aywll7819"; }; }; @@ -2170,12 +2170,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-04-26"; + version = "2019-05-02"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "28ed36a9ec9c9bc35bec81c42cfbf8cf5e76b231"; - sha256 = "0a5cgkwwhrdxfh1mf1x5vph132s4cmmdy9h88yhzz1jpw0x8322d"; + rev = "a26a46069825ec391b342481b2d45be66887b8a2"; + sha256 = "14g72yg38vb027xw3bsyzrvq16hbapgqqvhls7p4pf3880v9ngff"; }; }; @@ -2445,12 +2445,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2019-04-21"; + version = "2019-04-27"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "8901782b58f5613d6c1b45456c9f130f30df2dc7"; - sha256 = "0wmqcfiysp6nhspqv1lyvjvpkxpkslrg9rqa8kjf04vcggipdr5g"; + rev = "ea338f099183c95ecbc2ea7ebde370206573fe94"; + sha256 = "0az1qpzbv662a12paasx9ci246jy0z5b72chn294254pla595w2b"; }; }; @@ -2478,12 +2478,12 @@ let vim-easy-align = buildVimPluginFrom2Nix { pname = "vim-easy-align"; - version = "2017-06-03"; + version = "2019-04-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-easy-align"; - rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0"; - sha256 = "16yis2wlgi8v0h04hiqmnkm9qrby4kbc2fvkw4szfsbg5m3qx0fc"; + rev = "12dd6316974f71ce333e360c0260b4e1f81169c3"; + sha256 = "0gpfdla8shaf5ykgakrsf0h0w6ygvwcv3lfpnki24l790xhdi606"; }; }; @@ -2533,12 +2533,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-04-25"; + version = "2019-05-02"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "8e4782f439b5c8adbfe6d368c21bd4bf5db4cd3a"; - sha256 = "02ikcdpffcwipzlpcjmrsnr7rxm6632x2qhxw0m22727pzqbmrmc"; + rev = "98c03047d15dfa62cedf56e27bffb03772d41753"; + sha256 = "0pbad3hlsy6glhmbz6nkb6lfx9y3yb6rw23vc48acxw936zm282n"; }; }; @@ -2577,12 +2577,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2018-06-01"; + version = "2019-05-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "1ef0f0726cadd96547a5f79103b66339f170da02"; - sha256 = "0ihhd34bl98xssa602386ji013pjj6xnkgww3y2wg73sx2nk6qc4"; + rev = "8ccbaf0cfde235126af3346705a4c2945b32cd77"; + sha256 = "0xzxx9i4c82zrfyak1a3c0sqdjzh2gzw6vyyjpbcwq58dm6hzz16"; }; }; @@ -2632,12 +2632,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-04-24"; + version = "2019-05-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "16b7a060a3e20b8e159783f42ce4aa79a158208c"; - sha256 = "0jg8xcp69134kgjib2pknh0ibsqcc8bcfdi1cw7nb16p3w2s2fzp"; + rev = "2bde1d9de608f7086c8b2eaeb3e295107bce9d92"; + sha256 = "0mb7k1kxkvgyfvfi6x37jsxbbq4f9cm0r5nwvb4c5czi915nahnh"; }; }; @@ -2698,12 +2698,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-04-27"; + version = "2019-05-03"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "3e9a29279627d1ac50a855376b5da4dc0f809356"; - sha256 = "0jyy3hgw8z1c372qd4672p5zpbxnq0l4w2dd4s07div6wxxs9cdh"; + rev = "2c1a85bbd04f40503bb7d1488d5d8eeb14836efb"; + sha256 = "0x09prxw5ixprjldkw76b4xxqvl6mgqg5j48xl3ldpndg3v92nqg"; }; }; @@ -3260,34 +3260,34 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2019-04-25"; + version = "2019-04-29"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "89ebe3cf92b4502cb3b3f5a25f96b27456af5825"; - sha256 = "0d6x3js259xcs0440izrplhly9vg5dsx1fwf4dxgqr17dvd48l06"; + rev = "ecf6339e8fc31abd17fff7895ca8218540c52598"; + sha256 = "03zdjbndrzq4gnlsx5ykagw53112b338sj66lpqip2x1kvlw66gk"; }; }; vim-pandoc-after = buildVimPluginFrom2Nix { pname = "vim-pandoc-after"; - version = "2017-11-21"; + version = "2019-04-29"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-after"; - rev = "844f27debf4d72811049167f97191a3b551ddfd5"; - sha256 = "0i99g9lnk1xzarw3vzbc47i4bg4iybaywkjvd2krln4q426a6saf"; + rev = "26513a138d5e2ba8c785e0d7dfec0218e983e9dd"; + sha256 = "07wg4j2kx08s9hvvp8jspwb0v7fgac8m8cjr3y1sbq8ca18bkvgy"; }; }; vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2019-04-17"; + version = "2019-04-29"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "e1ce4ff92afd23139759e7322ebeb434bbad88b0"; - sha256 = "1wa2gwkq5d5mb97dklyl6q81f0irr8bmbwcdn39x5sxwsahck83c"; + rev = "22b67a7c67665b97402809195e0ec1d3e8661635"; + sha256 = "1kxfncw783kw374kn53rq25hw59q6pvx3ypk7s6wxv6cfh2c59kc"; }; }; @@ -3359,11 +3359,11 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-04-23"; + version = "2019-05-01"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "9fd5c11a20f88525088c8635a3bc6a25ec4c05c7"; + rev = "e8245dbf1746aa59774124de1c77ffc4d8b5b52f"; sha256 = "1b9ndv9lm9p39c56ikj0mj6xs857464vicw3bif9k78j4mf2q12y"; }; }; @@ -3579,12 +3579,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2019-04-02"; + version = "2019-05-02"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "9035bef4c91fd730d76b5fdc994f1dcdcef49405"; - sha256 = "1f65nq1hgvblm074hbqy647vixzhkimr1yhqjlrqg7mjiffrkr43"; + rev = "d9856e26a552b72238c4f3d65a520b4dcb250b82"; + sha256 = "0pafvfhf3xbdqyy7v5y8h2j47k4y1zmscp7rans6vd5rq68k8fwf"; }; }; @@ -3623,12 +3623,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-04-19"; + version = "2019-05-01"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "a79d5b062427a4acfd665b2f5498e7052ebc29e5"; - sha256 = "0si5gl0v5f2jhvx03n5vz41kjzbhzqvxwd3p6kg7z3c8r4bac7zh"; + rev = "9827f1713407ace7d7608b5dec4db256979d5858"; + sha256 = "1l3pig6v0k629av50vcdhc0qwh5v1lsg7wlmm77q11sk0jacw2sv"; }; }; @@ -3865,12 +3865,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-04-23"; + version = "2019-04-27"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "b29d535fae1b27308b7cf75c2d27e8b0c929a381"; - sha256 = "09mhcnb8798lb28bc2xpbxkyic3zkypybxbr5p5xniq4d2hmqmx1"; + rev = "7fa183675d690054022e5d27dbfc29e740637641"; + sha256 = "14hl9v5l08qcsj3a9zd53v72lr7hm4vkyv8idmxg9wi0m0bqgq5i"; }; }; @@ -3898,12 +3898,12 @@ let vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2019-03-31"; + version = "2019-04-30"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "fdd56e0e1b0f9cafc0268076c4636f97ccd081dc"; - sha256 = "1b1m4d1dn1ymqrj6bbl44hnmf0rh93jipjlrrbk9gr3fc0x99xmh"; + rev = "da37439234c7bc10afdd23f10b115eade1e8fa30"; + sha256 = "1vw14naa535nv8bh1dmv8ji5a2qlrlcqi1szljss2kv9p9z5gl4j"; }; }; @@ -4163,12 +4163,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-04-24"; + version = "2019-04-27"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "2ae00449e5d7505102bb63d4bc28abb5e0744829"; - sha256 = "16xsrnlyrzjsx4sr30xbk4bh37yrw0bwkdfvlahicsh6x9fz9sxj"; + rev = "d691404ae2f7c79ec5d053f2c22a4c775b4bf915"; + sha256 = "1ijs627q679241qjjajk5nwj664vk7vk1szipjm728m9hf9pk5sx"; fetchSubmodules = true; }; }; From 804105e6b77bfdef02e139826036c70ba5d308db Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 May 2019 01:16:32 -0700 Subject: [PATCH 60/76] vbam: 2.1.2 -> 2.1.3 (#60821) * vbam: 2.1.2 -> 2.1.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/visualboyadvance-m/versions * vbam: refactor build inputs --- pkgs/misc/emulators/vbam/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index 72eb537bf18..c8712d20859 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -15,22 +15,22 @@ stdenv.mkDerivation rec { name = "visualboyadvance-m-${version}"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "0bgb9r6qc4g1biymayknj1fccwrdmn772i4qnc9zs3f9jrs0b34g"; + sha256 = "0ibpn05jm6zvvrjyxbmh8qwm1qd26v0dzq45cp233ksvapw1h77h"; }; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ cairo - cmake ffmpeg gettext libGLU_combined openal - pkgconfig SDL2 sfml zip From 07f53c71e8818c6cba5f32de1ebc5b00811c8f51 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 3 May 2019 01:17:58 +0200 Subject: [PATCH 61/76] electron-cash: enable tests --- pkgs/applications/misc/electron-cash/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 48101137874..11adfaaf80d 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -48,7 +48,14 @@ python3Packages.buildPythonApplication rec { --replace "(share_dir" "(\"share\"" ''; - doCheck = false; + checkInputs = with python3Packages; [ + pytest + ]; + + checkPhase = '' + unset HOME + pytest lib/tests + ''; postInstall = '' substituteInPlace $out/share/applications/electron-cash.desktop \ From 045078f096c82b59c1ccc5e233441528059952af Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 May 2019 02:14:31 -0700 Subject: [PATCH 62/76] tortoisehg: 4.9 -> 4.9.1 (#60806) * tortoisehg: 4.9 -> 4.9.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tortoisehg/versions * tortoisehg: update meta.homepage --- pkgs/applications/version-management/tortoisehg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 9e42880dd7d..2cca53d6fe7 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.9"; + version = "4.9.1"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "01na1ymdlh9nd121gmq3vkssr183sd2fcwjfdnq5n5fpys6bazjc"; + sha256 = "0c5gp5wyaiyh8w2zzy1q0f2qv8aa3219shb6swpsdzqr2j9gkk4b"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; @@ -30,7 +30,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Qt based graphical tool for working with Mercurial"; - homepage = http://tortoisehg.bitbucket.org/; + homepage = https://tortoisehg.bitbucket.io/; license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ danbst ]; From 24b1f7b1458233ff2172431381931d46d067bf3a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 3 May 2019 10:20:58 +0200 Subject: [PATCH 63/76] maintainers: add leahneukirchen --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1b96c12cab5..cd264bd5a77 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2673,6 +2673,11 @@ github = "league"; name = "Christopher League"; }; + leahneukirchen = { + email = "leah@vuxu.org"; + github = "leahneukirchen"; + name = "Leah Neukirchen"; + }; lebastr = { email = "lebastr@gmail.com"; github = "lebastr"; From 23336fb44a4704c688c0b2d546720838d2e73d8f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 3 May 2019 10:07:52 +0200 Subject: [PATCH 64/76] extrace: init at 0.7 --- pkgs/os-specific/linux/extrace/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/os-specific/linux/extrace/default.nix diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix new file mode 100644 index 00000000000..28a92d31eaa --- /dev/null +++ b/pkgs/os-specific/linux/extrace/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "extrace-${version}"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "leahneukirchen"; + repo = "extrace"; + rev = "v${version}"; + sha256 = "0acspj3djspfvgr3ng5b61qws6v2md6b0lc5qkby10mqnfpkvq85"; + }; + + makeFlags = "PREFIX=$(out)"; + + postInstall = '' + install -dm755 "$out/share/licenses/extrace/" + install -m644 LICENSE "$out/share/licenses/extrace/LICENSE" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/leahneukirchen/extrace; + description = "Trace exec() calls system-wide"; + license = with licenses; [ gpl2 bsd2 ]; + platforms = platforms.linux; + maintainers = [ maintainers.leahneukirchen ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76025ab7f4b..75e5a65d103 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14825,6 +14825,8 @@ in ebtables = callPackage ../os-specific/linux/ebtables { }; + extrace = callPackage ../os-specific/linux/extrace { }; + facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { }; fatrace = callPackage ../os-specific/linux/fatrace { }; From 473feb7fa3503c75fdc6fc7779771c7c0ac9f999 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 3 May 2019 11:21:57 +0200 Subject: [PATCH 65/76] bcat: use https rubygems --- pkgs/tools/text/bcat/Gemfile | 2 +- pkgs/tools/text/bcat/Gemfile.lock | 4 ++-- pkgs/tools/text/bcat/gemset.nix | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/bcat/Gemfile b/pkgs/tools/text/bcat/Gemfile index f389866324d..a25a2e89097 100644 --- a/pkgs/tools/text/bcat/Gemfile +++ b/pkgs/tools/text/bcat/Gemfile @@ -1,2 +1,2 @@ -source 'http://rubygems.org' +source 'https://rubygems.org' gem 'bcat' diff --git a/pkgs/tools/text/bcat/Gemfile.lock b/pkgs/tools/text/bcat/Gemfile.lock index fa67e6e28db..09108977c71 100644 --- a/pkgs/tools/text/bcat/Gemfile.lock +++ b/pkgs/tools/text/bcat/Gemfile.lock @@ -1,5 +1,5 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: bcat (0.6.2) rack (~> 1.0) @@ -12,4 +12,4 @@ DEPENDENCIES bcat BUNDLED WITH - 1.16.4 + 1.17.2 diff --git a/pkgs/tools/text/bcat/gemset.nix b/pkgs/tools/text/bcat/gemset.nix index 744c0e6e107..75de0e5cf38 100644 --- a/pkgs/tools/text/bcat/gemset.nix +++ b/pkgs/tools/text/bcat/gemset.nix @@ -1,16 +1,20 @@ { bcat = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { - remotes = ["http://rubygems.org"]; + remotes = ["https://rubygems.org"]; sha256 = "0w2wwlngcs7f4lmvifixrb89bjkw2lx8z0nn72w360hz394ic651"; type = "gem"; }; version = "0.6.2"; }; rack = { + groups = ["default"]; + platforms = []; source = { - remotes = ["http://rubygems.org"]; + remotes = ["https://rubygems.org"]; sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; type = "gem"; }; From 9a0596ee9738d8e23f9b8d628604c3a6c2517613 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 3 May 2019 12:48:14 +0200 Subject: [PATCH 66/76] mikutter: 3.5.13 -> 3.8.7 (#60808) --- .../instant-messengers/mikutter/Gemfile | 9 +- .../instant-messengers/mikutter/Gemfile.lock | 102 ++++---- .../mikutter/core/plugin/gtk/Gemfile | 2 +- .../mikutter/core/plugin/uitranslator/Gemfile | 3 +- .../instant-messengers/mikutter/default.nix | 24 +- .../instant-messengers/mikutter/gemset.nix | 229 +++++++++++++----- .../instant-messengers/mikutter/shell.nix | 18 -- .../ruby-modules/gem-config/default.nix | 24 +- 8 files changed, 277 insertions(+), 134 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/mikutter/shell.nix diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile index 0eed9808ab4..3ebd745e4f1 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile @@ -7,17 +7,20 @@ def source(url) source 'https://rubygems.org' +ruby '>= 2.3.0' + group :default do gem 'oauth', '>= 0.5.1' gem 'json_pure', '~> 1.8' - gem 'addressable', '~> 2.3' + gem 'addressable', '>= 2.5.2', '< 2.6' + gem 'diva', '>= 0.3.2', '< 2.0' gem 'memoist', '>= 0.16', '< 0.17' gem 'ruby-hmac', '~> 0.4' gem 'typed-array', '~> 0.1' gem 'delayer', '~> 0.0' gem 'pluggaloid', '>= 1.1.1', '< 2.0' - gem 'delayer-deferred', '>= 1.0.4', '< 1.1' - gem 'twitter-text', '>= 1.14.6' + gem 'delayer-deferred', '>= 2.0', '< 3.0' + gem 'twitter-text', '>= 2.1.0' end group :test do diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock index 69530be4a44..2e1f2fbd382 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock +++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock @@ -3,75 +3,78 @@ GEM specs: addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - atk (3.1.9) - glib2 (= 3.1.9) - cairo (1.15.10) + atk (3.3.2) + glib2 (= 3.3.2) + cairo (1.16.4) native-package-installer (>= 1.0.3) pkg-config (>= 1.2.2) - cairo-gobject (3.1.9) - cairo - glib2 (= 3.1.9) + cairo-gobject (3.3.2) + cairo (>= 1.16.2) + glib2 (= 3.3.2) crack (0.4.3) safe_yaml (~> 1.0.0) delayer (0.0.2) - delayer-deferred (1.0.4) + delayer-deferred (2.0.0) delayer (>= 0.0.2, < 0.1) - gdk_pixbuf2 (3.1.9) - gio2 (= 3.1.9) - gettext (3.0.9) + diva (0.3.2) + addressable (>= 2.5, < 2.6) + gdk_pixbuf2 (3.3.2) + gio2 (= 3.3.2) + gettext (3.2.9) locale (>= 2.0.5) - text - gio2 (3.1.9) - glib2 (= 3.1.9) - gobject-introspection (= 3.1.9) - glib2 (3.1.9) + text (>= 1.3.0) + gio2 (3.3.2) + gobject-introspection (= 3.3.2) + glib2 (3.3.2) native-package-installer (>= 1.0.3) pkg-config (>= 1.2.2) - gobject-introspection (3.1.9) - glib2 (= 3.1.9) - gtk2 (3.1.9) - atk (= 3.1.9) - gdk_pixbuf2 (= 3.1.9) - pango (= 3.1.9) - hashdiff (0.3.7) + gobject-introspection (3.3.2) + glib2 (= 3.3.2) + gtk2 (3.3.2) + atk (= 3.3.2) + gdk_pixbuf2 (= 3.3.2) + pango (= 3.3.2) + hashdiff (0.3.9) httpclient (2.8.3) + idn-ruby (0.1.0) instance_storage (1.0.0) + irb (1.0.0) json_pure (1.8.6) locale (2.1.2) memoist (0.16.0) metaclass (0.0.4) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) mocha (0.14.0) metaclass (~> 0.0.1) - moneta (1.0.0) - native-package-installer (1.0.4) - nokogiri (1.8.1) - mini_portile2 (~> 2.3.0) - oauth (0.5.3) - pango (3.1.9) - cairo (>= 1.14.0) - cairo-gobject (= 3.1.9) - gobject-introspection (= 3.1.9) - pkg-config (1.2.8) - pluggaloid (1.1.1) + moneta (1.1.1) + native-package-installer (1.0.7) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + oauth (0.5.4) + pango (3.3.2) + cairo-gobject (= 3.3.2) + gobject-introspection (= 3.3.2) + pkg-config (1.3.7) + pluggaloid (1.1.2) delayer instance_storage (>= 1.0.0, < 2.0.0) - power_assert (1.1.1) - public_suffix (3.0.0) + power_assert (1.1.4) + public_suffix (3.0.3) rake (10.5.0) ruby-hmac (0.4.0) - ruby-prof (0.16.2) - safe_yaml (1.0.4) - test-unit (3.2.6) + ruby-prof (0.17.0) + safe_yaml (1.0.5) + test-unit (3.3.2) power_assert text (1.3.1) totoridipjp (0.1.0) - twitter-text (1.14.7) + twitter-text (3.0.0) + idn-ruby unf (~> 0.1.0) typed-array (0.1.2) unf (0.1.4) unf_ext - unf_ext (0.0.7.4) + unf_ext (0.0.7.6) watch (0.1.0) webmock (1.24.6) addressable (>= 2.3.6) @@ -82,12 +85,14 @@ PLATFORMS ruby DEPENDENCIES - addressable (~> 2.3) + addressable (>= 2.5.2, < 2.6) delayer (~> 0.0) - delayer-deferred (>= 1.0.4, < 1.1) - gettext (~> 3.0.1) - gtk2 (= 3.1.9) + delayer-deferred (>= 2.0, < 3.0) + diva (>= 0.3.2, < 2.0) + gettext (>= 3.2.9, < 3.3) + gtk2 (= 3.3.2) httpclient + irb (>= 1.0.0, < 1.1) json_pure (~> 1.8) memoist (>= 0.16, < 0.17) mocha (~> 0.14) @@ -100,10 +105,13 @@ DEPENDENCIES ruby-prof test-unit (~> 3.0) totoridipjp - twitter-text (>= 1.14.6) + twitter-text (>= 2.1.0) typed-array (~> 0.1) watch (~> 0.1) webmock (~> 1.17) +RUBY VERSION + ruby 2.5.5p157 + BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile index b7d19db3763..efe602edc4f 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem 'gtk2', '3.1.9' +gem 'gtk2', '3.3.2' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile index 1625327f16d..61424d395f9 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile @@ -1,5 +1,6 @@ source 'https://rubygems.org' group :default do - gem 'gettext', '~> 3.0.1' + gem 'gettext', '>= 3.2.9', '< 3.3' + gem 'irb', '>= 1.0.0', '< 1.1' end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 3cb254122d7..ea190db07a6 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -1,15 +1,29 @@ { stdenv, fetchurl , bundlerEnv, ruby -, alsaUtils, libnotify, which, wrapGAppsHook, gtk2 +, alsaUtils, libnotify, which, wrapGAppsHook, gtk2, atk, gobject-introspection }: +# how to update: +# find latest version at: http://mikutter.hachune.net/download#download +# run these commands: +# +# wget http://mikutter.hachune.net/bin/mikutter.3.8.7.tar.gz +# tar xvf mikutter.3.8.7.tar.gz +# cd mikutter +# find . -not -name Gemfile -exec rm {} \; +# find . -type d -exec rmdir -p --ignore-fail-on-non-empty {} \; +# cd .. +# mv mikutter/* . +# rm mikutter.3.8.7.tar.gz +# rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix' + stdenv.mkDerivation rec { name = "mikutter-${version}"; - version = "3.5.13"; + version = "3.8.7"; src = fetchurl { url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz"; - sha256 = "2e01cd6cfe0caad663a381e5263f6d8030f0fb7cd8d4f858d320166516c7c320"; + sha256 = "1griypcd1xgyfd9wc3ls32grpw4ig0xxdiygpdinzr3bigfmd7iv"; }; env = bundlerEnv { @@ -19,7 +33,7 @@ stdenv.mkDerivation rec { inherit ruby; }; - buildInputs = [ alsaUtils libnotify which gtk2 ruby ]; + buildInputs = [ alsaUtils libnotify which gtk2 ruby atk gobject-introspection ]; nativeBuildInputs = [ wrapGAppsHook ]; postUnpack = '' @@ -41,6 +55,7 @@ stdenv.mkDerivation rec { --prefix GEM_HOME : "${env}/${env.ruby.gemPath}" --set DISABLE_BUNDLER_SETUP 1 ) + # --prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules" mkdir -p $out/share/mikutter $out/share/applications ln -sv $out/core/skin $out/share/mikutter/skin @@ -54,7 +69,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - broken = true; description = "An extensible Twitter client"; homepage = https://mikutter.hachune.net; platforms = ruby.meta.platforms; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix index ef7091689b3..5f3ef945b3d 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix @@ -1,6 +1,8 @@ { addressable = { dependencies = ["public_suffix"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; @@ -10,33 +12,41 @@ }; atk = { dependencies = ["glib2"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18l99gv6828rn59q8k6blxg146b025fj44klrcisffw6h9s9qqxm"; + sha256 = "17c5ixwyg16lbbjix2prk7fa6lm0vkxvc1z6m6inc6jgkb1x0700"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; cairo = { dependencies = ["native-package-installer" "pkg-config"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f0n057cj6cjz7f38pwnflrkbwkl8pm3g9ssa51flyxr7lcpcw7c"; + sha256 = "0yvv2lcbsybzbw1nrmfivmln23da4rndrs3av6ymjh0x3ww5h7p8"; type = "gem"; }; - version = "1.15.10"; + version = "1.16.4"; }; cairo-gobject = { dependencies = ["cairo" "glib2"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnsd9203qc6hl2i4hfzngr8v06rfk4vxfn6sbr8b4c1q4n0lq26"; + sha256 = "12q441a5vnfvbcnli4fpq2svb75vq1wvs2rlgsp6fv38fh6fgsfz"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; crack = { dependencies = ["safe_yaml"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; @@ -45,6 +55,8 @@ version = "0.4.3"; }; delayer = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "156vy4x1d2jgafkjaafzfz7g8ghl4p5zgbl859b8slp4wdxy3v1r"; @@ -54,76 +66,105 @@ }; delayer-deferred = { dependencies = ["delayer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rp2hpik8gs1kzwwq831jwj1iv5bhfwd3dmm9nvizy3nqpz1gvvb"; + sha256 = "0zvqphyzngj5wghgbb2nd1qj2qvj2plsz9vx8hz24c7bfq55n4xz"; type = "gem"; }; - version = "1.0.4"; + version = "2.0.0"; + }; + diva = { + dependencies = ["addressable"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rp125gdlq7jqq7x8la52pdpimhx5wr66frcgf6z4jm927rjw84d"; + type = "gem"; + }; + version = "0.3.2"; }; gdk_pixbuf2 = { dependencies = ["gio2"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x7vna77qw26479dydzfs1sq7xmq31xfly2pn5fvh35wg0q4y07d"; + sha256 = "071z8a8khs5qb43ri5hbvaijwbx43mick7cjfmhn6javifkzijk7"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; gettext = { dependencies = ["locale" "text"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14vw306p46w2kyad3kp9vq56zw3ch6px30wkhl5x0qkx8d3ya3ir"; + sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; type = "gem"; }; - version = "3.0.9"; + version = "3.2.9"; }; gio2 = { - dependencies = ["glib2" "gobject-introspection"]; + dependencies = ["gobject-introspection"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dxyaxp32m19mynw20x39vkb50wa4jcxczwmbkq7pcg55j76wwhm"; + sha256 = "1f131yd9zzfsjn8i4k8xkl7xm3c5f9sm7irvwxnqqh635qccfz8n"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; glib2 = { dependencies = ["native-package-installer" "pkg-config"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y1ws895345a88wikqil1x87cpd7plmwfi635piam7il6vsb4h73"; + sha256 = "13r1i8gkgxj0fjz7bdnqqrsvszl7dffbf85ghx2f8p7zrcbzlk3p"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; gobject-introspection = { dependencies = ["glib2"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04gla6z9y8g0d69wlwl0wr7pwyzqg132pfs1n9fq6fgkjb6l7sm3"; + sha256 = "15njcm0yg4qpwkhyx6gf2nxvjl6fxm9jffan8zrl2xyh68yr4jf7"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; gtk2 = { dependencies = ["atk" "gdk_pixbuf2" "pango"]; + groups = ["plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mshgsw2x0w5wfcp17qnsja50aafbjxy2g42kvk5sr19l0chkkkq"; + sha256 = "1a4lj6anmvr82cwrg8swzglz90jss995zr7bvsiwr876qqdwv7qs"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; hashdiff = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; + sha256 = "1qji49afni3c90zws617x514xi7ik70g2iwngj9skq68mjcq6y4x"; type = "gem"; }; - version = "0.3.7"; + version = "0.3.9"; }; httpclient = { + groups = ["plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; @@ -131,7 +172,19 @@ }; version = "2.8.3"; }; + idn-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr"; + type = "gem"; + }; + version = "0.1.0"; + }; instance_storage = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "08nf5fhq9dckq9lmaklxydq0hrlfi7phk66gr3bggxg45zd687pl"; @@ -139,7 +192,19 @@ }; version = "1.0.0"; }; + irb = { + groups = ["default" "plugin"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "181d88hns00fpw8szg8hbchflwq69wp3y5zvd3dyqjzbq91v1dcr"; + type = "gem"; + }; + version = "1.0.0"; + }; json_pure = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1vllrpm2hpsy5w1r7000mna2mhd7yfrmd8hi713lk0n9mv27bmam"; @@ -148,6 +213,8 @@ version = "1.8.6"; }; locale = { + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x"; @@ -156,6 +223,8 @@ version = "2.1.2"; }; memoist = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; @@ -164,6 +233,8 @@ version = "0.16.0"; }; metaclass = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5"; @@ -172,15 +243,19 @@ version = "0.0.4"; }; mini_portile2 = { + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; mocha = { dependencies = ["metaclass"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0id1x7g46fzy8f4jna20ys329ydaj3sad75qs9db2a6nd7f0zc2b"; @@ -189,81 +264,101 @@ version = "0.14.0"; }; moneta = { + groups = ["plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pgwn6xnlh7vviy511mfgkv2j3sfihn5ic2zabmyrs2nh6kfa912"; + sha256 = "1mbs9w3c13phza8008mwlx8s991fzigml7pncq94i1c2flz9vw95"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.1"; }; native-package-installer = { + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0svj2sg7y7izl90qrvzd2fcb1rkq8bv3bd6lr9sh1ml18v3w882a"; + sha256 = "03qrzhk807f98bdwy6c37acksyb5fnairdz4jpl7y3fifh7k7yfn"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.7"; }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021"; + sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; type = "gem"; }; - version = "1.8.1"; + version = "1.10.3"; }; oauth = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a5cfg9pm3mxsmlk1slj652vza8nha2lpbpbmf3rrk0lh6zi4d0b"; + sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y"; type = "gem"; }; - version = "0.5.3"; + version = "0.5.4"; }; pango = { - dependencies = ["cairo" "cairo-gobject" "gobject-introspection"]; + dependencies = ["cairo-gobject" "gobject-introspection"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0swld0s01djjlqrari0ib75703mb7qr4ydn00cqfhdr7xim66hjk"; + sha256 = "0lbhjsd6y42iw572xcynd6gcapczjki41h932s90rkh6022pbm9p"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; pkg-config = { + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "056qb6cwbw2l9riq376wazx4kwd67cdilyclpa6j38mfsswpmzws"; + sha256 = "1s56ym0chq3fycl29vqabcalqdcf7y2f25pmihjwqgbmrmzdyvr1"; type = "gem"; }; - version = "1.2.8"; + version = "1.3.7"; }; pluggaloid = { dependencies = ["delayer" "instance_storage"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p9s1bzw02jzjlpjpxsbfsy1cyfbqs10iqvhxqh4xgyh72nry9zr"; + sha256 = "0fkm6y7aq132icmmv4k8mqw08fxqil8k52l8li642jyi79hvzrqh"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; power_assert = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h0s1clasynlbk3782801c61yx24pdv959fpw53g5yl8gxqj34iz"; + sha256 = "072y5ixw59ad47hkfj6nl2i4zcyad8snfxfsyyrgjkiqnvqwvbvq"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.4"; }; public_suffix = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.3"; }; rake = { + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b"; @@ -272,6 +367,8 @@ version = "10.5.0"; }; ruby-hmac = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01zym41f8fqbmxfz8zv19627swi62ka3gp33bfbkc87v5k7mw954"; @@ -280,31 +377,39 @@ version = "0.4.0"; }; ruby-prof = { + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y13gdcdajfgrkx5rc9pvb7bwkyximwl5yrhq05gkmhflzdr7kag"; + sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c"; type = "gem"; }; - version = "0.16.2"; + version = "0.17.0"; }; safe_yaml = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; test-unit = { dependencies = ["power_assert"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gl5b2d6bysnm0a1zx54qn6iwd67f6gsjy0c7zb68ag0453rqcnv"; + sha256 = "0hf47w70ajvwdchx0psq3dir26hh902x9sz0iwbxqj8z9w1kc6sd"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.2"; }; text = { + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; @@ -313,6 +418,8 @@ version = "1.3.1"; }; totoridipjp = { + groups = ["plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "03ci9hbwc6xf4x0lkm6px4jgbmi37n8plsjhbf2ir5vka9f29lck"; @@ -321,15 +428,19 @@ version = "0.1.0"; }; twitter-text = { - dependencies = ["unf"]; + dependencies = ["idn-ruby" "unf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg"; + sha256 = "1ibk4bl9hrq0phlg7zplkilsqgniji6yvid1a7k09rs0ai422jax"; type = "gem"; }; - version = "1.14.7"; + version = "3.0.0"; }; typed-array = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qlv2rnkin9rwkgjx3k5qvc17m0m7jf5cdirw3wxbjnw5kga27w9"; @@ -339,6 +450,8 @@ }; unf = { dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; @@ -347,14 +460,18 @@ version = "0.1.4"; }; unf_ext = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf"; type = "gem"; }; - version = "0.0.7.4"; + version = "0.0.7.6"; }; watch = { + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "02g4g6ynnldyjjzrh19r584gj4z6ksff7h0ajz5jdwhpp5y7cghx"; @@ -364,6 +481,8 @@ }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "03vlr6axajz6c7xmlk0w1kvkxc92f8y2zp27wq1z6yk916ry25n5"; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix deleted file mode 100644 index bc83767af32..00000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs ? import {} }: - -pkgs.stdenv.mkDerivation { - name = "mikutter-shell"; - buildInputs = with pkgs; [ - bundix - bundler - ]; - - shellHook = '' - export MIKUTTER_CONFROOT="/homeless-shelter" - truncate --size 0 Gemfile.lock - bundle lock - bundle package --path=vendor/bundle --no-install - rm -rf vendor .bundle - bundix -d - ''; -} diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 4e2de5c9caf..f9f1addd4c3 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf +, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , libselinux ? null, libsepol ? null }@args: @@ -179,9 +179,17 @@ in gtk2 = attrs: { nativeBuildInputs = [ pkgconfig ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ]; - buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp]; + buildInputs = [ + fribidi + gobject-introspection + gtk2 + harfbuzz + pcre + xorg.libpthreadstubs + xorg.libXdmcp + ]; # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly - CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; + # CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; }; gobject-introspection = attrs: { @@ -299,7 +307,15 @@ in pango = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ]; + buildInputs = [ + fribidi + gobject-introspection + gtk2 + harfbuzz + pcre + xorg.libpthreadstubs + xorg.libXdmcp + ]; }; patron = attrs: { From d29c13b4de97d7cd19044ab353cd53a78102d9f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 22:16:27 -0700 Subject: [PATCH 67/76] python37Packages.google-auth-oauthlib: 0.2.0 -> 0.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-google-auth-oauthlib/versions --- .../python-modules/google-auth-oauthlib/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index c5e9b102828..b318016ee81 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "226d1d0960f86ba5d9efd426a70b291eaba96f47d071657e0254ea969025728a"; + sha256 = "03rq2rjac0zh16vsw0q914sp62l9f8fp033wn3191pqd2cchqix0"; }; checkInputs = [ @@ -28,6 +28,7 @@ buildPythonPackage rec { ]; checkPhase = '' + rm -fr tests/__pycache__/ py.test ''; From 4f4d3f3d62a537c55054455f5df4e596c3f513b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Apr 2019 18:15:24 -0700 Subject: [PATCH 68/76] python37Packages.identify: 1.2.2 -> 1.4.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-identify/versions --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index d47f5ce39fe..2db6ad1c3d0 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.2.2"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "d3ddec4436e043c3398392b4ba8936b4ab52fa262284e767eb6c351d9b3ab5b7"; + sha256 = "443f419ca6160773cbaf22dbb302b1e436a386f23129dbb5482b68a147c2eca9"; }; # Tests not included in PyPI tarball From 10ffb3864365de5f0287df32c85844a13119057a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 3 May 2019 08:35:12 -0300 Subject: [PATCH 69/76] qogir-theme: 2019-04-07 -> 2019-05-03 --- pkgs/data/themes/qogir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index 0c48f892992..aac9ec5e85e 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2019-04-07"; + version = "2019-05-03"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0knv35xb4rg4pddxc78hd8frnlm8n0za1yj51ydwskn9b0qqcyhs"; + sha256 = "031nqr47b3x8ahcym7cfc75y8sy53dcmrrrlywi7m1a10ckfp0pd"; }; buildInputs = [ gdk_pixbuf librsvg ]; From 15ccf1fe4adad60596c87725b40682725dc43085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 May 2019 13:48:59 +0200 Subject: [PATCH 70/76] python.pkgs.jsbeautifier: 1.9.1 -> 1.10.0 --- .../python-modules/jsbeautifier/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 2ca26ad65e8..226f1743a2a 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,25 +2,16 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.9.1"; + version = "1.10.0"; propagatedBuildInputs = [ six EditorConfig ]; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "0q8ld072dkccssagjxyvc9633fb6ynflvz70924phgp3zxmim960"; + sha256 = "1e389572ade865173605471e98df4002f4b6e5235121c13f1e4497a3eac69108"; }; - patches = [ - (fetchpatch { - url = "https://github.com/beautify-web/js-beautify/commit/78e35a11cbb805fc044241d6465800ee2bd57ebc.patch"; - sha256 = "1ah7nshk96yljy37i20v4fga834dix9cdbhkdc3flfm4904n4523"; - }) - ]; - - patchFlags = [ "-p2" ]; - meta = with lib; { homepage = "http://jsbeautifier.org"; description = "JavaScript unobfuscator and beautifier."; From e2877499363c12ec393c290ed07d3f600a294d9f Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 3 May 2019 14:36:56 +0200 Subject: [PATCH 71/76] taskjuggler: fix security issues --- pkgs/applications/misc/taskjuggler/Gemfile | 2 +- .../misc/taskjuggler/Gemfile.lock | 10 ++++----- .../applications/misc/taskjuggler/default.nix | 12 +++++----- pkgs/applications/misc/taskjuggler/gemset.nix | 22 +++++++++---------- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/misc/taskjuggler/Gemfile b/pkgs/applications/misc/taskjuggler/Gemfile index 77cbaeeed79..ab9f5a35464 100644 --- a/pkgs/applications/misc/taskjuggler/Gemfile +++ b/pkgs/applications/misc/taskjuggler/Gemfile @@ -1,2 +1,2 @@ -source 'http://rubygems.org' +source 'https://rubygems.org' gem 'taskjuggler' diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/pkgs/applications/misc/taskjuggler/Gemfile.lock index ebd04c20ea6..dcc46e370e7 100644 --- a/pkgs/applications/misc/taskjuggler/Gemfile.lock +++ b/pkgs/applications/misc/taskjuggler/Gemfile.lock @@ -1,15 +1,15 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) mini_mime (1.0.1) taskjuggler (3.6.0) mail (>= 2.4.3) term-ansicolor (>= 1.0.7) - term-ansicolor (1.6.0) + term-ansicolor (1.7.1) tins (~> 1.0) - tins (1.16.3) + tins (1.20.2) PLATFORMS ruby @@ -18,4 +18,4 @@ DEPENDENCIES taskjuggler BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index f3f9285b312..1b3bacf71df 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -1,9 +1,7 @@ -{ lib, bundlerApp, ruby }: +{ lib, bundlerApp }: bundlerApp { pname = "taskjuggler"; - - inherit ruby; gemdir = ./.; exes = [ @@ -11,11 +9,11 @@ bundlerApp { "tj3ts_receiver" "tj3ts_sender" "tj3ts_summary" "tj3webd" ]; - meta = { + meta = with lib; { description = "A modern and powerful project management tool"; homepage = http://taskjuggler.org/; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.manveru ]; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.manveru ]; }; } diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/pkgs/applications/misc/taskjuggler/gemset.nix index 24c1e431177..fcf607de815 100644 --- a/pkgs/applications/misc/taskjuggler/gemset.nix +++ b/pkgs/applications/misc/taskjuggler/gemset.nix @@ -4,17 +4,17 @@ groups = ["default"]; platforms = []; source = { - remotes = ["http://rubygems.org"]; - sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz"; + remotes = ["https://rubygems.org"]; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; mini_mime = { groups = ["default"]; platforms = []; source = { - remotes = ["http://rubygems.org"]; + remotes = ["https://rubygems.org"]; sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; type = "gem"; }; @@ -25,7 +25,7 @@ groups = ["default"]; platforms = []; source = { - remotes = ["http://rubygems.org"]; + remotes = ["https://rubygems.org"]; sha256 = "0ky3cydl3szhdyxsy4k6zxzjlbll7mlq025aj6xd5jmh49k3pfbp"; type = "gem"; }; @@ -36,20 +36,20 @@ groups = ["default"]; platforms = []; source = { - remotes = ["http://rubygems.org"]; - sha256 = "1b1wq9ljh7v3qyxkk8vik2fqx2qzwh5lval5f92llmldkw7r7k7b"; + remotes = ["https://rubygems.org"]; + sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.1"; }; tins = { groups = ["default"]; platforms = []; source = { - remotes = ["http://rubygems.org"]; - sha256 = "0g95xs4nvx5n62hb4fkbkd870l9q3y9adfc4h8j21phj9mxybkb8"; + remotes = ["https://rubygems.org"]; + sha256 = "1pqj45n216zrz7yckdbdknlmhh187iqzx8fp76y2h0jrgqjfkxmj"; type = "gem"; }; - version = "1.16.3"; + version = "1.20.2"; }; } \ No newline at end of file From b6d0bdf5136031b49d174e638e7d0bdc8c5e5a12 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 3 May 2019 10:25:17 -0400 Subject: [PATCH 72/76] texlive: provide bin.texlive on Darwin too texlive attribute was accidentally added in attrset wrapped with stdenv.lib.optionalAttrs (!stdenv.isDarwin) Fixes: dbc2c1c4b8 ('texlive: add missing perl dependencies for latexindent') --- pkgs/tools/typesetting/tex/texlive/bin.nix | 53 +++++++++++----------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 10b4198bd64..6122fcdba3f 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -284,6 +284,33 @@ dvipng = stdenv.mkDerivation { }; +latexindent = perlPackages.buildPerlPackage rec { + inherit (src) name version; + + src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs); + + outputs = [ "out" ]; + + propagatedBuildInputs = with perlPackages; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ]; + + postPatch = '' + substituteInPlace scripts/latexindent/LatexIndent/GetYamlSettings.pm \ + --replace '$FindBin::RealBin/defaultSettings.yaml' ${src}/scripts/latexindent/defaultSettings.yaml + ''; + + # Dirty hack to apply perlFlags, but do no build + preConfigure = '' + touch Makefile.PL + ''; + buildPhase = ":"; + installPhase = '' + install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent + mkdir -p "$out"/${perl.libPrefix} + cp -r ./scripts/latexindent/LatexIndent "$out"/${perl.libPrefix}/ + ''; +}; + + inherit biber; bibtexu = bibtex8; bibtex8 = stdenv.mkDerivation { @@ -364,30 +391,4 @@ xindy = stdenv.mkDerivation { ''; }; -latexindent = perlPackages.buildPerlPackage rec { - inherit (src) name version; - - src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs); - - outputs = [ "out" ]; - - propagatedBuildInputs = with perlPackages; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ]; - - postPatch = '' - substituteInPlace scripts/latexindent/LatexIndent/GetYamlSettings.pm \ - --replace '$FindBin::RealBin/defaultSettings.yaml' ${src}/scripts/latexindent/defaultSettings.yaml - ''; - - # Dirty hack to apply perlFlags, but do no build - preConfigure = '' - touch Makefile.PL - ''; - buildPhase = ":"; - installPhase = '' - install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent - mkdir -p "$out"/${perl.libPrefix} - cp -r ./scripts/latexindent/LatexIndent "$out"/${perl.libPrefix}/ - ''; -}; - } From 71a3f9f9e95a6ce68f685035e39835cc8e8b15f6 Mon Sep 17 00:00:00 2001 From: royneary Date: Fri, 3 May 2019 17:13:14 +0200 Subject: [PATCH 73/76] gitAndTools.git-bug: remove deps.nix --- .../git-and-tools/git-bug/default.nix | 2 - .../git-and-tools/git-bug/deps.nix | 408 ------------------ 2 files changed, 410 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/git-bug/deps.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index fb2b5a317a9..0baf09918d4 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -13,8 +13,6 @@ buildGoPackage rec { sha256 = "1l86m0y360lmpmpw2id0k7zc2nyq1irr26k2ik06lxhzvpbyajz6"; }; - goDeps = ./deps.nix; - buildFlagsArray = '' -ldflags= -X ${goPackagePath}/commands.GitCommit=${rev} diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix b/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix deleted file mode 100644 index a914f462e3e..00000000000 --- a/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix +++ /dev/null @@ -1,408 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/99designs/gqlgen"; - fetch = { - type = "git"; - url = "https://github.com/99designs/gqlgen"; - rev = "010a79b66f08732cb70d133dcab297a8ee895572"; - sha256 = "1z9rh02bysmk1hfnffq3qa0ahyfv93i3cfkra0b6x2hqj2104444"; - }; - } - { - goPackagePath = "github.com/MichaelMure/gocui"; - fetch = { - type = "git"; - url = "https://github.com/MichaelMure/gocui"; - rev = "d753c235dd8582d55e99bbb7f7fe453fb3fd3a19"; - sha256 = "1bgyjlikb0da3090bwwxdhy5s20h6x6lsrg63jhwwpsy2785p483"; - }; - } - { - goPackagePath = "github.com/agnivade/levenshtein"; - fetch = { - type = "git"; - url = "https://github.com/agnivade/levenshtein"; - rev = "3d21ba515fe27b856f230847e856431ae1724adc"; - sha256 = "0dym3k3ycsj0zj0p4dhdp7gd2hm7c7pyh2wii1mdbmpdyipy99cd"; - }; - } - { - goPackagePath = "github.com/cheekybits/genny"; - fetch = { - type = "git"; - url = "https://github.com/cheekybits/genny"; - rev = "9127e812e1e9e501ce899a18121d316ecb52e4ba"; - sha256 = "1z57ga9c2sjnl5ngqgb1ap0zqv36sk0rarm02bbbkipz4m9yabjg"; - }; - } - { - goPackagePath = "github.com/corpix/uarand"; - fetch = { - type = "git"; - url = "https://github.com/corpix/uarand"; - rev = "2b8494104d86337cdd41d0a49cbed8e4583c0ab4"; - sha256 = "06ml5m8l9wbr96gvyg6z1syawn797f8kmq74nhgry3vqpngyb6yn"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "20f5889cbdc3c73dbd2862796665e7c465ade7d1"; - sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "aa810b61a9c79d51363740d207bb46cf8e620ed5"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; - sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768"; - sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; - }; - } - { - goPackagePath = "github.com/icrowley/fake"; - fetch = { - type = "git"; - url = "https://github.com/icrowley/fake"; - rev = "4178557ae428460c3780a381c824a1f3aceb6325"; - sha256 = "1mv4bxfphaqbvacy49v4lf4gf2nmadzpmjq0jbdx93wi5bnkc977"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; - sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "fa473d140ef3c6adf42d6b391fe76707f1f243c8"; - sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"; - sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw"; - }; - } - { - goPackagePath = "github.com/phayes/freeport"; - fetch = { - type = "git"; - url = "https://github.com/phayes/freeport"; - rev = "b8543db493a5ed890c5499e935e2cad7504f3a04"; - sha256 = "1gwaan8fwmc5lfx4dzymq0jd6z2l1frg83jkmjpm4kw8ay4vr11q"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5"; - sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0"; - }; - } - { - goPackagePath = "github.com/shurcooL/githubv4"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/githubv4"; - rev = "b5f70540eee0ebfb6a27b52fc5b131be76415539"; - sha256 = "0hrjk16l8jwkhrbzcasp4dflv6hl24hcc4q2md5rn6i8f73dl18h"; - }; - } - { - goPackagePath = "github.com/shurcooL/go"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/go"; - rev = "9e1955d9fb6e1ee2345ba1f5e71669263e719e27"; - sha256 = "1lad9bvs75jsn61cfza19739c2c057k0bqxg2b4xz3z3l4w1mkqj"; - }; - } - { - goPackagePath = "github.com/shurcooL/graphql"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/graphql"; - rev = "365899397c9ad12805631fe4c9b2a64be9d74818"; - sha256 = "10n4id76zpj5g4hr1ry8d9v5cvm039rygrpgdk4ygk198vhr0gwm"; - }; - } - { - goPackagePath = "github.com/shurcooL/httpfs"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/httpfs"; - rev = "809beceb23714880abc4a382a00c05f89d13b1cc"; - sha256 = "1hvj5q5kjw83z7f77y03fqfg7fps7pqj2cj2c38x752m0pq4j2w3"; - }; - } - { - goPackagePath = "github.com/shurcooL/vfsgen"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/vfsgen"; - rev = "62bca832be04bd2bcaabd3b68a6b19a7ec044411"; - sha256 = "1lh8sw7qxs43jj8k9pfn91kfy2033p3il9bcb63whz8zhqw2a16y"; - }; - } - { - goPackagePath = "github.com/skratchdot/open-golang"; - fetch = { - type = "git"; - url = "https://github.com/skratchdot/open-golang"; - rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c"; - sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/theckman/goconstraint"; - fetch = { - type = "git"; - url = "https://github.com/theckman/goconstraint"; - rev = "93babf24513d0e8277635da8169fcc5a46ae3f6a"; - sha256 = "1ngc5zc409smdbl5yj84ynzzcqk3g070bxwhl9jy03bz0ic4sfxc"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "github.com/vektah/gqlgen"; - fetch = { - type = "git"; - url = "https://github.com/vektah/gqlgen"; - rev = "636435b68700211441303f1a5ed92f3768ba5774"; - sha256 = "0d4sr6kpyn3zq3kpvk8lizy7hdpcw3fjmv7fbv2m1k9w8fzjawrz"; - }; - } - { - goPackagePath = "github.com/vektah/gqlparser"; - fetch = { - type = "git"; - url = "https://github.com/vektah/gqlparser"; - rev = "e805d08bb209b1accdea76bd2327811858d81985"; - sha256 = "0cw7pm3z3ydsyfs95wd1fsi6f7sb5i2bhvw8gq1l7m2gd430872p"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "0e37d006457bf46f9e6692014ba72ef82c33022c"; - sha256 = "1fj8rvrhgv5j8pmckzphvm3sqkzhcqp3idkxvgv13qrjdfycsa5r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "2f5d2388922f370f4355f327fcf4cfe9f5583908"; - sha256 = "03s92ygxfrd2c1m4697sd6iksgbar6c007w1yf3h6wmd79vr5dxs"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "d2e6202438beef2727060aa7cabdd924d92ebfd9"; - sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"; - sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "7e5bf9270d7061560865b8847c378236480f47e3"; - sha256 = "1772rb2p40fy4n62nl61l3m3p2vzm3aycxgaz46lpmzzci7yii6a"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06"; - sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] \ No newline at end of file From 241063ca84811cd4bf6be1274cfd3f57413f6297 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 3 May 2019 01:16:37 -0500 Subject: [PATCH 74/76] bpftrace: unstable-2018-10-27 -> 0.9 Update bpftrace to the latest pre-release, with a real version number. The most notable change now is that bpftrace can use a stable version of the 'bcc' toolchain in order to build, meaning no more hacks are needed to clone the source code and fix up the build system, etc. This simplifies things greatly and removes the old bcc-source patch. Similarly, we can remove our custom gtests patch (which disabled the build) by just passing -DBUILD_TESTING=FALSE when running cmake. This was also added upstream recently. However, something does still need to be fixed, at a cost: bpftrace requires the kernel -dev package because it wants both objects and include directories (some files are only shipped in one or the other). Therefore, we remove the dependency on linuxHeaders and instead use kernel.dev as the sole input to the build. This is both a positive and a negative: the positive is that tools work without annoying fatal errors, and that the bpf toolchain is synchronized to the linuxPackages.kernel derivation it was built against. The downside is that the .dev expression is much heavier as a dependency, so bpftrace is now closer to 700mb in closure size. (This especially hurts across kernel upgrades requiring a whole new rebuild, especially if you have existing nixos generations that won't GC, etc.) We probably want to slim this down substantially in the future (and there may be a few ways to do that), but as this will probably also touch bcc, and as a first cut of the pre-releases, this is probably fine while we work out other kinks. Signed-off-by: Austin Seipp --- .../linux/bpftrace/bcc-source.patch | 32 -------- pkgs/os-specific/linux/bpftrace/default.nix | 70 +++++++++--------- .../linux/bpftrace/disable-gtests.patch | 73 ------------------- .../bpftrace/fix-kernel-include-dir.patch | 22 ++++++ 4 files changed, 56 insertions(+), 141 deletions(-) delete mode 100644 pkgs/os-specific/linux/bpftrace/bcc-source.patch delete mode 100644 pkgs/os-specific/linux/bpftrace/disable-gtests.patch create mode 100644 pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch diff --git a/pkgs/os-specific/linux/bpftrace/bcc-source.patch b/pkgs/os-specific/linux/bpftrace/bcc-source.patch deleted file mode 100644 index a4c9947f0c3..00000000000 --- a/pkgs/os-specific/linux/bpftrace/bcc-source.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fc0a5bd2ddb5827c5288ee284c1f2d834d79e432 Mon Sep 17 00:00:00 2001 -From: Rodney Lorrimar -Date: Tue, 16 Oct 2018 09:55:59 +1000 -Subject: [PATCH 1/3] Don't use ExternalProject for bcc sources - ---- - CMakeLists.txt | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eae850a..b20fb33 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,6 +31,15 @@ if (OFFLINE_BUILDS) - UPDATE_DISCONNECTED 1 - BUILD_COMMAND ${CMAKE_COMMAND} --build . --target bcc-static - ) -+elseif (NIX_BUILDS) -+ include(ExternalProject) -+ ExternalProject_Add(bcc -+ DOWNLOAD_COMMAND rmdir bcc && ln -sf $ENV{bccSrc} bcc -+ STEP_TARGETS build update -+ EXCLUDE_FROM_ALL 1 -+ UPDATE_DISCONNECTED 1 -+ BUILD_COMMAND ${CMAKE_COMMAND} --build . --target bcc-static -+ ) - else() - include(ExternalProject) - ExternalProject_Add(bcc --- -2.17.1 - diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 12773a95716..022e0300a8c 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -1,57 +1,55 @@ { stdenv, fetchFromGitHub , cmake, pkgconfig, flex, bison -, llvmPackages, kernel, linuxHeaders, elfutils, libelf, bcc +, llvmPackages, kernel, elfutils, libelf, bcc }: stdenv.mkDerivation rec { - name = "bpftrace-unstable-${version}"; - version = "2018-10-27"; + name = "bpftrace-${version}"; + version = "0.9"; src = fetchFromGitHub { - owner = "iovisor"; - repo = "bpftrace"; - rev = "c07b54f61fd7b7b49e0a254e746d6f442c5d780d"; - sha256 = "1mpcjfyay9akmpqxag2ndwpz1qsdx8ii07jh9fky4w40wi9cipyg"; + owner = "iovisor"; + repo = "bpftrace"; + rev = "refs/tags/v${version}"; + sha256 = "1kp6as3i67dnw5v3vc1cj5hmrq6c8pjpg9g38g1qcnc9i6drl1r8"; }; - # bpftrace requires an unreleased version of bcc, added to the cmake - # build as an ExternalProject. - # https://github.com/iovisor/bpftrace/issues/184 - bccSrc = fetchFromGitHub { - owner = "iovisor"; - repo = "bcc"; - rev = "afd00154865f3b2da6781cf92cecebaca4853950"; - sha256 = "0ad78smrnipr1f377i5rv6ksns7v2vq54g5badbj5ldqs4x0hygd"; - }; + enableParallelBuilding = true; - buildInputs = [ - llvmPackages.llvm llvmPackages.clang-unwrapped kernel - elfutils libelf bccSrc - ]; + buildInputs = with llvmPackages; + [ llvm clang-unwrapped + kernel elfutils libelf bcc + ]; nativeBuildInputs = [ cmake pkgconfig flex bison ] # libelf is incompatible with elfutils-libelf ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies; - patches = [ - ./bcc-source.patch - # https://github.com/iovisor/bpftrace/issues/184 - ./disable-gtests.patch - ]; - - configurePhase = '' - mkdir build - cd build - cmake ../ \ - -DKERNEL_HEADERS_DIR=${linuxHeaders} \ - -DNIX_BUILDS:BOOL=ON \ - -DCMAKE_INSTALL_PREFIX=$out + # patch the source, *then* substitute on @NIX_KERNEL_SRC@ in the result. we could + # also in theory make this an environment variable around bpftrace, but this works + # nicely without wrappers. + patchPhase = '' + patch -p1 < ${./fix-kernel-include-dir.patch} + substituteInPlace ./src/clang_parser.cpp \ + --subst-var-by NIX_KERNEL_SRC '${kernel.dev}/lib/modules/${kernel.modDirVersion}' ''; + # tests aren't built, due to gtest shenanigans. see: + # + # https://github.com/iovisor/bpftrace/issues/161#issuecomment-453606728 + # https://github.com/iovisor/bpftrace/pull/363 + # + cmakeFlags = + [ "-DBUILD_TESTING=FALSE" + "-DLIBBCC_INCLUDE_DIRS=${bcc}/include/bcc" + ]; + + outputs = [ "out" "man" ]; + meta = with stdenv.lib; { description = "High-level tracing language for Linux eBPF"; - homepage = https://github.com/iovisor/bpftrace; - license = licenses.asl20; - maintainers = with maintainers; [ rvl ]; + homepage = https://github.com/iovisor/bpftrace; + license = licenses.asl20; + maintainers = with maintainers; [ rvl thoughtpolice ]; }; } diff --git a/pkgs/os-specific/linux/bpftrace/disable-gtests.patch b/pkgs/os-specific/linux/bpftrace/disable-gtests.patch deleted file mode 100644 index 941d85a4112..00000000000 --- a/pkgs/os-specific/linux/bpftrace/disable-gtests.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 221eea24674fffb3b657b2bd0c923071b69d48a7 Mon Sep 17 00:00:00 2001 -From: Rodney Lorrimar -Date: Tue, 16 Oct 2018 09:56:47 +1000 -Subject: [PATCH 2/3] Disable tests - -Would prefer to use gtest library in the normal way rather through -ExternalProject. ---- - CMakeLists.txt | 4 ++-- - tests/CMakeLists.txt | 18 +++++++++++------- - 2 files changed, 13 insertions(+), 9 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b20fb33..7025d17 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,7 +20,7 @@ add_compile_options("-Wno-format-security") - #add_compile_options("-Wstrict-overflow=5") - #add_compile_options("-Wdisabled-optimization") - --enable_testing() -+# enable_testing() - - if (OFFLINE_BUILDS) - include(ExternalProject) -@@ -79,7 +79,7 @@ include_directories(${CLANG_INCLUDE_DIRS}) - add_subdirectory(src/arch) - add_subdirectory(src/ast) - add_subdirectory(src) --add_subdirectory(tests) -+# add_subdirectory(tests) - add_subdirectory(resources) - add_subdirectory(tools) - add_subdirectory(man) -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index c283efa..6b5bff0 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -45,6 +45,8 @@ if (OFFLINE_BUILDS) - EXCLUDE_FROM_ALL 1 - UPDATE_DISCONNECTED 1 - ) -+elseif (NIX_BUILDS) -+ - else() - include(ExternalProject) - ExternalProject_Add(gtest-git -@@ -54,13 +56,15 @@ else() - EXCLUDE_FROM_ALL 1 - ) - endif() --add_dependencies(bpftrace_test gtest-git-build) --ExternalProject_Get_Property(gtest-git source_dir binary_dir) --target_include_directories(bpftrace_test PUBLIC ${source_dir}/googletest/include) --target_include_directories(bpftrace_test PUBLIC ${source_dir}/googlemock/include) --target_link_libraries(bpftrace_test ${binary_dir}/googlemock/gtest/libgtest.a) --target_link_libraries(bpftrace_test ${binary_dir}/googlemock/gtest/libgtest_main.a) --target_link_libraries(bpftrace_test ${binary_dir}/googlemock/libgmock.a) -+ -+find_library(LIBGTEST "gtest") -+if(LIBGTEST) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBGTEST} -+ ) -+endif() -+ - target_link_libraries(bpftrace_test ${CMAKE_THREAD_LIBS_INIT}) - - add_test(NAME bpftrace_test COMMAND bpftrace_test) --- -2.17.1 - diff --git a/pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch b/pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch new file mode 100644 index 00000000000..0c6ffc471ad --- /dev/null +++ b/pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch @@ -0,0 +1,22 @@ +commit b6172952c0150d84912fa6f09bab782dd0549f1e +Author: Austin Seipp +Date: Fri May 3 00:47:12 2019 -0500 + + src: special case nix build directories for clang + + Signed-off-by: Austin Seipp + +diff --git a/src/clang_parser.cpp b/src/clang_parser.cpp +index b1db8ff..0cfb01f 100644 +--- a/src/clang_parser.cpp ++++ b/src/clang_parser.cpp +@@ -140,6 +140,9 @@ static bool is_dir(const std::string& path) + // Both ksrc and kobj are guaranteed to be != "", if at least some trace of kernel sources was found. + static std::tuple get_kernel_dirs(const struct utsname& utsname) + { ++ // NB (aseipp): special case the kernel directory for nix ++ return { "@NIX_KERNEL_SRC@/source", "@NIX_KERNEL_SRC@/build" }; ++ + #ifdef KERNEL_HEADERS_DIR + return {KERNEL_HEADERS_DIR, KERNEL_HEADERS_DIR}; + #endif From ed81e9eba8cfd452a5873891aed39f364d0ecc45 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sat, 4 May 2019 02:19:51 +0900 Subject: [PATCH 75/76] ccid: set platforms to unix (#60871) Upstream supports Linux, macOS and various Unixes. --- pkgs/tools/security/ccid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index c5a0de0c75f..6fbcffdae29 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "ccid drivers for pcsclite"; homepage = https://ccid.apdu.fr/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From f40a559cbb6c1dffe144cb4c77ff5e5a443e632f Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 3 May 2019 12:25:28 -0500 Subject: [PATCH 76/76] bpftrace: nuke some unneeded files from $out Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/bpftrace/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 022e0300a8c..87355fbcc2e 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -44,6 +44,12 @@ stdenv.mkDerivation rec { "-DLIBBCC_INCLUDE_DIRS=${bcc}/include/bcc" ]; + # nuke the example/reference output .txt files, for the included tools, + # stuffed inside $out. we don't need them at all. + postInstall = '' + rm -rf $out/share/bpftrace/tools/doc + ''; + outputs = [ "out" "man" ]; meta = with stdenv.lib; {