From 08d10e04dbaa740ffbe7395cbb72fd38440b1ea4 Mon Sep 17 00:00:00 2001 From: Ben Hipple Date: Wed, 17 Jul 2019 20:49:17 +0000 Subject: [PATCH 01/35] pythonPackages.mkl-service: init at 2.1.0 --- .../python-modules/mkl-service/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/mkl-service/default.nix diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix new file mode 100644 index 00000000000..ad3f30a66da --- /dev/null +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, cython, mkl, nose, six }: + +buildPythonPackage rec { + pname = "mkl-service"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "IntelPython"; + repo = "mkl-service"; + rev = "v${version}"; + sha256 = "1bnpgx629rxqf0yhn0jn68ypj3dqv6njc3981j1g8j8rsm5lycrn"; + }; + + MKLROOT = mkl; + + checkInputs = [ nose ]; + nativeBuildInputs = [ cython ]; + propagatedBuildInputs = [ mkl six ]; + + meta = with lib; { + description = "Python hooks for Intel(R) Math Kernel Library runtime control settings"; + homepage = "https://github.com/IntelPython/mkl-service"; + license = licenses.bsd3; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8e85d775f5..778a7476382 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -536,10 +536,12 @@ in { maxminddb = callPackage ../development/python-modules/maxminddb { }; - monty = callPackage ../development/python-modules/monty { }; - mininet-python = (toPythonModule (pkgs.mininet.override{ inherit python; })).py; + mkl-service = callPackage ../development/python-modules/mkl-service { }; + + monty = callPackage ../development/python-modules/monty { }; + mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; From 58ea28eb2c11a419b3e895f16d045fbd8f05468c Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 19 Jul 2019 16:23:11 +0200 Subject: [PATCH 02/35] lib: allow sourceByRegex to be composed after cleanSourceWith `sourceByRegex src regexes` should include a source file if one of the regular expressions `regexes` matches the path of that file relative to `src`. However to compute this relative path `sourceByRegex` uses: ``` relPath = lib.removePrefix (toString src + "/") (toString path); ``` Note that `toString path` evaluates to an absolute file somewhere under `src` and not under `/nix/store`. The problem is that this doesn't work if `src` is a `cleanSourceWith` invocation as well because `toString src` will then evaluate to `src.outPath` which will evaluate to `builtins.filterSource ...` which evaluates to a path in `/nix/store` which is not a prefix of `path`. The solution is to replace `src` with `origSrc` where ``` origSrc = if isFiltered then src.origSrc else src; isFiltered = src ? _isLibCleanSourceWith; ``` Test this by executing the following from the nixpkgs repo: ``` (cat << 'EOI' let pkgs = import ./. {}; in pkgs.runCommand "test-sourceByRegex" { test_sourceByRegex = let src1 = pkgs.lib.sourceByRegex ./. [ "^test-sourceByRegex.nix$" ]; src2 = pkgs.lib.sourceByRegex src1 [ "^test-sourceByRegex.nix$" ]; in src2 + "/test-sourceByRegex.nix"; } '' cp $test_sourceByRegex $out '' EOI ) > test-sourceByRegex.nix nix-build test-sourceByRegex.nix ``` --- lib/sources.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/sources.nix b/lib/sources.nix index 0ffadea8f1b..c4680087b24 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -53,12 +53,16 @@ rec { # Filter sources by a list of regular expressions. # # E.g. `src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]` - sourceByRegex = src: regexes: cleanSourceWith { - filter = (path: type: - let relPath = lib.removePrefix (toString src + "/") (toString path); - in lib.any (re: builtins.match re relPath != null) regexes); - inherit src; - }; + sourceByRegex = src: regexes: + let + isFiltered = src ? _isLibCleanSourceWith; + origSrc = if isFiltered then src.origSrc else src; + in lib.cleanSourceWith { + filter = (path: type: + let relPath = lib.removePrefix (toString origSrc + "/") (toString path); + in lib.any (re: builtins.match re relPath != null) regexes); + inherit src; + }; # Get all files ending with the specified suffices from the given # directory or its descendants. E.g. `sourceFilesBySuffices ./dir From 8438e3e67f05f2600e2def07f5cc58ae214b6267 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 21 Jul 2019 15:04:45 -0400 Subject: [PATCH 03/35] gtk3: don't multiout demos --- pkgs/development/libraries/gtk+/3.x.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 8c3df083087..d814bb58fbc 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -154,17 +154,13 @@ stdenv.mkDerivation rec { done ''; - # Make all demo related things in dev - postFixup = '' - moveToOutput share/icons/hicolor "$dev" - moveToOutput share/applications "$dev" - moveToOutput share/gsettings-schemas "$dev" - + # Wrap demos + postFixup = optionalString (!stdenv.isDarwin) '' demos=(gtk3-demo gtk3-demo-application gtk3-icon-browser gtk3-widget-factory) for program in ''${demos[@]}; do wrapProgram $dev/bin/$program \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$dev/share/gsettings-schemas/${pname}-${version}" + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" done ''; From 9332773e5108b096d1e67fb01158cd1a9530e0b0 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Tue, 23 Jul 2019 16:30:56 +0200 Subject: [PATCH 04/35] wine: disable zbar in gst-plugins-bad --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 +++- pkgs/misc/emulators/wine/base.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index ba59a251437..2ae0ad2b453 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -2,6 +2,7 @@ , config , pkgconfig, python3, gst-plugins-base, orc , gobject-introspection +, enableZbar ? true , faacSupport ? false, faac ? null , faad2, libass, libkate, libmms, librdf, ladspaH , libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom @@ -136,13 +137,13 @@ stdenv.mkDerivation rec { soundtouch spandsp srtp - zbar fluidsynth libvdpau libwebp xvidcore gnutls libGLU_combined libgme openssl x265 libxml2 libintl srt ] + ++ optional enableZbar zbar ++ optional faacSupport faac ++ optional stdenv.isLinux wayland # wildmidi requires apple's OpenAL @@ -158,6 +159,7 @@ stdenv.mkDerivation rec { "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" + "-Dzbar=${if enableZbar then "enabled" else "disabled"}" "-Dfaac=${if faacSupport then "enabled" else "disabled"}" "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing "-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 8edf7ad3959..01d09659915 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -46,7 +46,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional udevSupport pkgs.udev ++ lib.optional vulkanSupport pkgs.vulkan-loader ++ lib.optional sdlSupport pkgs.SDL2 - ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]) + ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; + [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav + (gst-plugins-bad.override { enableZbar = false; }) ]) ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] From 4921d7d048a0d48b1249fcb3bd74f4425c82fef7 Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Tue, 23 Jul 2019 16:53:18 +0200 Subject: [PATCH 05/35] humanfriendly: add top level attribute --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f642f9e1832..74b7e0afb2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3711,6 +3711,8 @@ in hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; + humanfriendly = with python3Packages; toPythonApplication humanfriendly; + hwinfo = callPackage ../tools/system/hwinfo { }; hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { }; From 8238ddfbf820323e63d7cc67273207c23a518eec Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Tue, 23 Jul 2019 16:55:47 +0200 Subject: [PATCH 06/35] pythonPackages.verboselogs: init at 1.7 --- .../python-modules/verboselogs/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/verboselogs/default.nix diff --git a/pkgs/development/python-modules/verboselogs/default.nix b/pkgs/development/python-modules/verboselogs/default.nix new file mode 100644 index 00000000000..f4c78858913 --- /dev/null +++ b/pkgs/development/python-modules/verboselogs/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest, mock }: + +buildPythonPackage rec { + pname = "verboselogs"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "xolox"; + repo = "python-verboselogs"; + rev = version; + sha256 = "10jzm8pkl49as4y2zyiidmfqqj5zmqg3p73jvx4lfxi0gmp1vhl5"; + }; + + # do not run pylint plugin test, as astroid is a old unsupported version + checkPhase = '' + PATH=$PATH:$out/bin pytest . -k "not test_pylint_plugin" + ''; + checkInputs = [ pytest mock ]; + + meta = with lib; { + description = "Verbose logging for Python's logging module"; + homepage = https://github.com/xolox/python-verboselogs; + license = licenses.mit; + maintainers = with maintainers; [ eyjhb ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43d76a7fa4e..b162718aafd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4819,6 +4819,8 @@ in { user-agents = callPackage ../development/python-modules/user-agents { }; + verboselogs = callPackage ../development/python-modules/verboselogs { }; + vega_datasets = callPackage ../development/python-modules/vega_datasets { }; virtkey = callPackage ../development/python-modules/virtkey { From b0b81b0c1821276a89f44d80cb6f00091fbece8f Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Tue, 23 Jul 2019 16:56:25 +0200 Subject: [PATCH 07/35] pythonPackages.update-dotdee: init at 5.0 --- .../python-modules/update-dotdee/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/update-dotdee/default.nix diff --git a/pkgs/development/python-modules/update-dotdee/default.nix b/pkgs/development/python-modules/update-dotdee/default.nix new file mode 100644 index 00000000000..b537ca8c264 --- /dev/null +++ b/pkgs/development/python-modules/update-dotdee/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchFromGitHub, executor, naturalsort }: + +buildPythonPackage rec { + pname = "update-dotdee"; + version = "5.0"; + + src = fetchFromGitHub { + owner = "xolox"; + repo = "python-update-dotdee"; + rev = version; + sha256 = "1h3m593nwzx6vwa24k0wizb7la49yhqxwn73ipclxgxxi4dfdj01"; + }; + + propagatedBuildInputs = [ executor naturalsort ]; + + meta = with lib; { + description = "Generic modularized configuration file manager"; + homepage = https://github.com/xolox/python-update-dotdee; + license = licenses.mit; + maintainers = with maintainers; [ eyjhb ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74b7e0afb2b..9f00c228063 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5090,6 +5090,8 @@ in oppai-ng = callPackage ../tools/misc/oppai-ng { }; + update-dotdee = with python3Packages; toPythonApplication update-dotdee; + update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; opae = callPackage ../development/libraries/opae { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b162718aafd..84e3047568d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4807,6 +4807,8 @@ in { update-copyright = callPackage ../development/python-modules/update-copyright {}; + update-dotdee = callPackage ../development/python-modules/update-dotdee { }; + uritemplate = callPackage ../development/python-modules/uritemplate { }; uproot = callPackage ../development/python-modules/uproot {}; From adfa7bd59f100b10d5d48bb401ab5aa7c51bb4a9 Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Tue, 23 Jul 2019 16:57:03 +0200 Subject: [PATCH 08/35] pythonPackages.property-manager: init at 2.3.1 --- .../property-manager/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/property-manager/default.nix diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix new file mode 100644 index 00000000000..30c720927e7 --- /dev/null +++ b/pkgs/development/python-modules/property-manager/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, verboselogs, coloredlogs, pytest, pytestcov }: + +buildPythonPackage rec { + pname = "property-manager"; + version = "2.3.1"; + + src = fetchFromGitHub { + owner = "xolox"; + repo = "python-property-manager"; + rev = version; + sha256 = "0s4nwipxd8c2vp4rd8mxrj8wbycniz5ki5n177d0dbrnll5amcz0"; + }; + + propagatedBuildInputs = [ coloredlogs humanfriendly verboselogs ]; + checkInputs = [ pytest pytestcov ]; + + meta = with lib; { + description = "Useful property variants for Python programming"; + homepage = https://github.com/xolox/python-property-manager; + license = licenses.mit; + maintainers = with maintainers; [ eyjhb ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 84e3047568d..5526d169972 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4085,6 +4085,8 @@ in { prettytable = callPackage ../development/python-modules/prettytable { }; + property-manager = callPackage ../development/python-modules/property-manager { }; + prompt_toolkit = let filename = if isPy3k then ../development/python-modules/prompt_toolkit else ../development/python-modules/prompt_toolkit/1.nix; in callPackage filename { }; From d774370939551d00bc040b8e589210d09d8b0dad Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Tue, 23 Jul 2019 16:57:40 +0200 Subject: [PATCH 09/35] pythonPackages.rotate-backups: init at 6.0 --- pkgs/tools/backup/rotate-backups/default.nix | 23 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 pkgs/tools/backup/rotate-backups/default.nix diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/pkgs/tools/backup/rotate-backups/default.nix new file mode 100644 index 00000000000..17397ce838f --- /dev/null +++ b/pkgs/tools/backup/rotate-backups/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub, update-dotdee, simpleeval, dateutil }: + +buildPythonPackage rec { + pname = "rotate-backups"; + version = "6.0"; + + src = fetchFromGitHub { + owner = "xolox"; + repo = "python-rotate-backups"; + rev = version; + sha256 = "0i59qfv1cfm0ss63ab2nrkn5wr4rxpqqmvfd7pf9c3pl9dbfq20c"; + }; + + propagatedBuildInputs = [ update-dotdee simpleeval dateutil ]; + + meta = with lib; { + description = "Simple command line interface for backup rotation"; + homepage = https://github.com/xolox/python-rotate-backups; + license = licenses.mit; + maintainers = with maintainers; [ eyjhb ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f00c228063..a5e49b0fdef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13097,6 +13097,8 @@ in rocksdb_lite = rocksdb.override { enableLite = true; }; + rotate-backups = with python3Packages; toPythonApplication rotate-backups; + rote = callPackage ../development/libraries/rote { }; ronn = callPackage ../development/tools/ronn { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5526d169972..565f72b9b7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2665,6 +2665,8 @@ in { roman = callPackage ../development/python-modules/roman { }; + rotate-backups = callPackage ../tools/backup/rotate-backups { }; + librosa = callPackage ../development/python-modules/librosa { }; samplerate = callPackage ../development/python-modules/samplerate { }; From 531422ab4a924e08f140032176df9df42b89cb97 Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Tue, 23 Jul 2019 16:58:17 +0200 Subject: [PATCH 10/35] pythonPackages.naturalsort: init at 1.5.1 --- .../python-modules/naturalsort/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/naturalsort/default.nix diff --git a/pkgs/development/python-modules/naturalsort/default.nix b/pkgs/development/python-modules/naturalsort/default.nix new file mode 100644 index 00000000000..f7dcbe4d827 --- /dev/null +++ b/pkgs/development/python-modules/naturalsort/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "naturalsort"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "xolox"; + repo = "python-naturalsort"; + rev = version; + sha256 = "0w43vlddzh97hffnvxp2zkrns9qyirx5g8ijxnxkbx1c4b4gq5ih"; + }; + + meta = with lib; { + description = "Simple natural order sorting API for Python that just works"; + homepage = https://github.com/xolox/python-naturalsort; + license = licenses.mit; + maintainers = with maintainers; [ eyjhb ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 565f72b9b7e..4440c47cc3b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2448,6 +2448,8 @@ in { natsort = callPackage ../development/python-modules/natsort { }; + naturalsort = callPackage ../development/python-modules/naturalsort { }; + ncclient = callPackage ../development/python-modules/ncclient {}; logfury = callPackage ../development/python-modules/logfury { }; From fa7bd53d0d002646870a18e202ac98b3ac0f598c Mon Sep 17 00:00:00 2001 From: Brad Jensen Date: Wed, 24 Jul 2019 09:21:04 -0700 Subject: [PATCH 11/35] Resolve symlinks before trying to recognize a lisp implementation The CCL package installs a symlink named "ccl" that points at the actual implementation executable: lx86cl64 (or lx86cl for 32 bit). When clwrapper is used with CCL as the backing implementation, this script fails to recognize the implementation. By resolving the symlink, we are able to recognize which implementation we're actually working with. --- pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 65fb6e615f5..3b35d7ba5a9 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -8,7 +8,12 @@ eval "$NIX_LISP_PREHOOK" NIX_LISP_COMMAND="$1" shift -[ -z "$NIX_LISP" ] && NIX_LISP="${NIX_LISP_COMMAND##*/}" +if [ -z "$NIX_LISP" ]; then + while [ -h "${NIX_LISP_COMMAND}" ]; do + NIX_LISP_COMMAND="$(readlink -n "${NIX_LISP_COMMAND}")" + done + NIX_LISP="${NIX_LISP_COMMAND##*/}" +fi export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS From 16e70997a8af42f62b6e00cce5776b00f93fb583 Mon Sep 17 00:00:00 2001 From: Brad Jensen Date: Wed, 24 Jul 2019 09:30:24 -0700 Subject: [PATCH 12/35] Use if instead of && for deciding whether to run a command The only difference between these forms is the return value when "$NIX_LISP_SKIP_CODE" is the empty string. In the original formulation, the script would return a false exit status. In the new formulation, it will return a true exit status. Its useful to be able to source cl-wrapper.sh (to get the variables it establishes), and its a bit annoying that sourcing it with NIX_LISP_SKIP_CODE=1 results in a false exit status. --- .../development/lisp-modules/clwrapper/cl-wrapper.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 3b35d7ba5a9..9836bbe5642 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -121,8 +121,10 @@ nix_lisp_build_system(){ eval "$NIX_LISP_PRELAUNCH_HOOK" -[ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \ - $NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.$NIX_LISP_FASL_TYPE\")"}" \ - $NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \ - ${NIX_LISP_FINAL_PARAMETERS[*]:+"${NIX_LISP_FINAL_PARAMETERS[@]}"} \ - "$@" +if [ -z "$NIX_LISP_SKIP_CODE" ]; then + "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \ + $NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.$NIX_LISP_FASL_TYPE\")"}" \ + $NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \ + ${NIX_LISP_FINAL_PARAMETERS[*]:+"${NIX_LISP_FINAL_PARAMETERS[@]}"} \ + "$@" +fi From a6ddcd45da2105b1b8b43f92756cbd07db973699 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 24 Jul 2019 21:26:13 +0200 Subject: [PATCH 13/35] checksec: 1.5 -> 2.0.1 --- ...dprobe-config-before-checking-kernel.patch | 23 +++++---- pkgs/os-specific/linux/checksec/default.nix | 50 +++++++++---------- 2 files changed, 35 insertions(+), 38 deletions(-) diff --git a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch b/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch index 2caf52f3c0a..9beeab0f954 100644 --- a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch +++ b/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch @@ -8,20 +8,21 @@ Signed-off-by: Austin Seipp checksec.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/checksec.sh b/checksec.sh +diff --git a/checksec b/checksec index dd1f72e..63acc29 100644 ---- a/checksec.sh -+++ b/checksec.sh -@@ -337,7 +337,8 @@ kernelcheck() { - printf " userspace processes, this option lists the status of kernel configuration\n" - printf " options that harden the kernel itself against attack.\n\n" - printf " Kernel config: " -- +--- a/checksec ++++ b/checksec +@@ -676,7 +676,8 @@ kernelcheck() { + echo_message " userspace processes, this option lists the status of kernel configuration\n" '' '' '' + echo_message " options that harden the kernel itself against attack.\n\n" '' '' '' + echo_message " Kernel config:\n" '' '' '{ "kernel": ' +- + + modprobe configs 2> /dev/null - if [ -f /proc/config.gz ] ; then - kconfig="zcat /proc/config.gz" - printf "\033[32m/proc/config.gz\033[m\n\n" + if [[ ! "${1}" == "" ]] ; then + kconfig="cat ${1}" + echo_message " Warning: The config ${1} on disk may not represent running kernel config!\n\n" "${1}" " Date: Tue, 23 Jul 2019 16:58:50 +0200 Subject: [PATCH 14/35] pythonPackages.executor: init at 21.3 --- .../python-modules/executor/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/executor/default.nix diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix new file mode 100644 index 00000000000..8c71d63ef5c --- /dev/null +++ b/pkgs/development/python-modules/executor/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchFromGitHub, coloredlogs, property-manager, fasteners, pytest, mock, virtualenv }: + +buildPythonPackage rec { + pname = "executor"; + version = "21.3"; + + src = fetchFromGitHub { + owner = "xolox"; + repo = "python-executor"; + rev = version; + sha256 = "0rc14vjx3d6irfaw0pczzw1pn0xjl7xikv32hc1fvxv2ibnldv5d"; + }; + + propagatedBuildInputs = [ coloredlogs property-manager fasteners ]; + + checkInputs = [ pytest mock virtualenv ]; + + # ignore impure tests + checkPhase = '' + pytest . -k "not option and not retry \ + and not remote and not ssh \ + and not foreach and not local_context" + ''; + + meta = with lib; { + description = "Programmer friendly subprocess wrapper"; + homepage = https://github.com/xolox/python-executor; + license = licenses.mit; + maintainers = with maintainers; [ eyjhb ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5e49b0fdef..bd0d80d2e82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2845,6 +2845,8 @@ in execline = skawarePackages.execline; + executor = with python3Packages; toPythonApplication executor; + exif = callPackage ../tools/graphics/exif { }; exiftags = callPackage ../tools/graphics/exiftags { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4440c47cc3b..4fc2c85465d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2176,6 +2176,8 @@ in { execnet = callPackage ../development/python-modules/execnet { }; + executor = callPackage ../development/python-modules/executor { }; + ezdxf = callPackage ../development/python-modules/ezdxf {}; facebook-sdk = callPackage ../development/python-modules/facebook-sdk { }; From 1de0c3275a960f3e85bc796749d471e98ceef837 Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Tue, 23 Jul 2019 16:59:14 +0200 Subject: [PATCH 15/35] pythonPackages.coloredlogs: init at 10.0 --- .../python-modules/coloredlogs/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/coloredlogs/default.nix diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix new file mode 100644 index 00000000000..48eb4520b16 --- /dev/null +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchFromGitHub, stdenv, isPy3k, fetchpatch, humanfriendly, verboselogs, capturer, pytest, mock, utillinux }: + +buildPythonPackage rec { + pname = "coloredlogs"; + version = "10.0"; + + src = fetchFromGitHub { + owner = "xolox"; + repo = "python-coloredlogs"; + rev = version; + sha256 = "0rdvp4dfvzhx7z7s2jdl3fv7x1hazgpy5gc7bcf05bnbv2iia54a"; + }; + + # patch by risicle + patches = lib.optional (stdenv.isDarwin && isPy3k) (fetchpatch { + name = "darwin-py3-capture-fix.patch"; + url = "https://github.com/xolox/python-coloredlogs/pull/74.patch"; + sha256 = "0pk7k94iz0gdripw623vzdl4hd83vwhsfzshl8pbvh1n6swi0xx9"; + }); + + checkPhase = '' + PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format" + ''; + checkInputs = [ pytest mock utillinux ]; + + propagatedBuildInputs = [ humanfriendly verboselogs capturer ]; + + meta = with lib; { + description = "Colored stream handler for Python's logging module"; + homepage = https://github.com/xolox/python-coloredlogs; + license = licenses.mit; + maintainers = with maintainers; [ eyjhb ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd0d80d2e82..6df502d3336 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1302,6 +1302,8 @@ in clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; + coloredlogs = with python3Packages; toPythonApplication coloredlogs; + colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; colpack = callPackage ../applications/science/math/colpack { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4fc2c85465d..67df72cc091 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1489,6 +1489,8 @@ in { colorcet = callPackage ../development/python-modules/colorcet { }; + coloredlogs = callPackage ../development/python-modules/coloredlogs { }; + colorclass = callPackage ../development/python-modules/colorclass {}; colorlog = callPackage ../development/python-modules/colorlog { }; From 3d91e7fde081da2a6902e0d959baeb0345136945 Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Tue, 23 Jul 2019 16:59:48 +0200 Subject: [PATCH 16/35] pythonPackages.capturer: init at 2.4 --- .../python-modules/capturer/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/capturer/default.nix diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix new file mode 100644 index 00000000000..86062d28a85 --- /dev/null +++ b/pkgs/development/python-modules/capturer/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytest, pytestcov }: + +buildPythonPackage rec { + pname = "capturer"; + version = "2.4"; + + src = fetchFromGitHub { + owner = "xolox"; + repo = "python-capturer"; + rev = version; + sha256 = "07zy264xd0g7pz9sxjqcpwmrck334xcbb7wfss26lmvgdr5nhcb9"; + }; + + propagatedBuildInputs = [ humanfriendly ]; + + checkPhase = '' + PATH=$PATH:$out/bin pytest . + ''; + checkInputs = [ pytest ]; + + meta = with lib; { + description = "Easily capture stdout/stderr of the current process and subprocesses"; + homepage = https://github.com/xolox/python-capturer; + license = licenses.mit; + maintainers = with maintainers; [ eyjhb ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67df72cc091..9a3aa7a9a0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1465,6 +1465,8 @@ in { capstone = callPackage ../development/python-modules/capstone { }; + capturer = callPackage ../development/python-modules/capturer { }; + cement = callPackage ../development/python-modules/cement {}; cgen = callPackage ../development/python-modules/cgen { }; From 3b8e595810fc8faa89a81d4a4c4064bb5cf24e8a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 18 Jul 2019 23:09:55 -0400 Subject: [PATCH 17/35] zmq: add enableDrafts option This is needed by emacs-zmq, and will be used by it. --- pkgs/development/libraries/zeromq/4.x.nix | 4 +++- pkgs/top-level/emacs-packages.nix | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 9fc0c4ac230..506db644142 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc }: +{ stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }: stdenv.mkDerivation rec { name = "zeromq-${version}"; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { doCheck = false; # fails all the tests (ctest) + cmakeFlags = if enableDrafts then [ "-DENABLE_DRAFTS=ON" ] else null; + meta = with stdenv.lib; { branch = "4"; homepage = http://www.zeromq.org; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 29600670f61..6696520c33e 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -434,7 +434,10 @@ let }; stripDebugList = [ "share" ]; packageRequires = [ emacs ]; - nativeBuildInputs = [ external.autoconf external.automake external.pkgconfig external.libtool external.zeromq ]; + nativeBuildInputs = [ + external.autoconf external.automake external.pkgconfig external.libtool + (external.zeromq.override { enableDrafts = true; }) + ]; preBuild = '' make ''; From 1c0e584c6468b7eb74ddb4bdd3dfb6f44e70b3ff Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Tue, 23 Jul 2019 14:51:03 -0700 Subject: [PATCH 18/35] ngrok: fix build on darwin --- pkgs/tools/networking/ngrok-2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index 686bb1d7ebf..c74ceb055ce 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { sourceRoot = "."; - nativeBuildInputs = [ patchelfUnstable ]; + nativeBuildInputs = optionals stdenv.isLinux [ patchelfUnstable ]; unpackPhase = "cp $src ngrok"; @@ -32,10 +32,10 @@ stdenv.mkDerivation { installPhase = '' install -D ngrok $out/bin/ngrok - + '' + optionalString stdenv.isLinux '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/ngrok - ''; + ''; passthru.updateScript = ./update.sh; From cec27ceabc4f734bddc00f5bbf2c0d56a354f654 Mon Sep 17 00:00:00 2001 From: josephtheengineer Date: Thu, 25 Jul 2019 07:51:06 +1000 Subject: [PATCH 19/35] kitty: fix wayland support (EGL: Library not found) --- pkgs/applications/misc/kitty/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 63e77ec0e67..0be9bc82187 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -1,6 +1,6 @@ { stdenv, substituteAll, fetchFromGitHub, python3Packages, glfw, libunistring, harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, - libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, + libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, which, dbus, Cocoa, @@ -57,6 +57,8 @@ buildPythonApplication rec { optipng ]; + propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL; + outputs = [ "out" "terminfo" ]; patches = [ @@ -70,6 +72,10 @@ buildPythonApplication rec { ./png2icns.patch ]; + preConfigure = stdenv.lib.optional (!stdenv.isDarwin) '' + substituteInPlace glfw/egl_context.c --replace "libEGL.so.1" "${stdenv.lib.getLib libGL}/lib/libEGL.so.1" + ''; + buildPhase = if stdenv.isDarwin then '' make app '' else '' From c555bc38a34b899dfba66663a18c7ea343935b5e Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 23 Jul 2019 14:14:57 -0700 Subject: [PATCH 20/35] jsondiff: 1.1.2 -> 1.2.0 --- pkgs/development/python-modules/jsondiff/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index fd31dc93fbf..73017ee68b1 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsondiff"; - version = "1.1.2"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "7e18138aecaa4a8f3b7ac7525b8466234e6378dd6cae702b982c9ed851d2ae21"; + sha256 = "00v3689175aqzdscrxpffm712ylp8jvcpqdg51ca22ni6721p51l"; }; # No tests @@ -20,5 +20,4 @@ buildPythonPackage rec { homepage = https://github.com/ZoomerAnalytics/jsondiff; license = lib.licenses.mit; }; - -} \ No newline at end of file +} From d99c6ccecebe0723d8700d5677f699b632f56fd9 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 23 Jul 2019 14:15:39 -0700 Subject: [PATCH 21/35] jsondiff: patch setup.py to prevent creating bin/jsondiff pythonPackages.jsonpatch also creates bin/jsondiff, and packages depending on both are not usable. --- pkgs/development/python-modules/jsondiff/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index 73017ee68b1..6b254a7221a 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -12,6 +12,10 @@ buildPythonPackage rec { sha256 = "00v3689175aqzdscrxpffm712ylp8jvcpqdg51ca22ni6721p51l"; }; + postPatch = '' + sed -e "/'jsondiff=jsondiff.cli:main_deprecated',/d" -i setup.py + ''; + # No tests doCheck = false; From a8f174ff7ceb3228175eed982ad1e86749654b8c Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Thu, 25 Jul 2019 02:43:45 -0700 Subject: [PATCH 22/35] buildBazelPackage: autodetect nix toolchain instead of Xcode on Darwin (#65308) * buildBazelPackage: autodetect nix toolchain instead of Xcode on Darwin * do not export the variables outside of Darwin * remove unecessary parens * move comment within the darwin check --- .../build-bazel-package/default.nix | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 4e19b244f3c..72725f9818c 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -1,4 +1,8 @@ -{ stdenv, bazel, cacert }: +{ stdenv +, bazel +, cacert +, lib +}: args@{ name, bazelFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }: @@ -109,6 +113,31 @@ in stdenv.mkDerivation (fBuildAttrs // { buildPhase = fBuildAttrs.buildPhase or '' runHook preBuild + '' + lib.optionalString stdenv.isDarwin '' + # Bazel sandboxes the execution of the tools it invokes, so even though we are + # calling the correct nix wrappers, the values of the environment variables + # the wrappers are expecting will not be set. So instead of relying on the + # wrappers picking them up, pass them in explicitly via `--copt`, `--linkopt` + # and related flags. + # + copts=() + host_copts=() + for flag in $NIX_CFLAGS_COMPILE; do + copts+=( "--copt=$flag" ) + host_copts+=( "--host_copt=$flag" ) + done + for flag in $NIX_CXXSTDLIB_COMPILE; do + copts+=( "--copt=$flag" ) + host_copts+=( "--host_copt=$flag" ) + done + linkopts=() + host_linkopts=() + for flag in $NIX_LD_FLAGS; do + linkopts+=( "--linkopt=$flag" ) + host_linkopts+=( "--host_linkopt=$flag" ) + done + '' + '' + BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ USER=homeless-shelter \ bazel \ @@ -116,6 +145,12 @@ in stdenv.mkDerivation (fBuildAttrs // { --output_user_root="$bazelUserRoot" \ build \ -j $NIX_BUILD_CORES \ + '' + lib.optionalString stdenv.isDarwin '' + "''${copts[@]}" \ + "''${host_copts[@]}" \ + "''${linkopts[@]}" \ + "''${host_linkopts[@]}" \ + '' + '' $bazelFlags \ $bazelTarget From 3d00d8e4eebbaf41b28163aa1bcf344084b084a4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Jul 2019 11:51:55 +0200 Subject: [PATCH 23/35] pythonPackages.pyyaml_3: init , instead of multiple pyyaml overrides Temporary attribute until we can get rid of it everywhere. This was triggered due to the libyaml 0.2.2 incompatibilty requiring patches and still not building. --- .../tools/build-managers/conan/default.nix | 8 +------- pkgs/servers/home-assistant/appdaemon.nix | 9 --------- pkgs/servers/home-assistant/default.nix | 8 +++++--- pkgs/servers/home-assistant/esphome.nix | 7 ------- pkgs/tools/admin/awscli/default.nix | 13 +------------ pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 6 files changed, 22 insertions(+), 38 deletions(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 9c5d22ee07b..ce7b0871044 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -37,13 +37,7 @@ let newPython = python3.override { sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8"; }; }); - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "3.13"; - src = oldAttrs.src.override { - inherit version; - sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; - }; - }); + pyyaml = super.pyyaml_3; }; }; diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 82df1f6b988..5f8884cbd3b 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -38,15 +38,6 @@ let sha256 = "0f390693f46173d8ffb95669acbb0e2a3ec54ecce676703510ad47f1a6d9dc83"; }; }); - - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "5.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95"; - }; - }); - }; }; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d778e8df18f..511aff05dea 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -36,8 +36,6 @@ let "03f38115dccb266dd96538f94067442a877932c2322661bdc5bf2502c76658af") (mkOverride "python-slugify" "3.0.2" "57163ffb345c7e26063435a27add1feae67fa821f1ef4b2f292c25847575d758") - (mkOverride "pyyaml" "3.13" - "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf") (mkOverride "requests" "2.21.0" "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e") (mkOverride "ruamel_yaml" "0.15.94" @@ -63,6 +61,10 @@ let }; }) + (self: super: { + pyyaml = super.pyyaml_3; + }) + # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; @@ -78,7 +80,7 @@ let }; }); }; - + py = python3.override { # Put packageOverrides at the start so they are applied after defaultOverrides packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/servers/home-assistant/esphome.nix index 895b089f991..bd657067939 100644 --- a/pkgs/servers/home-assistant/esphome.nix +++ b/pkgs/servers/home-assistant/esphome.nix @@ -3,13 +3,6 @@ let python = python3.override { packageOverrides = self: super: { - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "5.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95"; - }; - }); tornado = super.tornado.overridePythonAttrs (oldAttrs: rec { version = "5.1.1"; src = oldAttrs.src.override { diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index f8a68bc6f64..b07db447262 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -22,18 +22,7 @@ let sha256 = "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1"; }; }); - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "3.13"; - src = oldAttrs.src.override { - inherit version; - sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; - }; - # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 - patches = lib.singleton (fetchpatch { - url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch"; - sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn"; - }); - }); + pyyaml = super.pyyaml_3; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c932c721ae..1151e61d7b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4434,6 +4434,21 @@ in { pyyaml = callPackage ../development/python-modules/pyyaml { }; + pyyaml_3 = (callPackage ../development/python-modules/pyyaml { }).overridePythonAttrs (oldAttrs: rec { + version = "3.13"; + src = oldAttrs.src.override { + inherit version; + sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; + }; + # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 + patches = singleton (pkgs.fetchpatch { + url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch"; + sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn"; + }); + # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 + doCheck = false; + }); + rabbitpy = callPackage ../development/python-modules/rabbitpy { }; rasterio = callPackage ../development/python-modules/rasterio { From e7e70b7073ca774f2f0dfeace5511d29c75d3cec Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 22 Jun 2019 10:31:51 +0200 Subject: [PATCH 24/35] bazel: add fixed output test case Feels like a horrible hack, but it should make sure that downstream hashes are preserved between bazel versions. --- .../tools/build-managers/bazel/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 1a383b76d5d..a8c4ffcb85b 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,5 @@ -{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, runCommand, runCommandCC, makeWrapper +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub +, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel , lr, xe, zip, unzip, bash, writeCBin, coreutils @@ -11,6 +12,8 @@ , buildJdk, runJdk , buildJdkName , runtimeShell +# Downstream packages for tests +, bazel-watcher # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -221,10 +224,18 @@ stdenv.mkDerivation rec { pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; }; bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; + cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; }; javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; }; protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; }; + + # downstream packages using buildBazelPackage + # fixed-output hashes of the fetch phase need to be spot-checked manually + downstream = recurseIntoAttrs { + inherit (python3.pkgs) dm-sonnet; + inherit bazel-watcher; + }; }; # update the list of workspace dependencies From eab06d4517f126e6ed22056268eacad32040f09e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 23 Jul 2019 11:56:42 +0200 Subject: [PATCH 25/35] python-modules/dm-sonnet: update fixed-output hash --- pkgs/development/python-modules/dm-sonnet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index c10dafdabc6..ed6bff96d73 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -36,7 +36,7 @@ let bazelTarget = ":install"; fetchAttrs = { - sha256 = "0f2rlzrlazmgjrsin8vq3jfv431cc8sx8lxsr6x4wgd4jx5d1zzy"; + sha256 = "141k2caj5hlk31gnqryp6w2mzyz4i5s1rf8f3qr18isxy235k3w6"; }; bazelFlags = [ From 63e0b8b3f96c04344de637fdc968fbcd19864627 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 23 Jul 2019 12:05:14 +0200 Subject: [PATCH 26/35] bazel: execute dm-sonnet test only on linux --- pkgs/development/tools/build-managers/bazel/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index a8c4ffcb85b..3a94b335522 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -232,10 +232,13 @@ stdenv.mkDerivation rec { # downstream packages using buildBazelPackage # fixed-output hashes of the fetch phase need to be spot-checked manually - downstream = recurseIntoAttrs { - inherit (python3.pkgs) dm-sonnet; + downstream = recurseIntoAttrs ({ inherit bazel-watcher; - }; + } + // (lib.optionalAttrs stdenv.isLinux { + # dm-sonnet is only packaged for linux + dm-sonnet-linux = python3.pkgs.dm-sonnet; + })); }; # update the list of workspace dependencies From fdee6f4fae81addf74c4dfe48ff4f1e512e2a7c3 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 25 Jul 2019 11:49:23 +0200 Subject: [PATCH 27/35] bazel: disable dm-sonnet downstream test --- pkgs/development/tools/build-managers/bazel/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 3a94b335522..8c19c0021d1 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -235,9 +235,10 @@ stdenv.mkDerivation rec { downstream = recurseIntoAttrs ({ inherit bazel-watcher; } - // (lib.optionalAttrs stdenv.isLinux { # dm-sonnet is only packaged for linux - dm-sonnet-linux = python3.pkgs.dm-sonnet; + // (lib.optionalAttrs stdenv.isLinux { + # TODO(timokau) dm-sonnet is broken currently + # dm-sonnet-linux = python3.pkgs.dm-sonnet; })); }; From 5f33bcd953a17c903e407e6a5fce51039bae239c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Thu, 25 Jul 2019 15:37:32 +0200 Subject: [PATCH 28/35] matrix-synapse: fix documentation better --- nixos/doc/manual/configuration/matrix.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/configuration/matrix.xml b/nixos/doc/manual/configuration/matrix.xml index 40dd1406bb6..ef8d5cbda88 100644 --- a/nixos/doc/manual/configuration/matrix.xml +++ b/nixos/doc/manual/configuration/matrix.xml @@ -95,7 +95,7 @@ in { # forward all Matrix API calls to the synapse Matrix homeserver locations."/_matrix" = { - proxyPass = "http://[::1]:8008/_matrix"; + proxyPass = "http://[::1]:8008"; # without a trailing / }; }; }; From 969aec30b68935041899accf78634c21efbf2c22 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 15:53:15 +0300 Subject: [PATCH 29/35] bazel-remote: mark as broken --- .../tools/build-managers/bazel/bazel-remote/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 0d821fa6166..2eb5f772f89 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -76,5 +76,6 @@ buildBazelPackage rec { license = licenses.asl20; maintainers = [ maintainers.uri-canva ]; platforms = platforms.darwin; + broken = true; # global variable '_layer' is referenced before assignment. }; } From 7b828532b9b464d418bd3aa19db13408123c3ebc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 15:56:37 +0300 Subject: [PATCH 30/35] bazel-deps: 2019-02-01 -> 2019-07-11, mark as broken Also drop preInstall cleanup for dependencies. The reason is while it's more thorough than default cleanup in buildBazelPackage if such a problem happens we should fix buildBazelPackage instead. Perhaps even move this (awesome!) snippet there but it's very slow-running so we'd rather attempt to fix it in other ways. Anyway after an update at least .deps build, checked with `nix-build -A --check`. --- .../bazel/bazel-deps/default.nix | 51 ++----------------- 1 file changed, 5 insertions(+), 46 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix index 6fdb5734507..62a1329eca6 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix @@ -2,7 +2,7 @@ buildBazelPackage rec { name = "bazel-deps-${version}"; - version = "2019-02-01"; + version = "2019-07-11"; meta = with stdenv.lib; { homepage = "https://github.com/johnynek/bazel-deps"; @@ -10,13 +10,14 @@ buildBazelPackage rec { license = licenses.mit; maintainers = [ maintainers.uri-canva ]; platforms = platforms.all; + broken = true; # global variable '_common_attrs_for_plugin_bootstrapping' is referenced before assignment. }; src = fetchFromGitHub { owner = "johnynek"; repo = "bazel-deps"; - rev = "6585033409e09028852403ec15ec0c77851234be"; - sha256 = "0hypf7mcbpx2djqm92k82vn1k6pbnv564xbnazx8nw60f6ns0x87"; + rev = "48fdf7f8bcf3aadfa07f9f7e6f0c9f4247cb0f58"; + sha256 = "0wpn5anfgq5wfljfhpn8gbgdmgcp0claffjgqcnv5dh70ch7i0gi"; }; bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar"; @@ -24,49 +25,7 @@ buildBazelPackage rec { buildInputs = [ git makeWrapper ]; fetchAttrs = { - preInstall = '' - # Remove all built in external workspaces, Bazel will recreate them when building - rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,embedded_jdk,\@embedded_jdk.marker,local_*,\@local_*} - # For each external workspace, remove all files that aren't referenced by Bazel - # Many of these files are non-hermetic (for example .git/refs/remotes/origin/HEAD) - files_to_delete=() - for workspace in $(find $bazelOut/external -maxdepth 2 -name "WORKSPACE" -print0 | xargs -0L1 dirname); do - workspaceOut="$NIX_BUILD_TOP/workspaces/$(basename workspace)/output" - workspaceUserRoot="$NIX_BUILD_TOP/workspaces/$(basename workspace)/tmp" - rm -rf $workspace/.git - if ! targets_and_files=$(cd "$workspace" && bazel --output_base="$workspaceOut" --output_user_root="$workspaceUserRoot" query '//...:*' 2> /dev/null | sort -u); then - continue - fi - if ! targets=$(cd "$workspace" && bazel --output_base="$workspaceOut" --output_user_root="$workspaceUserRoot" query '//...:all' 2> /dev/null | sort -u); then - continue - fi - mapfile -t referenced_files < <(comm -23 <(printf '%s' "$targets_and_files") <(printf '%s' "$targets") | sed -e 's,^//:,,g' | sed -e 's,^//,,g' | sed -e 's,:,/,g') - referenced_files+=( "WORKSPACE" ) - for referenced_file in "''${referenced_files[@]}"; do - # Some of the referenced files are symlinks to non-referenced files. - # The symlink targets have deterministic contents, but non-deterministic - # paths. Copy them to the referenced path, which is deterministic. - if target=$(readlink "$workspace/$referenced_file"); then - rm "$workspace/$referenced_file" - cp -a "$target" "$workspace/$referenced_file" - fi - done - mapfile -t workspace_files_to_delete < <(find "$workspace" -type f -or -type l | sort -u | comm -23 - <(printf "$workspace/%s\n" "''${referenced_files[@]}" | sort -u)) - for workspace_file_to_delete in "''${workspace_files_to_delete[@]}"; do - files_to_delete+=("$workspace_file_to_delete") - done - # We're running bazel in many different workspaces in a loop. Letting the - # daemon shut down on its own would leave several daemons alive at the - # same time, using up a lot of memory. Shut them down explicitly instead. - bazel --output_base="$workspaceOut" --output_user_root="$workspaceUserRoot" shutdown 2> /dev/null - done - for file_to_delete in "''${files_to_delete[@]}"; do - rm "$file_to_delete" - done - find . -type d -empty -delete - ''; - - sha256 = "1yirrzhhrsmbgd27fg709plhrhyi8pzwqv84yg72sd3799kswh9m"; + sha256 = "1r5qxsbw2cgww7vcg5psh7404l3jcxpvc0ndgl3k8vj1x8y93nkf"; }; buildAttrs = { From 1d9d31a0eb8e8358830528538a391df52f6a075a Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Wed, 24 Jul 2019 11:55:12 +0100 Subject: [PATCH 31/35] tmuxPlugins.tmux-colors-solarized: init tmux plugin --- pkgs/misc/tmux-plugins/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 6c85f9a6329..57e96d559d3 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -1,4 +1,5 @@ { fetchgit +, fetchFromGitHub , lib , pkgs , reattach-to-user-namespace @@ -215,6 +216,16 @@ in rec { }; }; + tmux-colors-solarized = mkDerivation { + pluginName = "tmuxcolors"; + src = fetchFromGitHub { + owner = "seebi"; + repo = "tmux-colors-solarized"; + rev = "e5e7b4f1af37f8f3fc81ca17eadee5ae5d82cd09"; + sha256 = "1l3i82abzi4b395cgdsjg7lcfaq15kyyhijwvrgchzxi95z3hl4x"; + }; + }; + urlview = mkDerivation { pluginName = "urlview"; src = fetchgit { From 967b8422d7ae9b29a54ccb07490490d4df017322 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 25 Jul 2019 21:09:27 +0200 Subject: [PATCH 32/35] python37Packages.google_api_python_client: 1.7.9 -> 1.7.10 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 1acc9603db3..60a6caace5e 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.7.9"; + version = "1.7.10"; src = fetchPypi { inherit pname version; - sha256 = "1v551xaavqff085gplinnnrz2sk6sikmm7j47gi0wf34hpba1384"; + sha256 = "1mlx5dvkh6rjkvkd91flyhrmji2kw9rlr05n8n4wccv2np3sam9f"; }; # No tests included in archive From f178bee18ed2790aae9db3b9256da3eea18491a7 Mon Sep 17 00:00:00 2001 From: Luis Pedro Coelho Date: Wed, 17 Jul 2019 15:04:31 +0200 Subject: [PATCH 33/35] rocksdb: Remove gflags dependency GFlags are only used for the tools, which are not installed in any case. --- pkgs/development/libraries/rocksdb/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index bd6441eeb0e..05ecf0f8f25 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, bzip2, cmake, gflags, lz4, snappy, zlib, zstd, enableLite ? false }: +{ stdenv, fetchFromGitHub, lib, bzip2, cmake, lz4, snappy, zlib, zstd, enableLite ? false }: stdenv.mkDerivation rec { pname = "rocksdb"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ bzip2 gflags lz4 snappy zlib zstd ]; + buildInputs = [ bzip2 lz4 snappy zlib zstd ]; patches = [ ./0001-findzlib.patch ]; @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "-DWITH_SNAPPY=1" "-DWITH_ZLIB=1" "-DWITH_ZSTD=1" + "-DWITH_GFLAGS=0" (lib.optional (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") From fd2b2b5cd56a5be788fa88dcd9605a3a5bb5ecc7 Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Thu, 25 Jul 2019 15:13:07 -0400 Subject: [PATCH 34/35] tmux-ctrlw: init at 0.1.0 --- pkgs/misc/tmux-plugins/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 57e96d559d3..8d885cbf516 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -91,6 +91,15 @@ in rec { }; }; + ctrlw = mkDerivation { + pluginName = "ctrlw"; + src = fetchgit { + url = "https://github.com/eraserhd/tmux-ctrlw"; + rev = "2354b5d56828813d0f7a4b228ca74b6134c2695f"; + sha256 = "00hy1axmki8h2285mivsj923z327xkq89wfl2x4dxc71xjhdl216"; + }; + }; + fpp = mkDerivation { pluginName = "fpp"; src = fetchgit { From eaafd840bf45c239143701a0e6bff0e294d84350 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 25 Jul 2019 22:05:13 +0100 Subject: [PATCH 35/35] Revert "unzip: CVE-2019-13232" This reverts commit 0238946872c1c63709790f6285bf9cc5585a6704. This patch broke a number of legitimate zips in the wild, including but not limited to most luarocks and a number of gradle-produced JARs. --- pkgs/tools/archivers/unzip/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 749f481d890..cdf189e82df 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -26,11 +26,6 @@ stdenv.mkDerivation { ./CVE-2016-9844.patch ./CVE-2018-18384.patch ./dont-hardcode-cc.patch - (fetchurl { - url = "https://github.com/madler/unzip/commit/47b3ceae397d21bf822bc2ac73052a4b1daf8e1c.patch"; - name = "CVE-2019-13232.patch"; - sha256 = "0iy2wcjyvzwrjk02iszwcpg85fkjxs1bvb9isvdiywszav4yjs32"; - }) ] ++ stdenv.lib.optional enableNLS (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1";