From 5ece342d0f95c4158a1db4122259ac5233556021 Mon Sep 17 00:00:00 2001 From: Kristian Brucaj Date: Sun, 2 Feb 2020 19:43:52 -0500 Subject: [PATCH 001/150] fusee-interfacee-tk: init at V1.0.0 all-packages: Add fusee-interfacee-tk --- .../misc/fusee-interfacee-tk/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/misc/fusee-interfacee-tk/default.nix diff --git a/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/pkgs/applications/misc/fusee-interfacee-tk/default.nix new file mode 100644 index 00000000000..d74b6565ba3 --- /dev/null +++ b/pkgs/applications/misc/fusee-interfacee-tk/default.nix @@ -0,0 +1,40 @@ +{ stdenv , fetchFromGitHub , python3 , makeWrapper }: + +let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); +in stdenv.mkDerivation rec { + pname = "fusee-interfacee-tk"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "nh-server"; + repo = pname; + rev = "V${version}"; + sha256 = "0ycsxv71b5yvkcawxmcnmywxfvn8fdg1lyq71xdw7qrskxv5fgq7"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pythonEnv ]; + + installPhase = '' + mkdir -p $out/bin + + # The program isn't just called app, so I'm renaming it based on the repo name + # It also isn't a standard program, so we need to append the shebang to the top + echo "#!${pythonEnv.interpreter}" > $out/bin/fusee-interfacee-tk + cat app.py >> $out/bin/fusee-interfacee-tk + chmod +x $out/bin/fusee-interfacee-tk + + # app.py depends on these to run + cp *.py $out/bin/ + cp intermezzo.bin $out/bin/intermezzo.bin + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/nh-server/fusee-interfacee-tk"; + description = "A tool to send .bin files to a Nintendo Switch in RCM mode"; + longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. + Must be run as sudo."; + maintainers = with maintainers; [ kristian-brucaj ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98e878a8d79..be3f4d67771 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3453,6 +3453,8 @@ in fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; fuse-overlayfs = callPackage ../tools/filesystems/fuse-overlayfs {}; + + fusee-interfacee-tk = callPackage ../applications/misc/fusee-interfacee-tk { }; fusee-launcher = callPackage ../development/tools/fusee-launcher { }; @@ -6680,6 +6682,8 @@ in Sylk = callPackage ../applications/networking/Sylk {}; + otter-browser = qt5.callPackage ../applications/networking/browsers/otter {}; + privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; }; From 87adf9a702262b2ebd1cb96f806e97ae90fd7dfc Mon Sep 17 00:00:00 2001 From: Kristian Brucaj Date: Mon, 3 Feb 2020 23:13:50 -0500 Subject: [PATCH 002/150] Removed unexpected package from all-packages.nix --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be3f4d67771..b4be33ed6b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6682,8 +6682,6 @@ in Sylk = callPackage ../applications/networking/Sylk {}; - otter-browser = qt5.callPackage ../applications/networking/browsers/otter {}; - privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; }; From 6dab1b50a63fa6e9dfb9bd9eddd3f5d5c7b055ef Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 24 Feb 2020 00:41:55 +0100 Subject: [PATCH 003/150] buildLayeredImage: Allow empty store, no paths to add This is useful when buildLayeredImage is called in a generic way that should allow simple (base) images to be built, which may not reference any store paths. --- nixos/tests/docker-tools.nix | 17 +++++++++++++++++ pkgs/build-support/docker/default.nix | 9 +++++---- pkgs/build-support/docker/examples.nix | 22 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 54dd97e5b13..51b472fcf9c 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -137,5 +137,22 @@ import ./make-test-python.nix ({ pkgs, ... }: { # Ensure the two output paths (ls and hello) are in the layer "docker run bulk-layer ls /bin/hello", ) + + with subtest("Ensure correct behavior when no store is needed"): + # This check tests two requirements simultaneously + # 1. buildLayeredImage can build images that don't need a store. + # 2. Layers of symlinks are eliminated by the customization layer. + # + docker.succeed( + "docker load --input='${pkgs.dockerTools.examples.no-store-paths}'" + ) + + # Busybox will not recognize argv[0] and print an error message with argv[0], + # but it confirms that the custom-true symlink is present. + docker.succeed("docker run --rm no-store-paths custom-true |& grep custom-true") + + # This check may be loosened to allow an *empty* store rather than *no* store. + docker.succeed("docker run --rm no-store-paths ls /") + docker.fail("docker run --rm no-store-paths ls /nix/store") ''; }) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ff9949bc8dd..28c0d2dfcae 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -319,6 +319,8 @@ rec { enableParallelBuilding = true; } '' + mkdir layers + # Delete impurities for store path layers, so they don't get # shared and taint other projects. cat ${configJson} \ @@ -330,13 +332,12 @@ rec { # created, and that no paths are missed. If you change the # following head and tail call lines, double-check that your # code behaves properly when the number of layers equals: - # maxLayers-1, maxLayers, and maxLayers+1 + # maxLayers-1, maxLayers, and maxLayers+1, 0 paths() { - cat $paths ${lib.concatMapStringsSep " " (path: "| grep -v ${path}") (closures ++ [ overallClosure ])} + cat $paths ${lib.concatMapStringsSep " " (path: "| (grep -v ${path} || true)") (closures ++ [ overallClosure ])} } - # We need to sponge to avoid grep broken pipe error when maxLayers == 1 - paths | sponge | head -n $((maxLayers - 1)) | cat -n | xargs -r -P$NIX_BUILD_CORES -n2 ${storePathToLayer} + paths | head -n $((maxLayers - 1)) | cat -n | xargs -r -P$NIX_BUILD_CORES -n2 ${storePathToLayer} if [ $(paths | wc -l) -ge $maxLayers ]; then paths | tail -n+$maxLayers | xargs ${storePathToLayer} $maxLayers fi diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index f0dcf236c0e..f42b35e6494 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -258,4 +258,26 @@ rec { maxLayers = 2; }; + # 17. Create a "layered" image without nix store layers. This is not + # recommended, but can be useful for base images in rare cases. + no-store-paths = pkgs.dockerTools.buildLayeredImage { + name = "no-store-paths"; + tag = "latest"; + extraCommands = '' + chmod a+w bin + + # This removes sharing of busybox and is not recommended. We do this + # to make the example suitable as a test case with working binaries. + cp -r ${pkgs.pkgsStatic.busybox}/* . + ''; + contents = [ + # This layer has no dependencies and its symlinks will be dereferenced + # when creating the customization layer. + (pkgs.runCommand "layer-to-flatten" {} '' + mkdir -p $out/bin + ln -s /bin/true $out/bin/custom-true + '' + ) + ]; + }; } From 8710544c5e8ba398d735e2dfbf1c19862f633139 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 27 Feb 2020 20:00:35 +0100 Subject: [PATCH 004/150] mma: 19.08 -> 20.02 --- pkgs/applications/audio/MMA/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index 42f8af99e6f..4304fe59bdf 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: stdenv.mkDerivation rec { - version = "19.08"; + version = "20.02"; pname = "mma"; src = fetchurl { url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; - sha256 = "02g2q9f1hbrj1v4mbf7zx2571vqpfla5803hcjpkdkvn8g0dwci0"; + sha256 = "0i9c3f14j7wy2c86ky83f2vgmg5bihnnwsmpkq13fgqjsaf0qwnv"; }; buildInputs = [ makeWrapper python3 alsaUtils timidity ]; @@ -19,6 +19,7 @@ sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g' + find . -type f | xargs sed -i 's@/usr/bin/python@${python3.interpreter}@g' ''; installPhase = '' From 321d788e2a1e122896627ffaed740dd31a44db31 Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Sat, 29 Feb 2020 18:31:57 +0100 Subject: [PATCH 005/150] rstudio: 1.2.1335 -> 1.2.5033 --- pkgs/applications/editors/rstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index cab7ac119b6..f10578b1168 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -8,7 +8,7 @@ with lib; let verMajor = "1"; verMinor = "2"; - verPatch = "1335"; + verPatch = "5033"; version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "2.1.2"; gwtVer = "2.8.1"; @@ -26,7 +26,7 @@ mkDerivation rec { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "0jv1d4yznv2lzwp0fdf377vqpg0k2q4z9qvji4sj86fabj835lqd"; + sha256 = "0f3p2anz9xay2859bxj3bvyj582igsp628qxsccpkgn0jifvi4np"; }; # Hack RStudio to only use the input R and provided libclang. From 476dd85c093d3a2618530bdb5065a4dc966a281f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 2 Mar 2020 17:41:47 +0800 Subject: [PATCH 006/150] vmfs-tools: minor cleanup --- pkgs/tools/filesystems/vmfs-tools/default.nix | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index c15a782fa3c..f473fa04334 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -1,25 +1,39 @@ -{ stdenv, fetchFromGitHub, pkgconfig -, asciidoc, docbook_xsl, fuse, libuuid, libxslt }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, asciidoc +, docbook_xsl +, fuse +, libuuid +, libxslt +}: -stdenv.mkDerivation { - name = "vmfs-tools"; +stdenv.mkDerivation rec { + pname = "vmfs-tools"; + version = "0.2.5.20160116"; src = fetchFromGitHub { - owner = "glandium"; - repo = "vmfs-tools"; - rev = "4ab76ef5b074bdf06e4b518ff6d50439de05ae7f"; + owner = "glandium"; + repo = pname; + rev = "4ab76ef5b074bdf06e4b518ff6d50439de05ae7f"; sha256 = "14y412ww5hxk336ils62s3fwykfh6mx1j0iiaa5cwc615pi6qvi4"; }; - nativeBuildInputs = [ asciidoc docbook_xsl fuse libuuid libxslt pkgconfig ]; + nativeBuildInputs = [ asciidoc docbook_xsl libxslt pkgconfig ]; + + buildInputs = [ fuse libuuid ]; enableParallelBuilding = true; + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} AUTHORS LICENSE README TODO + ''; + meta = with stdenv.lib; { - homepage = https://github.com/glandium/vmfs-tools; - description = "FUSE-based VMFS (vmware) mounting tools"; + description = "FUSE-based VMFS (vmware) file system tools"; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; license = licenses.gpl2; + platforms = platforms.linux; + inherit (src.meta) homepage; }; } From 740ec9474ef3a22ca3608093e128746c167031f9 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 2 Mar 2020 17:48:27 +0800 Subject: [PATCH 007/150] teensy-loader-cli: 2.1 -> 2.1.20191110 Add manpages and documentation. --- .../tools/misc/teensy-loader-cli/default.nix | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 2975d64113e..e03320f8429 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,26 +1,31 @@ -{ stdenv, libusb, fetchgit }: -let - version = "2.1"; -in -stdenv.mkDerivation { +{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb }: + +stdenv.mkDerivation rec { pname = "teensy-loader-cli"; - inherit version; - src = fetchgit { - url = "git://github.com/PaulStoffregen/teensy_loader_cli.git"; - rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2"; - sha256 = "1a663bv3lvm7bsf2wcaj2c0vpmniak7w5hwix5qgz608bvm2v781"; + version = "2.1.20191110"; + + src = fetchFromGitHub { + owner = "PaulStoffregen"; + repo = "teensy_loader_cli"; + rev = "e98b5065cdb9f04aa4dde3f2e6e6e6f12dd97592"; + sha256 = "1yx8vsh6b29pqr4zb6sx47429i9x51hj9psn8zksfz75j5ivfd5i"; }; buildInputs = [ libusb ]; + nativeBuildInputs = [ go-md2man installShellFiles ]; + installPhase = '' - install -Dm755 teensy_loader_cli $out/bin/teensy-loader-cli + install -Dm555 teensy_loader_cli $out/bin/teensy-loader-cli + install -Dm444 -t $out/share/doc/${pname} *.md *.txt + go-md2man -in README.md -out ${pname}.1 + installManPage *.1 ''; meta = with stdenv.lib; { - license = licenses.gpl3; description = "Firmware uploader for the Teensy microcontroller boards"; - homepage = https://www.pjrc.com/teensy/; + homepage = "https://www.pjrc.com/teensy/"; + license = licenses.gpl3; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; }; From bb46f897d1396768cec5d42a57b7fe17574c4369 Mon Sep 17 00:00:00 2001 From: Bruce Toll <4109762+tollb@users.noreply.github.com> Date: Mon, 2 Mar 2020 09:38:08 -0500 Subject: [PATCH 008/150] gdal: 3.0.3 -> 3.0.4 Update GDAL/OGR to 3.0.4 GDAL 3.0.4 includes a fix for build failure due to poppler 0.85.0 upgrade (change to parameters for setErrorCallback). See commit: https://github.com/OSGeo/gdal/commit/6e9e51ef93a911df781c22ba2cb04e0e24d8fd6d --- pkgs/development/libraries/gdal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 1734ee9ce58..7f3e796bbf1 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${version}"; - sha256 = "1rbyxmgmp27a5wvm4g70jr79bazhdl8q9rcch2b78m73njdv73xa"; + sha256 = "00a7q9wv8s1bmdhqxvixkq2afr8aibg3pkc76gg50r8lavf6j84c"; }; sourceRoot = "source/gdal"; From 473c80526ae89cfce340c30884d01a29699710d5 Mon Sep 17 00:00:00 2001 From: sjau Date: Tue, 25 Feb 2020 11:29:23 +0100 Subject: [PATCH 009/150] evdi: 2019-01-16 -> 2019-02-25 --- pkgs/os-specific/linux/evdi/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 6dbf6ace693..2a6ce13c162 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,26 +2,19 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "-unstable-20190116"; + version = "unstable-20200222"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "391f1f71e4c86fc18de27947c78e02b5e3e9f128"; - sha256 = "147cwmk57ldchvzr06lila6av7jvcdggs9jgifqscklp9x6dc4ny"; + rev = "bb3038c1b10aae99feddc7354c74a5bf22341246"; + sha256 = "058f8gdma6fndg2w512l08mwl79h4hffacx4rnfkjxrb2ard3gd1"; }; nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ kernel libdrm ]; - patches = [ - (fetchpatch { - url = "https://crazy.dev.frugalware.org/evdi-all-in-one-fixes.patch"; - sha256 = "03hs68v8c2akf8a4rc02m15fzyp14ay70rcx8kwg2y98qkqh7w30"; - }) - ]; - makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" From c8299d69b03c470f80931bab77f16ce8f1889db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= Date: Tue, 3 Mar 2020 22:40:33 +0100 Subject: [PATCH 010/150] licensor: Fix test in 2020 --- pkgs/tools/misc/licensor/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix index 246684c6638..376dd2f2e9a 100644 --- a/pkgs/tools/misc/licensor/default.nix +++ b/pkgs/tools/misc/licensor/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "licensor"; @@ -11,6 +11,11 @@ rustPlatform.buildRustPackage rec { sha256 = "0zr8hcq7crmhrdhwcclc0nap68wvg5kqn5l93ha0vn9xgjy8z11p"; }; + patches = [ (fetchpatch { + url = "https://github.com/raftario/licensor/commit/77ae1ea6d9b6de999ee7590d9dbd3c8465d70bb6.patch"; + sha256 = "0kfyg06wa2v7swm7hs9kkazjg34mircd4nm4qmljyzjh2yh8icg3"; + })]; + # Delete this on next update; see #79975 for details legacyCargoFetcher = true; From 0e8ce4639d09fae13e59a4f3c7c9914ef0cb12ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 03:38:07 +0000 Subject: [PATCH 011/150] faudio: 20.02 -> 20.03 --- pkgs/development/libraries/faudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index d515d0c07eb..596de28d2df 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.02"; + version = "20.03"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "07f3n8qxjbrn7dhyi90l1zx5klsr3qiw14n0jdk589jgynhjgv5r"; + sha256 = "0wlbh1py9074896fxa8lcfvjj3l943zz8wjl2rn7g21xf0ar9kyv"; }; nativeBuildInputs = [cmake]; From 6f8dcc3c5e4ca37721524c104e7738f413247243 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 4 Mar 2020 04:20:00 -0500 Subject: [PATCH 012/150] zz: init at 2020-03-02 --- pkgs/development/compilers/zz/default.nix | 28 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/compilers/zz/default.nix diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix new file mode 100644 index 00000000000..7ac59cc5869 --- /dev/null +++ b/pkgs/development/compilers/zz/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub, makeWrapper, z3 }: + +rustPlatform.buildRustPackage rec { + pname = "zz-unstable"; + version = "2020-03-02"; + + src = fetchFromGitHub { + owner = "aep"; + repo = "zz"; + rev = "2dd92b959f7c34bf99af84b263e3864a5c41a0fe"; + sha256 = "14ch5qgga2vpxvb53v4v4y6cwy3kkm10x1vbfpyfa7im57syib85"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + cargoSha256 = "1m9az3adbkx2ab6fkg64cr7f9d73jbx8kx2pmgpw29csmh9hzqjy"; + + postInstall = '' + wrapProgram $out/bin/zz --prefix PATH ":" "${lib.getBin z3}/bin" + ''; + + meta = with lib; { + description = "🍺🐙 ZetZ a zymbolic verifier and tranzpiler to bare metal C"; + homepage = "https://github.com/aep/zz"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34040871511..495cb1eea9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14938,6 +14938,8 @@ in zita-resampler = callPackage ../development/libraries/audio/zita-resampler { }; + zz = callPackage ../development/compilers/zz { }; + zziplib = callPackage ../development/libraries/zziplib { }; gsignond = callPackage ../development/libraries/gsignond { From 0af1d360144955a585835bb9fb5e604c8bd1cb9f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 2 Dec 2019 19:39:42 +0800 Subject: [PATCH 013/150] pythonPackages.Pyro5: init at 5.7 --- .../python-modules/pyro5/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pyro5/default.nix diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix new file mode 100644 index 00000000000..36559a03239 --- /dev/null +++ b/pkgs/development/python-modules/pyro5/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage +, fetchPypi +, lib +, serpent +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "Pyro5"; + version = "5.7"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "08n9jqm81pjw9hvzk6kgxwqvh29q3glgccf77kxih5nn77pwdnni"; + }; + + propagatedBuildInputs = [ serpent ]; + + checkInputs = [ pytestCheckHook ]; + + # ignore network related tests, which fail in sandbox + disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" ]; + + meta = with lib; { + description = "Distributed object middleware for Python (RPC)"; + homepage = "https://github.com/irmen/Pyro5"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d7ef1072ec5..20c5f00689d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5444,6 +5444,8 @@ in { Pyro4 = callPackage ../development/python-modules/pyro4 { }; + Pyro5 = callPackage ../development/python-modules/pyro5 { }; + rope = callPackage ../development/python-modules/rope { }; ropper = callPackage ../development/python-modules/ropper { }; From 662700ae91b01f1e678b415fd06e942f07edc850 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 10 Feb 2020 17:52:55 +0800 Subject: [PATCH 014/150] pythonPackages.bugsnag: init at 3.6.0 --- .../python-modules/bugsnag/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/bugsnag/default.nix diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix new file mode 100644 index 00000000000..2f0e67683d9 --- /dev/null +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, webob +}: + +buildPythonPackage rec { + pname = "bugsnag"; + version = "3.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "17cjh7g8gbr0gb22nzybkw7vq9x5wfa5ln94hhzijbz934bw1f37"; + }; + + propagatedBuildInputs = [ six webob ]; + + # no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Automatic error monitoring for django, flask, etc."; + homepage = "https://www.bugsnag.com"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20c5f00689d..381eb2eaaad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -522,6 +522,8 @@ in { bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + bugsnag = callPackage ../development/python-modules/bugsnag { }; + cachecontrol = callPackage ../development/python-modules/cachecontrol { }; cachelib = callPackage ../development/python-modules/cachelib { }; From 75f3ab6b689aa763812cc7c5a99ba52d87874c5a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 2 Dec 2019 09:01:02 +0800 Subject: [PATCH 015/150] maestral: 0.4.2 -> 0.6.1 --- .../networking/maestral/default.nix | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix index 708957bdf01..49348610be5 100644 --- a/pkgs/applications/networking/maestral/default.nix +++ b/pkgs/applications/networking/maestral/default.nix @@ -1,24 +1,40 @@ -{ stdenv, lib, python3Packages, fetchFromGitHub -, withGui ? false, wrapQtAppsHook ? null }: +{ stdenv +, lib +, fetchFromGitHub +, python3 +, withGui ? false +, wrapQtAppsHook ? null +}: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "maestral${lib.optionalString withGui "-gui"}"; - version = "0.4.2"; + version = "0.6.1"; + + disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-dropbox"; rev = "v${version}"; - sha256 = "0xis0cqfp3wgajwk44dmi2gbfirmz0a0zi25qxdzpdn0z19hp88m"; + sha256 = "06i3c7i85x879np158156mba7kxz2cwh75390sc9gwwngc95d9h9"; }; - disabled = python3Packages.pythonOlder "3.6"; - - propagatedBuildInputs = (with python3Packages; [ - blinker click dropbox keyring keyrings-alt Pyro4 requests u-msgpack-python watchdog + propagatedBuildInputs = with python3.pkgs; [ + blinker + bugsnag + click + dropbox + keyring + keyrings-alt + lockfile + Pyro5 + requests + u-msgpack-python + watchdog ] ++ lib.optionals stdenv.isLinux [ - sdnotify systemd - ] ++ lib.optional withGui pyqt5); + sdnotify + systemd + ] ++ lib.optional withGui pyqt5; nativeBuildInputs = lib.optional withGui wrapQtAppsHook; From bc5617503453c9b7e32bc8d7bc75e0a938a85841 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Thu, 5 Mar 2020 05:16:49 +0100 Subject: [PATCH 016/150] satallax: Fix build with GCC9 --- .../science/logic/satallax/default.nix | 5 +++++ .../logic/satallax/fix-declaration-gcc9.patch | 21 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 7249eb991d3..d3ceeadbf9a 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib"; }; + patches = [ + # GCC9 doesn't allow default value in friend declaration. + ./fix-declaration-gcc9.patch + ]; + preConfigure = '' mkdir fake-tools echo "echo 'Nix-build-host.localdomain'" > fake-tools/hostname diff --git a/pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch b/pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch new file mode 100644 index 00000000000..1933fc25c4d --- /dev/null +++ b/pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch @@ -0,0 +1,21 @@ +diff --git i/minisat/core/SolverTypes.h w/minisat/core/SolverTypes.h +--- i/minisat/core/SolverTypes.h ++++ w/minisat/core/SolverTypes.h +@@ -47,7 +47,7 @@ struct Lit { + int x; + + // Use this as a constructor: +- friend Lit mkLit(Var var, bool sign = false); ++ friend Lit mkLit(Var var, bool sign); + + bool operator == (Lit p) const { return x == p.x; } + bool operator != (Lit p) const { return x != p.x; } +@@ -55,7 +55,7 @@ struct Lit { + }; + + +-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; } ++inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; } + inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; } + inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; } + inline bool sign (Lit p) { return p.x & 1; } From 4e49c4090b834c4c86de4d5930895b0bddd09a6c Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Thu, 5 Mar 2020 01:15:47 -0500 Subject: [PATCH 017/150] scaff: 0.1.1 -> 0.1.2 --- pkgs/development/tools/scaff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix index f81ca70c6a9..97f94e2d61b 100644 --- a/pkgs/development/tools/scaff/default.nix +++ b/pkgs/development/tools/scaff/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "scaff"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitLab { owner = "jD91mZM2"; repo = pname; rev = version; - sha256 = "1s5v50205l2h33pccyafrjv3a6lpb62inhm8z81hkvx53bqifvd7"; + sha256 = "01yf2clf156qv2a6w866a2p8rc2dl8innxnsqrj244x54s1pk27r"; }; - cargoSha256 = "0k6msvly3yhzl1hhs4zv31qzbllwmw16i55dbznlgp1c8icy2pwr"; + cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; From 6784c98627f32b9582f8a72c752677bb9df5c3b8 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 5 Mar 2020 09:13:00 +0100 Subject: [PATCH 018/150] zam-plugins: 3.11 -> 3.12 --- pkgs/applications/audio/zam-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index a8236b4b60f..b9645fa4d8a 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "zam-plugins"; - version = "3.11"; + version = "3.12"; src = fetchgit { url = "https://github.com/zamaudio/zam-plugins.git"; deepClone = true; - rev = "af338057e42dd5d07cba1889bfc74eda517c6147"; - sha256 = "1qbskhcvy2k2xv0f32lw13smz5g72v0yy47zv6vnhnaiaqf3f2d5"; + rev = "87fdee6e87dbee75c1088e2327ea59c1ab1522e4"; + sha256 = "0kz0xygff3ca1v9nqi0dvrzy9whbzqxrls5b7hydi808d795893n"; }; nativeBuildInputs = [ pkgconfig ]; From b2bda57104495e5bf89ac325c1d2205c9697164d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 11:41:40 +0000 Subject: [PATCH 019/150] mercury: 14.01.1 -> 20.01.1 --- pkgs/development/compilers/mercury/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index 0327e0dc215..5c26d5ab117 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mercury"; - version = "14.01.1"; + version = "20.01.1"; src = fetchurl { url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; - sha256 = "12z8qi3da8q50mcsjsy5bnr4ia6ny5lkxvzy01a3c9blgbgcpxwq"; + sha256 = "0vxp9f0jmr228n13p6znhbxncav6ay0bnl4ypy6r3lw5lh7z172p"; }; buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper From 0072d12b60fa1ce11bce8478710ee6c33565e279 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 13:40:28 +0000 Subject: [PATCH 020/150] openiscsi: 2.1.0 -> 2.1.1 --- pkgs/os-specific/linux/open-iscsi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 34e2591d44a..43859dc9af3 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.0"; + version = "2.1.1"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; buildInputs = [ kmod openisns.lib openssl systemd utillinux ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "0z7rnbfa48j3r4ij7335xgjfb835gnnp10v7q6lvwg7bq6v5xvih"; + sha256 = "1xa3mbid9mkajp8mr8jx6cymv0kd7yqs96jvff54n6wb9qhn9qll"; }; DESTDIR = "$(out)"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; license = licenses.gpl2; - homepage = https://www.open-iscsi.com; + homepage = "https://www.open-iscsi.com"; platforms = platforms.linux; maintainers = with maintainers; [ cleverca22 zaninime ]; }; From 349e923e00cf46fa33f118bfd22024f392e95a79 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Thu, 5 Mar 2020 18:53:11 +0100 Subject: [PATCH 021/150] appimage-run: replace writeScript to a standalone appimage-exec.sh --- .../appimage-run/appimage-exec.sh | 43 ++++++++++++ .../appimage-run/default.nix | 69 ++++++------------- 2 files changed, 65 insertions(+), 47 deletions(-) create mode 100755 pkgs/tools/package-management/appimage-run/appimage-exec.sh diff --git a/pkgs/tools/package-management/appimage-run/appimage-exec.sh b/pkgs/tools/package-management/appimage-run/appimage-exec.sh new file mode 100755 index 00000000000..cdce727af4f --- /dev/null +++ b/pkgs/tools/package-management/appimage-run/appimage-exec.sh @@ -0,0 +1,43 @@ +#!@bash@/bin/bash +if [ $# -eq 0 ]; then + echo "Usage: $0 FILE [OPTION...]" + echo + echo 'Options are passed on to the appimage.' + echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable." + exit 1 +fi +APPIMAGE="$(realpath "$1")" +shift + +if [ ! -x "$APPIMAGE" ]; then + echo "fatal: $APPIMAGE is not executable" + exit 1 +fi + +SHA256="$(@coreutils@/bin/sha256sum "$APPIMAGE" | cut -d ' ' -f 1)" +SQUASHFS_ROOT="''${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256/" +mkdir -p "$SQUASHFS_ROOT" + +export APPDIR="$SQUASHFS_ROOT/squashfs-root" +if [ ! -x "$APPDIR" ]; then + cd "$SQUASHFS_ROOT" + + if @file@/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then + # is type-1 appimage + mkdir "$APPDIR" + @libarchive@/bin/bsdtar -x -C "$APPDIR" -f "$APPIMAGE" + else + # is type-2 appimage + "$APPIMAGE" --appimage-extract 2>/dev/null + fi +fi + +cd "$APPDIR" +export PATH="$PATH:$PWD/usr/bin" +export APPIMAGE_SILENT_INSTALL=1 + +if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then + exec "$APPIMAGE_DEBUG_EXEC" +fi + +exec ./AppRun "$@" diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index 426cc7943e5..3eeaa752f02 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -1,56 +1,31 @@ -{ writeScript, buildFHSUserEnv, coreutils, file, libarchive, runtimeShell -, extraPkgs ? pkgs: [], appimageTools }: +{ buildFHSUserEnv, coreutils, file, libarchive, runtimeShell +, extraPkgs ? pkgs: [], appimageTools, stdenv, bash }: let - fhsArgs = appimageTools.defaultFhsEnvArgs; -in buildFHSUserEnv (fhsArgs // { + name = "appimage-run"; + version = "1.0"; + fhsArgs = appimageTools.defaultFhsEnvArgs; - targetPkgs = pkgs: fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; + appimage-exec = stdenv.mkDerivation { + #inherit pname version; + name = "appimage-exec"; - runScript = writeScript "appimage-exec" '' - #!${runtimeShell} - if [ $# -eq 0 ]; then - echo "Usage: $0 FILE [OPTION...]" - echo - echo 'Options are passed on to the appimage.' - echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable." - exit 1 - fi - APPIMAGE="$(realpath "$1")" - shift + inherit coreutils file libarchive bash; - if [ ! -x "$APPIMAGE" ]; then - echo "fatal: $APPIMAGE is not executable" - exit 1 - fi + buildCommand = '' + mkdir -p $out/bin/ + substituteAll ${./appimage-exec.sh} $out/bin/appimage-exec.sh + chmod +x $out/bin/appimage-exec.sh + ''; + }; - SHA256="$(${coreutils}/bin/sha256sum "$APPIMAGE" | cut -d ' ' -f 1)" - SQUASHFS_ROOT="''${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256/" - mkdir -p "$SQUASHFS_ROOT" +in buildFHSUserEnv (fhsArgs // { + inherit name; - export APPDIR="$SQUASHFS_ROOT/squashfs-root" - if [ ! -x "$APPDIR" ]; then - cd "$SQUASHFS_ROOT" - - if ${file}/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then - # is type-1 appimage - mkdir "$APPDIR" - ${libarchive}/bin/bsdtar -x -C "$APPDIR" -f "$APPIMAGE" - else - # is type-2 appimage - "$APPIMAGE" --appimage-extract 2>/dev/null - fi - fi - - cd "$APPDIR" - export PATH="$PATH:$PWD/usr/bin" - export APPIMAGE_SILENT_INSTALL=1 - - if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then - exec "$APPIMAGE_DEBUG_EXEC" - fi - - exec ./AppRun "$@" - ''; + targetPkgs = pkgs: + [ appimage-exec + ] ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; + #extraInstallCommands = ''''; + runScript = "appimage-exec.sh"; }) From 2b8ccf0c8c8db267e5a72e8dd43b821def6be991 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Mar 2020 20:01:19 +0000 Subject: [PATCH 022/150] jackett: 0.12.1301 -> 0.13.467 --- pkgs/servers/jackett/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index cbac1a42352..a9c22489aa8 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.12.1301"; + version = "0.13.467"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz"; - sha256 = "03glp5qhyb6bldslbhivywcfbxpv374q9aaybz5f2s0r9il5cb35"; + sha256 = "1hjihafb8w9gcqdi2i8dmimbbg17c5hwwqhav3avfizq2drsrv5c"; }; buildInputs = [ makeWrapper ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "API Support for your favorite torrent trackers."; - homepage = https://github.com/Jackett/Jackett/; + homepage = "https://github.com/Jackett/Jackett/"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo nyanloutre ]; platforms = platforms.all; From 972db874b34f6c27cc4bd8ce766013fc5ed3e7d1 Mon Sep 17 00:00:00 2001 From: Michael Reilly Date: Thu, 5 Mar 2020 15:14:10 -0500 Subject: [PATCH 023/150] cudnn_cudatoolkit_10_2: init at 7.6.5 --- .../development/libraries/science/math/cudnn/default.nix | 9 ++++++++- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 8cd74939959..765d634a91f 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1 }: +{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -72,5 +72,12 @@ in rec { sha256 = "0qc9f1xpyfibwqrpqxxq2v9h6w90j0dbx564akwy44c1dls5f99m"; }; + cudnn_cudatoolkit_10_2 = generic rec { + version = "7.6.5"; + cudatoolkit = cudatoolkit_10_2; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.5.32.tgz"; + sha256 = "084c13vzjdkb5s1996yilybg6dgav1lscjr1xdcgvlmfrbr6f0k0"; + }; + cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_1; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5574d0cc76a..78a7584adcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2683,7 +2683,8 @@ in cudatoolkit_9_2 cudatoolkit_10 cudatoolkit_10_0 - cudatoolkit_10_1; + cudatoolkit_10_1 + cudatoolkit_10_2; cudatoolkit = cudatoolkit_10; @@ -2699,7 +2700,8 @@ in cudnn_cudatoolkit_9_2 cudnn_cudatoolkit_10 cudnn_cudatoolkit_10_0 - cudnn_cudatoolkit_10_1; + cudnn_cudatoolkit_10_1 + cudnn_cudatoolkit_10_2; cudnn = cudnn_cudatoolkit_10; From ced888aea6ba20694f713174e27d82b2252b40ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Mar 2020 02:26:57 +0000 Subject: [PATCH 024/150] xxHash: 0.7.2 -> 0.7.3 --- pkgs/development/libraries/xxHash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index 1ea25fb7209..9d2ed44cb4b 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xxHash"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "Cyan4973"; repo = "xxHash"; rev = "v${version}"; - sha256 = "1f9gl0cymmi92ihsfan0p4zmyf2hxwx4arjimpbmbp719nbcvdsx"; + sha256 = "0bin0jch6lbzl4f8y052a7azfgq2n7iwqihzgqmcccv5vq4vcx5a"; }; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { highly portable, and hashes are identical on all platforms (little / big endian). ''; - homepage = https://github.com/Cyan4973/xxHash; + homepage = "https://github.com/Cyan4973/xxHash"; license = with licenses; [ bsd2 gpl2 ]; maintainers = with maintainers; [ orivej ]; platforms = platforms.unix; From e572b36a29be05486ba7f24576af86ff8104fd3a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Mar 2020 07:28:31 +0000 Subject: [PATCH 025/150] cimg: 2.8.3 -> 2.8.4 --- pkgs/development/libraries/cimg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 37e85617fb7..89bbdff3bbc 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "0k7cra95v46i1q3rvklrxxhz3z10yql1ysvfrapcas0m4z6f94ld"; + sha256 = "1y4j2dmk4nnc5rx65c2px7r0nfq5117pmqpvi7klp9wmgcjs29gf"; }; nativeBuildInputs = [ unzip ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small, open source, C++ toolkit for image processing"; - homepage = http://cimg.eu/; + homepage = "http://cimg.eu/"; license = licenses.cecill-c; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; From 215e759e19f1e948f84a8a96b34994bc667eaa93 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Mar 2020 07:50:32 +0000 Subject: [PATCH 026/150] cfr: 0.148 -> 0.149 --- pkgs/development/tools/java/cfr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 1d928292cd5..09684ea9986 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cfr"; - version = "0.148"; + version = "0.149"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "04nhbzcb0n5xckkbl1rz4xa2bz53hrlm938wrh0gfkzrwwgzj1ql"; + sha256 = "1jksjr1345wj42nfad7k6skvpg5qsm4xgjdwzb90zhn27ddkns6v"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { Java beta 103 changes), Java 7 String switches etc, but is written entirely in Java 6. ''; - homepage = http://www.benf.org/other/cfr/; + homepage = "http://www.benf.org/other/cfr/"; license = licenses.mit; platforms = platforms.all; }; From 0810dc1129ecca2bdf57266df0bede95e90c26d7 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 6 Mar 2020 12:00:00 +0100 Subject: [PATCH 027/150] perlPackages.AuthenSCRAM: init at 0.011 dependencies: perlPackages.CryptURandom: init at 0.36 perlPackages.PBKDF2Tiny: init at 0.005 perlPackages.UnicodeStringprep: init at 1.105 perlPackages.AuthenSASLSASLprep: init at 1.100 --- pkgs/top-level/perl-packages.nix | 77 ++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 316be153152..c6a610ae0cc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -878,6 +878,39 @@ let }; }; + AuthenSASLSASLprep = buildPerlModule { + pname = "Authen-SASL-SASLprep"; + version = "1.100"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CF/CFAERBER/Authen-SASL-SASLprep-1.100.tar.gz"; + sha256 = "a4cccc34bb3f53acf0ba78c9fc61af8d156d109d1c10487ba5988a55077d1f70"; + }; + buildInputs = [ TestNoWarnings ]; + propagatedBuildInputs = [ UnicodeStringprep ]; + meta = { + description = "A Stringprep Profile for User Names and Passwords (RFC 4013)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + + AuthenSCRAM = buildPerlPackage { + pname = "Authen-SCRAM"; + version = "0.011"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Authen-SCRAM-0.011.tar.gz"; + sha256 = "45108c239a7373d00941dcf0d171acd03e7c16a63ce6f7d9568ff052b17cf5a8"; + }; + buildInputs = [ TestFailWarnings TestFatal ]; + propagatedBuildInputs = [ AuthenSASLSASLprep CryptURandom Moo PBKDF2Tiny TryTiny TypeTiny namespaceclean ]; + meta = { + homepage = "https://github.com/dagolden/Authen-SCRAM"; + description = "Salted Challenge Response Authentication Mechanism (RFC 5802)"; + license = stdenv.lib.licenses.asl20; + maintainers = [ maintainers.sgo ]; + }; + }; + AuthenSimple = buildPerlPackage { pname = "Authen-Simple"; version = "0.5"; @@ -3634,6 +3667,20 @@ let }; }; + CryptURandom = buildPerlPackage { + pname = "Crypt-URandom"; + version = "0.36"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DD/DDICK/Crypt-URandom-0.36.tar.gz"; + sha256 = "81fec9921adc5d3c91cbe0ad8cb2bb89b045c4fb0de9cb3c43f17e58e477f8a1"; + }; + meta = { + description = "Provide non blocking randomness"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptScryptKDF = buildPerlModule { pname = "Crypt-ScryptKDF"; version = "0.010"; @@ -14555,6 +14602,21 @@ let }; }; + PBKDF2Tiny = buildPerlPackage { + pname = "PBKDF2-Tiny"; + version = "0.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/PBKDF2-Tiny-0.005.tar.gz"; + sha256 = "b4e21dc59b30265eaaa41b705087ec03447d9c655a14ac40ff46e4de29eabf8e"; + }; + meta = { + homepage = "https://github.com/dagolden/PBKDF2-Tiny"; + description = "Minimalist PBKDF2 (RFC 2898) with HMAC-SHA1 or HMAC-SHA2"; + license = stdenv.lib.licenses.asl20; + maintainers = [ maintainers.sgo ]; + }; + }; + pcscperl = buildPerlPackage { pname = "pcsc-perl"; version = "1.4.14"; @@ -20243,6 +20305,21 @@ let }; }; + UnicodeStringprep = buildPerlModule { + pname = "Unicode-Stringprep"; + version = "1.105"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CF/CFAERBER/Unicode-Stringprep-1.105.tar.gz"; + sha256 = "e6bebbc58408231fd1317db9102449b3e7da4fa437e79f637382d36313efd011"; + }; + buildInputs = [ TestNoWarnings ]; + meta = { + description = "Preparation of Internationalized Strings (RFC 3454)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + UnixGetrusage = buildPerlPackage { pname = "Unix-Getrusage"; version = "0.03"; From c8523fe0038739ddee2aa653b1927e219830c78b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Mar 2020 00:57:21 +0000 Subject: [PATCH 028/150] openvswitch: 2.12.0 -> 2.13.0 --- pkgs/os-specific/linux/openvswitch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 53fc986d9f6..f0fb0a834ff 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,12 +8,12 @@ let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.12.0"; + version = "2.13.0"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1y78ix5inhhcvicbvyy2ij38am1215nr55vydhab3d4065q45z8k"; + sha256 = "0cd5vmfr6zwgcnkwys6rag6cmz68v0librpaplianv734xs74pyx"; }; kernel = optional (_kernel != null) _kernel.dev; @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. ''; - homepage = https://www.openvswitch.org/; + homepage = "https://www.openvswitch.org/"; license = licenses.asl20; maintainers = with maintainers; [ netixx kmcopper ]; }; From 6528554396dac582f1b6bb771879ff8b3be15ddf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Mar 2020 02:43:40 +0000 Subject: [PATCH 029/150] pari: 2.11.2 -> 2.11.3 --- pkgs/applications/science/math/pari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 89ae354e7c7..8886a0c8a69 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -12,11 +12,11 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.11.2"; + version = "2.11.3"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz"; - sha256 = "0fck8ssmirl8fy7s4mspgrxjs5sag76xbshqlqzkcl3kqyrk4raa"; + sha256 = "1jd65h2psrmba2dx7rkf5qidf9ka0cwbsg20pd18k45ggr30l467"; }; buildInputs = [ From 8e8090838748fe4401014c9ca9c74d9a43ff1efd Mon Sep 17 00:00:00 2001 From: skykanin <3789764+skykanin@users.noreply.github.com> Date: Thu, 5 Mar 2020 05:19:48 +0100 Subject: [PATCH 030/150] gomatrix: init at 101.0.0 --- pkgs/applications/misc/gomatrix/default.nix | 22 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/misc/gomatrix/default.nix diff --git a/pkgs/applications/misc/gomatrix/default.nix b/pkgs/applications/misc/gomatrix/default.nix new file mode 100644 index 00000000000..5d412469617 --- /dev/null +++ b/pkgs/applications/misc/gomatrix/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gomatrix"; + version = "101.0.0"; + + src = fetchFromGitHub { + owner = "GeertJohan"; + repo = "gomatrix"; + rev = "v${version}"; + sha256 = "1wq55rvpyz0gjn8kiwwj49awsmi86zy1fdjcphzgb7883xalgr2m"; + }; + + modSha256 = "13higizadnf4ypk8qn1b5s6mdg7n6l3indb43mjp1b4cfzjsyl91"; + + meta = with lib; { + description = ''Displays "The Matrix" in a terminal''; + license = licenses.bsd2; + maintainers = with maintainers; [ skykanin ]; + homepage = "https://github.com/GeertJohan/gomatrix"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b864a2b57f..f413e45459c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -933,6 +933,8 @@ in glasgow = with python3Packages; toPythonApplication glasgow; + gomatrix = callPackage ../applications/misc/gomatrix { }; + gucci = callPackage ../tools/text/gucci { }; grc = callPackage ../tools/misc/grc { }; From 56a901b8d6841a7dfcb310ad8af9789ead911fc4 Mon Sep 17 00:00:00 2001 From: Robert Djubek Date: Sat, 7 Mar 2020 04:27:18 +0000 Subject: [PATCH 031/150] matomo: 3.13.2 -> 3.13.3 Updated both matomo and matomo-beta to the latest version --- pkgs/servers/web-apps/matomo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 09a8d21c4ce..90a9a88986e 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "3.13.2"; - sha256 = "1psysdz60h5rvgbsflkfprygxnh3kq60snqamyss07rk0ahbcb16"; + version = "3.13.3"; + sha256 = "11mv7q33nhlz9ylsmwrhs315p14imr7sgr70gdbmi9p8jxc7kxrz"; }; matomo-beta = { - version = "3.13.2"; + version = "3.13.3"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "1psysdz60h5rvgbsflkfprygxnh3kq60snqamyss07rk0ahbcb16"; + sha256 = "11mv7q33nhlz9ylsmwrhs315p14imr7sgr70gdbmi9p8jxc7kxrz"; }; }; common = pname: { version, sha256, beta ? null }: From ad2a10d66cf26b957dff853e8c92316f46fbf594 Mon Sep 17 00:00:00 2001 From: Joshua Fern Date: Fri, 6 Mar 2020 20:46:18 -0800 Subject: [PATCH 032/150] maintainers: add joshuafern Feel free to check out my new NUR repo: https://github.com/JoshuaFern/nur-package-lab --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e4947f4c74c..807c9e66984 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3590,6 +3590,12 @@ github = "jorsn"; githubId = 4646725; }; + joshuafern = { + name = "Joshua Fern"; + email = "joshuafern@protonmail.com"; + github = "JoshuaFern"; + githubId = 4300747; + }; jpas = { name = "Jarrod Pas"; email = "jarrod@jarrodpas.com"; From b446413aa66b7e6e592a99a779d22fb8a13bd69f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 7 Mar 2020 08:20:57 +0100 Subject: [PATCH 033/150] maturin: 0.7.6 -> 0.7.9 Changelog: https://github.com/PyO3/maturin/blob/master/Changelog.md --- pkgs/development/tools/rust/maturin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 8edd69c28be..70c424ee008 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.7.6"; + version = "0.7.9"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "1siqd8k6grlbj9n1a75jq8px1pzvzpr2ph689g53rjngf1k44zqk"; + sha256 = "1l8i1mz97zsc8kayvryv6xznwpby9k9jxy7lsx45acs5yksqchrv"; }; - cargoSha256 = "10x8kr4qxvvmzpr1n41ybsb6rnii2qz5bdhnk0zpfnr2n9215p8s"; + cargoSha256 = "0ly0f64acn1hxnj7vg1m860xpl06rklwqh545c386nnxaj839b0r"; nativeBuildInputs = [ pkgconfig ]; From 1068dd3772ed2260ff63d95decf79bf73094310d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 7 Mar 2020 02:34:00 -0500 Subject: [PATCH 034/150] docker-slim: 1.27.0 -> 1.28.0 Changelog: https://github.com/docker-slim/docker-slim/releases/tag/1.28.0 --- pkgs/applications/virtualization/docker-slim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 8e0bd8e54ed..4cad4f8cc17 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.27.0"; + version = "1.28.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "1pd9sz981qgr5lx6ikrhdp0n21nyrnpjpnyl8i4r2jx35zr8b5q8"; + sha256 = "1yqg7ngrgq1382clyaal40v7rg9p54hyf78mdrzql454yzxfa819"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; From 609650a3e8aa434df971a483fa075dd059f3d3b1 Mon Sep 17 00:00:00 2001 From: edef Date: Fri, 28 Feb 2020 12:12:27 +0000 Subject: [PATCH 035/150] git-codereview: init at 2020-01-15 --- .../git-and-tools/default.nix | 2 ++ .../git-and-tools/git-codereview/default.nix | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-codereview/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index a7008bf44b3..79d2b8190f4 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -70,6 +70,8 @@ let git-codeowners = callPackage ./git-codeowners { }; + git-codereview = callPackage ./git-codereview { }; + git-cola = callPackage ./git-cola { }; git-crypt = callPackage ./git-crypt { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix b/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix new file mode 100644 index 00000000000..90281407848 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix @@ -0,0 +1,21 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage { + pname = "git-codereview"; + version = "2020-01-15"; + goPackagePath = "golang.org/x/review"; + + src = fetchFromGitHub { + owner = "golang"; + repo = "review"; + rev = "f51a73253c4da005cfdf18a036e11185c04c8ce3"; + sha256 = "0c4vsyy5zp7pngqn4q87xipndghxyw2x57dkv1kxnrffckx1s3pc"; + }; + + meta = with lib; { + description = "Manage the code review process for Git changes using a Gerrit server"; + homepage = "https://golang.org/x/review/git-codereview"; + license = licenses.bsd3; + maintainers = [ maintainers.edef ]; + }; +} From 68d61b1654a4fec02a31f5299edd024cb81accf0 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Sat, 7 Mar 2020 12:27:01 +0100 Subject: [PATCH 036/150] containerd: 1.2.6 -> 1.2.13 Signed-off-by: Vincent Demeester --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 9e9e6657291..6075a7bb219 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -4,13 +4,13 @@ with lib; buildGoPackage rec { pname = "containerd"; - version = "1.2.6"; + version = "1.2.13"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; + sha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn"; }; goPackagePath = "github.com/containerd/containerd"; From 37fb7a556866db495282b3a308043b31533a77c7 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 7 Mar 2020 09:34:29 -0500 Subject: [PATCH 037/150] buildRustPackage: update docstring comment The inlined readme that we were iterating on has been moved to GitHub issue #79975, and the default is now the new cargo fetcher, so this doc comment is out of date. --- pkgs/build-support/rust/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 3fdfc0636f9..34ad4043de9 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -14,9 +14,6 @@ , cargoUpdateHook ? "" , cargoDepsHook ? "" , cargoBuildFlags ? [] - # Please set to true on any Rust package updates. Once all packages set this - # to true, we will delete and make it the default. For details, see the Rust - # section on the manual and ./README.md. , legacyCargoFetcher ? false , buildType ? "release" , meta ? {} From 735707ef0cea0d22a9d0648ee4f4b173104ae219 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 6 Mar 2020 22:04:07 +0100 Subject: [PATCH 038/150] chromium: Update the VA-API patch (fix #81909) --- .../browsers/chromium/patches/vaapi-fix.patch | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch index db9d6082756..b5372d1a255 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch @@ -1,6 +1,6 @@ --- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc -@@ -635,6 +635,7 @@ +@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's // internal decoded frame. if (buffer_allocation_mode_ != BufferAllocationMode::kNone && @@ -8,24 +8,22 @@ !vpp_vaapi_wrapper_) { vpp_vaapi_wrapper_ = VaapiWrapper::Create( VaapiWrapper::kVideoProcess, VAProfileNone, -@@ -650,7 +651,8 @@ - // only used as a copy destination. Therefore, the VaapiWrapper used and - // owned by |picture| is |vpp_vaapi_wrapper_|. +@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( + PictureBuffer buffer = buffers[i]; + buffer.set_size(requested_pic_size_); std::unique_ptr picture = vaapi_picture_factory_->Create( - (buffer_allocation_mode_ == BufferAllocationMode::kNone) + ((buffer_allocation_mode_ == BufferAllocationMode::kNone) || + (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau)) ? vaapi_wrapper_ : vpp_vaapi_wrapper_, - make_context_current_cb_, bind_image_cb_, buffers[i]); -@@ -1077,6 +1079,14 @@ + make_context_current_cb_, bind_image_cb_, buffer); +@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() { VaapiVideoDecodeAccelerator::BufferAllocationMode VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { + // NVIDIA blobs use VDPAU -+ if (base::StartsWith(VaapiWrapper::GetVendorStringForTesting(), -+ "Splitted-Desktop Systems VDPAU", -+ base::CompareCase::SENSITIVE)) { ++ if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) { + LOG(INFO) << "VA-API driver on VDPAU backend"; + return BufferAllocationMode::kWrapVdpau; + } @@ -33,7 +31,7 @@ // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT // |output_mode_| as well. if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) -@@ -1089,7 +1099,7 @@ +@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { // depends on the bitstream and sometimes it's not enough to cover the amount // of frames needed by the client pipeline (see b/133733739). // TODO(crbug.com/911754): Enable for VP9 Profile 2. @@ -44,7 +42,7 @@ // an extra allocation for both |client_| and |decoder_|, see --- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h -@@ -204,6 +204,7 @@ +@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator // Using |client_|s provided PictureBuffers and as many internally // allocated. kNormal, @@ -52,3 +50,25 @@ }; // Decides the concrete buffer allocation mode, depending on the hardware +--- a/media/gpu/vaapi/vaapi_wrapper.cc ++++ b/media/gpu/vaapi/vaapi_wrapper.cc +@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType( + } else if (base::StartsWith(va_vendor_string, "Intel iHD driver", + base::CompareCase::SENSITIVE)) { + return media::VAImplementation::kIntelIHD; ++ } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU", ++ base::CompareCase::SENSITIVE)) { ++ return media::VAImplementation::kNVIDIAVDPAU; + } + return media::VAImplementation::kOther; + } +--- a/media/gpu/vaapi/vaapi_wrapper.h ++++ b/media/gpu/vaapi/vaapi_wrapper.h +@@ -79,6 +79,7 @@ enum class VAImplementation { + kIntelIHD, + kOther, + kInvalid, ++ kNVIDIAVDPAU, + }; + + // This class handles VA-API calls and ensures proper locking of VA-API calls From b0ab073145bded06a28088804f28b45159491856 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Mar 2020 16:58:18 +0000 Subject: [PATCH 039/150] python27Packages.Quandl: 3.4.6 -> 3.4.8 --- pkgs/development/python-modules/quandl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index 385c51bcd3b..bd73a021331 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "quandl"; - version = "3.4.6"; + version = "3.4.8"; src = fetchPypi { inherit version; pname = "Quandl"; - sha256 = "15b58nj45bdax0aha6kwjz5pxj3bz8bs6ajwxqp9r89j13xxn94g"; + sha256 = "179knz21filz6x6qk66b7dk2pj1x4jnvxxd5x71ap19f367dkkb3"; }; doCheck = true; From c385ed4d6f86ee28818615a44f0ac54f56ebe898 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 7 Mar 2020 12:10:26 -0500 Subject: [PATCH 040/150] wmfocus: 1.1.2 -> 1.1.3 --- .../applications/window-managers/i3/wmfocus.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 677108e2163..c4e22546d1c 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchFromGitHub, rustPlatform, - xorg, python3, pkgconfig, cairo, libxkbcommon }: +{ stdenv, fetchFromGitHub, rustPlatform +, xorg, python3, pkgconfig, cairo, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "wmfocus"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = version; - sha256 = "0jx0h2zyghs3bp4sg8f3vk5rkyprz2dqfqs0v72vmkp3cvgzxbvs"; + sha256 = "17qdsqp9072yr7rcm6g1h620rff95ldawr8ldpkbjmkh0rc86skn"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1xmc28ns59jcmnv17102s2084baxqdvi0ibbyqwb108385qnixzf"; + cargoSha256 = "1nsdvzrsgprwq7lsvfpymqslhggdzfk3840y8x92qjb0l2g4jhw1"; nativeBuildInputs = [ python3 pkgconfig ]; buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; @@ -27,9 +24,9 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Visually focus windows by label"; + homepage = "https://github.com/svenstaro/wmfocus"; + license = licenses.mit; maintainers = with maintainers; [ synthetica ]; platforms = platforms.linux; - license = licenses.mit; - homepage = https://github.com/svenstaro/wmfocus; }; } From b36d3f2c4a94a5e5002fb0647db5465e7c38668b Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Thu, 5 Mar 2020 23:57:36 +0100 Subject: [PATCH 041/150] appimage: replace writeScript to a standalone appimage-exec.sh --- pkgs/build-support/appimage/appimage-exec.sh | 129 ++++++++++++++++++ pkgs/build-support/appimage/default.nix | 68 +++------ .../appimage-run/appimage-exec.sh | 43 ------ .../appimage-run/default.nix | 28 +--- 4 files changed, 155 insertions(+), 113 deletions(-) create mode 100755 pkgs/build-support/appimage/appimage-exec.sh delete mode 100755 pkgs/tools/package-management/appimage-run/appimage-exec.sh diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh new file mode 100755 index 00000000000..fd38889b9aa --- /dev/null +++ b/pkgs/build-support/appimage/appimage-exec.sh @@ -0,0 +1,129 @@ +#!@shell@ +if [ ! -z "$DEBUG" ] ; then + set -x +fi + +export PATH=@path@ + +# src : AppImage +# dest : let's unpack() create the directory +unpack() { + src=$1 + out=$2 + + # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63 + eval "$(r2 "$src" -nn -Nqc "p8j 3 @ 8" | + jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}| + @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"')" + + # check AppImage signature + if [[ "$appimageSignature" != "AI" ]]; then + echo "Not an appimage." + exit -1 + fi + + case "$appimageType" in + 1) echo "Uncompress $(basename "$src") of Type: $appimageType." + mkdir "$out" + pv "$src" | bsdtar -x -C "$out" -f - + ;; + + 2) echo "Uncompress $(basename "$src") of Type: $appimageType." + # This method avoid issues with non executable appimages, + # non-native packer, packer patching and squashfs-root destination prefix. + + # multiarch offset one-liner using same method as AppImage + # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93 + offset=$(r2 "$src" -nn -Nqc "pfj.elf_header @ 0" |\ + jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)') + + unsquashfs -q -d "$out" -o "$offset" "$src" + chmod go-w "$out" + ;; + + # 3) get ready, https://github.com/TheAssassin/type3-runtime + *) echo Unsupported AppImage Type: "$appimageType" + exit + ;; + esac + echo "$(basename "$src") is now installed in $out" +} + +apprun() { + + eval "$(rahash2 "$APPIMAGE" -j | jq -r '.[] | @sh "SHA256=\(.hash)"')" + echo sha256 = \"$SHA256\"\; + export APPDIR="${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256" + + #compatibility + if [ -x "$APPDIR/squashfs-root" ]; then APPDIR="$APPDIR/squashfs-root"; fi + + if [ ! -x "$APPDIR" ]; then + mkdir -p $(dirname "$APPDIR") + unpack "$APPIMAGE" "$APPDIR" + fi + + echo $(basename "$APPIMAGE") installed in "$APPDIR" + + export PATH="$PATH:$PWD/usr/bin" + wrap +} + +wrap() { + + cd "$APPDIR" + # quite same in appimageTools + export APPIMAGE_SILENT_INSTALL=1 + + if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then + exec "$APPIMAGE_DEBUG_EXEC" + fi + + exec ./AppRun "$@" +} + +usage() { + echo "Usage: appimage-run [appimage-run options] [AppImage options]"; + echo + echo 'Options are passed on to the appimage.' + echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable." + exit 1 +} + +while getopts ":a:d:xrw" option; do + case "${option}" in + a) #AppImage file + # why realpath? + APPIMAGE="$(realpath "${OPTARG}")" + ;; + d) #appimage Directory + export APPDIR=${OPTARG} + ;; + x) # eXtract + unpack_opt=true + ;; + r) # appimage-Run + apprun_opt=true + ;; + w) # WrapAppImage + wrap_opt=true + ;; + *) + usage + ;; + esac +done +shift $((OPTIND-1)) + +if [[ $unpack_opt = true ]] && [[ -f "$APPIMAGE" ]]; then + unpack "$APPIMAGE" "$APPDIR" + exit +fi + +if [[ $apprun_opt = true ]] && [[ -f "$APPIMAGE" ]]; then + apprun +fi + +if [[ $wrap_opt = true ]] && [[ -d "$APPDIR" ]]; then + wrap +fi diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index c56aae4c599..4df0f15d84d 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -1,61 +1,35 @@ -{ stdenv, libarchive, radare2, jq, buildFHSUserEnv, squashfsTools, writeScript }: +{ stdenv, buildFHSUserEnv, writeScript, pkgs +, bash, radare2, jq, squashfsTools, ripgrep +, coreutils, libarchive, file, runtimeShell, pv +, lib, runCommand }: rec { - - extract = { name, src }: stdenv.mkDerivation { - name = "${name}-extracted"; - inherit src; - nativeBuildInputs = [ radare2 libarchive jq squashfsTools ]; - buildCommand = '' - # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63 - eval $(r2 $src -nn -Nqc "p8j 3 @ 8" | - jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}| - @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"') - - # check AppImage signature - if [[ "$appimageSignature" != "AI" ]]; then - echo "Not an appimage." - exit - fi - - case "$appimageType" in - 1) - mkdir $out - bsdtar -x -C $out -f $src - ;; - - 2) - # multiarch offset one-liner using same method as AppImage - # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93 - offset=$(r2 $src -nn -Nqc "pfj.elf_header @ 0" |\ - jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)') - - unsquashfs -q -d $out -o $offset $src - chmod go-w $out - ;; - - # 3) get ready, https://github.com/TheAssassin/type3-runtime - *) echo "Unsupported AppImage Type: $appimageType";; - esac - ''; + appimage-exec = pkgs.substituteAll { + src = ./appimage-exec.sh; + isExecutable = true; + dir = "bin"; + path = with pkgs; lib.makeBinPath [ pv ripgrep file radare2 libarchive jq squashfsTools coreutils bash ]; }; + extract = { name, src }: runCommand "${name}-extracted" { + buildInputs = [ appimage-exec ]; + } '' + appimage-exec.sh -x -d $out -a ${src} + ''; + + # for compatibility, deprecated extractType1 = extract; extractType2 = extract; + #wrapType2 = wrapAppImage; + #wrapType1 = wrapAppImage; wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // { inherit name; - targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; + targetPkgs = pkgs: [ appimage-exec ] + ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; - runScript = writeScript "run" '' - #!${stdenv.shell} - - export APPDIR=${src} - export APPIMAGE_SILENT_INSTALL=1 - cd $APPDIR - exec ./AppRun "$@" - ''; + runScript = "appimage-exec.sh -w -d ${src}"; } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))); wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { diff --git a/pkgs/tools/package-management/appimage-run/appimage-exec.sh b/pkgs/tools/package-management/appimage-run/appimage-exec.sh deleted file mode 100755 index cdce727af4f..00000000000 --- a/pkgs/tools/package-management/appimage-run/appimage-exec.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!@bash@/bin/bash -if [ $# -eq 0 ]; then - echo "Usage: $0 FILE [OPTION...]" - echo - echo 'Options are passed on to the appimage.' - echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable." - exit 1 -fi -APPIMAGE="$(realpath "$1")" -shift - -if [ ! -x "$APPIMAGE" ]; then - echo "fatal: $APPIMAGE is not executable" - exit 1 -fi - -SHA256="$(@coreutils@/bin/sha256sum "$APPIMAGE" | cut -d ' ' -f 1)" -SQUASHFS_ROOT="''${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256/" -mkdir -p "$SQUASHFS_ROOT" - -export APPDIR="$SQUASHFS_ROOT/squashfs-root" -if [ ! -x "$APPDIR" ]; then - cd "$SQUASHFS_ROOT" - - if @file@/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then - # is type-1 appimage - mkdir "$APPDIR" - @libarchive@/bin/bsdtar -x -C "$APPDIR" -f "$APPIMAGE" - else - # is type-2 appimage - "$APPIMAGE" --appimage-extract 2>/dev/null - fi -fi - -cd "$APPDIR" -export PATH="$PATH:$PWD/usr/bin" -export APPIMAGE_SILENT_INSTALL=1 - -if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then - exec "$APPIMAGE_DEBUG_EXEC" -fi - -exec ./AppRun "$@" diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index 3eeaa752f02..37d1afe2843 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -1,31 +1,13 @@ -{ buildFHSUserEnv, coreutils, file, libarchive, runtimeShell -, extraPkgs ? pkgs: [], appimageTools, stdenv, bash }: +{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [] }: let - name = "appimage-run"; - version = "1.0"; fhsArgs = appimageTools.defaultFhsEnvArgs; - appimage-exec = stdenv.mkDerivation { - #inherit pname version; - name = "appimage-exec"; - - inherit coreutils file libarchive bash; - - buildCommand = '' - mkdir -p $out/bin/ - substituteAll ${./appimage-exec.sh} $out/bin/appimage-exec.sh - chmod +x $out/bin/appimage-exec.sh - ''; - }; - in buildFHSUserEnv (fhsArgs // { - inherit name; + name = "appimage-run"; - targetPkgs = pkgs: - [ appimage-exec - ] ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; - #extraInstallCommands = ''''; - runScript = "appimage-exec.sh"; + targetPkgs = pkgs: [ appimageTools.appimage-exec ] + ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; + runScript = "appimage-exec.sh -r -a"; }) From 877348836c17426549b6546617320137db11ec86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= Date: Sat, 7 Mar 2020 20:32:01 +0100 Subject: [PATCH 042/150] cvsq: 1.10 -> 1.11 --- pkgs/applications/version-management/cvsq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/applications/version-management/cvsq/default.nix index f9cabb94b97..c030d8b0878 100644 --- a/pkgs/applications/version-management/cvsq/default.nix +++ b/pkgs/applications/version-management/cvsq/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "cvsq"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "http://www.linta.de/~aehlig/cvsq/cvsq-${version}.tgz"; - sha256 = "1a2e5666d4d23f1eb673a505caeb771ac62a86ed69c9ab89c4e2696c2ccd0621"; + sha256 = "0491k4skk3jyyd6plp2kcihmxxav9rsch7vd1yi697m2fqckp5ws"; }; nativeBuildInputs = [ makeWrapper ]; From d5d648b0f6178dfe03d902bfaf94585b4f85bf7b Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 7 Mar 2020 15:17:27 -0500 Subject: [PATCH 043/150] ion: mark as broken As noted in the comment, its Rust vendor directory no longer compiles. That said, we can still compute the new `cargoSha256`, and the package fails in precisely the same way. --- pkgs/shells/ion/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index 5886fdb5574..c58302df210 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -13,10 +13,7 @@ buildRustPackage rec { sha256 = "0i0acl5nw254mw8dbfmb4792rr71is98a5wg32yylfnlrk7zlf8z"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1hs01b1rhbpafxlhw661k907rznqhcgyng85njkb99bg4lxwxaap"; + cargoSha256 = "0f266kygvw2id771g49s25qsbqb6a0gr1r0czkcj96n5r0wg8wrn"; meta = with stdenv.lib; { description = "Modern system shell with simple (and powerful) syntax"; @@ -24,10 +21,12 @@ buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; - broken = stdenv.isDarwin; + # This has not had a release since 2017, and no longer compiles with the + # latest Rust compiler. + broken = false; }; passthru = { - shellPath = "/bin/ion"; + shellPath = "/bin/ion"; }; } From 9044bdef6a6aa1e216518020b47516990a00d304 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 7 Mar 2020 15:22:11 -0500 Subject: [PATCH 044/150] heatseeker: 1.5.1 -> 1.7.1 The build is currently broken on master; upgrading fixes it. --- pkgs/tools/misc/heatseeker/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index d7944e55d32..22a7d8ec4a7 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -1,22 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "heatseeker"; - version = "1.5.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "rschmitt"; repo = "heatseeker"; rev = "v${version}"; - sha256 = "1fcrbjwnhcz71i70ppy0rcgk5crwwmbkm9nrk1kapvks33pv0az7"; + sha256 = "1x7mdyf1m17s55f6yjdr1j510kb7a8f3zkd7lb2kzdc7nd3vgaxg"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0m3sxbz1iii31s30cnv1970i1mwfhl6gm19k8wv0n7zji30ayx07"; + cargoSha256 = "0jnlcm7v29m4nc318qgf7r7jvs80s7n04fw83imm506vwr9rxbx9"; # some tests require a tty, this variable turns them off for Travis CI, # which we can also make use of @@ -24,7 +19,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "A general-purpose fuzzy selector"; - homepage = https://github.com/rschmitt/heatseeker; + homepage = "https://github.com/rschmitt/heatseeker"; license = licenses.mit; maintainers = [ maintainers.michaelpj ]; platforms = platforms.unix; From a2514c22a8054b85b5123bf5a35891e7c2177ca4 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 7 Mar 2020 15:28:56 -0500 Subject: [PATCH 045/150] sit: mark as broken Dependencies in the Cargo.lock fail to build due to mutable self borrows. --- pkgs/applications/version-management/sit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 0a1f4c72da6..aa2cdfab82a 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg, +{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg, # Darwin libiconv, CoreFoundation, Security }: @@ -20,10 +20,7 @@ rustPlatform.buildRustPackage rec { export HOME=$(mktemp -d) ''; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0kijx7s7zh6yisrsjz213h9x5jx43ixr44vy5rb3wwbn9dgsr528"; + cargoSha256 = "092yfpr2svp1qy7xis1q0sdkbsjmmswmdwb0rklrc0yhydcsghp9"; meta = with stdenv.lib; { description = "Serverless Information Tracker"; @@ -31,5 +28,8 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir yrashk ]; platforms = platforms.all; + # Upstream has not had a release in several years, and dependencies no + # longer compile with the latest Rust compiler. + broken = true; }; } From b848abe4c6cbb744d9464cfe8b9b06b026bb94c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Mar 2020 20:52:17 +0000 Subject: [PATCH 046/150] jdepend: 2.9.1 -> 2.10 --- pkgs/development/tools/analysis/jdepend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index 455ff7722fa..c903833a731 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdepend"; - version = "2.9.1"; + version = "2.10"; src = fetchFromGitHub { owner = "clarkware"; repo = "jdepend"; rev = version; - sha256 = "1sxkgj4k4dhg8vb772pvisyzb8x0gwvlfqqir30ma4zvz3rfz60p"; + sha256 = "1lxf3j9vflky7a2py3i59q7cwd1zvjv2b88l3za39vc90s04dz6k"; }; nativeBuildInputs = [ ant jdk ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Traverses Java class file directories and generates design quality metrics for each Java package"; - homepage = http://www.clarkware.com/software/JDepend.html; + homepage = "http://www.clarkware.com/software/JDepend.html"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; From 099b52dabf39101cac50d709819761a5e74f50c9 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 7 Mar 2020 15:50:29 -0500 Subject: [PATCH 047/150] amp: 0.6.1 -> 0.6.2 The build also happens to be broken on master; this fixes it, along with upgrading the cargoSha256. --- pkgs/applications/editors/amp/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index e4248e32447..625a5d3c0ab 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -3,19 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "amp"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "jmacdonald"; repo = pname; rev = version; - sha256 = "0jhxyl27nwp7rp0lc3kic69g8x55d0azrwlwwhz3z74icqa8f03j"; + sha256 = "0l1vpcfq6jrq2dkrmsa4ghwdpp7c54f46gz3n7nk0i41b12hnigw"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0rk5c8knx8swqzmj7wd18hq2h5ndkzvcbq4lzggpavkk01a8hlb1"; + cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin From c4c936f2f766e83263a519be924d48009bfd6cd3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 8 Mar 2020 07:16:53 +1000 Subject: [PATCH 048/150] rkt: add CVEs https://www.twistlock.com/labs-blog/breaking-out-of-coresos-rkt-3-new-cves/ --- pkgs/applications/virtualization/rkt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index fd0bd92faa6..bacd175197d 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -69,5 +69,10 @@ in stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ ragge steveej ]; platforms = [ "x86_64-linux" ]; + knownVulnerabilities = [ + "CVE-2019-10144: processes run with `rkt enter` are given all capabilities during stage 2" + "CVE-2019-10145: processes run with `rkt enter` do not have seccomp filtering during stage 2" + "CVE-2019-10147: processes run with `rkt enter` are not limited by cgroups during stage 2" + ]; }; } From e6f5bb8dc4fa472c14b6ef3314f24c466d56df6c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Mar 2020 00:14:22 +0000 Subject: [PATCH 049/150] qalculate-gtk: 3.7.0 -> 3.8.0 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 8370685f00a..c23debdd7a4 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1zzvxkpman75lxhhvyggwzvrlc6v0rd5ak76rmcny51i4xirmrc0"; + sha256 = "0nsg6dzg5r7rzqr671nvrf1c50rjwpz7bxv5f20i4s7agizgv840"; }; patchPhase = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The ultimate desktop calculator"; - homepage = http://qalculate.github.io; + homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; }; From dac3a7e3f9345dc8ea1dbdae69d9339648956409 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Mar 2020 02:27:11 +0000 Subject: [PATCH 050/150] yarn: 1.22.0 -> 1.22.2 --- pkgs/development/tools/yarn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index daf46ec4896..9db4472f672 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.0"; + version = "1.22.2"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0hbsdbrqx5xhr171ik862v51xwjzbfncic92pgbnhnlmxy2y974x"; + sha256 = "1av52k5hl7xylxz5c0h64akz6ccd1vm64v0pzmny1661pbihiwp5"; }; buildInputs = [ nodejs ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://yarnpkg.com/; + homepage = "https://yarnpkg.com/"; description = "Fast, reliable, and secure dependency management for javascript"; license = licenses.bsd2; maintainers = with maintainers; [ offline screendriver ]; From 3f02faf825564982c14102bed11f3d511a4a5211 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Mar 2020 07:09:51 +0000 Subject: [PATCH 051/150] etesync-dav: 0.14.2 -> 0.15.0 --- pkgs/applications/misc/etesync-dav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index d99d1890563..27ce4708ac3 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "etesync-dav"; - version = "0.14.2"; + version = "0.15.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "05kzy74r2hd44sqjgd0bc588ganrzbz5brpiginb8sh8z38igb60"; + sha256 = "1rjp4lhxs6g5yw99rrdg5v98vcvagsabkqf51k1fhhsmbj47mdsm"; }; propagatedBuildInputs = with python3Packages; [ From 44085e35017d1a07f436bc66b526f5699698629d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 8 Mar 2020 08:27:48 +0100 Subject: [PATCH 052/150] freeoffice: 973 -> 974 Changelog: https://www.freeoffice.com/en/download/servicepacks --- pkgs/applications/office/softmaker/freeoffice.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix index ff54f8ff90f..b114194d563 100644 --- a/pkgs/applications/office/softmaker/freeoffice.nix +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -2,13 +2,13 @@ callPackage ./generic.nix (args // rec { pname = "freeoffice"; - version = "973"; + version = "974"; edition = "2018"; suiteName = "FreeOffice"; src = fetchurl { url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz"; - sha256 = "0xac4ynf1lfh8qmni5bhp4ybaamdfngva4bqaq21n1m4pgrx1ba5"; + sha256 = "0z7131qmqyv1m9phm7wzvb5z7wkh27h59lsa3zc0zjkykikmjrp2"; }; archive = "freeoffice${edition}.tar.lzma"; From 88efa8b1aeea46eeeacb8ca87a942372cbcb178f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 8 Mar 2020 04:20:00 -0500 Subject: [PATCH 053/150] flow: 0.119.1 -> 0.120.1 Changelog: https://github.com/facebook/flow/releases/tag/v0.120.1 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 67ded5bbb4a..c977a9d2082 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.119.1"; + version = "0.120.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1p3kjdm4lsbc2lzab3kj1fjvccv8p47bj4s3jnfp2n7qppy7sbbf"; + sha256 = "0cqwwrml7yaqyd52rqcz64gbm1pc0yj5yhqqqj9vqyil8wif30v3"; }; installPhase = '' From 3d6908bca193f55c4956da3112d19beac9112f6f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 7 Mar 2020 11:04:32 +0100 Subject: [PATCH 054/150] medusa-unstable: init at 2018-12-16 --- pkgs/tools/security/medusa/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/security/medusa/default.nix diff --git a/pkgs/tools/security/medusa/default.nix b/pkgs/tools/security/medusa/default.nix new file mode 100644 index 00000000000..bc18f165be7 --- /dev/null +++ b/pkgs/tools/security/medusa/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pkg-config, freerdp, openssl, libssh2 }: + +stdenv.mkDerivation rec { + pname = "medusa-unstable"; + version = "2018-12-16"; + + src = fetchFromGitHub { + owner = "jmk-foofus"; + repo = "medusa"; + rev = "292193b3995444aede53ff873899640b08129fc7"; + sha256 = "0njlz4fqa0165wdmd5y8lfnafayf3c4la0r8pf3hixkdwsss1509"; + }; + + outputs = [ "out" "man" ]; + + configureFlags = [ "--enable-module-ssh=yes" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ freerdp openssl libssh2 ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jmk-foofus/medusa"; + description = "A speedy, parallel, and modular, login brute-forcer"; + license = licenses.gpl2; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a00adec661d..fafe354021a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1964,6 +1964,8 @@ in massren = callPackage ../tools/misc/massren { }; + medusa = callPackage ../tools/security/medusa { }; + megasync = libsForQt5.callPackage ../applications/misc/megasync { }; megacmd = callPackage ../applications/misc/megacmd { }; From e0a5d34664036bf9757f59d26f872ea9895c5c52 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 7 Mar 2020 11:06:00 +0100 Subject: [PATCH 055/150] brutespray: init at 1.6.6 --- pkgs/tools/security/brutespray/default.nix | 40 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/security/brutespray/default.nix diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix new file mode 100644 index 00000000000..be7c99f5252 --- /dev/null +++ b/pkgs/tools/security/brutespray/default.nix @@ -0,0 +1,40 @@ +{ stdenv, python3, fetchFromGitHub, makeWrapper, medusa }: + +stdenv.mkDerivation rec { + pname = "brutespray"; + version = "1.6.6"; + + src = fetchFromGitHub { + owner = "x90skysn3k"; + repo = pname; + rev = "brutespray-${version}"; + sha256 = "1rj8fkq1xz4ph1pmldphlsa25mg6xl7i7dranb0qjx00jhfxjxjh"; + }; + + postPatch = '' + substituteInPlace brutespray.py \ + --replace "/usr/share/brutespray" "$out/share/brutespray" + ''; + + dontBuild = true; + nativeBuildInputs = [ python3.pkgs.wrapPython makeWrapper ]; + buildInputs = [ python3 ]; + + installPhase = '' + install -Dm0755 brutespray.py $out/bin/brutespray + patchShebangs $out/bin + patchPythonScript $out/bin/brutespray + wrapProgram $out/bin/brutespray \ + --prefix PATH : ${stdenv.lib.makeBinPath [ medusa ]} + + mkdir -p $out/share/brutespray + cp -r wordlist/ $out/share/brutespray/wordlist + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/x90skysn3k/brutespray"; + description = "Brute-Forcing from Nmap output - Automatically attempts default creds on found services"; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fafe354021a..e0600f702cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1284,6 +1284,8 @@ in bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; + brutespray = callPackage ../tools/security/brutespray { }; + breakpointHook = assert stdenv.isLinux; makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; From ef03ff7c1fffe25a85e668bbe3dcf62748179844 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Mar 2020 11:45:01 +0000 Subject: [PATCH 056/150] hopper: 4.5.19 -> 4.5.21 --- pkgs/development/tools/analysis/hopper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index f6c5dcaf1ad..14b61eac374 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.19"; + version = "4.5.21"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "1c9wbjwz5xn0skz2a1wpxyx78hhrm8vcbpzagsg4wwnyblap59db"; + sha256 = "0s733n3hmzpsnrvfryq7kzsvwshd1y9fzm16a64gnii8cmfalrqc"; }; sourceRoot = "."; From 1cd54c9f36a5aa51b6028705a3e6e7bd40f2ca54 Mon Sep 17 00:00:00 2001 From: royneary Date: Sun, 8 Mar 2020 13:31:07 +0100 Subject: [PATCH 057/150] gitAndTools.git-bug: 0.6.0 -> 0.7.0 Update to version 0.7.0. Includes switch to buildGoModule because Gopkg.toml has been removed upstream. --- .../git-and-tools/git-bug/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 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 fa3970c4b15..ed0c8680d75 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 @@ -1,18 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "git-bug"; - version = "0.6.0"; - rev = "fc568209f073b9d775a09e0dbb8289cf9e5749bf"; + version = "0.7.0"; + rev = "71580c41a931a1ad2c04682e0fd701661b716c95"; goPackagePath = "github.com/MichaelMure/git-bug"; src = fetchFromGitHub { inherit rev; owner = "MichaelMure"; repo = "git-bug"; - sha256 = "1s18lzip52qpf52ad6m20j306mr16vnwhz9f7rirsa6b7srmcgli"; + sha256 = "0mhqvcwa6y3hrrv88vbp22k7swzr8xw6ipm80gdpx85yp8j2wdkh"; }; + modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld"; + buildFlagsArray = '' -ldflags= -X ${goPackagePath}/commands.GitCommit=${rev} @@ -21,10 +23,9 @@ buildGoPackage rec { ''; postInstall = '' - cd go/src/${goPackagePath} - install -D -m 0644 misc/bash_completion/git-bug "$bin/etc/bash_completion.d/git-bug" - install -D -m 0644 misc/zsh_completion/git-bug "$bin/share/zsh/site-functions/git-bug" - install -D -m 0644 -t "$bin/share/man/man1" doc/man/* + install -D -m 0644 misc/bash_completion/git-bug "$out/etc/bash_completion.d/git-bug" + install -D -m 0644 misc/zsh_completion/git-bug "$out/share/zsh/site-functions/git-bug" + install -D -m 0644 -t "$out/share/man/man1" doc/man/* ''; meta = with stdenv.lib; { From 2a6cd0e6c08f837b7599601700313c68eb86a6fa Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Sun, 8 Mar 2020 13:38:32 +0100 Subject: [PATCH 058/150] appimageTools: fix appimage-exec.sh according to shellcheck --- pkgs/build-support/appimage/appimage-exec.sh | 37 +++++++++++--------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh index fd38889b9aa..b209ce983e5 100755 --- a/pkgs/build-support/appimage/appimage-exec.sh +++ b/pkgs/build-support/appimage/appimage-exec.sh @@ -1,15 +1,19 @@ #!@shell@ -if [ ! -z "$DEBUG" ] ; then +if [ -n "$DEBUG" ] ; then set -x fi -export PATH=@path@ +#export PATH=@path@ +PATH="@path@:$PATH" +#DEBUG=0 # src : AppImage # dest : let's unpack() create the directory unpack() { - src=$1 - out=$2 + local src=$1 + local out=$2 + local appimageSignature="" + local appimageType=0 # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63 eval "$(r2 "$src" -nn -Nqc "p8j 3 @ 8" | @@ -19,16 +23,15 @@ unpack() { # check AppImage signature if [[ "$appimageSignature" != "AI" ]]; then echo "Not an appimage." - exit -1 + exit fi case "$appimageType" in - 1) echo "Uncompress $(basename "$src") of Type: $appimageType." + 1 ) echo "Uncompress $(basename "$src") of type $appimageType." mkdir "$out" pv "$src" | bsdtar -x -C "$out" -f - ;; - - 2) echo "Uncompress $(basename "$src") of Type: $appimageType." + 2) # This method avoid issues with non executable appimages, # non-native packer, packer patching and squashfs-root destination prefix. @@ -37,6 +40,7 @@ unpack() { offset=$(r2 "$src" -nn -Nqc "pfj.elf_header @ 0" |\ jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)') + echo "Uncompress $(basename "$src") of type $appimageType @ offset $offset." unsquashfs -q -d "$out" -o "$offset" "$src" chmod go-w "$out" ;; @@ -52,26 +56,25 @@ unpack() { apprun() { eval "$(rahash2 "$APPIMAGE" -j | jq -r '.[] | @sh "SHA256=\(.hash)"')" - echo sha256 = \"$SHA256\"\; + echo sha256 = \""$SHA256"\"\; export APPDIR="${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256" #compatibility if [ -x "$APPDIR/squashfs-root" ]; then APPDIR="$APPDIR/squashfs-root"; fi if [ ! -x "$APPDIR" ]; then - mkdir -p $(dirname "$APPDIR") + mkdir -p "$(dirname "$APPDIR")" unpack "$APPIMAGE" "$APPDIR" + else echo "$(basename "$APPIMAGE")" installed in "$APPDIR" fi - echo $(basename "$APPIMAGE") installed in "$APPDIR" - export PATH="$PATH:$PWD/usr/bin" - wrap + wrap "$@" } wrap() { - cd "$APPDIR" + cd "$APPDIR" || exit # quite same in appimageTools export APPIMAGE_SILENT_INSTALL=1 @@ -121,9 +124,11 @@ if [[ $unpack_opt = true ]] && [[ -f "$APPIMAGE" ]]; then fi if [[ $apprun_opt = true ]] && [[ -f "$APPIMAGE" ]]; then - apprun + apprun "$@" + exit fi if [[ $wrap_opt = true ]] && [[ -d "$APPDIR" ]]; then - wrap + wrap "$@" + exit fi From a201e3dbc4949400e99189fa1c5196668722eeaf Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Thu, 13 Feb 2020 13:07:35 +0100 Subject: [PATCH 059/150] romdirfs: init at 1.2 --- pkgs/tools/filesystems/romdirfs/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/filesystems/romdirfs/default.nix diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix new file mode 100644 index 00000000000..8085eb5f234 --- /dev/null +++ b/pkgs/tools/filesystems/romdirfs/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, fuse }: + +stdenv.mkDerivation rec { + pname = "romdirfs"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "mlafeldt"; + repo = "romdirfs"; + rev = "v${version}"; + sha256 = "1jbsmpklrycz5q86qmzvbz4iz2g5fvd7p9nca160aw2izwpws0g7"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ fuse ]; + + meta = with stdenv.lib; { + description = "FUSE for access Playstation 2 IOP IOPRP images and BIOS dumps"; + homepage = https://github.com/mlafeldt/romdirfs; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ genesis ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e351a5f9064..e043d19af08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25281,6 +25281,8 @@ in rmount = callPackage ../tools/filesystems/rmount {}; + romdirfs = callPackage ../tools/filesystems/romdirfs {}; + rss-glx = callPackage ../misc/screensavers/rss-glx { }; run-scaled = callPackage ../tools/X11/run-scaled { }; From 95dc1ef1f0d5da42f3b92d9af00cbb0179cb5ecf Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Sun, 8 Mar 2020 13:53:48 +0100 Subject: [PATCH 060/150] appimageTools: fix appimage-exec.sh passing arguments --- pkgs/build-support/appimage/appimage-exec.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh index b209ce983e5..ee952db0fd7 100755 --- a/pkgs/build-support/appimage/appimage-exec.sh +++ b/pkgs/build-support/appimage/appimage-exec.sh @@ -3,7 +3,6 @@ if [ -n "$DEBUG" ] ; then set -x fi -#export PATH=@path@ PATH="@path@:$PATH" #DEBUG=0 @@ -69,7 +68,6 @@ apprun() { fi export PATH="$PATH:$PWD/usr/bin" - wrap "$@" } wrap() { @@ -98,6 +96,7 @@ while getopts ":a:d:xrw" option; do a) #AppImage file # why realpath? APPIMAGE="$(realpath "${OPTARG}")" + break ;; d) #appimage Directory export APPDIR=${OPTARG} @@ -124,7 +123,8 @@ if [[ $unpack_opt = true ]] && [[ -f "$APPIMAGE" ]]; then fi if [[ $apprun_opt = true ]] && [[ -f "$APPIMAGE" ]]; then - apprun "$@" + apprun + wrap "$@" exit fi From dbff9b54795574a8bfbf7f679cdecb766aab9455 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 8 Mar 2020 14:00:40 +0100 Subject: [PATCH 061/150] =?UTF-8?q?borgbackup:=201.1.10=20=E2=86=92=201.1.?= =?UTF-8?q?11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 1.1.11 (2020-03-08) Compatibility notes: When upgrading from borg 1.0.x to 1.1.x, please note: read all the compatibility notes for 1.1.0*, starting from 1.1.0b1. borg upgrade: you do not need to and you also should not run it. borg might ask some security-related questions once after upgrading. You can answer them either manually or via environment variable. One known case is if you use unencrypted repositories, then it will ask about a unknown unencrypted repository one time. your first backup with 1.1.x might be significantly slower (it might completely read, chunk, hash a lot files) - this is due to the --files-cache mode change (and happens every time you change mode). You can avoid the one-time slowdown by using the pre-1.1.0rc4-compatible mode (but that is less safe for detecting changed files than the default). See the --files-cache docs for details. 1.1.11 removes WSL autodetection (Windows 10 Subsystem for Linux). If WSL still has a problem with sync_file_range, you need to set BORG_WORKAROUNDS=basesyncfile in the borg process environment to work around the WSL issue. Fixes: fixed potential index corruption / data loss issue due to bug in hashindex_set, #4829 Please read and follow the more detailled notes close to the top of this document. upgrade bundled xxhash to 0.7.3, #4891 0.7.2 is the minimum requirement for correct operations on ARMv6 in non-fixup mode, where unaligned memory accesses cause bus errors. 0.7.3 adds some speedups and libxxhash 0.7.3 even has a pkg-config file now. upgrade bundled lz4 to 1.9.2 upgrade bundled zstd to 1.4.4 fix crash when upgrading erroneous hints file, #4922 extract: fix KeyError for "partial" extraction, #4607 fix "partial" extract for hardlinked contentless file types, #4725 fix preloading for old (0.xx) remote servers, #4652 fix confusing output of borg extract --list --strip-components, #4934 delete: after double-force delete, warn about necessary repair, #4704 create: give invalid repo error msg if repo config not found, #4411 mount: fix FUSE mount missing st_birthtime, #4763 #4767 check: do not stumble over invalid item key, #4845 info: if the archive doesn't exist, print a pretty message, #4793 SecurityManager.known(): check all files, #4614 Repository.open: use stat() to check for repo dir, #4695 Repository.check_can_create_repository: use stat() to check, #4695 fix invalid archive error message fix optional/non-optional location arg, #4541 commit-time free space calc: ignore bad compact map entries, #4796 ignore EACCES (errno 13) when hardlinking the old config, #4730 --prefix / -P: fix processing, avoid argparse issue, #4769 New features: enable placeholder usage in all extra archive arguments new BORG_WORKAROUNDS mechanism, basesyncfile, #4710 recreate: support --timestamp option, #4745 support platforms without os.link (e.g. Android with Termux), #4901 if we don't have os.link, we just extract another copy instead of making a hardlink. support linux platforms without sync_file_range (e.g. Android 7 with Termux), #4905 Other: ignore --stats when given with --dry-run, but continue, #4373 add some ProgressIndicator msgids to code / fix docs, #4935 elaborate on "Calculating size" message argparser: always use REPOSITORY in metavar, also use more consistent help phrasing. check: improve error output for matching index size, see #4829 docs: changelog: add advisory about hashindex_set bug #4829 better describe BORG_SECURITY_DIR, BORG_CACHE_DIR, #4919 infos about cache security assumptions, #4900 add FAQ describing difference between a local repo vs. repo on a server. document how to test exclusion patterns without performing an actual backup timestamps in the files cache are now usually ctime, #4583 fix bad reference to borg compact (does not exist in 1.1), #4660 create: borg 1.1 is not future any more extract: document limitation "needs empty destination", #4598 how to supply a passphrase, use crypto devices, #4549 fix osxfuse github link in installation docs add example of exclude-norecurse rule in help patterns update macOS Brew link add note about software for automating backups, #4581 AUTHORS: mention copyright+license for bundled msgpack fix various code blocks in the docs, #4708 updated docs to cover use of temp directory on remote, #4545 add restore docs, #4670 add a pull backup / push restore how-to, #1552 add FAQ how to retain original paths, #4532 explain difference between --exclude and --pattern, #4118 add FAQs for SSH connection issues, #3866 improve password FAQ, #4591 reiterate that 'file cache names are absolute' in FAQ tests: cope with ANY error when importing pytest into borg.testsuite, #4652 fix broken test that relied on improper zlib assumptions test_fuse: filter out selinux xattrs, #4574 travis / vagrant: misc python versions removed / changed (due to openssl 1.1 compatibility) or added (3.7 and 3.8, for better borg compatibility testing) binary building is on python 3.5.9 now vagrant: add new boxes: ubuntu 18.04 and 20.04, debian 10 update boxes: openindiana, darwin, netbsd remove old boxes: centos 6 darwin: updated osxfuse to 3.10.4 use debian/ubuntu pip/virtualenv packages rather use python 3.6.2 than 3.6.0, fixes coverage/sqlite3 issue use requirements.d/development.lock.txt to avoid compat issues travis: darwin: backport some install code / order from master remove deprecated keyword "sudo" from travis config allow osx builds to fail, #4955 this is due to travis-ci frequently being so slow that the OS X builds just fail because they exceed 50 minutes and get killed by travis. --- pkgs/tools/backup/borg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index ed8fbbf76cd..a12cc368ee5 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.10"; + version = "1.1.11"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1pp70p4n5kamvcbl4d8021ggrxhyykmg9isjg4yd3wags8b19d7g"; + sha256 = "190gjzx83b6p64nqj840x382dgz9gfv0gm7wj585lnkrpa90j29n"; }; nativeBuildInputs = with python3.pkgs; [ @@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication rec { HOME=$(mktemp -d) py.test --pyargs borg.testsuite ''; - # 63 failures, needs pytest-benchmark + # 64 failures, needs pytest-benchmark doCheck = false; meta = with stdenv.lib; { From ff54badc616887c9823cf81a89981d3ed5dde791 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Mar 2020 13:11:20 +0000 Subject: [PATCH 062/150] java-service-wrapper: 3.5.42 -> 3.5.43 --- pkgs/tools/system/java-service-wrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 512bb7341ca..758942c0549 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.42"; + version = "3.5.43"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "1gi4zc7fhqm7rb1ajpnxx0n7ngpa06ja46mb5p65h025mz567ywd"; + sha256 = "19cx3854rk7b2056z8pvxnf4simsg5js7czsy2bys7jl6vh2x02b"; }; buildInputs = [ jdk ]; From bc21f7a0ceb729f354d65ff9b2eb76daa2b037af Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 8 Mar 2020 16:41:00 +0100 Subject: [PATCH 063/150] bitwarden_rs-vault: fix directory structure --- pkgs/tools/security/bitwarden_rs/vault.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index b5f00a4abf9..0ce9d43f967 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -10,9 +10,10 @@ stdenv.mkDerivation rec { }; buildCommand = '' - mkdir -p $out/share/bitwarden_rs/vault - cd $out/share/bitwarden_rs/vault + mkdir -p $out/share/bitwarden_rs/ + cd $out/share/bitwarden_rs/ tar xf $src + mv web-vault vault ''; meta = with stdenv.lib; { From 49e7871196ea43f6b8b6c81801f632f57ab892de Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Sun, 8 Mar 2020 17:55:43 +0100 Subject: [PATCH 064/150] appimageTools: wrapType1 = wrapType2; --- pkgs/build-support/appimage/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 4df0f15d84d..eb9a2a5ee08 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -20,8 +20,7 @@ rec { # for compatibility, deprecated extractType1 = extract; extractType2 = extract; - #wrapType2 = wrapAppImage; - #wrapType1 = wrapAppImage; + wrapType1 = wrapType2; wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // { inherit name; @@ -32,14 +31,9 @@ rec { runScript = "appimage-exec.sh -w -d ${src}"; } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))); - wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { - inherit name extraPkgs; - src = extractType1 { inherit name src; }; - }); - wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { inherit name extraPkgs; - src = extractType2 { inherit name src; }; + src = extract { inherit name src; }; }); defaultFhsEnvArgs = { From 5e468ef98191e2a68a2975b737a697d3f1cb5f9d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 Mar 2020 10:21:37 +0100 Subject: [PATCH 065/150] =?UTF-8?q?ocsigen-i18n:=203.4.0=20=E2=86=92=203.5?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/ocsigen-i18n/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 09ab9587ddb..5144af97f75 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, ocamlPackages }: +{ stdenv, fetchzip, ocamlPackages }: stdenv.mkDerivation rec { pname = "ocsigen-i18n"; - version = "3.4.0"; - - buildInputs = with ocamlPackages; [ ocaml findlib ]; + version = "3.5.0"; + buildInputs = with ocamlPackages; [ ocaml findlib ppx_tools ]; dontStrip = true; @@ -15,9 +14,9 @@ stdenv.mkDerivation rec make bindir=$out/bin install ''; - src = fetchurl { + src = fetchzip { url = "https://github.com/besport/${pname}/archive/${version}.tar.gz"; - sha256 = "0i7cck6zlgwjpksb4s1jpy193h85jixf4d0nmqj09y3zcpn2i8gb"; + sha256 = "1qsgwfl64b53w235wm7nnchqinzgsvd2gb52xm0kra2wlwp69rfq"; }; meta = { From b4c65bccee9dce268aee74e1a1aa3143183e6424 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Mar 2020 17:13:31 +0000 Subject: [PATCH 066/150] libzdb: 3.1 -> 3.2.1 --- pkgs/development/libraries/libzdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index b16d897fb5f..4e7168a0211 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { - version = "3.1"; + version = "3.2.1"; pname = "libzdb"; src = fetchurl { url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; - sha256 = "1596njvy518x7vsvsykmnk1ky82x8jxd6nmmp551y6hxn2qsn08g"; + sha256 = "1w9zzpgw3qzirsy5g4aaq1469kdq46gr2nhvrs3xqlwz1adbb9xr"; }; buildInputs = [ sqlite ]; meta = { - homepage = http://www.tildeslash.com/libzdb/; + homepage = "http://www.tildeslash.com/libzdb/"; description = "A small, easy to use Open Source Database Connection Pool Library"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; From 202c2a8effa549eab4ca3240d2d5bab36ab00fbc Mon Sep 17 00:00:00 2001 From: mucaho Date: Fri, 21 Feb 2020 12:43:11 +0100 Subject: [PATCH 067/150] clingcon: init at 3.3.0 --- .../science/logic/potassco/clingcon.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/science/logic/potassco/clingcon.nix diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix new file mode 100644 index 00000000000..1203822d86e --- /dev/null +++ b/pkgs/applications/science/logic/potassco/clingcon.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchFromGitHub +, cmake +, bison +, re2c +}: + +stdenv.mkDerivation rec { + pname = "clingcon"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "potassco"; + repo = "${pname}"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "1q7517h10jfvjdk2czq8d6y57r8kr1j1jj2k2ip2qxkpyfigk4rs"; + }; + + # deal with clingcon through git submodules recursively importing + # an outdated version of libpotassco which uses deprecated header in .cpp files + postPatch = '' + find ./ -type f -exec sed -i 's///g' {} \; + ''; + + nativeBuildInputs = [ cmake bison re2c ]; + + cmakeFlags = [ + "-DCLINGCON_MANAGE_RPATH=ON" + "-DCLINGO_BUILD_WITH_PYTHON=OFF" + "-DCLINGO_BUILD_WITH_LUA=OFF" + ]; + + meta = { + inherit version; + description = "Extension of clingo to handle constraints over integers"; + license = stdenv.lib.licenses.gpl3; # for now GPL3, next version MIT! + platforms = stdenv.lib.platforms.unix; + homepage = "https://potassco.org/"; + downloadPage = "https://github.com/potassco/clingcon/releases/"; + changelog = "https://github.com/potassco/clingcon/releases/tag/v${version}"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c8282ef729..aad00a719d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1451,6 +1451,8 @@ in clingo = callPackage ../applications/science/logic/potassco/clingo.nix { }; + clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { }; + clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; coloredlogs = with python3Packages; toPythonApplication coloredlogs; From b99feeb269e074f92a799f524a5e49fbcb221ad5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Mar 2020 18:43:29 +0000 Subject: [PATCH 068/150] lxcfs: 3.1.2 -> 4.0.0 --- pkgs/os-specific/linux/lxcfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 7acee410a4e..15a3fa5f04f 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-3.1.2"; + name = "lxcfs-4.0.0"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "195skz6wc2gfcf99f1fz1yaw29ngzg9lphnkag7yxnk3ffbhv40s"; + sha256 = "0p9fl7zya65wsxg2vabdc0jrhw6mdz081cacd7np4zrppv16v6dx"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://linuxcontainers.org/lxcfs; + homepage = "https://linuxcontainers.org/lxcfs"; description = "FUSE filesystem for LXC"; license = licenses.asl20; platforms = platforms.linux; From 14c9441a28df2ea5133659e4ba677c9deec73c97 Mon Sep 17 00:00:00 2001 From: dawidsowa Date: Sun, 8 Mar 2020 20:21:28 +0100 Subject: [PATCH 069/150] capitaine-cursors: 3 -> 4 --- pkgs/data/icons/capitaine-cursors/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/data/icons/capitaine-cursors/default.nix index 46d6c1a731e..09491b904ef 100644 --- a/pkgs/data/icons/capitaine-cursors/default.nix +++ b/pkgs/data/icons/capitaine-cursors/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub -, inkscape, xcursorgen }: +, inkscape, xcursorgen, bc }: stdenv.mkDerivation rec { pname = "capitaine-cursors"; - version = "3"; + version = "4"; src = fetchFromGitHub { owner = "keeferrourke"; repo = pname; rev = "r${version}"; - sha256 = "0pnfbmrn9nv8pryv6cbjcq5hl9366hzvz1kd8vsdkgb2nlfv5gdv"; + sha256 = "0652ydy73x29z7wc6ccyqihmfg4bk0ksl7yryycln6c7i0iqfmc9"; }; postPatch = '' @@ -19,24 +19,27 @@ stdenv.mkDerivation rec { buildInputs =[ inkscape xcursorgen + bc ]; buildPhase = '' + for variant in dark light ; do # https://github.com/NixOS/nixpkgs/blob/master/pkgs/data/fonts/emojione/default.nix#L16 - HOME="$NIX_BUILD_ROOT" ./build.sh + HOME="$NIX_BUILD_ROOT" ./build.sh --max-dpi xhd --type $variant + done ''; installPhase = '' install -dm 0755 $out/share/icons - cp -pr dist $out/share/icons/capitaine-cursors - cp -pr dist-white $out/share/icons/capitaine-cursors-white + cp -pr dist/dark $out/share/icons/capitaine-cursors + cp -pr dist/light $out/share/icons/capitaine-cursors-white ''; meta = with stdenv.lib; { description = '' An x-cursor theme inspired by macOS and based on KDE Breeze ''; - homepage = https://github.com/keeferrourke/capitaine-cursors; + homepage = "https://github.com/keeferrourke/capitaine-cursors"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ From a3df64c8a7bd5e3e26c1cf469680d563c42103be Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Sun, 8 Mar 2020 20:34:23 +0100 Subject: [PATCH 070/150] appimage-exec.sh: simplify and improve getopts options --- pkgs/build-support/appimage/appimage-exec.sh | 48 +++++++++++-------- pkgs/build-support/appimage/default.nix | 4 +- .../appimage-run/default.nix | 4 +- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh index ee952db0fd7..1273effe5fe 100755 --- a/pkgs/build-support/appimage/appimage-exec.sh +++ b/pkgs/build-support/appimage/appimage-exec.sh @@ -4,6 +4,8 @@ if [ -n "$DEBUG" ] ; then fi PATH="@path@:$PATH" +apprun_opt=true + #DEBUG=0 # src : AppImage @@ -84,32 +86,35 @@ wrap() { } usage() { - echo "Usage: appimage-run [appimage-run options] [AppImage options]"; - echo - echo 'Options are passed on to the appimage.' - echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable." + cat < [AppImage options] + +-h show this message +-d debug mode +-x : extract appimage in the directory then exit. +-w : run uncompressed appimage directory (used in appimageTools) + +[AppImage options]: Options are passed on to the appimage. +If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable. + +EOF exit 1 } -while getopts ":a:d:xrw" option; do +while getopts "x:w:dh" option; do case "${option}" in - a) #AppImage file - # why realpath? - APPIMAGE="$(realpath "${OPTARG}")" - break - ;; - d) #appimage Directory - export APPDIR=${OPTARG} + d) set -x ;; x) # eXtract unpack_opt=true - ;; - r) # appimage-Run - apprun_opt=true + APPDIR=${OPTARG} ;; w) # WrapAppImage + export APPDIR=${OPTARG} wrap_opt=true ;; + h) usage + ;; *) usage ;; @@ -117,6 +122,14 @@ while getopts ":a:d:xrw" option; do done shift $((OPTIND-1)) +if [[ $wrap_opt = true ]] && [[ -d "$APPDIR" ]]; then + wrap "$@" + exit +else + APPIMAGE="$(realpath "$1")" || usage + shift +fi + if [[ $unpack_opt = true ]] && [[ -f "$APPIMAGE" ]]; then unpack "$APPIMAGE" "$APPDIR" exit @@ -127,8 +140,3 @@ if [[ $apprun_opt = true ]] && [[ -f "$APPIMAGE" ]]; then wrap "$@" exit fi - -if [[ $wrap_opt = true ]] && [[ -d "$APPDIR" ]]; then - wrap "$@" - exit -fi diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index eb9a2a5ee08..993032c5601 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -14,7 +14,7 @@ rec { extract = { name, src }: runCommand "${name}-extracted" { buildInputs = [ appimage-exec ]; } '' - appimage-exec.sh -x -d $out -a ${src} + appimage-exec.sh -x $out ${src} ''; # for compatibility, deprecated @@ -28,7 +28,7 @@ rec { targetPkgs = pkgs: [ appimage-exec ] ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; - runScript = "appimage-exec.sh -w -d ${src}"; + runScript = "appimage-exec.sh -w ${src}"; } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))); wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index 37d1afe2843..3bc59f2ad14 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -1,13 +1,11 @@ { appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [] }: let - fhsArgs = appimageTools.defaultFhsEnvArgs; - in buildFHSUserEnv (fhsArgs // { name = "appimage-run"; targetPkgs = pkgs: [ appimageTools.appimage-exec ] ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; - runScript = "appimage-exec.sh -r -a"; + runScript = "appimage-exec.sh"; }) From e9d492a89666170be963d06a0200b855e86013ad Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 19:16:56 -0400 Subject: [PATCH 071/150] intecture-auth: upgrade cargo fetcher and cargoSha256 (#81979) --- pkgs/tools/admin/intecture/auth.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index 4807cd89aac..f60cbaf7b6e 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -14,10 +14,7 @@ buildRustPackage rec { sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1rnhhb4mpf1j7c7a2pz4741hzbf2s2wb0bm25j049n64j49j3jq8"; + cargoSha256 = "17k4a3jd7n2fkalx7vvgah62pj77n536jvm17d60sj0yz2fxx799"; buildInputs = [ openssl zeromq czmq zlib ]; From c1a78b79286c8d0425b28f01f3ad1816cfeaa556 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 19:17:12 -0400 Subject: [PATCH 072/150] intecture-agent: upgrade cargo fetcher and cargoSha256 (#81981) --- pkgs/tools/admin/intecture/agent.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 5f0e6334115..7fc3da2f19c 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -14,10 +14,7 @@ buildRustPackage rec { sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "093ipd8lg2ngnln55x5j40g2n8f3y8aysgz9rjn95a4npxrg4yxw"; + cargoSha256 = "1is1cbbwxf00dc64h76h57s0wxsai0zm5vfrrss7598cim6a4yxb"; buildInputs = [ openssl zeromq czmq zlib ]; From df4ec1545364a63e9cebdfe52ffbbd76669146b9 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 19:18:22 -0400 Subject: [PATCH 073/150] intecture-cli: upgrade cargo fetcher and cargoSha256 (#81982) --- pkgs/tools/admin/intecture/cli.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index e5aa379e9c3..73865bdea78 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -14,10 +14,7 @@ buildRustPackage rec { sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0dhrx6njfbd8w27ifk13g6s3ick579bhc4ijf54rfb9g6n8abafx"; + cargoSha256 = "11r551baz3hrkyf9nv68mdf09nqyvbcfjh2rgy8babmi7jljpzav"; buildInputs = [ openssl zeromq czmq zlib ]; From d1cdeb7aaee04be11010879382e858a57af69391 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 19:18:40 -0400 Subject: [PATCH 074/150] ripasso-cursive: upgrade cargo fetcher and cargoSha256 (#81988) --- pkgs/tools/security/ripasso/cursive.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index f0e9cb8959d..70c4ee864b6 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -12,10 +12,7 @@ buildRustPackage rec { sha256 = "164da20j727p8l7hh37j2r8pai9sj402nhswvg0nrlgj53nr6083"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1vyhdbia7khh0ixim00knai5d270jl5a5crqik1qaz7bkwc02bsp"; + cargoSha256 = "1wpn67v0xmxhn1dgzhh1pwz1yc3cizmfxhpb7qv9b27ynx4486ji"; cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; From 0b933b408505df6e5c64fd713930ed6478e9140b Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 19:19:09 -0400 Subject: [PATCH 075/150] dwm-status: upgrade cargo fetcher and cargoSha256 (#82013) --- pkgs/applications/window-managers/dwm/dwm-status.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 9507ada4011..69337976f88 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -21,10 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0l6x59bzzilc78gsi5rlgq9zjvp8qjphfsds776ljzmkbdq8q4iz"; + cargoSha256 = "0xybd6110b29ghl66kxfs64704qlhnn9jb5vl7lfk9sv62cs564i"; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" From fa353a0f0a4f275779bd49aa22dc8ea0203afbc9 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 19:19:41 -0400 Subject: [PATCH 076/150] gnvim: upgrade cargo fetcher and cargoSha256 (#82015) --- pkgs/applications/editors/neovim/gnvim/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index a9b2abd0cb3..e9f42d2b9b5 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "11gb59lhc1sp5dxj2fdm6072f4nxxay0war3kmchdwsk41nvxlrh"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "00r5jf5qdw02vcv3522qqrnwj14mip0l58prcncbvyg4pxlm2rb2"; + cargoSha256 = "0ay7hx5bzchp772ywgxzia12c44kbyarrshl689cmqh59wphsrx5"; buildInputs = [ gtk webkitgtk ]; @@ -43,8 +40,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "GUI for neovim, without any web bloat"; homepage = "https://github.com/vhakulinen/gnvim"; - license = licenses.mit; - maintainers = with maintainers; [ minijackson ]; - inherit version; + license = licenses.mit; + maintainers = with maintainers; [ minijackson ]; }; } From a38ad34271e03b7f6fae267c8d61dc6927ffc1fc Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 19:25:13 -0400 Subject: [PATCH 077/150] cloudflare-wranger: upgrade cargoSha256 (#82022) General infrastructure improvement as part of #79975, no functional changes expected. --- .../development/tools/cloudflare-wrangler/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix index d2d4669ad64..a13433e784b 100644 --- a/pkgs/development/tools/cloudflare-wrangler/default.nix +++ b/pkgs/development/tools/cloudflare-wrangler/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin -}: +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }: rustPlatform.buildRustPackage rec { pname = "cloudflare-wrangler"; @@ -8,13 +7,11 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; - rev = "v" + version; + rev = "v${version}"; sha256 = "0lh06cnjddmy5h5xvbkg8f97vw2v0wr5fi7vrs3nnidiz7x4rsja"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - cargoSha256 = "0s07143vsrb2vwj4rarx5w3wcz1zh0gi8al6cdrfqyl7nhm1mshm"; + cargoSha256 = "1q7vilh0bynhdz5bbpig5ibaqvk2153n07gmc715qb80w92sjw7w"; nativeBuildInputs = [ pkg-config ]; @@ -29,7 +26,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with stdenv.lib; { - description = "A CLI tool designed for folks who are interested in using Cloudflare Workers."; + description = "A CLI tool designed for folks who are interested in using Cloudflare Workers"; homepage = "https://github.com/cloudflare/wrangler"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ ]; From 1cc9cb7ea1fac5a84b911660625d8eb810b47d8e Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 19:26:19 -0400 Subject: [PATCH 078/150] cargo-make: remove unnecessary attribute (#82071) The default value when left unspecified is now false, so no need to state this explicitly. --- pkgs/development/tools/rust/cargo-make/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 35dba114982..53849e4176f 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -24,8 +24,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - legacyCargoFetcher = false; - cargoSha256 = "1x0lb68d47nhggnj7jf90adz7shb0cg305mavgqvxizd2s9789dx"; # Some tests fail because they need network access. From dceec409cca15df4f1a94de85f95890b52d233b0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 9 Mar 2020 00:47:49 +0100 Subject: [PATCH 079/150] nixos/cage: move ConditionPathExists to service config It doesn't belong into [Service]: > Unknown key name 'ConditionPathExists' in section 'Service', ignoring. --- nixos/modules/services/wayland/cage.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix index cac5c042ec1..c59ca9983a6 100644 --- a/nixos/modules/services/wayland/cage.nix +++ b/nixos/modules/services/wayland/cage.nix @@ -51,6 +51,7 @@ in { conflicts = [ "getty@tty1.service" ]; restartIfChanged = false; + unitConfig.ConditionPathExists = "/dev/tty1"; serviceConfig = { ExecStart = '' ${pkgs.cage}/bin/cage \ @@ -59,7 +60,6 @@ in { ''; User = cfg.user; - ConditionPathExists = "/dev/tty1"; IgnoreSIGPIPE = "no"; # Log this user with utmp, letting it show up with commands 'w' and From 2873950bb7130457d8ffe894eb2b6174b1abd523 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 8 Mar 2020 20:59:06 -0400 Subject: [PATCH 080/150] perlPackages.TextBibTeX: fix on darwin Fixes: 6d8539c1d8f ('perl: Enable threading on darwin') cc #73819 --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 316be153152..c1f39481066 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19159,7 +19159,7 @@ let install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex" install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse" install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames" - install_name_tool -change "$oldPath" "$newPath" "$out/${perl.libPrefix}/${perl.version}/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" + install_name_tool -change "$oldPath" "$newPath" "$out/${perl.libPrefix}/${perl.version}/darwin"*"-2level/auto/Text/BibTeX/BibTeX.bundle" ''; meta = { description = "Interface to read and parse BibTeX files"; From a67fbc1562736691d911be78cf8795e34a2303cf Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 21:06:00 -0400 Subject: [PATCH 081/150] cargo-license: upgrade cargo fetcher and cargoSha256 (#82084) --- pkgs/tools/package-management/cargo-license/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/tools/package-management/cargo-license/default.nix index e91f099da85..b3c404f476f 100644 --- a/pkgs/tools/package-management/cargo-license/default.nix +++ b/pkgs/tools/package-management/cargo-license/default.nix @@ -1,4 +1,5 @@ { lib, rustPlatform, fetchFromGitHub }: + rustPlatform.buildRustPackage rec { pname = "cargo-license"; version = "0.3.0"; @@ -12,10 +13,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./add-Cargo.lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0ksxvbrx8d8d09i167mdrhz5m46nbr6l0vyn7xpdanmha31xiaz9"; + cargoSha256 = "0bkaj54avvib1kipk8ky7gyxfs00qm80jd415zp53hhvinphzb5v"; meta = with lib; { description = "Cargo subcommand to see license of dependencies"; From 6331093673d50ff303e832e5e8eb32ff0264ed94 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 21:06:25 -0400 Subject: [PATCH 082/150] b3sum: upgrade cargo fetcher and cargoSha256 (#82086) --- pkgs/tools/security/b3sum/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix index db5524ce365..5dc4f1b81e6 100644 --- a/pkgs/tools/security/b3sum/default.nix +++ b/pkgs/tools/security/b3sum/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/b3sum"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0qw7sr817lmj9xicc03cj1k49lwjwc1whllc7sj2g4c0nl2vndir"; + cargoSha256 = "1rqhz2r60603mylazn37mkm783qb7qhjcg8cqss0iy1g752f3f2i"; verifyCargoDeps = false; cargoPatches = [ ./add-cargo-lock.patch ]; From 0757551d3c0b955b541705e16a21f37d0790533a Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 21:06:49 -0400 Subject: [PATCH 083/150] cargo-geiger: upgrade cargo fetcher and cargoSha256 (#82087) --- pkgs/development/tools/rust/cargo-geiger/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index b6f3bb7af00..7678db0a386 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -15,10 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0kvmjahyx5dcjhry2hkvcshi0lbgipfj0as74a3h3bllfvdfkkg0"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0aykhhxk416p237safmqh5dhwjgrhvgc6zikkmxi9rq567ypp914"; + cargoSha256 = "0v50fkyf0a77l7whxalwnfqfi8lxy82z2gpd0fa0ib80qjla2n5z"; cargoPatches = [ ./cargo-lock.patch ]; # Multiple tests require internet connectivity, so they are disabled here. From bfa084b56b652f9f0bd17b816adc9d2068dd683b Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 21:15:32 -0400 Subject: [PATCH 084/150] git-series: upgrade cargo fetcher and cargoSha256 --- pkgs/development/tools/git-series/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index e94f1f1e14a..4a09e2225be 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -15,10 +15,7 @@ buildRustPackage rec { sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "16qjbvppc01yxk8x9jk7gs8jaag5nkfl30j3lyv3dc27vv9mckjv"; + cargoSha256 = "0ijgx8fksg2najb336dhddxlqfzc338f9ylydkpw6b39k72mm00d"; cargoPatches = [ (fetchpatch { From 2c76b3d8d73fee7d09a73dffd6c98a3537d8c9b0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Mar 2020 01:24:14 +0000 Subject: [PATCH 085/150] pdns-recursor: 4.2.1 -> 4.3.0 --- pkgs/servers/dns/pdns-recursor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index e5fc3ac5bb9..7d6fa7d9c91 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "07w9av3v9zjnb1fhknmza168yxsq4zr2jqcla7yg10ajrhsk534d"; + sha256 = "13v2iah7z10wc43v9agcjrzi3wds4jna8f0b7ph35nyzhzr31h9b"; }; nativeBuildInputs = [ pkgconfig ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A recursive DNS server"; - homepage = https://www.powerdns.com/; + homepage = "https://www.powerdns.com/"; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; From 053e735b3cfd94009efcda49fc0cf81528bb5c61 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 21:25:21 -0400 Subject: [PATCH 086/150] gnirehtet: upgrade cargo fetcher and cargoSha256 --- pkgs/tools/networking/gnirehtet/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 913d1c1a52b..601f70e187a 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -25,10 +25,7 @@ rustPlatform.buildRustPackage { sha256 = "1c99d6zpjxa8xlrg0n1825am20d2pjiicfcjwv8iay9ylfdnvygl"; }; sourceRoot = "source/relay-rust"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1l1cirhmfkpa466vksynlhwggsfiahws7cpsxydrc414l415l283"; + cargoSha256 = "0rb5xcqg5ikgrxpmzrql5n298j50aqgkkp45znbfv2x2n40dywad"; patchFlags = [ "-p2" ]; patches = [ From b6d45301de5bb6e275af92333a4c767edef09f0e Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 9 Mar 2020 02:42:17 +0100 Subject: [PATCH 087/150] alot: add patch for email composition This version is not usable without this patch. See https://github.com/pazz/alot/issues/1468. --- pkgs/development/python-modules/alot/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index b7005b4168b..0b869e4228b 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, python, fetchFromGitHub, isPy3k +{ stdenv, lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k , notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme , service-identity , gnupg ? null, sphinx, awk ? null, procps ? null, future ? null @@ -19,6 +19,15 @@ buildPythonPackage rec { sha256 = "sha256-WUwOJcq8JE7YO8sFeZwYikCRhpufO0pL6MKu54ZYsHI="; }; + patches = [ + # can't compose email if signature is set: https://github.com/pazz/alot/issues/1468 + (fetchpatch { + name = "envelope-body.patch"; + url = "https://github.com/pazz/alot/commit/28a4296c7f556c251d71d9502681980d46d9fa55.patch"; + sha256 = "1iwvmjyz4mh1g08vr85ywhah2xarcqg8dazagygk19icgsn45w06"; + }) + ]; + nativeBuildInputs = lib.optional withManpage sphinx; propagatedBuildInputs = [ From 5c6081efdf4bc8a00a6ba87338e2a4ae6d482375 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 22:04:15 -0400 Subject: [PATCH 088/150] httplz: upgrade cargo fetcher and cargoSha256 --- pkgs/tools/networking/httplz/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index c394f216e0f..5d59010ac1e 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -21,10 +21,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--bin httplz" ]; cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1ajxfvj1pv6yq84zgrh7vjzghpb2y8qd5r09gzwdvww5rbj920fq"; + cargoSha256 = "13hk9m09jff3bxbixsjvksiir4j4mak4ckvlq45bx5d5lh8sapxl"; postInstall = '' wrapProgram $out/bin/httplz \ From 2fd069c4e5801e84fb67e11123636582cbc33941 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 22:10:27 -0400 Subject: [PATCH 089/150] onefetch: upgrade cargo fetcher and cargoSha256 --- pkgs/tools/misc/onefetch/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 9c5ffc260ff..58abf6f72f8 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1sgpai3gx3w7w3ilmbnmzgdxdim6klkfiqaqxmffpyap6qgksfqs"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1phv06zf47bv5cmhypivljfiynrblha0kj13c5al9l0hd1xx749h"; + cargoSha256 = "18z887mklynxpjci6va4i5zhg90j824avykym24vbz9w97nqpdd5"; buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; From e6180f61b39042e4d56b9464b3c81e163dbe42fe Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 22:14:17 -0400 Subject: [PATCH 090/150] diesel-cli: upgrade cargo fetcher and cargoSha256 (#82089) --- pkgs/development/tools/diesel-cli/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index d2888dc616a..5c59703af3e 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -37,10 +37,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--no-default-features --features \"${features}\"" ]; cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0xlcskddhy7xsiwj54gmn1xlgkfxb4dwrys7rbamfz1h8aa6ixjx"; + cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] From 98493add79d048438b51150ec9a56649b04dcfad Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 22:14:49 -0400 Subject: [PATCH 091/150] eidolon: upgrade cargo fetcher and cargoSha256 (#82090) --- pkgs/games/eidolon/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix index f6bc271ec02..5461304d334 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1887fjkk641cn6dpmyc5r3r2li61yw1nvfb0f2dp3169gycka15h"; + cargoSha256 = "1i8qfphynwi42pkhhgllxq42dnw9f0dd6f829z94a3g91czyqvsw"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; From ad5b73c910bd4c4d064f589ee769fb968fe934ea Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 22:15:19 -0400 Subject: [PATCH 092/150] pax-rs: upgrade cargo fetcher and cargoSha256 --- pkgs/development/tools/pax-rs/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index f2fff99d153..aa83a1b8e1b 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -36,8 +36,5 @@ buildRustPackage rec { cp ${cargo-lock} $out/Cargo.lock ''; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "132a9vnlyp78zxiw5xrazadvx0scs7h2vbm5wz612dmh436mwnxg"; + cargoSha256 = "0wx5x7ll21bb6v34csk63kkvxdk3as720hdkaj0izdkpy0xf1knr"; } From 0696641d9f3801d8263567608007391d1a1d64df Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 22:15:25 -0400 Subject: [PATCH 093/150] cargo-raze: upgrade cargo fetcher and cargoSha256 (#82091) --- pkgs/development/tools/rust/cargo-raze/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 48579e43106..f892263dd69 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "source/impl"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "06rl7v0f1lgj9ii07fcnaxmhn28ckr03cpf5b93q8ripm5qh7my9"; + cargoSha256 = "1z20xc508a3slc1ii3hy09swvlyib14zwf9akxc0h24d5m48as1c"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl libgit2 openssl ] From ab0c847d8cecf0034f72fb61a79ac80d66268592 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 22:16:06 -0400 Subject: [PATCH 094/150] eva: upgrade cargo fetcher and cargoSha256 (#82093) --- pkgs/tools/misc/eva/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index c720361b9cd..dee181d95c2 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -4,10 +4,7 @@ rustPlatform.buildRustPackage rec { pname = "eva"; version = "0.2.7"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0n3xvlmp4l925nbz8lx6dr9yrrfh6z7b9z8wd6sli3a1dq26d6bg"; + cargoSha256 = "1lycjw5i169xx73qw8gknbakrxikdbr65fmqx7xq2mafc0hb1zyn"; src = fetchFromGitHub { owner = "NerdyPepper"; From 3dcdededf6623c989ae794530a41f15509e79164 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 22:27:42 -0400 Subject: [PATCH 095/150] rav1e: upgrade cargo fetcher and cargoSha256 --- pkgs/tools/video/rav1e/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 099a02e8f65..8a5e6c9eb40 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -25,10 +25,7 @@ rustPlatform.buildRustPackage rec { ''; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0jxc8qsp5fasnh5cbg6yl9d878n7dppay9gzjndlb65kj9j43h84"; + cargoSha256 = "0n6gkn4iyqk4bijrvcpq884hiihl4mpw1p417w1m0dw7j4y4karn"; nativeBuildInputs = [ nasm ]; From 288561cd5856b81dae3a613178f85ce0109e8154 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 22:29:14 -0400 Subject: [PATCH 096/150] svd2rust: upgrade cargo fetcher and cargoSha256 --- pkgs/development/tools/rust/svd2rust/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index fa457477b58..ecc7537267a 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -14,10 +14,7 @@ buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "03rfb8swxbcc9qm4mhxz5nm4b1gw7g7389wrdc91abxl4mw733ac"; + cargoSha256 = "0n0xc8b982ra007l6gygssf1n60gfc2rphwyi7n95dbys1chciyg"; # doc tests fail due to missing dependency doCheck = false; From 7fcbbea6548d33058a53801b15a33b80cb17af9c Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 23:06:25 -0400 Subject: [PATCH 097/150] wasm-bindgen-cli: upgrade cargo fetcher and cargoSha256 --- pkgs/development/tools/wasm-bindgen-cli/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index a073d0ae932..e5afcb30a81 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1cp8ns0cywzqchdw5hkg4fhxhqb6apxwjjasf1ksf3dgjwynlhzm"; + cargoSha256 = "1ylk9vrpajslx1zy4vqmlyqa5ygcmvir1gcn8hsr6liigf5kcz7p"; cargoPatches = [ ./0001-Add-cargo.lock.patch ]; cargoBuildFlags = [ "-p" pname ]; From aa86eb9261eda71b7931aff70029c4775f0b181d Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 23:06:26 -0400 Subject: [PATCH 098/150] svgbob: upgrade cargo fetcher and cargoSha256 --- pkgs/tools/graphics/svgbob/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index 68640d45bb2..d11f715464d 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/svgbob_cli"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0mnq1s809f394x83gjv9zljr07c94k48zkrwxs6ibi19shgmrnnd"; + cargoSha256 = "1y9jsnxmz51zychmmzp6mi29pb5ks2qww7lk5bshkhp56v51sm8d"; # Test tries to build outdated examples doCheck = false; From 6bfb702a4de3457d5f1d457c29e675d241e0a63d Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 23:09:16 -0400 Subject: [PATCH 099/150] unpfs: upgrade cargo fetcher and cargoSha256 --- pkgs/servers/unpfs/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix index dc228c25915..9b67a901693 100644 --- a/pkgs/servers/unpfs/default.nix +++ b/pkgs/servers/unpfs/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/example/unpfs"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1d33nwj3i333a6ji3r3037mgg553lc3wsawm0pz13kbvhjf336i8"; + cargoSha256 = "13mk86d8ql2196039qb7z0rx4svwffw1mzpiyxp35gg5fhcphriq"; RUSTC_BOOTSTRAP = 1; From d4844a1a498e5e188dede00baf69e80229948db8 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 23:32:01 -0400 Subject: [PATCH 100/150] vdirsyncer: upgrade cargo fetcher and cargoSha256 --- pkgs/tools/misc/vdirsyncer/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 2f8bb36990b..52eec555b16 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -19,10 +19,7 @@ python3Packages.buildPythonApplication rec { name = "${name}-native"; inherit src; sourceRoot = "source/rust"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1n1dxq3klsry5mmbfff2jv7ih8mr5zvpncrdgba6qs93wi77qi0y"; + cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d"; buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; }; From b20aaf3e7a3d76e9c4dd6208ee7d464917c53f5e Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 23:32:15 -0400 Subject: [PATCH 101/150] rustracerd: upgrade cargo fetcher and cargoSha256 --- pkgs/development/tools/rust/racerd/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index c9b89abb0b0..c49ea2aaf12 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchFromGitHub, rustPlatform, makeWrapper , Security }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "racerd"; version = "unstable-2019-09-02"; + src = fetchFromGitHub { owner = "jwilm"; repo = "racerd"; @@ -12,16 +11,13 @@ buildRustPackage rec { sha256 = "13jqdvjk4savcl03mrn2vzgdsd7vxv2racqbyavrxp2cm9h6cjln"; }; + cargoSha256 = "1nwjr7v8hkhsql93wbwk5gqqiq725gj5iwwsbd250my9g5kkfdbw"; + # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; doCheck = false; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "07130587drrdkrk7aqb8pl8i3p485qr6xh1m86630ydlnb9z6s6i"; - nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -35,7 +31,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs"; - homepage = https://github.com/jwilm/racerd; + homepage = "https://github.com/jwilm/racerd"; license = licenses.asl20; platforms = platforms.all; }; From a709184ba31804321ef23ca626445b9b754b97e2 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 9 Mar 2020 00:02:24 -0400 Subject: [PATCH 102/150] polkadot: upgrade cargoSha256 and add maintainer note While the package is broken and does not build, we can still recompute the cargoSha256. I attempted to upgrade to the latest release, but that doesn't build either. --- .../applications/blockchains/polkadot/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index cf83be9b50d..a919a305419 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -11,24 +11,27 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "paritytech"; + # N.B. In 2018, the thing that was "polkadot" was split off into its own + # repo, so if this package is ever updated it should be changed to + # paritytech/polkadot, as per comment here: + # https://github.com/paritytech/polkadot#note repo = "substrate"; rev = "19f4f4d4df3bb266086b4e488739f73d3d5e588c"; sha256 = "0v7g03rbml2afw0splmyjh9nqpjg0ldjw09hyc0jqd3qlhgxiiyj"; - }; + }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0gc3w0cwdyk8f7cgpp9sfawczk3n6wd7q0nhfvk87sry71b8vvwq"; + cargoSha256 = "1h5v7c7xi2r2wzh1pj6xidrg7dx23w3rjm88mggpq7574arijk4i"; buildInputs = [ pkgconfig openssl openssl.dev ]; meta = with stdenv.lib; { description = "Polkadot Node Implementation"; - homepage = https://polkadot.network; + homepage = "https://polkadot.network"; license = licenses.gpl3; maintainers = [ maintainers.akru ]; platforms = platforms.linux; + # Last attempt at building this was on v0.7.22 + # https://github.com/paritytech/polkadot/releases broken = true; }; } From 6ea0cad71409217fa28c86ca7e218ff1fb0b06cf Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 9 Mar 2020 00:10:59 -0400 Subject: [PATCH 103/150] rustracer: upgrade cargo fetcher and cargoSha256 --- pkgs/development/tools/rust/racer/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 8839464e9f6..82b415bc8a3 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0svvdkfqpk2rw0wxyrhkxy553k55lg7jxc0ly4w1195iwv14ad3y"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1qxg9r6wpv811fh2l889jm0ya96gsra00kqpyxh41fb7myvl2a4i"; + cargoSha256 = "0zaqa89z3nf23s2q1jpmfz4lygh4zq9ymql71d748fgjy9psr449"; buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin Security; From 81cb6ccb576d44277bae074dc5349fc47f1c8b42 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 9 Mar 2020 00:15:13 -0400 Subject: [PATCH 104/150] ja2-stracciatella: upgrade cargo fetcher and cargoSha256 --- pkgs/games/ja2-stracciatella/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index a08ce593012..89d75dd837f 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchFromGitHub, cmake, SDL2, boost, fltk, rustPlatform }: -with rustPlatform; let version = "0.16.1"; src = fetchFromGitHub { @@ -18,12 +17,11 @@ let cp ${lockfile} $out/Cargo.lock ''; }; - libstracciatella = buildRustPackage { - name = "libstracciatella-${version}"; + libstracciatella = rustPlatform.buildRustPackage { + pname = "libstracciatella"; inherit version; src = libstracciatellaSrc; - legacyCargoFetcher = true; - cargoSha256 = "0a1pc8wyvgmna0a5cbpv3mh0h4nzjxlm887ymcq00cy1ciq5nmj4"; + cargoSha256 = "15djs4xaz4y1hpfyfqxdgdasxr0b5idy9i5a7c8cmh0jkxjv8bqc"; doCheck = false; }; in @@ -37,15 +35,17 @@ stdenv.mkDerivation { patches = [ ./remove-rust-buildstep.patch ]; + preConfigure = '' sed -i -e 's|rust-stracciatella|${libstracciatella}/lib/libstracciatella.so|g' CMakeLists.txt cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2") ''; enableParallelBuilding = true; + meta = { description = "Jagged Alliance 2, with community fixes"; license = "SFI Source Code license agreement"; - homepage = https://ja2-stracciatella.github.io/; + homepage = "https://ja2-stracciatella.github.io/"; }; } From 134f8cc84d11e332de2431493e8009fd946ae9d6 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 9 Mar 2020 15:58:22 +1000 Subject: [PATCH 105/150] youtube-dl: 2020.03.06 -> 2020.03.08 https://github.com/ytdl-org/youtube-dl/releases/tag/2020.03.08 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index c17731c8cdb..2f875e01f3f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.03.06"; + version = "2020.03.08"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "16c10rgkjrjv115w4r7gsr9hcakqq5s2cg250b1hwvxdsxqp8vnv"; + sha256 = "1xbka14wnalcqkhibfcqw8f5bw1m9b1f44719yifv1jk0614q4bn"; }; nativeBuildInputs = [ makeWrapper ]; From d140b5f8f713226d3f24c23c5c14fb96550235ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Mar 2020 06:02:02 +0000 Subject: [PATCH 106/150] python27Packages.jenkins-job-builder: 3.2.0 -> 3.3.0 --- .../python-modules/jenkins-job-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index a5015f4d326..26b7ab5d622 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1njxww53d92cpgrqlr09w2n0pk6wamjcb0mvpns1mr2pn5hy1jhi"; + sha256 = "0znnw1vnvnm8a6gfrk479s2b9hzlxi4qy57c9a47qphvx3mklm8x"; }; postPatch = '' From 2607aae93fc9db7b05541d8338a7e6bb9871d057 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 9 Mar 2020 00:43:44 -0400 Subject: [PATCH 107/150] fetchsvn: Fix for cross Just use `nativeBuildInputs` at build time. --- pkgs/build-support/fetchsvn/builder.sh | 4 ---- pkgs/build-support/fetchsvn/default.nix | 19 ++++++++++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index c386a3f3489..ed3e65f0769 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -2,10 +2,6 @@ source $stdenv/setup header "exporting $url (r$rev) into $out" -if test "$sshSupport"; then - export SVN_SSH="$openssh/bin/ssh" -fi - if test -n "$http_proxy"; then # Configure proxy mkdir .subversion diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 68433d1471d..06f0ea0a3d1 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,7 +1,13 @@ -{stdenvNoCC, subversion, glibcLocales, sshSupport ? true, openssh ? null}: -{url, rev ? "HEAD", md5 ? "", sha256 ? "" +{ stdenvNoCC, buildPackages +, subversion, glibcLocales, sshSupport ? true, openssh ? null +}: + +{ url, rev ? "HEAD", md5 ? "", sha256 ? "" , ignoreExternals ? false, ignoreKeywords ? false, name ? null -, preferLocalBuild ? true }: +, preferLocalBuild ? true +}: + +assert sshSupport -> openssh != null; let repoName = with stdenvNoCC.lib; @@ -32,13 +38,16 @@ else stdenvNoCC.mkDerivation { name = name_; builder = ./builder.sh; - nativeBuildInputs = [ subversion glibcLocales ]; + nativeBuildInputs = [ subversion glibcLocales ] + ++ stdenvNoCC.lib.optional sshSupport openssh; + + SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null; outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = sha256; - inherit url rev sshSupport openssh ignoreExternals ignoreKeywords; + inherit url rev ignoreExternals ignoreKeywords; impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; inherit preferLocalBuild; From 8e967e8b8db3abf045f60a7cc49bc1bfd1fe168f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Mar 2020 07:26:18 +0000 Subject: [PATCH 108/150] python27Packages.dominate: 2.4.0 -> 2.5.1 --- pkgs/development/python-modules/dominate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index 7288dee7763..3881bf2dd86 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -2,17 +2,17 @@ buildPythonPackage rec { pname = "dominate"; - version = "2.4.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1775cz6lipb43hmjll77m2pxh72pikng74lpg30v9n1b66s78959"; + sha256 = "0y4xzch6kwzddwz6pmk8cd09r3dpkxm1bh4q1byhm37a0lb4h1cv"; }; doCheck = !isPy3k; meta = with lib; { - homepage = https://github.com/Knio/dominate/; + homepage = "https://github.com/Knio/dominate/"; description = "Dominate is a Python library for creating and manipulating HTML documents using an elegant DOM API"; license = licenses.lgpl3; maintainers = with maintainers; [ ]; From 08341c372a014505054306a25cce466e624687ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Mar 2020 09:10:43 +0000 Subject: [PATCH 109/150] python27Packages.lark-parser: 0.8.1 -> 0.8.2 --- pkgs/development/python-modules/lark-parser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index 1ba7df00ea3..ddf6cabcae9 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1mjicdvrzh9r9q3xrjrzaiaxk04r60a3l6l0vnp1hq3xfc9ccqc8"; + sha256 = "1i585q27qlwk4rpgsh621s60im1j9ynwyz5pcc8s3ffmjam28vss"; }; # tests of Nearley support require js2py @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "A modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; - homepage = https://github.com/lark-parser/lark; + homepage = "https://github.com/lark-parser/lark"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; From b074365fd4a0b979f63d5e503195ddd8bfe1a048 Mon Sep 17 00:00:00 2001 From: Luis Hebendanz Date: Wed, 30 Oct 2019 22:40:12 +0100 Subject: [PATCH 110/150] rmount: 1.0.1 -> 1.1.0 --- pkgs/tools/filesystems/rmount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix index 46be9e30f70..72172ef5baa 100644 --- a/pkgs/tools/filesystems/rmount/default.nix +++ b/pkgs/tools/filesystems/rmount/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "rmount"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "Luis-Hebendanz"; repo = "rmount"; - sha256 = "1wjmfvbsq3126z51f2ivj85cjmkrzdm2acqsiyqs57qga2g6w5p9"; + sha256 = "0j1ayncw1nnmgna7vyx44vwinh4ah1b0l5y8agc7i4s8clbvy3h0"; }; buildInputs = [ makeWrapper ]; From cc90ececa78a269bcf185e62e160a0eed4d45a14 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 9 Mar 2020 12:01:19 +0100 Subject: [PATCH 111/150] environment.etc: fix typo --- nixos/modules/system/etc/etc.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 57ade288096..1f4d54a1ae2 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -94,7 +94,7 @@ in default = 0; type = types.int; description = '' - UID of created file. Only takes affect when the file is + UID of created file. Only takes effect when the file is copied (that is, the mode is not 'symlink'). ''; }; @@ -103,7 +103,7 @@ in default = 0; type = types.int; description = '' - GID of created file. Only takes affect when the file is + GID of created file. Only takes effect when the file is copied (that is, the mode is not 'symlink'). ''; }; @@ -113,7 +113,7 @@ in type = types.str; description = '' User name of created file. - Only takes affect when the file is copied (that is, the mode is not 'symlink'). + Only takes effect when the file is copied (that is, the mode is not 'symlink'). Changing this option takes precedence over uid. ''; }; @@ -123,7 +123,7 @@ in type = types.str; description = '' Group name of created file. - Only takes affect when the file is copied (that is, the mode is not 'symlink'). + Only takes effect when the file is copied (that is, the mode is not 'symlink'). Changing this option takes precedence over gid. ''; }; From 5012d8a36cc570d7cc07b95fca80129dea8f32bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Mar 2020 11:05:00 +0000 Subject: [PATCH 112/150] python37Packages.jupyterlab_server: 1.0.6 -> 1.0.7 --- .../python-modules/jupyterlab_server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index edfe01728a4..9a526169489 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "1.0.6"; + version = "1.0.7"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "d0977527bfce6f47c782cb6bf79d2c949ebe3f22ac695fa000b730c671445dad"; + sha256 = "1qnqxy6812py7xklg7xfrkadm0v4z8x6n1035i26h2z7y891ff0j"; }; checkInputs = [ requests pytest ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "JupyterLab Server"; - homepage = https://jupyter.org; + homepage = "https://jupyter.org"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; }; From db6c94304f3186b2e09abfd01f8c485b7886e0c4 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 9 Mar 2020 11:28:07 +0000 Subject: [PATCH 113/150] switch-to-configuration: Add new option X-OnlyManualStart This is to facilitate units that should _only_ be manually started and not activated when a configuration is switched to. More specifically this is to be used by the new Nixops deploy-* targets created in https://github.com/NixOS/nixops/pull/1245 that are triggered by Nixops before/after switch-to-configuration is called. --- nixos/modules/system/activation/switch-to-configuration.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 641cf9faadc..b82d69b3bb8 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -183,7 +183,7 @@ while (my ($unit, $state) = each %{$activePrev}) { # active after the system has resumed, which probably # should not be the case. Just ignore it. if ($unit ne "suspend.target" && $unit ne "hibernate.target" && $unit ne "hybrid-sleep.target") { - unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no")) { + unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { $unitsToStart{$unit} = 1; recordUnit($startListFile, $unit); # Don't spam the user with target units that always get started. @@ -222,7 +222,7 @@ while (my ($unit, $state) = each %{$activePrev}) { $unitsToReload{$unit} = 1; recordUnit($reloadListFile, $unit); } - elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") ) { + elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { $unitsToSkip{$unit} = 1; } else { if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "yes")) { From 0bfada7dda710e1a1a99ab67639eb1deb981cbed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 20 Feb 2020 11:53:24 +0000 Subject: [PATCH 114/150] bcc: 0.12.0 -> 0.13.0 --- pkgs/os-specific/linux/bcc/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index ffb14e9c3c1..949d953c3bd 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,18 +1,15 @@ -{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages, kernel +{ stdenv, fetchurl, makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , systemtap, bash }: python.pkgs.buildPythonApplication rec { - version = "0.12.0"; + version = "0.13.0"; name = "bcc-${version}"; - src = fetchFromGitHub { - owner = "iovisor"; - repo = "bcc"; - rev = "v${version}"; - sha256 = "1r2yjxam23k56prsvjhqf8i8d3irhcvmy0bly6x23h1jc3zc6yym"; - fetchSubmodules = true; + src = fetchurl { + url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; + sha256 = "15xpwf17x2j1c1wcb84cgfs35dp5w0rjd9mllmddmdjvn303wffx"; }; format = "other"; From a615615a2d27aab7f061dfc1d51914818ee9873d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Mar 2020 12:12:53 +0000 Subject: [PATCH 115/150] python27Packages.sphinxcontrib_plantuml: 0.17.1 -> 0.18 --- .../python-modules/sphinxcontrib_plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index d89ecb6218c..579b2f173ee 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.17.1"; + version = "0.18"; src = fetchPypi { inherit pname version; - sha256 = "1amvczdin078ia1ax2379lklxr0bwjsrin96174dvssxpzjl04cc"; + sha256 = "08555dndvp12g261wag3qklybdbfnjcmagh4gpl79k2kz5bqrk5c"; }; # No tests included. From 634ab6fc5d5cda42a60cceac2cea33935861b9c1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 9 Mar 2020 14:07:43 +0100 Subject: [PATCH 116/150] python3Packages.acoustics: 0.2.3 -> 0.2.4 --- pkgs/development/python-modules/acoustics/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index bf3f31d351f..05f0e29f4e2 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "acoustics"; - version = "0.2.3"; + version = "0.2.4"; checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; src = fetchPypi { inherit pname version; - sha256 = "ca663059d61fbd2899aed4e3cedbc3f983aa67afd3ae1617db3c59b724206fb3"; + sha256 = "8ccb68ac258ba81a0b9064523e85eae013f9bfce7244d01db42d7d2d21d712cc"; }; checkPhase = '' @@ -26,6 +26,5 @@ buildPythonPackage rec { maintainers = with maintainers; [ fridh ]; license = with licenses; [ bsd3 ]; homepage = "https://github.com/python-acoustics/python-acoustics"; - broken = true; # no longer compatible with pandas>=1 }; } From 04e7462ee61c3f0477b40204f4d90e6b6d5d0a32 Mon Sep 17 00:00:00 2001 From: Peter Kolloch Date: Sun, 1 Mar 2020 12:58:26 +0100 Subject: [PATCH 117/150] buildRustCrate: refactor colored logging * Make errors include the crate name and make them much more prominent. * Move more code into lib.sh * Already source generated logging code and lib.sh in configure --- .../rust/build-rust-crate/build-crate.nix | 7 +- .../rust/build-rust-crate/configure-crate.nix | 8 ++- .../rust/build-rust-crate/default.nix | 8 +-- .../rust/build-rust-crate/lib.sh | 10 ++- .../rust/build-rust-crate/log.nix | 70 +++++++++++++------ 5 files changed, 68 insertions(+), 35 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 2dcca75e299..9759235e30e 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, echo_build_heading, noisily, mkRustcDepArgs, rust }: +{ lib, stdenv, mkRustcDepArgs, rust }: { crateName, dependencies, crateFeatures, crateRenames, libName, release, libPath, @@ -35,16 +35,13 @@ build_bin = if buildTests then "build_bin_test" else "build_bin"; in '' runHook preBuild - ${echo_build_heading colors} - ${noisily colors verbose} - + # configure & source common build functions LIB_RUSTC_OPTS="${libRustcOpts}" BIN_RUSTC_OPTS="${binRustcOpts}" LIB_EXT="${stdenv.hostPlatform.extensions.sharedLibrary}" LIB_PATH="${libPath}" LIB_NAME="${libName}" - source ${./lib.sh} CRATE_NAME='${lib.replaceStrings ["-"] ["_"] libName}' diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index c146ffef5ff..bbe7090aed3 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, echo_build_heading, noisily, mkRustcDepArgs }: +{ lib, stdenv, echo_colored, noisily, mkRustcDepArgs }: { build , buildDependencies , colors @@ -32,9 +32,11 @@ let version_ = lib.splitString "-" crateVersion; completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; in '' cd ${workspace_member} - runHook preConfigure - ${echo_build_heading colors} + ${echo_colored colors} ${noisily colors verbose} + source ${./lib.sh} + + runHook preConfigure symlink_dependency() { # $1 is the nix-store path of a dependency # $2 is the target path diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 94b64a1225c..35cb49293e8 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -4,7 +4,7 @@ # This can be useful for deploying packages with NixOps, and to share # binary dependencies between projects. -{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc, rust }: +{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc, rust, cargo, jq }: let # This doesn't appear to be officially documented anywhere yet. @@ -29,14 +29,14 @@ let " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") ) dependencies; - inherit (import ./log.nix { inherit lib; }) noisily echo_build_heading; + inherit (import ./log.nix { inherit lib; }) noisily echo_colored; configureCrate = import ./configure-crate.nix { - inherit lib stdenv echo_build_heading noisily mkRustcDepArgs; + inherit lib stdenv echo_colored noisily mkRustcDepArgs; }; buildCrate = import ./build-crate.nix { - inherit lib stdenv echo_build_heading noisily mkRustcDepArgs rust; + inherit lib stdenv mkRustcDepArgs rust; }; installCrate = import ./install-crate.nix { inherit stdenv; }; diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh index d4d9317496f..35e804aa104 100644 --- a/pkgs/build-support/rust/build-rust-crate/lib.sh +++ b/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -1,3 +1,11 @@ +echo_build_heading() { + if (( $# == 1 )); then + echo_colored "Building $1" + else + echo_colored "Building $1 ($2)" + fi +} + build_lib() { lib_src=$1 echo_build_heading $lib_src ${libName} @@ -132,7 +140,7 @@ search_for_bin_path() { done if [[ -z "$BIN_PATH" ]]; then - echo "failed to find file for binary target: $BIN_NAME" >&2 + echo_error "ERROR: failed to find file for binary target: $BIN_NAME" >&2 exit 1 fi } diff --git a/pkgs/build-support/rust/build-rust-crate/log.nix b/pkgs/build-support/rust/build-rust-crate/log.nix index 25181c787e2..a7e2cb4f463 100644 --- a/pkgs/build-support/rust/build-rust-crate/log.nix +++ b/pkgs/build-support/rust/build-rust-crate/log.nix @@ -1,30 +1,56 @@ { lib }: -{ - echo_build_heading = colors: '' - echo_build_heading() { - start="" - end="" - ${lib.optionalString (colors == "always") '' - start="$(printf '\033[0;1;32m')" #set bold, and set green. - end="$(printf '\033[0m')" #returns to "normal" - ''} - if (( $# == 1 )); then - echo "$start""Building $1""$end" - else - echo "$start""Building $1 ($2)""$end" - fi + +let echo_colored_body = start_escape: + # Body of a function that behaves like "echo" but + # has the output colored by the given start_escape + # sequence. E.g. + # + # * echo_x "Building ..." + # * echo_x -n "Running " + # + # This is more complicated than apparent at first sight + # because: + # * The color markers and the text must be print + # in the same echo statement. Otherise, other + # intermingled text from concurrent builds will + # be colored as well. + # * We need to preserve the trailing newline of the + # echo if and only if it is present. Bash likes + # to strip those if we capture the output of echo + # in a variable. + # * Leading "-" will be interpreted by test as an + # option for itself. Therefore, we prefix it with + # an x in `[[ "x$1" =~ ^x- ]]`. + '' + local echo_args=""; + while [[ "x$1" =~ ^x- ]]; do + echo_args+=" $1" + shift + done + + local start_escape="$(printf '${start_escape}')" + local reset="$(printf '\033[0m')" + echo $echo_args $start_escape"$@"$reset + ''; + echo_conditional_colored_body = colors: start_escape: + if colors == "always" + then (echo_colored_body start_escape) + else ''echo "$@"''; +in { + echo_colored = colors: '' + echo_colored() { + ${echo_conditional_colored_body colors ''\033[0;1;32m''} } - ''; + + echo_error() { + ${echo_conditional_colored_body colors ''\033[0;1;31m''} + } + ''; + noisily = colors: verbose: '' noisily() { - start="" - end="" - ${lib.optionalString (colors == "always") '' - start="$(printf '\033[0;1;32m')" #set bold, and set green. - end="$(printf '\033[0m')" #returns to "normal" - ''} ${lib.optionalString verbose '' - echo -n "$start"Running "$end" + echo_colored -n "Running " echo $@ ''} $@ From 504bfe0767cc6d5ea2be0170bee9a16725b3e194 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Mar 2020 13:54:12 +0000 Subject: [PATCH 118/150] python27Packages.python-jenkins: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/python-jenkins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index aea31053c5a..4de5e291063 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "python-jenkins"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1aa6rnzlzdgndiwjdbnklgz5pqy5zd7d6g7bhzsvyf0614z1w010"; + sha256 = "01jid5s09lr3kayr2h1z9n8h9nhyw3jxv9c4b5hrlxijknkqzvfy"; }; buildInputs = [ mock ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for the remote Jenkins API"; - homepage = https://pypi.python.org/pypi/python-jenkins; + homepage = "https://pypi.python.org/pypi/python-jenkins"; license = licenses.bsd3; maintainers = with maintainers; [ ma27 ]; }; From 8a6638daa96318f0cf6d37a1d1d67f1f1c06bd05 Mon Sep 17 00:00:00 2001 From: Peter Kolloch Date: Sun, 1 Mar 2020 13:34:36 +0100 Subject: [PATCH 119/150] build-support/rust/buildRustCrate: Search for matching Cargo.toml in sub directories This is what cargo does for git repositories. See related issues: * https://github.com/kolloch/crate2nix/issues/53 * https://github.com/kolloch/crate2nix/issues/33 --- .../rust/build-rust-crate/configure-crate.nix | 15 ++++++- .../rust/build-rust-crate/default.nix | 4 +- .../rust/build-rust-crate/lib.sh | 34 ++++++++++++++ .../rust/build-rust-crate/test/default.nix | 44 ++++++++++++++++++- 4 files changed, 94 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index bbe7090aed3..013b99a77b4 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -31,12 +31,25 @@ let version_ = lib.splitString "-" crateVersion; completeDepsDir = lib.concatStringsSep " " completeDeps; completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; in '' - cd ${workspace_member} ${echo_colored colors} ${noisily colors verbose} source ${./lib.sh} + ${lib.optionalString (workspace_member != null) '' + noisily cd "${workspace_member}" +''} + ${lib.optionalString (workspace_member == null) '' + echo_colored "Searching for matching Cargo.toml (${crateName})" + local cargo_toml_dir=$(matching_cargo_toml_dir "${crateName}") + if [ -z "$cargo_toml_dir" ]; then + echo_error "ERROR configuring ${crateName}: No matching Cargo.toml in $(pwd) found." >&2 + exit 23 + fi + noisily cd "$cargo_toml_dir" +''} + runHook preConfigure + symlink_dependency() { # $1 is the nix-store path of a dependency # $2 is the target path diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 35cb49293e8..70d48bef8c9 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (rec { src = crate.src or (fetchCrate { inherit (crate) crateName version sha256; }); name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; - depsBuildBuild = [ rust stdenv.cc ]; + depsBuildBuild = [ rust stdenv.cc cargo jq ]; buildInputs = (crate.buildInputs or []) ++ buildInputs_; dependencies = map lib.getLib dependencies_; buildDependencies = map lib.getLib buildDependencies_; @@ -114,6 +114,8 @@ stdenv.mkDerivation (rec { in lib.substring 0 10 hashedMetadata; build = crate.build or ""; + # Either set to a concrete sub path to the crate root + # or use `null` for auto-detect. workspace_member = crate.workspace_member or "."; crateVersion = crate.version; crateDescription = crate.description or ""; diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh index 35e804aa104..0f08c133e55 100644 --- a/pkgs/build-support/rust/build-rust-crate/lib.sh +++ b/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -144,3 +144,37 @@ search_for_bin_path() { exit 1 fi } + +# Extracts cargo_toml_path of the matching crate. +matching_cargo_toml_path() { + local manifest_path="$1" + local expected_crate_name="$2" + + # If the Cargo.toml is not a workspace root, + # it will only contain one package in ".packages" + # because "--no-deps" suppressed dependency resolution. + # + # But to make it more general, we search for a matching + # crate in all packages and use the manifest path that + # is referenced there. + cargo metadata --no-deps --format-version 1 \ + --manifest-path "$manifest_path" \ + | jq -r '.packages[] + | select( .name == "'$expected_crate_name'") + | .manifest_path' +} + +# Find a Cargo.toml in the current or any sub directory +# with a matching crate name. +matching_cargo_toml_dir() { + local expected_crate_name="$1" + + find -L -name Cargo.toml | sort | while read manifest_path; do + echo "...checking manifest_path $manifest_path" >&2 + local matching_path="$(matching_cargo_toml_path "$manifest_path" "$expected_crate_name")" + if [ -n "${matching_path}" ]; then + echo "$(dirname $matching_path)" + break + fi + done +} \ No newline at end of file diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 6aad02992c1..71004566468 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -8,6 +8,14 @@ let } // args; in buildRustCrate p; + mkCargoToml = + { name, crateVersion ? "0.1.0", path ? "Cargo.toml" }: + mkFile path '' + [package] + name = ${builtins.toJSON name} + version = ${builtins.toJSON crateVersion} + ''; + mkFile = destination: text: writeTextFile { name = "src"; destination = "/${destination}"; @@ -89,7 +97,7 @@ let in rec { tests = let - cases = { + cases = rec { libPath = { libPath = "src/my_lib.rs"; src = mkLib "src/my_lib.rs"; }; srcLib = { src = mkLib "src/lib.rs"; }; @@ -220,6 +228,40 @@ let ]; }; }; + rustCargoTomlInSubDir = { + # The "workspace_member" can be set to the sub directory with the crate to build. + # By default ".", meaning the top level directory is assumed. + # Using null will trigger a search. + workspace_member = null; + src = symlinkJoin rec { + name = "find-cargo-toml"; + paths = [ + (mkCargoToml { name = "ignoreMe"; }) + (mkTestFileWithMain "src/main.rs" "ignore_main") + + (mkCargoToml { name = "rustCargoTomlInSubDir"; path = "subdir/Cargo.toml"; }) + (mkTestFileWithMain "subdir/src/main.rs" "src_main") + (mkTestFile "subdir/tests/foo/main.rs" "tests_foo") + (mkTestFile "subdir/tests/bar/main.rs" "tests_bar") + ]; + }; + buildTests = true; + expectedTestOutputs = [ + "test src_main ... ok" + "test tests_foo ... ok" + "test tests_bar ... ok" + ]; + }; + + rustCargoTomlInTopDir = + let + withoutCargoTomlSearch = builtins.removeAttrs rustCargoTomlInSubDir [ "workspace_member" ]; + in + withoutCargoTomlSearch // { + expectedTestOutputs = [ + "test ignore_main ... ok" + ]; + }; }; brotliCrates = (callPackage ./brotli-crates.nix {}); in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // { From 8074942aed9630d3befefc8fd3f03e5adfb55e00 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Mon, 9 Mar 2020 16:47:57 +0200 Subject: [PATCH 120/150] nbstripout: 0.3.6 -> 0.3.7 --- pkgs/applications/version-management/nbstripout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 797bc782496..6668631ca9a 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -2,7 +2,7 @@ with python.pkgs; buildPythonApplication rec { - version = "0.3.6"; + version = "0.3.7"; pname = "nbstripout"; # Mercurial should be added as a build input but because it's a Python @@ -14,7 +14,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1x6010akw7iqxn7ba5m6malfr2fvaf0bjp3cdh983qn1s7vwlq0r"; + sha256 = "13w2zhw8vrfv6637bw5ygygj1dky55fvvncz11hq0abwkkzb3wb2"; }; # for some reason, darwin uses /bin/sh echo native instead of echo binary, so From 018a46ffe84126b6b71dc4944108877e0b40c745 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 9 Mar 2020 16:15:54 +0100 Subject: [PATCH 121/150] minecraft: install missing gsettings schemas --- pkgs/games/minecraft/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 5bc2157a70b..157fb4b93b9 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -2,6 +2,8 @@ , fetchurl , makeDesktopItem , makeWrapper +, wrapGAppsHook +, gobject-introspection , jre # old or modded versions of the game may require Java 8 (https://aur.archlinux.org/packages/minecraft-launcher/#pinned-674960) , xorg , zlib @@ -96,10 +98,12 @@ in sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + buildInputs = [ gobject-introspection ]; sourceRoot = "."; + dontWrapGApps = true; dontConfigure = true; dontBuild = true; @@ -109,11 +113,6 @@ in ${desktopItem.buildCommand} install -D $icon $out/share/icons/hicolor/symbolic/apps/minecraft-launcher.svg - - makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \ - --prefix LD_LIBRARY_PATH : ${envLibPath} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \ - --run "cd /tmp" # Do not create `GPUCache` in current directory ''; preFixup = '' @@ -129,6 +128,15 @@ in $out/opt/minecraft-launcher/liblauncher.so ''; + postFixup = '' + # Do not create `GPUCache` in current directory + makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \ + --prefix LD_LIBRARY_PATH : ${envLibPath} \ + --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \ + --run "cd /tmp" \ + "''${gappsWrapperArgs[@]}" + ''; + meta = with stdenv.lib; { description = "Official launcher for Minecraft, a sandbox-building game"; homepage = "https://minecraft.net"; From d9e86f4cea4389de0dfd33ff7dcbf31eca0809ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Mar 2020 16:11:26 +0000 Subject: [PATCH 122/150] python27Packages.stripe: 2.42.0 -> 2.43.0 --- pkgs/development/python-modules/stripe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 3f1c1e53c7c..4acc694a572 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.42.0"; + version = "2.43.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1vrs0mydj2j789slzfv5413qxa067zi7p34h2p63612gm3vdrcl9"; + sha256 = "0jikvcapg2xp3w824wz0wn74mx91nl3vmd92a10il3gli2p4wcnp"; }; propagatedBuildInputs = [ requests ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Stripe Python bindings"; - homepage = https://github.com/stripe/stripe-python; + homepage = "https://github.com/stripe/stripe-python"; license = licenses.mit; }; } From f391999026ba12cbcf176456299b1489772e5ff0 Mon Sep 17 00:00:00 2001 From: Milan Date: Mon, 9 Mar 2020 17:23:51 +0100 Subject: [PATCH 123/150] gitlab: 12.8.2 -> 12.8.5 (#82142) https://about.gitlab.com/releases/2020/03/09/gitlab-12-8-5-released/ --- pkgs/applications/version-management/gitlab/data.json | 8 ++++---- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../version-management/gitlab/gitaly/deps.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 2772ef5b6f4..07ec3a29144 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,11 +1,11 @@ { - "version": "12.8.2", - "repo_hash": "1d27s61kglryr5pashwfq55z7fh16fxkx1m4gc82xihwfzarf4x9", + "version": "12.8.5", + "repo_hash": "1y5606p793w1js39420jcd2bj42cripczgrdxgg2cq0r2kq8axk8", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.8.2-ee", + "rev": "v12.8.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.8.2", + "GITALY_SERVER_VERSION": "12.8.5", "GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_SHELL_VERSION": "11.0.0", "GITLAB_WORKHORSE_VERSION": "8.21.0" diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index af97873463e..0dd60a6df20 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -28,14 +28,14 @@ let }; }); in buildGoPackage rec { - version = "12.8.2"; + version = "12.8.5"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1zc44y5yl799vqg12w3iaivk4xwj9i4k6f198svplipa760nl9ic"; + sha256 = "19pwffncihhywfac7ybry38vyj3pmdz66g5nqrvwn4xxw7ypvd24"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 5ab063d1dea..83a2f0f5f74 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -1319,8 +1319,8 @@ fetch = { type = "git"; url = "https://github.com/ugorji/go"; - rev = "d75b2dcb6bc8"; - sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + rev = "v1.1.4"; + sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; }; } { From a140160314e80555d90b357b87548c73e9358d8a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Mar 2020 16:49:23 +0000 Subject: [PATCH 124/150] python27Packages.ua-parser: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/ua-parser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index 9249a1ce044..875f0ee2075 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ua-parser"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1qpw1jdm8bp09jwjp8r38rr7rd2jy4k2if798cax3wylphm285xy"; + sha256 = "0csh307zfz666kkk5idrw3crj1x8q8vsqgwqil0r1n1hs4p7ica7"; }; buildInputs = [ pyyaml ]; @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python implementation of the UA Parser"; - homepage = https://github.com/ua-parser/uap-python; + homepage = "https://github.com/ua-parser/uap-python"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dotlambda ]; From d4446c563d5d7f1709cb95ce3731b56ea4578447 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 27 Feb 2020 16:08:34 -0500 Subject: [PATCH 125/150] firefox: Fix AArch64 build * The 'arm.patch' patch doesn't apply anymore. * The 'build-arm-libopus.patch' patch isn't required anymore. * See the mozilla phabricator link for the added patch. Additionally, we are now *always* undconditionally applying all patches to all architectures. That is, unless they have undesirable side-effects, but those might not be fit for inclusion. By applying all patches all the time, they'll be removed or replaced when they stop applying. --- .../networking/browsers/firefox/common.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 4aa8105559b..7c58072d5af 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -93,16 +93,12 @@ stdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch - ] ++ lib.optionals (stdenv.isAarch64) [ - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch"; - sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/build-arm-libopus.patch"; - sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp"; - }) ] + ++ lib.optional (lib.versionAtLeast ffversion "73") (fetchpatch { + # https://phabricator.services.mozilla.com/D60667 + url = "https://hg.mozilla.org/mozilla-central/raw-rev/b3d8b08265b800165d684281d19ac845a8ff9a66"; + sha256 = "0b4s75w7sl619rglcjmlyvyibpj2ar5cpy6pnywl1xpd9qzyb27p"; + }) ++ patches; From ed8692b9f53ff5e6b327dcc0ee463f7eb41b4a26 Mon Sep 17 00:00:00 2001 From: ysengrimm Date: Mon, 9 Mar 2020 18:50:34 +0100 Subject: [PATCH 126/150] next: 1.4.0 -> 1.5.0 --- pkgs/applications/networking/browsers/next/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix index 22f0cf928ab..d4726fab651 100644 --- a/pkgs/applications/networking/browsers/next/default.nix +++ b/pkgs/applications/networking/browsers/next/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "next"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "atlas-engineer"; repo = "next"; rev = version; - sha256 = "1gkmr746rqqg94698a051gv79fblc8n9dq0zg04llba44adhpmjl"; + sha256 = "1gqkp185wcwaxr8py90hqk44nqjblrrdwvig19gizrbzr2gx2zhy"; }; nativeBuildInputs = [ From 4e5838132e2387fc3ed8f020ce1956b1ea4d1148 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 8 Mar 2020 23:43:10 -0400 Subject: [PATCH 127/150] vimPlugins.LanguageClient-neovim: upgrade cargo fetcher and cargoSha256 --- pkgs/misc/vim-plugins/overrides.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 79418c62aa8..9729d223e85 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -64,10 +64,7 @@ self: super: { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1w8g7pxwnjqp9zi47h4lz2mcg5daldsk5z72h8cjj750wng8a82c"; + cargoSha256 = "0w66fcrlaxf6zgkrfpgfybfbm759fzimnr3pjq6sm14frar7lhr6"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. From 53998cbc583db9c85b05e1b9a9ae89d5b31eabda Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Mon, 9 Mar 2020 18:24:35 +0200 Subject: [PATCH 128/150] pythonPackages.XlsxWriter: 1.2.6 -> 1.2.8 --- pkgs/development/python-modules/XlsxWriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index f9730eb61ae..d5c24c018b6 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.2.6"; + version = "1.2.8"; # PyPI release tarball doesn't contain tests so let's use GitHub. See: # https://github.com/jmcnamara/XlsxWriter/issues/327 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = pname; rev = "RELEASE_${version}"; - sha256 = "05y1py5mn1m65bbwhinzv84jd3xj8snvf2795flw0xbxnkn8nd8p"; + sha256 = "18q5sxm9jw5sfavdjy5z0yamknwj5fl359jziqllkbj5k2i16lnr"; }; meta = { From e04b6ecc64700da7f10358b1d0dee38ebf486290 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Mar 2020 00:54:06 +0000 Subject: [PATCH 129/150] ocrmypdf: 9.6.0 -> 9.6.1 --- pkgs/tools/text/ocrmypdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 6f7b4d487ef..83d0bdd92c7 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "9.6.0"; + version = "9.6.1"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "1cpj8fj1mzp6mbd1z9dj38fmlcg5q2gbya4vbag1ddd4vp7rvn2m"; + sha256 = "0lbld11r8zds79183hh5y2f5fi7cacl7bx9f7f2g58j38y1c65vj"; }; nativeBuildInputs = with python3Packages; [ From 15e8320ccd7a84077aa4bbf3e5ad8f357a494d3c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Mar 2020 08:16:01 +0000 Subject: [PATCH 130/150] extremetuxracer: 0.7.5 -> 0.8.0 --- pkgs/games/extremetuxracer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index c7c618c0c18..1c0a47e4b61 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "0.7.5"; + version = "0.8.0"; pname = "extremetuxracer"; src = fetchurl { url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; - sha256 = "1ly63316c07i0gyqqmyzsyvygsvygn0fpk3bnbg25fi6li99rlsg"; + sha256 = "05ysaxvsgps9fxc421kdifsxmc1sn6n79cjaa0k0i3fs9qqrja2b"; }; buildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes. ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://sourceforge.net/projects/extremetuxracer/; + homepage = "https://sourceforge.net/projects/extremetuxracer/"; maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; From 6ec025149e22b1c6eb755aa5256efa020180feff Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 9 Mar 2020 19:28:24 +0100 Subject: [PATCH 131/150] trezord-go: 2.0.28 -> 2.0.29 --- pkgs/servers/trezord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index e6427e5970f..7bdee09fca3 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "trezord-go"; - version = "2.0.28"; + version = "2.0.29"; goPackagePath = "github.com/trezor/trezord-go"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "trezor"; repo = "trezord-go"; rev = "v${version}"; - sha256 = "02c1mvn01gcfls37sa0c7v2lwffg14x54np8z7d4hjzxxzwg4gpw"; + sha256 = "1ks1fa0027s3xp0z6qp0dxmayvrb4dwwscfhbx7da0khp153f2cp"; }; propagatedBuildInputs = [ trezor-udev-rules ]; From 75aec2aae373445d7e2020cf8e0ffc3de9250270 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Mar 2020 11:56:30 -0700 Subject: [PATCH 132/150] datovka: 4.14.1 -> 4.15.0 (#81874) --- pkgs/applications/networking/datovka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index 12bad094fca..976541177dd 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -11,11 +11,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.14.1"; + version = "4.15.0"; src = fetchurl { url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz"; - sha256 = "0jinxsm2zw77294vz9pjiqpgpzdwx5nijsi4nqzxna5rkmwdyxk6"; + sha256 = "1f311qnyiay34iqpik4x492py46my89j4nnbdf6qcidnydzas8r1"; }; buildInputs = [ libisds qmake qtbase qtsvg libxml2 ]; From e95f1f32a0e64ce089ca38801d1733d51bcb5cd2 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 9 Mar 2020 21:49:24 +0100 Subject: [PATCH 133/150] jackett: disable macos platform --- pkgs/servers/jackett/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 9f411c69a8d..a6969fcbeff 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/Jackett/Jackett/; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo nyanloutre ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From 1b74dfcf6dc16bde182ba80867ec133fa501f60d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 20 Feb 2020 11:20:21 +0100 Subject: [PATCH 134/150] kitty: remove unused nativeBuildInputs on macOS These two dependencies were used to generate the PNG icons that would later be converted to the icon for the macOS app. The PNGs are now stored in git and are not generated during the build anymore. --- pkgs/applications/misc/kitty/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index cdba8c3f686..f332512bb84 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -12,8 +12,6 @@ libcanberra, libicns, libpng, - librsvg, - optipng, python3, zlib, }: @@ -55,8 +53,6 @@ buildPythonApplication rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. - librsvg - optipng ]; propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL; From 04d6123309fa5f89b436472d7b4fd418f8c3106f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Mar 2020 22:30:46 +0100 Subject: [PATCH 135/150] pytrainer: fix missing pkg_resources --- pkgs/applications/misc/pytrainer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 0375b99af48..bb3a92e72c3 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec { psycopg2 requests certifi + setuptools ]; nativeBuildInputs = [ From 22f578d8c430e3c8d09cc0460e84adf7c1f8968a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 9 Mar 2020 21:32:53 +0000 Subject: [PATCH 136/150] python27Packages.sqlmap: 1.4.2 -> 1.4.3 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index f39c57e6be6..1e35d4024eb 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.2"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "12i5s3qs0lxfs06p5b354scbapldf4isfr00cg1dq47n4gnqwa99"; + sha256 = "0qp9j8c92zbkwlbv5ywrszil6kvlkkf3wkc4krh2vdsrwd9cnf2g"; }; postPatch = '' From a7c53f7640638e7cccce9b763f5cd2a2d14566d8 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Mon, 9 Mar 2020 23:01:40 +0100 Subject: [PATCH 137/150] doc: fix grammar / typo in NixPkgs GNOME manual --- doc/languages-frameworks/gnome.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml index bb68d026ae2..57f73826670 100644 --- a/doc/languages-frameworks/gnome.xml +++ b/doc/languages-frameworks/gnome.xml @@ -233,7 +233,7 @@ mkDerivation { - You can rely on applications depending on the library set the necessary environment variables but that it often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples: + You can rely on applications depending on the library set the necessary environment variables but that is often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples: From 6733ecede5e86371e931f43115dd16598785a87f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Mar 2020 23:01:23 +0100 Subject: [PATCH 138/150] libgit2: 0.28.4 -> 0.99.0 https://github.com/libgit2/libgit2/releases/tag/v0.99.0 --- pkgs/development/libraries/git2/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index ed32f68635b..873865cdf83 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -5,17 +5,20 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "0.28.4"; + version = "0.99.0"; # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "171b25aym4q88bidc4c76y4l6jmdwifm3q9zjqsll0wjhlkycfy1"; + sha256 = "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg"; }; - cmakeFlags = [ "-DTHREADSAFE=ON" ]; + cmakeFlags = [ + "-DTHREADSAFE=ON" + "-DUSE_HTTP_PARSER=system" + ]; nativeBuildInputs = [ cmake python3 pkgconfig ]; @@ -30,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "The Git linkable library"; - homepage = https://libgit2.github.com/; + homepage = "https://libgit2.github.com/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; From 6a23ca8c8527a7042a31292b6fd47ffcdf76bb21 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 Feb 2020 23:12:49 +0000 Subject: [PATCH 139/150] libgit2-glib: 0.28.0.1 -> 0.99.0.1 https://ftp.gnome.org/pub/GNOME/sources/libgit2-glib/0.99/libgit2-glib-0.99.0.1.news --- pkgs/development/libraries/libgit2-glib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index d5edefc5d54..f3e07b50917 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgit2-glib"; - version = "0.28.0.1"; + version = "0.99.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0a0g7aw66rfgnqr4z7fgbk5zzcjq66m4rp8v4val3a212941h0g7"; + sha256 = "1pmrcnsa7qdda73c3dxf47733mwprmj5ljpw3acxbj6r8k27anp0"; }; postPatch = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A glib wrapper library around the libgit2 git access library"; - homepage = https://wiki.gnome.org/Projects/Libgit2-glib; + homepage = "https://wiki.gnome.org/Projects/Libgit2-glib"; license = licenses.lgpl21; maintainers = gnome3.maintainers; platforms = platforms.linux; From b0be93769ba339f037c62c8fa13955d04648914e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Mar 2020 23:06:56 +0100 Subject: [PATCH 140/150] =?UTF-8?q?python3.pkgs.pygit2:=201.0.3=20?= =?UTF-8?q?=E2=86=92=201.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/libgit2/pygit2/compare/v1.0.3...v1.1.1#diff-de0a9b67ffe2874a076b5fdb15bad484 --- pkgs/development/python-modules/pygit2/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index cd2994a4dc0..013ce9ae916 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, pytestCheckHook, cffi, cacert }: +{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, cached-property, pytestCheckHook, cffi, cacert }: buildPythonPackage rec { pname = "pygit2"; - version = "1.0.3"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1ql7hkcxrh8yszglrg7d3y0ivh1l56xdc3j34j2fjy4qq06ifv6y"; + sha256 = "klXVB9XYe/It/VeZeniQgBAzH8IfmoPsoSGlP2V76zw="; }; preConfigure = lib.optionalString stdenv.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; - propagatedBuildInputs = [ libgit2 ] ++ lib.optional (!isPyPy) cffi; + buildInputs = [ + libgit2 + ]; + + propagatedBuildInputs = [ + cached-property + ] ++ lib.optional (!isPyPy) cffi; checkInputs = [ pytestCheckHook ]; From 1aeaf9387a0f0c6f61255f3f4ff137d94d03376f Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 9 Mar 2020 22:53:53 +0000 Subject: [PATCH 141/150] libbpf: 0.0.3pre114 -> 0.0.7 Fixes #82153 --- pkgs/os-specific/linux/libbpf/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 1294bd3d268..b9626aac22d 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, pkgconfig -, libelf +, libelf, zlib }: with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.0.3pre114_${substring 0 7 src.rev}"; + version = "0.0.7"; src = fetchFromGitHub { - owner = "libbpf"; - repo = "libbpf"; - rev = "672ae75b66fd8780a4214fe7b116c427e0809a52"; - sha256 = "1bdw1hc4m95irmybqlwax85b6m856g07p2slcw8b7jw3k4j9x075"; + owner = "libbpf"; + repo = "libbpf"; + rev = "v${version}"; + sha256 = "1jcqhqvfbnbijm4jn949ibw1qywai9rwhyijf6lg8cvnyxkib2bs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libelf ]; + buildInputs = [ libelf zlib ]; sourceRoot = "source/src"; enableParallelBuilding = true; From 5ee998bbc264a0fba32b6c1e241cedae688520d1 Mon Sep 17 00:00:00 2001 From: caadar Date: Tue, 10 Mar 2020 02:40:37 +0300 Subject: [PATCH 142/150] scantailor-advanced: fix startup using wrapQtAppsHook (#82174) --- pkgs/applications/graphics/scantailor/advanced.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index 63f16f688ac..f9d6c87675f 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, mkDerivation , cmake, libjpeg, libpng, libtiff, boost , qtbase, qttools }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "scantailor-advanced"; version = "1.0.16"; From 6b943186d32980d11ba7c2c98fd8cab6ef44603d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 10 Mar 2020 00:54:59 +0100 Subject: [PATCH 143/150] jellyfin: 10.4.3 -> 10.5.0 --- pkgs/servers/jellyfin/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 6da342ae880..6cac79bdd4e 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnet-netcore, ffmpeg, +{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnetCorePackages, ffmpeg, fontconfig, freetype }: let @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.4.3"; + version = "10.5.0"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "11scxcwf02h6gvll0jwwac1wcpwz8d2y16yc3da0hrhy34yhysbl"; + sha256 = "1r6ljl535f8jchm5zvrwfl4aqjk5bg7sqbwr03yyjxgriqgf36lp"; }; buildInputs = [ @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - dotnet-netcore + dotnetCorePackages.aspnetcore_3_1 sqlite ]; @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { install -dm 755 "$out/opt/jellyfin" cp -r * "$out/opt/jellyfin" - makeWrapper "${dotnet-netcore}/bin/dotnet" $out/bin/jellyfin \ + makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ sqlite fontconfig freetype stdenv.cc.cc.lib ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \ From 59d3c9118a68ca851095e45a1466685d38c5dc4a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 9 Mar 2020 19:42:07 -0500 Subject: [PATCH 144/150] sqlmap: use toPythonApplication --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f748b141f10..5712dcdfb2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10706,7 +10706,7 @@ in sqlite-web = callPackage ../development/tools/database/sqlite-web { }; - sqlmap = python3Packages.sqlmap; + sqlmap = with python3Packages; toPythonApplication sqlmap; sselp = callPackage ../tools/X11/sselp{ }; From 13964b07adb962f029d0f7983a427d08d29a08af Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Tue, 3 Mar 2020 19:23:53 -0500 Subject: [PATCH 145/150] corerad: 0.2.1 -> 0.2.2 --- pkgs/tools/networking/corerad/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 517cb111c51..96798c1c17e 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,17 +2,23 @@ buildGoModule rec { pname = "corerad"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "04w77cahnphgd8b09a67dkrgx9jh8mvgjfjydj6drcw67v0d18c0"; + sha256 = "0nxrksv98mxs5spykhzpydwjzii5cc6gk8az7irs3fdi4jx6pq1w"; }; modSha256 = "0vbbpndqwwz1mc59j7liaayxaj53cs8s3javgj3pvhkn4vp65p7c"; + buildFlagsArray = '' + -ldflags= + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1583280117 + -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} + ''; + meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/corerad"; description = "CoreRAD extensible and observable IPv6 NDP RA daemon"; From 3193b639ff13941ec6d5c8d3cbf8a65dda8895a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Mar 2020 03:41:13 +0000 Subject: [PATCH 146/150] vttest: 20190710 -> 20200303 --- pkgs/tools/misc/vttest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index 0aa51363ff8..38fedbbf099 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20190710"; + version = "20200303"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "00v3a94vpmbdziizdw2dj4bfwzfzfs2lc0ijxv98ln1w01w412q4"; + sha256 = "1g27yp37kh57hmwicw3ndnsapsbqzk2cnjccmvyj4zw2z0l5iaj9"; }; meta = with stdenv.lib; { description = "Tests the compatibility so-called 'VT100-compatible' terminals"; - homepage = https://invisible-island.net/vttest/; + homepage = "https://invisible-island.net/vttest/"; license = licenses.mit; platforms = platforms.all; }; From af1d333bff00e1ea6903f134124f4d81b223369a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Mar 2020 05:54:06 +0000 Subject: [PATCH 147/150] devilutionx: 1.0.0 -> 1.0.1 --- pkgs/games/devilutionx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index ac7d61b31c7..69d7e3ca666 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.0.1"; pname = "devilutionx"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; rev = version; - sha256 = "0lx903gchda4bgr71469yn63rx5ya6xv9j1azx18nrv3sskrphn4"; + sha256 = "1jvjlch9ql5s5jx9g5y5pkc2xn62199qylsmzpqzx1jc3k2vmw5i"; }; NIX_CFLAGS_COMPILE = [ From dcd33b7a769ec425c657a808b239b456f2c427c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 10 Mar 2020 10:08:26 +0100 Subject: [PATCH 148/150] doc: tiny grammar improvement in the same sentence again --- doc/languages-frameworks/gnome.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml index 57f73826670..7671714d8a9 100644 --- a/doc/languages-frameworks/gnome.xml +++ b/doc/languages-frameworks/gnome.xml @@ -233,7 +233,7 @@ mkDerivation { - You can rely on applications depending on the library set the necessary environment variables but that is often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples: + You can rely on applications depending on the library setting the necessary environment variables but that is often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples: From 3a93ec6f6dbf136dda5193e37e22759a7e4620d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Mar 2020 09:09:46 +0000 Subject: [PATCH 149/150] neofetch: 6.1.0 -> 7.0.0 --- pkgs/tools/misc/neofetch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 5850c4a90af..a1a0c159bb4 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "neofetch"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "022xzn9jk18k2f4b6011d8jk5nbl84i3mw3inlz4q52p2hvk8fch"; + sha256 = "0xc0fdc7n5bhqirh83agqiy8r14l14zwca07czvj8vgnsnfybslr"; }; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast, highly customizable system info script"; - homepage = https://github.com/dylanaraps/neofetch; + homepage = "https://github.com/dylanaraps/neofetch"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ alibabzo konimex ]; From 57930a5f0e574f2a816fcefe1bcfa82ad5e46ec6 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Tue, 10 Mar 2020 13:15:25 +0200 Subject: [PATCH 150/150] electron-cash: fix build This commit fixes #82221. --- pkgs/applications/misc/electron-cash/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index e6cfca5667e..5b1cafaea32 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ - --replace "qdarkstyle<2.6" "qdarkstyle<3" + --replace "qdarkstyle==2.6.8" "qdarkstyle<3" substituteInPlace setup.py \ --replace "(share_dir" "(\"share\""