From 6403ffe2e1f2f27e49f0cd61406fc9a3c3e06a52 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 22 Jul 2020 02:26:15 +0300 Subject: [PATCH 001/148] meteor: enable on darwin --- pkgs/servers/meteor/default.nix | 87 +++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 38 deletions(-) diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 96363583b62e..ac870a8d5d15 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -2,15 +2,25 @@ let version = "1.12"; + + inherit (stdenv.hostPlatform) system; + + srcs = { + x86_64-linux = fetchurl { + url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; + sha256 = "0l3zc76djzypvc0dm5ikv5ybb6574qd6kdbbkarzc2dxx64wkyvb"; + }; + x86_64-darwin = fetchurl { + url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.x86_64.tar.gz"; + sha256 = "01gn3m6qacp3ibvp0rcvm2pq7fi1xds02ws0irypldh7vz3930jl"; + }; + }; in stdenv.mkDerivation { inherit version; pname = "meteor"; - src = fetchurl { - url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "0l3zc76djzypvc0dm5ikv5ybb6574qd6kdbbkarzc2dxx64wkyvb"; - }; + src = srcs.${system}; #dontStrip = true; @@ -30,38 +40,6 @@ stdenv.mkDerivation { toolsDir=$(dirname $(find $out/packages -print | grep "meteor-tool/.*/tools/index.js$")) ln -s $toolsDir $out/tools - # Patch Meteor to dynamically fixup shebangs and ELF metadata where - # necessary. - pushd $out - patch -p1 < ${./main.patch} - popd - substituteInPlace $out/tools/cli/main.js \ - --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --replace "@RPATH@" "${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ - --replace "@PATCHELF@" "${patchelf}/bin/patchelf" - - # Patch node. - node=$devBundle/bin/node - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$(patchelf --print-rpath $node):${stdenv.cc.cc.lib}/lib" \ - $node - - # Patch mongo. - for p in $devBundle/mongodb/bin/mongo{,d}; do - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$(patchelf --print-rpath $p):${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ - $p - done - - # Patch node dlls. - for p in $(find $out/packages -name '*.node'); do - patchelf \ - --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib" \ - $p || true - done - # Meteor needs an initial package-metadata in $HOME/.meteor, # otherwise it fails spectacularly. mkdir -p $out/bin @@ -75,16 +53,49 @@ stdenv.mkDerivation { chmod +w "\$HOME/.meteor/package-metadata/v2.0.1/packages.data.db" fi - $node \''${TOOL_NODE_FLAGS} $out/tools/index.js "\$@" + $out/dev_bundle/bin/node --no-wasm-code-gc \''${TOOL_NODE_FLAGS} $out/tools/index.js "\$@" EOF chmod +x $out/bin/meteor ''; + postFixup = lib.optionalString stdenv.isLinux '' + # Patch Meteor to dynamically fixup shebangs and ELF metadata where + # necessary. + pushd $out + patch -p1 < ${./main.patch} + popd + substituteInPlace $out/tools/cli/main.js \ + --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --replace "@RPATH@" "${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ + --replace "@PATCHELF@" "${patchelf}/bin/patchelf" + + # Patch node. + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$(patchelf --print-rpath $out/dev_bundle/bin/node):${stdenv.cc.cc.lib}/lib" \ + $out/dev_bundle/bin/node + + # Patch mongo. + for p in $out/dev_bundle/mongodb/bin/mongo{,d}; do + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$(patchelf --print-rpath $p):${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ + $p + done + + # Patch node dlls. + for p in $(find $out/packages -name '*.node'); do + patchelf \ + --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib" \ + $p || true + done + ''; + meta = with lib; { description = "Complete open source platform for building web and mobile apps in pure JavaScript"; homepage = "http://www.meteor.com"; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = builtins.attrNames srcs; maintainers = with maintainers; [ cstrahan ]; }; } From 7832afede7b910729d45ef5de522a6adfee51db3 Mon Sep 17 00:00:00 2001 From: Adam Griffiths Date: Wed, 16 Sep 2020 11:13:47 +1000 Subject: [PATCH 002/148] maintainers: Add adamlwgriffiths --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 20596519e011..4464db28db43 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -182,6 +182,12 @@ githubId = 124545; name = "Anthony Cowley"; }; + adamlwgriffiths = { + email = "adam.lw.griffiths@gmail.com"; + github = "adamlwgriffiths"; + githubId = 1239156; + name = "Adam Griffiths"; + }; adamt = { email = "mail@adamtulinius.dk"; github = "adamtulinius"; From 4cf09dd98c40a7d02de773bf503a72700f60bc7c Mon Sep 17 00:00:00 2001 From: Shay Bergmann Date: Thu, 22 Oct 2020 06:23:59 -0400 Subject: [PATCH 003/148] Remove unnecessary check that uses systemctl The use of systemctl makes this incompatible with darwin even though building/deploying a nixos closure from darwin is a perfectly valid use case. NIX_DAEMON is pretty much unnecessary nowadays as nix uses other indicators for deciding whether to use the daemon or not. --- .../linux/nixos-rebuild/nixos-rebuild.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index e452e24d263d..872e1f9e84fb 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -325,20 +325,6 @@ cleanup() { trap cleanup EXIT - -# If the Nix daemon is running, then use it. This allows us to use -# the latest Nix from Nixpkgs (below) for expression evaluation, while -# still using the old Nix (via the daemon) for actual store access. -# This matters if the new Nix in Nixpkgs has a schema change. It -# would upgrade the schema, which should only happen once we actually -# switch to the new configuration. -# If --repair is given, don't try to use the Nix daemon, because the -# flag can only be used directly. -if [ -z "$repair" ] && systemctl show nix-daemon.socket nix-daemon.service | grep -q ActiveState=active; then - export NIX_REMOTE=${NIX_REMOTE-daemon} -fi - - # First build Nix, since NixOS may require a newer version than the # current one. if [ -n "$rollback" -o "$action" = dry-build ]; then From f48c0089e0d02434dbff3baa991c3d97d2899376 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Thu, 4 Feb 2021 19:35:13 +0100 Subject: [PATCH 004/148] update tlsh to 4.5.0 --- pkgs/development/python-modules/tlsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 7be95b970888..851c072780c9 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -6,13 +6,13 @@ buildPythonPackage { pname = "tlsh"; - version = "3.4.5"; + version = "4.5.0"; src = fetchFromGitHub { owner = "trendmicro"; repo = "tlsh"; - rev = "22fa9a62068b92c63f2b5a87004a7a7ceaac1930"; - sha256 = "1ydliir308xn4ywy705mmsh7863ldlixdvpqwdhbipzq9vfpmvll"; + rev = "f2bb7a97cfb0f9418a750ba92c182d1091e6c159"; + sha256 = "1kxfhdwqjd4pjdlr1gjh2am8mxpaqmfq7rrxkjfi0mbisl1krkwb"; }; nativeBuildInputs = [ cmake ]; From 450f644900734984b7790c74d90166651e3dfa9c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 23:30:30 +0000 Subject: [PATCH 005/148] libxl: 3.8.8 -> 3.9.4.3 --- pkgs/development/libraries/libxl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix index 600e94d0a757..601c27c98eed 100644 --- a/pkgs/development/libraries/libxl/default.nix +++ b/pkgs/development/libraries/libxl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libxl"; - version = "3.8.8"; + version = "3.9.4.3"; src = fetchurl { url = "https://www.libxl.com/download/${pname}-lin-${version}.tar.gz"; - sha256 = "08jarfcl8l5mrmkx6bcifi3ghkaja9isz77zgggl84yl66js5pc3"; + sha256 = "sha256-U8hXoqBzjSGigOXc29LZQk3KrGiYvBPBJPg5qihcAsY="; }; dontConfigure = true; From 83e1c6ccc2711719fd756660d9c44fa09c5bf744 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 6 Feb 2021 15:27:24 -0300 Subject: [PATCH 006/148] anydesk: Add auto-update support This allow auto-update of the package and reduce maintenance burden. Refs: #80979 Signed-off-by: Otavio Salvador --- .../networking/remote/anydesk/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index c742d076f9da..f88a2e3d8e88 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem +{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg , lsb-release, freetype, fontconfig, polkit, polkit_gnome , pulseaudio }: @@ -28,6 +28,19 @@ in stdenv.mkDerivation rec { sha256 = "1qbq6r0yanjappsi8yglw8r54bwf32bjb2i63awmr6pk5kmhhy3r"; }; + passthru = { + updateScript = genericUpdater { + inherit pname version; + versionLister = writeShellScript "anydesk-versionLister" '' + echo "# Versions for $1:" >> "$2" + curl -s https://anydesk.com/en/downloads/linux \ + | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \ + | uniq \ + | sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g' + ''; + }; + }; + buildInputs = [ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango gnome2.gtkglext libGLU libGL freetype fontconfig From 628063bee2a22a93ed0e2bfa63db45608fea15cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 7 Feb 2021 01:44:22 +0000 Subject: [PATCH 007/148] belle-sip: 4.4.21 -> 4.4.26 --- pkgs/development/libraries/belle-sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index e08fc1ae3ee3..833d200ffa3b 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.4.21"; + version = "4.4.26"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0ylv1jsqnfhw23i6p3lfqqzw48lwii8zwkq3y34q0hhnngn26iiw"; + sha256 = "sha256-30w5X/S5VY4zSHs2G4KXOP8mEvC78xakwrcd/Bm1ds4="; }; nativeBuildInputs = [ antlr3_4 cmake ]; From bcc974f58ad608a5c61143d2beac7cd23be70c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Unger?= Date: Sat, 6 Feb 2021 21:12:27 +0100 Subject: [PATCH 008/148] cockatrice: 2.7.5 -> 2.8.0 --- pkgs/games/cockatrice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index a657913aad76..cb51489de9c1 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "cockatrice"; - version = "2020-08-23-Release-2.7.5"; + version = "2021-01-26-Release-2.8.0"; src = fetchFromGitHub { owner = "Cockatrice"; repo = "Cockatrice"; rev = version; - sha256 = "1yaxm7q0ja3rgx197hh8ynjc6ncc4hm0qdn9v7f0l4fbv0bdpv34"; + sha256 = "0q8ffcklb2b7hcqhy3d2f9kz9aw22pp04pc9y4sslyqmf17pwnz9"; }; buildInputs = [ From abd7ea5410bd44ac74b0c02f4f44e37f1ddfae26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Feb 2021 07:03:40 +0000 Subject: [PATCH 009/148] bschaffl: 1.4.2 -> 1.4.4 --- pkgs/applications/audio/bschaffl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix index 6b0ca55f27f1..76d2e78a2663 100644 --- a/pkgs/applications/audio/bschaffl/default.nix +++ b/pkgs/applications/audio/bschaffl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bschaffl"; - version = "1.4.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-R6QTADPE2PW/ySQla2lQbb308jrHXZ43DpFxUfQ0/NY="; + sha256 = "sha256-tu5JL0vcqRsZYmoaYGYm/aj95i7wLtnKYGbEPD7AsoM="; }; nativeBuildInputs = [ pkg-config ]; From 74c9af1c7cda6584ce715f59d24e49204a42a9a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Feb 2021 07:52:17 +0000 Subject: [PATCH 010/148] charliecloud: 0.21 -> 0.22 --- pkgs/applications/virtualization/charliecloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index 9e866d7cf4dc..3e9029cce0a6 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.21"; + version = "0.22"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "Y/tH6Znq//HBA/FHfIm2Wpppx6TiL7CqKtZFDc/XSNc="; + sha256 = "sha256-+9u7WRKAJ9F70+I68xNRck5Q22XzgLKTCnjGbIcsyW8="; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; From bc6a191e26cfbba2d8791b0c1978bb11666efb7e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Feb 2021 08:16:15 +0000 Subject: [PATCH 011/148] groonga: 10.1.1 -> 11.0.0 --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index b5c553b116e2..ea6fd9394579 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.1.1"; + version = "11.0.0"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-9NKyY+oliGIJQaNHdHOs+1GAfdZ0sy+mbQFrRNXpjLM="; + sha256 = "sha256-kgQAFa4Orvfms/trjaMrXULYy7nV+nsmLPpyZAq3cDY="; }; buildInputs = with lib; From 23313bac5103421b619ade9c89388a8fef520617 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Feb 2021 11:28:34 +0000 Subject: [PATCH 012/148] libisofs: 1.5.2 -> 1.5.4 --- pkgs/development/libraries/libisofs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index a291410941c6..d80614609c38 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libisofs"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "002mcyqwg625a8hqvsrmgm26mhhfwj0j7rahfhsqirmk02b16npg"; + sha256 = "sha256-qqDtgKdQGXkxb1BbCwF/Kcug6lRjt1EUO60sNgIVqI4="; }; buildInputs = [ attr zlib ]; From 6106f129c67fe5faf87077c560bb258ff26e84f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Feb 2021 11:37:04 +0000 Subject: [PATCH 013/148] libburn: 1.5.2.pl01 -> 1.5.4 --- pkgs/development/libraries/libburn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index 02e73b0c04cf..f9b6538027d6 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libburn"; - version = "1.5.2.pl01"; + version = "1.5.4"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1xrp9c2sppbds0agqzmdym7rvdwpjrq6v6q2c3718cwvbjmh66c8"; + sha256 = "sha256-UlBZ0QdZxcuBSO68hju1EOMRxmNgPae9LSHEa3z2O1Q="; }; meta = with lib; { From 3d101af5500ce712fb1fee124c2593d2002e1da2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 11 Feb 2021 04:23:35 +0100 Subject: [PATCH 014/148] python3Packages.csvw: 1.10.0 -> 1.10.1 --- pkgs/development/python-modules/csvw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index 410248b0193b..e4bd7ab2b624 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "csvw"; - version = "1.10.0"; + version = "1.10.1"; disabled = isPy27; src = fetchFromGitHub { owner = "cldf"; repo = "csvw"; rev = "v${version}"; - sha256 = "0cvfzfi1a2m1xqpm34mwp9r3bhgsnfz4pmslvgn81i42n5grbnis"; + sha256 = "1764nfa4frjdd7v6wj35y7prnciaqz57wwygy5zfavl4laxn4nxd"; }; patchPhase = '' From 8a5e196040845e14e36ee8642c9c1b64f4e4fece Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Feb 2021 00:46:58 +0000 Subject: [PATCH 015/148] unciv: 3.12.13-patch1 -> 3.12.14 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 0f04ebfe4daf..1632f7c41db8 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "3.12.13-patch1"; + version = "3.12.14"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-OwS1rn5mfU6cA6pvpp7Q407Kw2wBGvpqWmqlajgHtCI="; + sha256 = "sha256-FE6oPtEerjVusK3fpxLwcpvKjIAQl6oCrBj8GIkuVwU="; }; dontUnpack = true; From 1287374ca3a76cb04f2d021979a36fbb4ff68687 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Feb 2021 05:47:37 +0000 Subject: [PATCH 016/148] bshapr: 0.9 -> 0.10 --- pkgs/applications/audio/bshapr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/applications/audio/bshapr/default.nix index 7e45d6a826f9..04dd93b8f492 100644 --- a/pkgs/applications/audio/bshapr/default.nix +++ b/pkgs/applications/audio/bshapr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BShapr"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "v${version}"; - sha256 = "04zd3a178i2nivg5rjailzqvc5mlnilmhj1ziygmbhshbrywplri"; + sha256 = "sha256-oEBsaIcw/Ltxr2CUPGBjwcxOPhNQoYPZDkfQE7QA940="; }; nativeBuildInputs = [ pkg-config ]; From 5b9db1b309046cfb7dc32cb982d14a559468db8e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Feb 2021 05:57:22 +0000 Subject: [PATCH 017/148] bsequencer: 1.8.4 -> 1.8.6 --- pkgs/applications/audio/bsequencer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix index d45b42ddb9fa..692667c0003e 100644 --- a/pkgs/applications/audio/bsequencer/default.nix +++ b/pkgs/applications/audio/bsequencer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSEQuencer"; - version = "1.8.4"; + version = "1.8.6"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29"; + sha256 = "sha256-PZ2Ft7y2mbb5Wpa7mWPys2BVpcQC3WE5rKu2sRqkf8w="; }; nativeBuildInputs = [ pkg-config ]; From f8714c2596c125d4f683e78cdd947cfad9a1fd16 Mon Sep 17 00:00:00 2001 From: Ron B Date: Fri, 12 Feb 2021 10:40:48 +0200 Subject: [PATCH 018/148] maintainers: add ronthecookie --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8875791c29db..936f060ebbfc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8015,6 +8015,16 @@ githubId = 1312525; name = "Rongcui Dong"; }; + ronthecookie = { + name = "Ron B"; + email = "me@ronthecookie.me"; + github = "ronthecookie"; + githubId = 2526321; + keys = [{ + longkeyid = "rsa2048/0x6F5B32DE5E5FA80C"; + fingerprint = "4B2C DDA5 FA35 642D 956D 7294 6F5B 32DE 5E5F A80C"; + }]; + }; roosemberth = { email = "roosembert.palacios+nixpkgs@gmail.com"; github = "roosemberth"; From c48b1b395655b53df4f50020ac75b814fceff59e Mon Sep 17 00:00:00 2001 From: Ron B Date: Fri, 12 Feb 2021 10:41:35 +0200 Subject: [PATCH 019/148] blockbench-electron: init at 3.7.5 --- .../graphics/blockbench-electron/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/graphics/blockbench-electron/default.nix diff --git a/pkgs/applications/graphics/blockbench-electron/default.nix b/pkgs/applications/graphics/blockbench-electron/default.nix new file mode 100644 index 000000000000..174733a4fdc1 --- /dev/null +++ b/pkgs/applications/graphics/blockbench-electron/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_8 }: + +stdenv.mkDerivation rec { + pname = "blockbench-electron"; + version = "3.7.5"; + + src = fetchurl { + url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage"; + sha256 = "0qqklhncd4khqmgp7jg7wap2rzkrg8b6dflmz0wmm5zxxp5vcy1c"; + name = "${pname}-${version}.AppImage"; + }; + + appimageContents = appimageTools.extractType2 { + name = "${pname}-${version}"; + inherit src; + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/${pname} $out/share/applications + cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + cp -a ${appimageContents}/blockbench.desktop $out/share/applications/${pname}.desktop + cp -a ${appimageContents}/usr/share/icons $out/share + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron_8}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" + ''; + + meta = with lib; { + description = "A boxy 3D model editor powered by Electron"; + homepage = "https://blockbench.net/"; + license = licenses.gpl3Only; + maintainers = [ maintainers.ronthecookie ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 148ce73d290d..8558a582e3f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1112,6 +1112,8 @@ in bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { }; + blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; + bmap-tools = callPackage ../tools/misc/bmap-tools { }; bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; From 4a8b6c0317d2bb0c399c3089e9409b0dffd2ee3f Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 14 Feb 2021 09:49:59 -0800 Subject: [PATCH 020/148] =?UTF-8?q?pypy,=20pypy3:=207.3.2=20=E2=86=92=207.?= =?UTF-8?q?3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/development/interpreters/python/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index d6030a4bf1d7..c87cfc32bbd5 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -218,9 +218,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "2"; + patch = "3"; }; - sha256 = "1l98b7s9sf16a5w8y0fdn7a489l3gpykjasws1j67bahhc6li2c1"; + sha256 = "0di3dr5ry4r0hwxh4fbqjhyl5im948wdby0bhijzsxx83c2qhd7n"; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; @@ -234,9 +234,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "2"; + patch = "3"; }; - sha256 = "03f1fdw6yk2mypa9pbmgk26r8y1hhmw801l6g36zry9zsvz7aqgx"; + sha256 = "1bq5i2mqgjjfc4rhxgxm6ihwa76vn2qapd7l59ri7xp01p522gd2"; pythonVersion = "3.6"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; @@ -251,9 +251,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "2"; + patch = "3"; }; - sha256 = "0fx1kp13cgx3rijd0zf8rdjbai6mfhc9is4xfc7kl5cpd88hhkwd"; # linux64 + sha256 = "1cfpdyvbvzwc0ynjr7248jhwgcpl7073wlp7w3g2v4fnrh1bc4pl"; # linux64 pythonVersion = "2.7"; inherit passthruFun; }; @@ -264,9 +264,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "2"; + patch = "3"; }; - sha256 = "10xdx7q04fzy4v4rbj9bbdw8g9y68qgaih7z2n0s5aknj0bizafp"; # linux64 + sha256 = "02lys9bjky9bqg6ggv8djirbd3zzcsq7755v4yvwm0k4a7fmzf2g"; # linux64 pythonVersion = "3.6"; inherit passthruFun; }; From a6766bee7bee10903232660dd9f200da9cdc1210 Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Sun, 7 Feb 2021 21:00:00 +0000 Subject: [PATCH 021/148] virtualization/amazon-init: enable option --- nixos/modules/virtualisation/amazon-init.nix | 41 ++++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix index c5470b7af09b..be83607c0af7 100644 --- a/nixos/modules/virtualisation/amazon-init.nix +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -1,6 +1,10 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: + +with lib; let + cfg = config.virtualisation.amazon-init; + script = '' #!${pkgs.runtimeShell} -eu @@ -41,20 +45,33 @@ let nixos-rebuild switch ''; in { - systemd.services.amazon-init = { - inherit script; - description = "Reconfigure the system from EC2 userdata on startup"; - wantedBy = [ "multi-user.target" ]; - after = [ "multi-user.target" ]; - requires = [ "network-online.target" ]; + options.virtualisation.amazon-init = { + enable = mkOption { + default = true; + type = types.bool; + description = '' + Enable or disable the amazon-init service. + ''; + }; + }; - restartIfChanged = false; - unitConfig.X-StopOnRemoval = false; + config = mkIf cfg.enable { + systemd.services.amazon-init = { + inherit script; + description = "Reconfigure the system from EC2 userdata on startup"; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; + wantedBy = [ "multi-user.target" ]; + after = [ "multi-user.target" ]; + requires = [ "network-online.target" ]; + + restartIfChanged = false; + unitConfig.X-StopOnRemoval = false; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; }; }; } From 672ed52ca5e312360ed380de30ec81e3a2116a38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Feb 2021 06:54:35 +0000 Subject: [PATCH 022/148] i3lock-color: 2.13.c.1 -> 2.13.c.2 --- pkgs/applications/window-managers/i3/lock-color.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 6f22070dbc86..3581e4749431 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "2.13.c.1"; + version = "2.13.c.2"; pname = "i3lock-color"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; rev = version; - sha256 = "sha256-E+ejc26eyCJ0PnMpDgQrouaBIaUH0SWlzB08fQs8lDw="; + sha256 = "sha256-cMj1uB2Hf7v5Rukw9c5YeUmwbdTn1+PV13bUaOWzBp0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From d035547ffa96f36b4b9685473b5975e2b093153f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Feb 2021 11:11:46 +0000 Subject: [PATCH 023/148] projectm: 3.1.8 -> 3.1.11 --- pkgs/applications/audio/projectm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 8f4cfb499f2c..2199a171a30b 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "projectm"; - version = "3.1.8"; + version = "3.1.11"; src = fetchFromGitHub { owner = "projectM-visualizer"; repo = "projectM"; rev = "v${version}"; - sha256 = "17zyxj1q0zj17jskq8w9bn2ijn34ldvdq61wy01yf5wgngax2r4z"; + sha256 = "sha256-0aIaT+pzwPjI1nSo6C5SrHBXcrxIpSi6TFV2mgK5GvU="; }; nativeBuildInputs = [ From 1309f5d5307a0cd41fc4ab3589873a63e9fd13b0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 17 Feb 2021 12:19:21 +0000 Subject: [PATCH 024/148] openfortivpn: 1.15.0 -> 1.16.0 --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 6b132fd4b0b5..e02782cccbfd 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - sha256 = "1qsfgpxg553s8rc9cyrc4k96z0pislxsdxb9wyhp8fdprkak2mw2"; + sha256 = "sha256-wijP9VGKXlxCAU3xN6+cv9+NGwBS55ql8WsZZ592b/k="; }; # we cannot write the config file to /etc and as we don't need the file, so drop it From 2a7b9aeb64e6e5985e11b9c22769e571f84b7458 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Feb 2021 19:31:46 +0000 Subject: [PATCH 025/148] cm256cc: 1.0.5 -> 1.1.0 --- pkgs/development/libraries/cm256cc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/development/libraries/cm256cc/default.nix index b40aea70b410..09b0ffba98ba 100644 --- a/pkgs/development/libraries/cm256cc/default.nix +++ b/pkgs/development/libraries/cm256cc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cm256cc"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "cm256cc"; rev = "v${version}"; - sha256 = "0d16y3lhdwr644am4sxqpshpbc3qik6dgr1w2c39vy75w9ff61a0"; + sha256 = "sha256-T7ZUVVYGdzAialse//MoqWCVNBpbZvzWMAKc0cw7O9k="; }; nativeBuildInputs = [ cmake ]; From 6aaa89b38da1b679118c46534c6271aa6510cf28 Mon Sep 17 00:00:00 2001 From: Akshat Agarwal Date: Fri, 5 Feb 2021 08:19:49 +0530 Subject: [PATCH 026/148] tremor-rs: init at v0.10.1 Signed-off-by: Akshat Agarwal --- pkgs/tools/misc/tremor-rs/default.nix | 43 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/misc/tremor-rs/default.nix diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix new file mode 100644 index 000000000000..0db042120cad --- /dev/null +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -0,0 +1,43 @@ +{ lib, rustPlatform, pkg-config, cmake, llvmPackages, openssl, fetchFromGitHub +, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "tremor"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "tremor-rs"; + repo = "tremor-runtime"; + rev = "v${version}"; + sha256 = "1z1khxfdj2j0xf7dp0x2cd9kl6r4qicp7kc4p4sdky2yib66512y"; + }; + + cargoSha256 = "sha256-rN/d6BL2d0D0ichQR6v0543Bh/Y2ktz8ExMH50M8B8c="; + + nativeBuildInputs = [ cmake pkg-config installShellFiles ]; + + buildInputs = [ openssl ]; + + postInstall = '' + installShellCompletion --cmd tremor \ + --bash <($out/bin/tremor completions bash) \ + --fish <($out/bin/tremor completions fish) \ + --zsh <($out/bin/tremor completions zsh) + ''; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + # OPENSSL_NO_VENDOR - If set, always find OpenSSL in the system, even if the vendored feature is enabled. + OPENSSL_NO_VENDOR = 1; + + cargoBuildFlags = [ "--all" ]; + + meta = with lib; { + description = + "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation"; + homepage = "https://www.tremor.rs/"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ humancalico ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index caa32c330eda..9b7d36d27164 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8851,6 +8851,8 @@ in tre = callPackage ../development/libraries/tre { }; + tremor-rs = callPackage ../tools/misc/tremor-rs { }; + ts = callPackage ../tools/system/ts { }; transfig = callPackage ../tools/graphics/transfig { From bd370455c85cead2ff95f7c16605ccac4739a634 Mon Sep 17 00:00:00 2001 From: bloomvdomino <0x@ytex.de> Date: Sat, 20 Feb 2021 21:07:22 +0100 Subject: [PATCH 027/148] bottles: init at 2.1.1 --- pkgs/applications/misc/bottles/default.nix | 77 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/applications/misc/bottles/default.nix diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix new file mode 100644 index 000000000000..5c6e9a0f9fef --- /dev/null +++ b/pkgs/applications/misc/bottles/default.nix @@ -0,0 +1,77 @@ +{ lib, fetchFromGitHub +, meson, ninja, pkg-config, wrapGAppsHook +, desktop-file-utils, gsettings-desktop-schemas, libnotify +, python3Packages, gettext +, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3 +, steam-run-native +}: + +python3Packages.buildPythonApplication rec { + pname = "bottles"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "bottlesdevs"; + repo = pname; + rev = version; + sha256 = "1hbjnd06h0h47gcwb1s1b9py5nwmia1m35da6zydbl70vs75imhn"; + }; + + postPatch = '' + chmod +x build-aux/meson/postinstall.py + patchShebangs build-aux/meson/postinstall.py + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + gettext + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + gdk-pixbuf + glib + gobject-introspection + gsettings-desktop-schemas + gspell + gtk3 + libnotify + ]; + + propagatedBuildInputs = with python3Packages; [ + pycairo + pygobject3 + lxml + dbus-python + gst-python + liblarch + ] ++ [ steam-run-native ]; + + format = "other"; + strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 + dontWrapGApps = true; # prevent double wrapping + + preConfigure = '' + substituteInPlace build-aux/meson/postinstall.py \ + --replace "'update-desktop-database'" "'${desktop-file-utils}/bin/update-desktop-database'" + substituteInPlace src/runner.py \ + --replace " {runner}" " ${steam-run-native}/bin/steam-run {runner}" \ + --replace " {dxvk_setup}" " ${steam-run-native}/bin/steam-run {dxvk_setup}" + ''; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "An easy-to-use wineprefix manager"; + homepage = "https://github.com/bottlesdevs/Bottles"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ bloomvdomino ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d488a13b224..5606c20e86bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21439,6 +21439,8 @@ in bonzomatic = callPackage ../applications/editors/bonzomatic { }; + bottles = callPackage ../applications/misc/bottles { }; + brave = callPackage ../applications/networking/browsers/brave { }; break-time = callPackage ../applications/misc/break-time { }; From a4cbbc027f557596f9c80f0fca001d468d4e547e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Christiansen=20S=C3=B8rby?= Date: Thu, 25 Feb 2021 18:42:35 +0100 Subject: [PATCH 028/148] nixos/minetest-server: Fix port coercion Fix coercion of minetest-server port. --- nixos/modules/services/games/minetest-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix index f52079fc1ef6..2111c970d4f2 100644 --- a/nixos/modules/services/games/minetest-server.nix +++ b/nixos/modules/services/games/minetest-server.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.minetest-server; - flag = val: name: if val != null then "--${name} ${val} " else ""; + flag = val: name: if val != null then "--${name} ${toString val} " else ""; flags = [ (flag cfg.gameId "gameid") (flag cfg.world "world") From be9d37e2f08386b880329d18d1e16c0be3d78ca1 Mon Sep 17 00:00:00 2001 From: ilian Date: Fri, 19 Feb 2021 20:06:01 +0100 Subject: [PATCH 029/148] nixos/steam: Add port forwarding options --- nixos/modules/programs/steam.nix | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 6e9b7729ad6d..025ef617f10e 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -12,7 +12,25 @@ let else [ package32 ] ++ extraPackages32; }; in { - options.programs.steam.enable = mkEnableOption "steam"; + options.programs.steam = { + enable = mkEnableOption "steam"; + + remotePlay.openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports in the firewall for Steam Remote Play. + ''; + }; + + dedicatedServer.openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports in the firewall for Source Dedicated Server. + ''; + }; + }; config = mkIf cfg.enable { hardware.opengl = { # this fixes the "glXChooseVisual failed" bug, context: https://github.com/NixOS/nixpkgs/issues/47932 @@ -26,6 +44,18 @@ in { hardware.steam-hardware.enable = true; environment.systemPackages = [ steam steam.run ]; + + networking.firewall = lib.mkMerge [ + (mkIf cfg.remotePlay.openFirewall { + allowedTCPPorts = [ 27036 ]; + allowedUDPPortRanges = [ { from = 27031; to = 27036; } ]; + }) + + (mkIf cfg.dedicatedServer.openFirewall { + allowedTCPPorts = [ 27015 ]; # SRCDS Rcon port + allowedUDPPorts = [ 27015 ]; # Gameplay traffic + }) + ]; }; meta.maintainers = with maintainers; [ mkg20001 ]; From 11d0bba9e4f5eda2ed19f07733f777fdddad4f94 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Fri, 26 Feb 2021 12:55:55 +0100 Subject: [PATCH 030/148] tlsh: update address of official website in metainformation --- pkgs/development/python-modules/tlsh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 851c072780c9..fbe474166c11 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { meta = with lib; { description = "Trend Micro Locality Sensitive Hash"; - homepage = "https://github.com/trendmicro/tlsh"; + homepage = "http://tlsh.org/"; license = licenses.asl20; platforms = platforms.unix; }; From 9d895039059b9055dafa79c12a02f83eccf000fe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 27 Feb 2021 17:11:01 +0000 Subject: [PATCH 031/148] python37Packages.bx-python: 0.8.9 -> 0.8.10 --- pkgs/development/python-modules/bx-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 57ace67d3f26..395978396a59 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "bx-python"; - version = "0.8.9"; + version = "0.8.10"; disabled = isPy27; src = fetchFromGitHub { owner = "bxlab"; repo = "bx-python"; rev = "v${version}"; - sha256 = "0bsqnw8rv08586wksvx2a8dawvhyzvz5pzsh9y3217b6wxq98dnq"; + sha256 = "09q5nrv0w9b1bclc7g80bih87ikffhvia22d6cpdc747wjrzz8il"; }; nativeBuildInputs = [ cython ]; From 3fcd9361b5bfe9ec5cf1a07036e1c2127bb81492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Feb 2021 11:36:59 +0100 Subject: [PATCH 032/148] alerta-server: move to all-packages.nix and use buildPythonApplication --- nixos/modules/services/monitoring/alerta.nix | 2 +- .../monitoring/alerta}/default.nix | 16 ++++++---------- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 9 insertions(+), 13 deletions(-) rename pkgs/{development/python-modules/alerta-server => servers/monitoring/alerta}/default.nix (61%) diff --git a/nixos/modules/services/monitoring/alerta.nix b/nixos/modules/services/monitoring/alerta.nix index 34f2d41706a5..5bbc9ba1e847 100644 --- a/nixos/modules/services/monitoring/alerta.nix +++ b/nixos/modules/services/monitoring/alerta.nix @@ -95,7 +95,7 @@ in ALERTA_SVR_CONF_FILE = alertaConf; }; serviceConfig = { - ExecStart = "${pkgs.python36Packages.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}"; + ExecStart = "${pkgs.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}"; User = "alerta"; Group = "alerta"; }; diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/servers/monitoring/alerta/default.nix similarity index 61% rename from pkgs/development/python-modules/alerta-server/default.nix rename to pkgs/servers/monitoring/alerta/default.nix index 82783dd16bb5..e69a594a728b 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/servers/monitoring/alerta/default.nix @@ -1,17 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, bcrypt, blinker, flask, flask-compress, flask-cors, mohawk, psycopg2, pyjwt, pymongo, python-dateutil, pytz, pyyaml, requests, requests-hawk, sentry-sdk +{ lib +, python3 }: -buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "alerta-server"; version = "8.3.3"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "a2713a31c6e326c774a3ee0328f424f944b951935ff1b893a4a66598d61c5a97"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ bcrypt blinker flask @@ -31,11 +31,7 @@ buildPythonPackage rec { doCheck = false; # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server - postInstall = '' - wrapProgram $out/bin/alertad --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - disabled = pythonOlder "3.5"; + disabled = python3.pythonOlder "3.6"; meta = with lib; { homepage = "https://alerta.io"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78aa21f044fd..74522334756c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17733,6 +17733,8 @@ in adguardhome = callPackage ../servers/adguardhome {}; + alerta-server = callPackage ../servers/monitoring/alerta { }; + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = pkgs.apacheHttpd_2_4; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 205813ddb1c5..3ef26b4ee35c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -324,8 +324,6 @@ in { alerta = callPackage ../development/python-modules/alerta { }; - alerta-server = callPackage ../development/python-modules/alerta-server { }; - algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; allpairspy = callPackage ../development/python-modules/allpairspy { }; From 336c114214d07249815748bbefddf00a9edc8aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Feb 2021 11:43:57 +0100 Subject: [PATCH 033/148] alerta: move to all-packages.nix and use buildPythonApplication --- nixos/modules/services/monitoring/alerta.nix | 2 +- .../python-modules/alerta/default.nix | 29 ------------------- pkgs/servers/monitoring/alerta/client.nix | 27 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 -- 5 files changed, 30 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/python-modules/alerta/default.nix create mode 100644 pkgs/servers/monitoring/alerta/client.nix diff --git a/nixos/modules/services/monitoring/alerta.nix b/nixos/modules/services/monitoring/alerta.nix index 5bbc9ba1e847..7c6eff713cb1 100644 --- a/nixos/modules/services/monitoring/alerta.nix +++ b/nixos/modules/services/monitoring/alerta.nix @@ -101,7 +101,7 @@ in }; }; - environment.systemPackages = [ pkgs.python36Packages.alerta ]; + environment.systemPackages = [ pkgs.alerta ]; users.users.alerta = { uid = config.ids.uids.alerta; diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix deleted file mode 100644 index ad80f62db055..000000000000 --- a/pkgs/development/python-modules/alerta/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, six, click, requests, requests-hawk, pytz, tabulate, pythonOlder -}: - -buildPythonPackage rec { - pname = "alerta"; - version = "8.4.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "260ff3118e73396104129928217b0f317ac5afdff8221874d8986df22ecf5f34"; - }; - - propagatedBuildInputs = [ six click requests requests-hawk pytz tabulate ]; - - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/alerta --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - disabled = pythonOlder "3.5"; - - meta = with lib; { - homepage = "https://alerta.io"; - description = "Alerta Monitoring System command-line interface"; - license = licenses.asl20; - }; -} diff --git a/pkgs/servers/monitoring/alerta/client.nix b/pkgs/servers/monitoring/alerta/client.nix new file mode 100644 index 000000000000..31f31d074057 --- /dev/null +++ b/pkgs/servers/monitoring/alerta/client.nix @@ -0,0 +1,27 @@ +{ lib +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "alerta"; + version = "8.4.0"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "260ff3118e73396104129928217b0f317ac5afdff8221874d8986df22ecf5f34"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + six click requests requests-hawk pytz tabulate + ]; + + doCheck = false; + + disabled = python3.pythonOlder "3.6"; + + meta = with lib; { + homepage = "https://alerta.io"; + description = "Alerta Monitoring System command-line interface"; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74522334756c..98f82a40bfa9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17733,6 +17733,8 @@ in adguardhome = callPackage ../servers/adguardhome {}; + alerta = callPackage ../servers/monitoring/alerta/client.nix { }; + alerta-server = callPackage ../servers/monitoring/alerta { }; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ef26b4ee35c..a77eecf137c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -322,8 +322,6 @@ in { alembic = callPackage ../development/python-modules/alembic { }; - alerta = callPackage ../development/python-modules/alerta { }; - algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; allpairspy = callPackage ../development/python-modules/allpairspy { }; From 35e773fb7289edee24dbd22f21ae2c32abdbf57f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 1 Mar 2021 07:45:17 +0000 Subject: [PATCH 034/148] i3: 4.19.1 -> 4.19.2 --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index c918a3b5d8c6..305c1d728f34 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.19.1"; + version = "4.19.2"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-IoTIEvxongM42P6b4LjRVS5Uj8Fo0WX3lbJr9JfCK0c="; + sha256 = "sha256-im7hd2idzyKWTSC2CTAU7k+gQZNF0/1RXVUS2ZgLsnk="; }; nativeBuildInputs = [ pkg-config makeWrapper meson ninja installShellFiles ]; From e42c19ff381252a54c28eee74d0c87d12db66002 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Wed, 3 Mar 2021 00:58:58 +0100 Subject: [PATCH 035/148] gitkraken: 7.5.1 -> 7.5.2 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 3c66456433ac..4f87dfc7cb0b 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.5.1"; + version = "7.5.2"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-7baWXv+SV1LX5p+eH6egp4QfTm1SXK8ITcOEj8yFAXg="; + sha256 = "0qd83licmw3p7cl04dki510nsn3kxk31s18g2xlixl8zqs3h08lp"; }; dontBuild = true; From fcd759da4e063af8f03bb67173bfa2ea3ff35460 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 3 Mar 2021 19:26:15 -0500 Subject: [PATCH 036/148] brave: 1.20.110 -> 1.21.73 --- pkgs/applications/networking/browsers/brave/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index fe996a01aa0e..0de942a1728e 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -30,6 +30,7 @@ , libXrandr , libXrender , libXScrnSaver +, libxshmfence , libXtst , mesa , nspr @@ -72,6 +73,7 @@ rpath = lib.makeLibraryPath [ libXi libXrandr libXrender + libxshmfence libXtst libuuid mesa @@ -88,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.20.110"; + version = "1.21.73"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0xmf74qh85f2jvi90q4cw2n7cvx5p46xmdr2iznfy09hdsymxfry"; + sha256 = "12jkj9h1smipqlkidnd3r492yfnncl0b2dmjq22qp2vsrscc3jfg"; }; dontConfigure = true; From 0da31372479db4e019315802557b6ea67f1e65cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 4 Mar 2021 09:09:23 +0100 Subject: [PATCH 037/148] python3.pkgs.coinmarketcap: remove The API was replaced and the library is no longer functional. It's only user 'home-assistant' is dropping support for it in 2021.3.0 depends on https://github.com/NixOS/nixpkgs/pull/115016 --- .../python-modules/coinmarketcap/default.nix | 19 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/python-modules/coinmarketcap/default.nix diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix deleted file mode 100644 index 168f75b7f49b..000000000000 --- a/pkgs/development/python-modules/coinmarketcap/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, requests-cache }: - -buildPythonPackage rec { - pname = "coinmarketcap"; - version = "5.0.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "1cfee31bf330a17cedf188e4e99588e6a4c6c969c93da71f55a9f4ec6a6c216f"; - }; - - propagatedBuildInputs = [ requests-cache ]; - - meta = with lib; { - description = "A python wrapper around the https://coinmarketcap.com API."; - homepage = "https://github.com/barnumbirr/coinmarketcap"; - license = licenses.asl20; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16c06ad170b9..2eddc29ae472 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1403,8 +1403,6 @@ in { coilmq = callPackage ../development/python-modules/coilmq { }; - coinmarketcap = callPackage ../development/python-modules/coinmarketcap { }; - ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; colander = callPackage ../development/python-modules/colander { }; From 12cde5ea853cf4b3ca03848cdde7d0af73d6ed12 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Mar 2021 18:40:37 +0000 Subject: [PATCH 038/148] messer-slim: 3.2.1 -> 3.6 --- pkgs/applications/science/biology/messer-slim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 687a2a985f28..9d9e46bc7800 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.6"; pname = "messer-slim"; src = fetchurl { url = "https://github.com/MesserLab/SLiM/archive/v${version}.tar.gz"; - sha256 = "1j3ssjvxpsc21mmzj59kwimglz8pdazi5w6wplmx11x744k77wa1"; + sha256 = "sha256-djWUKB+NW2a/6oaAMcH0Ul/R/XPHvGDbwlfeFmkbMOY="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; From d7cf422f7ecef8ce3848ad5a690981552c5b7da3 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Fri, 5 Mar 2021 00:00:00 +0000 Subject: [PATCH 039/148] passphrase2pgp: init at 1.1.0 --- .../tools/security/passphrase2pgp/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/security/passphrase2pgp/default.nix diff --git a/pkgs/tools/security/passphrase2pgp/default.nix b/pkgs/tools/security/passphrase2pgp/default.nix new file mode 100644 index 000000000000..a53e03c3c1e3 --- /dev/null +++ b/pkgs/tools/security/passphrase2pgp/default.nix @@ -0,0 +1,27 @@ +{ lib, pandoc, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "passphrase2pgp"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "skeeto"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Nje77tn55CKRU6igEA/6IquDhXVVQAdiez6nmN49di4"; + }; + + vendorSha256 = "sha256-7q5nwkj4TP7VgHmV9YBbCB11yTPL7tK4gD+uN4Vw3Cs"; + + postInstall = '' + mkdir -p $out/share/doc/$name + cp README.md $out/share/doc/$name + ''; + + meta = with lib; { + description = "Predictable, passphrase-based PGP key generator"; + homepage = "https://github.com/skeeto/passphrase2pgp"; + license = licenses.unlicense; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 144a3a7a0e59..88c2f87bec53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1398,6 +1398,8 @@ in pass = callPackage ../tools/security/pass { }; + passphrase2pgp = callPackage ../tools/security/passphrase2pgp { }; + pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { }; pass-nodmenu = callPackage ../tools/security/pass { From e4162f90b8fcdf2b46934e743a6ef66f090a175c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 6 Mar 2021 04:20:00 +0000 Subject: [PATCH 040/148] lxd: 4.11 -> 4.12 https://discuss.linuxcontainers.org/t/lxd-4-12-has-been-released/10424 --- pkgs/tools/admin/lxd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index ba6f9d074b24..eb748cc42ca5 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.11"; + version = "4.12"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1pcgxpmiiskq770sn25861dj0z8l24nzc1jbzyql7cxn0w5bnw1x"; + sha256 = "1qgi9ciljq8h3ja9kalfvnxnjymddd5j4agv984137z443mqfnrw"; }; postPatch = '' @@ -55,7 +55,7 @@ buildGoPackage rec { ) } - installShellCompletion --bash go/src/github.com/lxc/lxd/scripts/bash/lxd-client + installShellCompletion --bash --name lxd go/src/github.com/lxc/lxd/scripts/bash/lxd-client ''; nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ]; From e773a76ddf5cadb742ebbbdbc9bcb15e2bd38689 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 6 Mar 2021 04:20:00 +0000 Subject: [PATCH 041/148] syncthing: 1.13.1 -> 1.14.0 https://forum.syncthing.net/t/syncthing-v1-14-0/16430 --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 9d9be8966ca6..97ce75dfc9ce 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.13.1"; + version = "1.14.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1jvmcpyj4k43s4hv753pr9a1qg930nac90d5c8haqv30v1rw5pws"; + sha256 = "1nkjbikin341v74fcwdaa2v5f3zhd8xr6pjhpka1fdw6vvnn4lnd"; }; - vendorSha256 = "140b0wqp5ayyyan7ml12jqd72s00cawhmdf8g699j5sav8j6hppi"; + vendorSha256 = "1kr6yyigi7bbi4xwpk009q801wvmf3aaw4m40ki0s6gjn0wjl4j3"; doCheck = false; From d852ce11c33d524664955d57459267f1657456f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 5 Mar 2021 08:00:19 +0100 Subject: [PATCH 042/148] python3Packages.pytorch-bin: 1.7.1 -> 1.8.0 Changelog: https://github.com/pytorch/pytorch/releases/tag/v1.8.0 --- pkgs/development/python-modules/pytorch/bin.nix | 3 +-- pkgs/development/python-modules/pytorch/binary-hashes.nix | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index 0571269fa8b2..1880a0e2bf93 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -16,10 +16,9 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; - platform = if stdenv.isDarwin then "darwin" else "linux"; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.7.1"; + version = "1.8.0"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix index a542233e15e8..bc838597038d 100644 --- a/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -1,14 +1,14 @@ version: { x86_64-linux-37 = { url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-XXbCVaQUhMHUGp/1cLnJ82y4XflCiqFaWK4WrHz8LqY="; + hash = "sha256-bs29RJS0vy0xok3fvf8yvZlTibyGYqRUvUDT6M4gKQc="; }; x86_64-linux-38 = { url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-3S/GiAyV6DaWDYbvu8f2PTKH8uGJPFHTH5bb/gLw1z4="; + hash = "sha256-+h45HMo5N9Xeox8xoagKAb1KgGLAOUSMJUu/WljrB4c="; }; x86_64-linux-39 = { url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-o3k9zOsSseIoEpDMoSd8XOht39W/BE9lQoWk1pBXrqc="; + hash = "sha256-Ixj6yGCuc9xkhsDeIiNnTZ72E5/HXxV68r+Nzk/KVSQ="; }; } From 37d08649704fbed53b7134a593eccd5b44ee4e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 6 Mar 2021 08:16:19 +0100 Subject: [PATCH 043/148] python3Packages.somajo: 2.1.2 -> 2.1.3 Changelog: https://github.com/tsproisl/SoMaJo/releases/tag/v2.1.3 --- pkgs/development/python-modules/somajo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 54cd9beede3d..1f639d4f2b17 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.1.2"; + version = "2.1.3"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "1c4g8nhlcc348w0axdswv69q8k3qxwbnvim1yf7vagd0adv83gsj"; + sha256 = "07jkkg5ph5m47xf8w5asy5930qcpy6p11j0admll2y6yjynd2b47"; }; propagatedBuildInputs = [ regex ]; From ce3b4a623f11cf49ac4f9ca633d3ab26d19a1bf1 Mon Sep 17 00:00:00 2001 From: Adam Griffiths Date: Wed, 16 Sep 2020 12:22:40 +1000 Subject: [PATCH 044/148] raylib: init at 3.5.0 --- pkgs/development/libraries/raylib/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/libraries/raylib/default.nix diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix new file mode 100644 index 000000000000..47d8fdb040b2 --- /dev/null +++ b/pkgs/development/libraries/raylib/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, + mesa, libGLU, glfw, + libX11, libXi, libXcursor, libXrandr, libXinerama, + alsaSupport ? stdenv.hostPlatform.isLinux, alsaLib, + pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio, + includeEverything ? true +}: + +stdenv.mkDerivation rec { + pname = "raylib"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "raysan5"; + repo = pname; + rev = version; + sha256 = "0syvd5js1lbx3g4cddwwncqg95l6hb3fdz5nsh5pqy7fr6v84kwj"; + }; + + patches = [ + # fixes examples not compiling in 3.5.0 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/raysan5/raylib/pull/1470.patch"; + sha256 = "1ff5l839wl8dxwrs2bwky7kqa8kk9qmsflg31sk5vbil68dzbzg0"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + mesa libGLU glfw libX11 libXi libXcursor libXrandr libXinerama + ] ++ lib.optional alsaSupport alsaLib + ++ lib.optional pulseSupport libpulseaudio; + + # https://github.com/raysan5/raylib/wiki/CMake-Build-Options + cmakeFlags = [ + "-DUSE_EXTERNAL_GLFW=ON" + "-DSHARED=ON" + "-DBUILD_EXAMPLES=OFF" + ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"; + + # fix libasound.so/libpulse.so not being found + preFixup = '' + ${lib.optionalString alsaSupport "patchelf --add-needed ${alsaLib}/lib/libasound.so $out/lib/libraylib.so.${version}"} + ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"} + ''; + + meta = with lib; { + description = "A simple and easy-to-use library to enjoy videogames programming"; + homepage = "http://www.raylib.com/"; + license = licenses.zlib; + maintainers = with maintainers; [ adamlwgriffiths ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c2ef527ca9c..c2a2139a5f11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16337,6 +16337,8 @@ in raul = callPackage ../development/libraries/audio/raul { }; + raylib = callPackage ../development/libraries/raylib { }; + readline = readline6; readline6 = readline63; From 003b067baf2d8b4ac99a6b21cf7033d5330d2d2b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 5 Mar 2021 00:30:56 +0100 Subject: [PATCH 045/148] dovecot: add myself as maintainer --- pkgs/servers/mail/dovecot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 2c44094d0f70..60c9f9a78373 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with lib.maintainers; [ peti fpletz globin ]; + maintainers = with lib.maintainers; [ peti fpletz globin ajs124 ]; platforms = lib.platforms.unix; }; passthru.tests = { From 0b6c9a4c38d5a55ad52ac08488298e3b1023d0e4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 5 Mar 2021 00:33:21 +0100 Subject: [PATCH 046/148] dovecot: 2.3.13 -> 2.3.14 --- pkgs/servers/mail/dovecot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 60c9f9a78373..337405ff6729 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.13"; + version = "2.3.14"; nativeBuildInputs = [ perl pkg-config ]; buildInputs = @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { ++ lib.optional withSQLite sqlite; src = fetchurl { - url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz"; - sha256 = "1i7ijss79a23v7b6lycfzaa8r5rh01k0h0b9h0j4a6n11sw7by53"; + url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; + sha256 = "0jm3p52z619v7ajh533g2g7d790k82fk0w7ry0zqlm8ymzrxgcy8"; }; enableParallelBuilding = true; From c543f4d8842cd2ce6f1dea80e7265bb9eb0b64fe Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 5 Mar 2021 00:34:35 +0100 Subject: [PATCH 047/148] dovecot_pigeonhole: 0.5.13 -> 0.5.14 --- .../mail/dovecot/plugins/pigeonhole/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index e5a07aa3c278..6cdb2ee06f20 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl, dovecot, openssl }: - -stdenv.mkDerivation rec { +let + dovecotMajorMinor = lib.versions.majorMinor dovecot.version; +in stdenv.mkDerivation rec { pname = "dovecot-pigeonhole"; - version = "0.5.13"; + version = "0.5.14"; src = fetchurl { - url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; - sha256 = "05xz2d82ck6lmv94nbc3qff09j8b60a5640i3fmqwqsvv9kfa7wi"; + url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz"; + sha256 = "1lmjzz4kd90wbdslacybizd1dks4bhwmrx39lj8b19naldw0zjk8"; }; buildInputs = [ dovecot openssl ]; From 28e538c9e31caa0a124578b1d37eb4c304e58332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Mar 2021 16:49:05 +0100 Subject: [PATCH 048/148] lorri: cleanup, format --- pkgs/tools/misc/lorri/default.nix | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index 401636ab6878..a70554379393 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -1,13 +1,11 @@ -{ lib, stdenv +{ lib +, stdenv , pkgs +, rustPackages , fetchFromGitHub , rustPlatform - # Updater script -, runtimeShell , writers - # Tests , nixosTests - # Apple dependencies , CoreServices , Security }: @@ -23,13 +21,6 @@ in (rustPlatform.buildRustPackage rec { pname = "lorri"; inherit version; - meta = with lib; { - description = "Your project's nix-env"; - homepage = "https://github.com/nix-community/lorri"; - license = licenses.asl20; - maintainers = with maintainers; [ grahamc Profpatsch ]; - }; - src = fetchFromGitHub { owner = "nix-community"; repo = pname; @@ -43,11 +34,10 @@ in (rustPlatform.buildRustPackage rec { doCheck = false; BUILD_REV_COUNT = src.revCount or 1; - RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {}; + RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix { }; - nativeBuildInputs = with pkgs; [ rustPackages.rustfmt ]; - buildInputs = - lib.optionals stdenv.isDarwin [ CoreServices Security ]; + nativeBuildInputs = [ rustPackages.rustfmt ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; # copy the docs to the $man and $doc outputs postInstall = '' @@ -70,4 +60,11 @@ in (rustPlatform.buildRustPackage rec { nixos = nixosTests.lorri; }; }; + + meta = with lib; { + description = "Your project's nix-env"; + homepage = "https://github.com/target/lorri"; + license = licenses.asl20; + maintainers = with maintainers; [ grahamc Profpatsch ]; + }; }) From 80a09a477fabc28daaea815ec878d966a11030dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 6 Mar 2021 05:02:13 +0100 Subject: [PATCH 049/148] pythonPackages.googleapis_common_protos: remove unused input --- .../python-modules/googleapis-common-protos/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 898971629ae0..267e0e5f08ae 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -3,7 +3,6 @@ , fetchPypi , grpc , protobuf -, pytestCheckHook }: buildPythonPackage rec { From 2505c4ebc2984077ece9ca00c3d96cedb0f476cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 6 Mar 2021 05:14:34 +0100 Subject: [PATCH 050/148] ark: format --- pkgs/applications/kde/ark/default.nix | 39 +++++++++++++-------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 69a56254d65b..ef27380a3308 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -1,18 +1,12 @@ -{ - mkDerivation, lib, config, - - extra-cmake-modules, kdoctools, - - breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n, - kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons, - - libarchive, libzip, - - # Archive tools - p7zip, lrzip, - - # Unfree tools - unfreeEnableUnrar ? false, unrar, +{ mkDerivation, lib, config +, extra-cmake-modules, kdoctools +, breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n +, kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons +, libarchive, libzip +# Archive tools +, p7zip, lrzip +# Unfree tools +, unfreeEnableUnrar ? false, unrar }: let @@ -21,20 +15,23 @@ in mkDerivation { pname = "ark"; - meta = { - description = "Graphical file compression/decompression utility"; - license = with lib.licenses; - [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree; - maintainers = [ lib.maintainers.ttuegel ]; - }; outputs = [ "out" "dev" ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ libarchive libzip ] ++ extraTools; + propagatedBuildInputs = [ breeze-icons karchive kconfig kcrash kdbusaddons khtml ki18n kiconthemes kio kitemmodels kparts kpty kservice kwidgetsaddons ]; qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath extraTools) ]; + + meta = with lib; { + description = "Graphical file compression/decompression utility"; + license = with licenses; [ gpl2 lgpl3 ] ++ optional unfreeEnableUnrar unfree; + maintainers = [ maintainers.ttuegel ]; + }; } From 5be41d6d7d12be583763b5c2716274e2d3e7fff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 6 Mar 2021 05:14:44 +0100 Subject: [PATCH 051/148] kde-frameworks.kguiaddons: format, mark broken below qt 5.14 --- .../libraries/kde-frameworks/kguiaddons.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index a9b3c416624d..6c7365fd27e0 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -1,17 +1,19 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - qtbase, qtx11extras, wayland, +{ mkDerivation, lib +, extra-cmake-modules +, qtbase, qtx11extras, wayland }: mkDerivation { name = "kguiaddons"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; - }; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras wayland ]; propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; + + meta = with lib; { + maintainers = [ maintainers.ttuegel ]; + broken = versionOlder qtbase.version "5.14.0"; + }; } From a54f2438e47ed4627d9a66724b31e0f66458deac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 6 Mar 2021 05:26:11 +0100 Subject: [PATCH 052/148] pythonPackages.shap: mark broken --- pkgs/development/python-modules/shap/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index cfbd6f92b04c..abc68709caa4 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -66,5 +66,7 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ evax ]; platforms = platforms.unix; + # ModuleNotFoundError: No module named 'sklearn.ensemble.iforest' + broken = true; }; } From 901206a04e70c99b03a4d96f602a4f39c2780288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 6 Mar 2021 18:39:45 +0100 Subject: [PATCH 053/148] pythonPackages.crate: disable failing test on darwin --- pkgs/development/python-modules/crate/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index a37160a01acf..9be85ff4b3cd 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -6,6 +6,7 @@ , isPy3k , sqlalchemy , pytestCheckHook +, stdenv }: buildPythonPackage rec { @@ -28,6 +29,8 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = lib.optionals stdenv.isDarwin [ "src/crate/client/test_http.py" ]; + meta = with lib; { homepage = "https://github.com/crate/crate-python"; description = "A Python client library for CrateDB"; From 3353bf7a165d5c520d31f2b62f165b605910e512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 6 Mar 2021 19:17:51 +0100 Subject: [PATCH 054/148] beets: remove ``? null``; remove ``with lib`` --- pkgs/tools/audio/beets/default.nix | 81 ++++++++++++------------------ 1 file changed, 31 insertions(+), 50 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 7fea4bd28d4f..2be0b1bc76f6 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,24 +1,23 @@ { stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll , pythonPackages, imagemagick, gobject-introspection, gst_all_1 -, runtimeShell -, unstableGitUpdater +, runtimeShell, unstableGitUpdater # external plugins package set , beetsExternalPlugins -, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor ? null +, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor , enableAcousticbrainz ? true , enableAcoustid ? true -, enableBadfiles ? true, flac ? null, mp3val ? null +, enableBadfiles ? true, flac, mp3val , enableBeatport ? true , enableBpsync ? true -, enableConvert ? true, ffmpeg ? null +, enableConvert ? true, ffmpeg , enableDeezer ? true , enableDiscogs ? true , enableEmbyupdate ? true , enableFetchart ? true , enableGmusic ? true -, enableKeyfinder ? true, keyfinder-cli ? null +, enableKeyfinder ? true, keyfinder-cli , enableKodiupdate ? true , enableLastfm ? true , enableLoadext ? true @@ -33,32 +32,14 @@ # External plugins , enableAlternatives ? false -, enableCheck ? false, liboggz ? null +, enableCheck ? false, liboggz , enableCopyArtifacts ? false , enableExtraFiles ? false , bashInteractive, bash-completion }: -assert enableAbsubmit -> essentia-extractor != null; -assert enableAcoustid -> pythonPackages.pyacoustid != null; -assert enableBadfiles -> flac != null && mp3val != null; -assert enableBeatport -> pythonPackages.requests_oauthlib != null; assert enableBpsync -> enableBeatport; -assert enableCheck -> flac != null && mp3val != null && liboggz != null; -assert enableConvert -> ffmpeg != null; -assert enableDiscogs -> pythonPackages.discogs_client != null; -assert enableFetchart -> pythonPackages.responses != null; -assert enableGmusic -> pythonPackages.gmusicapi != null; -assert enableKeyfinder -> keyfinder-cli != null; -assert enableLastfm -> pythonPackages.pylast != null; -assert enableMpd -> pythonPackages.mpd2 != null; -assert enableReplaygain -> ffmpeg != null; -assert enableSonosUpdate -> pythonPackages.soco != null; -assert enableThumbnails -> pythonPackages.pyxdg != null; -assert enableWeb -> pythonPackages.flask != null; - -with lib; let optionalPlugins = { @@ -99,20 +80,20 @@ let "types" "unimported" "zero" ]; - enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins); + enabledOptionalPlugins = lib.attrNames (lib.filterAttrs (_: lib.id) optionalPlugins); - allPlugins = pluginsWithoutDeps ++ attrNames optionalPlugins; + allPlugins = pluginsWithoutDeps ++ lib.attrNames optionalPlugins; allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins; testShell = "${bashInteractive}/bin/bash --norc"; completion = "${bash-completion}/share/bash-completion/bash_completion"; # This is a stripped down beets for testing of the external plugins. - externalTestArgs.beets = (beets.override { + externalTestArgs.beets = (lib.beets.override { enableAlternatives = false; enableCopyArtifacts = false; enableExtraFiles = false; - }).overrideAttrs (const { + }).overrideAttrs (lib.const { doInstallCheck = false; }); @@ -147,10 +128,10 @@ in pythonPackages.buildPythonApplication rec { pythonPackages.confuse pythonPackages.mediafile gobject-introspection - ] ++ optional enableAbsubmit essentia-extractor - ++ optional enableAcoustid pythonPackages.pyacoustid - ++ optional enableBeatport pythonPackages.requests_oauthlib - ++ optional (enableFetchart + ] ++ lib.optional enableAbsubmit essentia-extractor + ++ lib.optional enableAcoustid pythonPackages.pyacoustid + ++ lib.optional enableBeatport pythonPackages.requests_oauthlib + ++ lib.optional (enableFetchart || enableDeezer || enableEmbyupdate || enableKodiupdate @@ -160,19 +141,19 @@ in pythonPackages.buildPythonApplication rec { || enableSubsonicupdate || enableAcousticbrainz) pythonPackages.requests - ++ optional enableCheck beetsExternalPlugins.check - ++ optional enableConvert ffmpeg - ++ optional enableDiscogs pythonPackages.discogs_client - ++ optional enableGmusic pythonPackages.gmusicapi - ++ optional enableKeyfinder keyfinder-cli - ++ optional enableLastfm pythonPackages.pylast - ++ optional enableMpd pythonPackages.mpd2 - ++ optional enableSonosUpdate pythonPackages.soco - ++ optional enableThumbnails pythonPackages.pyxdg - ++ optional enableWeb pythonPackages.flask - ++ optional enableAlternatives beetsExternalPlugins.alternatives - ++ optional enableCopyArtifacts beetsExternalPlugins.copyartifacts - ++ optional enableExtraFiles beetsExternalPlugins.extrafiles + ++ lib.optional enableCheck beetsExternalPlugins.check + ++ lib.optional enableConvert ffmpeg + ++ lib.optional enableDiscogs pythonPackages.discogs_client + ++ lib.optional enableGmusic pythonPackages.gmusicapi + ++ lib.optional enableKeyfinder keyfinder-cli + ++ lib.optional enableLastfm pythonPackages.pylast + ++ lib.optional enableMpd pythonPackages.mpd2 + ++ lib.optional enableSonosUpdate pythonPackages.soco + ++ lib.optional enableThumbnails pythonPackages.pyxdg + ++ lib.optional enableWeb pythonPackages.flask + ++ lib.optional enableAlternatives beetsExternalPlugins.alternatives + ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts + ++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles ; buildInputs = [ @@ -209,12 +190,12 @@ in pythonPackages.buildPythonApplication rec { # bs1770gain, and set the absolute path there, to avoid impurities. ++ lib.optional enableReplaygain (substituteAll { src = ./replaygain-default-ffmpeg.patch; - ffmpeg = getBin ffmpeg; + ffmpeg = lib.getBin ffmpeg; }) # Put absolute Nix paths in place ++ lib.optional enableConvert (substituteAll { src = ./convert-plugin-ffmpeg-path.patch; - ffmpeg = getBin ffmpeg; + ffmpeg = lib.getBin ffmpeg; }) ++ lib.optional enableBadfiles (substituteAll { src = ./badfiles-plugin-nix-paths.patch; @@ -269,7 +250,7 @@ in pythonPackages.buildPythonApplication rec { EDITOR="${writeScript "beetconfig.sh" '' #!${runtimeShell} cat > "$1" < Date: Sat, 6 Mar 2021 19:21:19 +0100 Subject: [PATCH 055/148] deltachat-electron: format --- .../instant-messengers/deltachat-electron/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix index 4be867bb4b5c..c579220cdde1 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix @@ -6,8 +6,7 @@ let name = "${pname}-${version}"; src = fetchurl { - url = - "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage"; + url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage"; sha256 = "sha256-iw2tU8qqXWbtEdLGlW8HNBHx8F2CgnCGCBUWpM407us="; }; From bee35c7b7c5599e065f7e10b55ca053a81643ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 6 Mar 2021 19:22:16 +0100 Subject: [PATCH 056/148] tree-sitter: cleanup --- pkgs/development/tools/parsing/tree-sitter/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 44d2a8d3c15b..48f48ed748f2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -108,7 +108,7 @@ in rustPlatform.buildRustPackage { }; }; - meta = { + meta = with lib; { homepage = "https://github.com/tree-sitter/tree-sitter"; description = "A parser generator tool and an incremental parsing library"; longDescription = '' @@ -122,10 +122,9 @@ in rustPlatform.buildRustPackage { * Robust enough to provide useful results even in the presence of syntax errors * Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application ''; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Profpatsch ]; + license = licenses.mit; + maintainers = with maintainers; [ Profpatsch ]; # Aarch has test failures with how tree-sitter compiles the generated C files broken = stdenv.isAarch64; }; - } From 975ec901f6498155713aaf6d897fd9b50dce6043 Mon Sep 17 00:00:00 2001 From: kolam Date: Thu, 20 Aug 2020 11:23:22 -0400 Subject: [PATCH 057/148] pylode: init at 2.8.6 --- pkgs/misc/pylode/default.nix | 37 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/misc/pylode/default.nix diff --git a/pkgs/misc/pylode/default.nix b/pkgs/misc/pylode/default.nix new file mode 100644 index 000000000000..fb908151765c --- /dev/null +++ b/pkgs/misc/pylode/default.nix @@ -0,0 +1,37 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "pyLODE"; + version = "2.8.6"; + + src = fetchFromGitHub { + owner = "RDFLib"; + repo = pname; + rev = version; + sha256 = "0zbk5lj9vlg32rmvw1himlw63kxd7sim7nzglrjs5zm6vpi4x5ch"; + }; + + propagatedBuildInputs = with python3Packages; [ + dateutil + falcon + gunicorn + isodate + jinja2 + markdown + rdflib + rdflib-jsonld + requests + six + beautifulsoup4 + ]; + + meta = with lib; { + description = "An OWL ontology documentation tool using Python and templating, based on LODE"; + homepage = "https://github.com/RDFLib/pyLODE"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ koslambrou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9e6234e92f3..b70ac1100654 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14603,6 +14603,8 @@ in pybind11 = pythonPackages.pybind11; + pylode = callPackage ../misc/pylode {}; + python-qt = callPackage ../development/libraries/python-qt { python = python27; inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; From 8597fe2032a05d9c0ab28d696a88774766c63736 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 7 Mar 2021 00:00:00 +0000 Subject: [PATCH 058/148] python3Packages.pure-cdb: init at 3.1.1 --- .../python-modules/pure-cdb/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/pure-cdb/default.nix diff --git a/pkgs/development/python-modules/pure-cdb/default.nix b/pkgs/development/python-modules/pure-cdb/default.nix new file mode 100644 index 000000000000..29905d72cf27 --- /dev/null +++ b/pkgs/development/python-modules/pure-cdb/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, flake8 }: + +buildPythonPackage rec { + pname = "pure-cdb"; + version = "3.1.1"; + disabled = pythonOlder "3.4"; + + # Archive on pypi has no tests. + src = fetchFromGitHub { + owner = "bbayles"; + repo = "python-pure-cdb"; + rev = "v${version}"; + hash = "sha256-/FAe4NkY5unt83BOnJ3QqBJFQCPdQnbMVl1fSZ511Fc="; + }; + + checkInputs = [ flake8 ]; + + pythonImportsCheck = [ "cdblib" ]; + + meta = with lib; { + description = "Python library for working with constant databases"; + homepage = "https://python-pure-cdb.readthedocs.io/en/latest"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a5dfccd8a2a..a093d674409b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5221,6 +5221,8 @@ in { pulsectl = callPackage ../development/python-modules/pulsectl { }; + pure-cdb = callPackage ../development/python-modules/pure-cdb { }; + pure-eval = callPackage ../development/python-modules/pure-eval { }; pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { }; From a2100d3c78121cf723944f97319426c6d4d019b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Mar 2021 13:55:19 +0100 Subject: [PATCH 059/148] python3Packages.defusedxml: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/defusedxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index 581a6cce9b2a..691d1783af0e 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "defusedxml"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5"; + sha256 = "sha256-hrFdnjxjneefTLOK7/6jKB9ir/eN3n15jhNSxjv6bqA="; }; } From 9001fbc439737a68d9fdb2dc12e1114bd4c4d906 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Mar 2021 14:12:11 +0100 Subject: [PATCH 060/148] python3Packages.defusedxml: add meta --- .../python-modules/defusedxml/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index 691d1783af0e..3abdd0fb792e 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -1,11 +1,25 @@ -{ buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "defusedxml"; version = "0.7.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hrFdnjxjneefTLOK7/6jKB9ir/eN3n15jhNSxjv6bqA="; + sha256 = "183fz8xwclhkirwpvpldyypn47r8lgzfz2mk9jgyg7b37jg5vcc6"; + }; + + pythonImportsCheck = [ "defusedxml" ]; + + meta = with lib; { + description = "Python module to defuse XML issues"; + homepage = "https://github.com/tiran/defusedxml"; + license = licenses.psfl; + maintainers = with maintainers; [ fab ]; }; } From 451ffcb2ac97c3d110cc88f0a301f4ba0d5b4b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 6 Mar 2021 19:52:53 +0100 Subject: [PATCH 061/148] pythonPackages.alot: cleanup inputs, fix inputs --- pkgs/development/python-modules/alot/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 1f4617ce9c0d..1117557a8a0a 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -1,9 +1,7 @@ -{ lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k +{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k , notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme -, service-identity -, gnupg ? null, sphinx, awk ? null, procps ? null, future ? null -, withManpage ? false }: - +, service-identity, gnupg, sphinx, gawk, procps, future , withManpage ? false +}: buildPythonPackage rec { pname = "alot"; @@ -41,7 +39,7 @@ buildPythonPackage rec { doCheck = false; postBuild = lib.optionalString withManpage "make -C docs man"; - checkInputs = [ awk future mock gnupg procps ]; + checkInputs = [ gawk future mock gnupg procps ]; postInstall = let completionPython = python.withPackages (ps: [ ps.configobj ]); From 473906dc8b895ef6576b054971bf78b923ff2009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 6 Mar 2021 20:10:17 +0100 Subject: [PATCH 062/148] hashdeep: simplify platforms --- pkgs/tools/security/hashdeep/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/hashdeep/default.nix b/pkgs/tools/security/hashdeep/default.nix index 702a40ab8b8d..0e24e0ec3a39 100644 --- a/pkgs/tools/security/hashdeep/default.nix +++ b/pkgs/tools/security/hashdeep/default.nix @@ -17,10 +17,11 @@ stdenv.mkDerivation rec { description = "A set of cross-platform tools to compute hashes"; homepage = "https://github.com/jessek/hashdeep"; license = licenses.gpl2; + maintainers = [ maintainers.karantan ]; + platforms = platforms.all; # Build fails on Darwin: # > ./xml.h:103:82: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] # > void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%"PRId64,value); } - platforms = with platforms; linux ++ freebsd ++ openbsd; - maintainers = [ maintainers.karantan ]; + broken = stdenv.isDarwin; }; } From 48c2a14fe0df35cb1137f975a191a96b7c3c8174 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 7 Mar 2021 08:38:35 +0100 Subject: [PATCH 063/148] mutt: 2.0.5 -> 2.0.6 Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 874fa0d42e5d..eecf8f0f67e1 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0k80s27sf7djb7zxj81ihksr8jkr71mfaa8976fzh41i1pn5l7g2"; + sha256 = "165mpivdhvhavglykwlz0hss2akxd6i6l40rgxs29mjzi52irqw1"; }; patches = optional smimeSupport (fetchpatch { From 6dcd1e4c6a89921b6610bf6888c2371eedf5f604 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 7 Mar 2021 00:12:55 -0800 Subject: [PATCH 064/148] lollypop: 1.4.16 -> 1.4.17 --- pkgs/applications/audio/lollypop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 6c218738f0e2..9ae05fb571b0 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.16"; + version = "1.4.17"; format = "other"; doCheck = false; @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "sha256-4txJ+lYx2BROjZznFwWMc+tTVpYQpPtPySfCl+Hfy+0="; + sha256 = "sha256-GrznUXIYUTYOKQ1znsCqmBdm5YImCABMK2NGRtx5fSk="; }; nativeBuildInputs = [ From c408936e23632b2a68a3114be8721df0536b9936 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Mar 2021 11:41:21 +0100 Subject: [PATCH 065/148] python3Packages.pypykatz: 0.3.15 -> 0.4.2 --- pkgs/development/python-modules/pypykatz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix index 2e5f19e1d12d..2a7abe5bd859 100644 --- a/pkgs/development/python-modules/pypykatz/default.nix +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pypykatz"; - version = "0.3.15"; + version = "0.4.2"; src = fetchFromGitHub { owner = "skelsec"; repo = pname; rev = version; - sha256 = "0bx2jdcfr1pdy3jgzg8fr5id9ffl2m1nc81dqhcplxdj8p214yri"; + sha256 = "sha256-dTpkwBYEAITdyKsRTfeJk40hgO8+wmxD3d2XXkvWUpc="; }; propagatedBuildInputs = [ From df885b718cce7350bd510b2461dcc60e072070eb Mon Sep 17 00:00:00 2001 From: zseri Date: Sun, 7 Mar 2021 13:47:21 +0100 Subject: [PATCH 066/148] zstxtns-utils: use stdenvNoCC stdenv (with compiler, etc.) is not used in this package https://github.com/NixOS/nixpkgs/pull/115225#discussion_r588833299 --- pkgs/tools/text/zstxtns-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/zstxtns-utils/default.nix b/pkgs/tools/text/zstxtns-utils/default.nix index 839a54933742..eebf0785394f 100644 --- a/pkgs/tools/text/zstxtns-utils/default.nix +++ b/pkgs/tools/text/zstxtns-utils/default.nix @@ -5,10 +5,10 @@ , lib , makeWrapper , moreutils -, stdenv +, stdenvNoCC }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "zstxtns-utils"; version = "0.0.3"; From 2ef5683cd999e1499fedc70c7aa58514c5ae18e8 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 7 Mar 2021 15:15:49 +0100 Subject: [PATCH 067/148] palemoon: 29.0.1 -> 29.1.0 --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 8207040f1b8c..df672e5160bd 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -16,14 +16,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.0.1"; + version = "29.1.0"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "18flr64041cvffj6jbzx0njnynvyk3k5yljb446a4lwmksvd3nmq"; + sha256 = "02blhk3v7gpnicd7s5l5fpqvdvj2279g3rq8xyhcd4sw6qnms8m6"; fetchSubmodules = true; }; From ffe611cec81843e0ef107ab69cc1932ce8cd406e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 7 Mar 2021 15:23:03 +0100 Subject: [PATCH 068/148] weechat: 3.0.1 -> 3.1 https://github.com/weechat/weechat/releases/tag/v3.1 --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 58952f28b558..daa088997309 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -27,12 +27,12 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.0.1"; + version = "3.1"; pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0f50kib8l99vlp9wqszq2r2g5panzphsgs7viga8lyc83v229b33"; + sha256 = "06w147wzrzp6xbqiz6s5nq5xdjy7jn3f18xajxy50pynjd6vmfh5"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; From 060efbe394e1633b8ff6e7aaf23a06cfdc53df1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= Date: Sat, 6 Mar 2021 21:47:30 +0100 Subject: [PATCH 069/148] cadaver: Fix building with current openssl ...by using the already-packaged (newer) version of neon as it is also done for openSUSE[1]. [1] https://build.opensuse.org/package/show/openSUSE:Factory/cadaver --- pkgs/tools/networking/cadaver/configure.patch | 20 +++++++++++++++++++ pkgs/tools/networking/cadaver/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/networking/cadaver/configure.patch diff --git a/pkgs/tools/networking/cadaver/configure.patch b/pkgs/tools/networking/cadaver/configure.patch new file mode 100644 index 000000000000..b618099b371a --- /dev/null +++ b/pkgs/tools/networking/cadaver/configure.patch @@ -0,0 +1,20 @@ +--- a/configure.orig ++++ b/configure +@@ -9595,7 +9595,7 @@ fi + $as_echo "$ne_cv_lib_neon" >&6; } + if test "$ne_cv_lib_neon" = "yes"; then + ne_cv_lib_neonver=no +- for v in 27 28 29; do ++ for v in 27 28 29 30 31; do + case $ne_libver in + 0.$v.*) ne_cv_lib_neonver=yes ;; + esac +@@ -10328,7 +10328,7 @@ fi + $as_echo "$ne_cv_lib_neon" >&6; } + if test "$ne_cv_lib_neon" = "yes"; then + ne_cv_lib_neonver=no +- for v in 27 28 29; do ++ for v in 27 28 29 30 31; do + case $ne_libver in + 0.$v.*) ne_cv_lib_neonver=yes ;; + esac diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index 84265d3f4b7e..70c7972bd65f 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, openssl, readline }: +{ lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib}: stdenv.mkDerivation rec { name = "cadaver-0.23.3"; @@ -14,11 +14,15 @@ stdenv.mkDerivation rec { name = "disable-sslv2.patch"; sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr"; }) + # Cadaver also works with newer versions of neon than stated + # in the configure script + ./configure.patch ]; configureFlags = [ "--with-ssl" "--with-readline" ]; - buildInputs = [ openssl readline ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ neon readline zlib ]; meta = with lib; { description = "A command-line WebDAV client"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b726c4f87baa..8b8693f450bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3116,9 +3116,7 @@ in cabextract = callPackage ../tools/archivers/cabextract { }; - cadaver = callPackage ../tools/networking/cadaver { - openssl = openssl_1_0_2; - }; + cadaver = callPackage ../tools/networking/cadaver { }; davix = callPackage ../tools/networking/davix { }; From 3ceb217e21fba0dcdaddb21e25f1b3a58b4af074 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 7 Mar 2021 12:31:34 +0100 Subject: [PATCH 070/148] zz: unstable-2021-01-26 -> unstable-2021-03-07 Picking from current master for these fixes: * makes module resolving via ZZ_MODULES_PATH deterministic * no longer tries to write to /nix/store failing compilation --- pkgs/development/compilers/zz/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix index dade163c5273..7dfa462e2254 100644 --- a/pkgs/development/compilers/zz/default.nix +++ b/pkgs/development/compilers/zz/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "zz"; - version = "unstable-2021-01-26"; + version = "unstable-2021-03-07"; - # commit chosen by using the latest build from http://bin.zetz.it/ + # when updating, choose commit of the latest build on http://bin.zetz.it/ src = fetchFromGitHub { owner = "zetzit"; repo = "zz"; - rev = "0b5c52674e9adf795fbfb051d4dceef3126e669f"; - sha256 = "0bb77ll1g5i6a04ybpgx6lqsb74xs4v4nyqm9j4j6x24407h8l89"; + rev = "d3fc968ba2ae6668f930e39077f9a90aecb9fdc4"; + sha256 = "18p17lgwq6rq1n76sj0dwb32bpxflfd7knky1v0sgmaxfpaq04y3"; }; nativeBuildInputs = [ makeWrapper ]; - cargoSha256 = "1lf4k3n89w2797c1yrj1dp97y8a8d5hnixr1nwa2qcq1sxmm5rcg"; + cargoSha256 = "0i3c459d4699z4dwvdw1495krdv3c2qpygrsw0cz3j0zd2n5gqj6"; postPatch = '' # remove search path entry which would reference /build From 1875033648417e12be76c4bf9b036294500a2c6c Mon Sep 17 00:00:00 2001 From: Jelle Besseling Date: Sun, 7 Mar 2021 15:56:42 +0100 Subject: [PATCH 071/148] python3Packages.python-telegram-bot: 13.0 -> 13.3 (#115287) Co-authored-by: Dmitry Kalinkin Co-authored-by: Sandro --- .../python-modules/python-telegram-bot/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index b681fcf85a93..27276e0619cd 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -7,25 +7,29 @@ , urllib3 , tornado , pytest +, APScheduler , isPy3k }: buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.0"; + version = "13.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ca78a41626d728a8f51affa792270e210fa503ed298d395bed2bd1281842dca3"; + hash = "sha256-dw1sGfdeUw3n9qh4TsBpRdqEvNI0SnKTK4wqBaeM1CE="; }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ certifi future urllib3 tornado decorator ]; + propagatedBuildInputs = [ certifi future urllib3 tornado decorator APScheduler ]; # --with-upstream-urllib3 is not working properly postPatch = '' - rm -rf telegram/vendor + rm -r telegram/vendor + + substituteInPlace requirements.txt \ + --replace 'APScheduler==3.6.3' 'APScheduler' ''; setupPyGlobalFlags = "--with-upstream-urllib3"; @@ -36,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "This library provides a pure Python interface for the Telegram Bot API."; homepage = "https://python-telegram-bot.org"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = with maintainers; [ veprbl pingiun ]; }; } From 33d7a98f9a46123fac6956b2e34e5b74649bea8e Mon Sep 17 00:00:00 2001 From: Jelle Besseling Date: Sat, 6 Mar 2021 21:01:03 +0100 Subject: [PATCH 072/148] python3Packages.APScheduler: add setuptools APScheduler requires setuptools as a propagatedBuildInput --- pkgs/development/python-modules/APScheduler/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index d1ac191489ad..32a9dda6c876 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -15,6 +15,7 @@ , tzlocal , funcsigs , futures +, setuptools , isPy3k }: @@ -47,12 +48,15 @@ buildPythonPackage rec { pytz tzlocal funcsigs + setuptools ] ++ lib.optional (!isPy3k) futures; checkPhase = '' py.test ''; + pythonImportsCheck = [ "apscheduler" ]; + # Somehow it cannot find pytestcov doCheck = false; From 2331c9c89b42220a99dc92d487c2e6ba1f215111 Mon Sep 17 00:00:00 2001 From: Ivan Kovnatsky Date: Sun, 7 Mar 2021 18:09:28 +0200 Subject: [PATCH 073/148] maintainers: Add ivankovnatsky --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 56d1cfb0ee62..4d5b60bfc5fc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4085,6 +4085,16 @@ fingerprint = "7311 2700 AB4F 4CDF C68C F6A5 79C3 C47D C652 EA54"; }]; }; + ivankovnatsky = { + email = "ikovnatsky@protonmail.ch"; + github = "ivankovnatsky"; + githubId = 75213; + name = "Ivan Kovnatsky"; + keys = [{ + longkeyid = "rsa4096/0x3A33FA4C82ED674F"; + fingerprint = "6BD3 7248 30BD 941E 9180 C1A3 3A33 FA4C 82ED 674F"; + }]; + }; ivar = { email = "ivar.scholten@protonmail.com"; github = "IvarWithoutBones"; From 99aa67688082e9280faa509116be00e8cfb64471 Mon Sep 17 00:00:00 2001 From: Ivan Kovnatsky Date: Sun, 7 Mar 2021 17:24:36 +0200 Subject: [PATCH 074/148] swaykbdd: Init at 1.0 --- pkgs/tools/wayland/swaykbdd/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/wayland/swaykbdd/default.nix diff --git a/pkgs/tools/wayland/swaykbdd/default.nix b/pkgs/tools/wayland/swaykbdd/default.nix new file mode 100644 index 000000000000..4584018596df --- /dev/null +++ b/pkgs/tools/wayland/swaykbdd/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, json_c, pkg-config }: + +stdenv.mkDerivation rec { + pname = "swaykbdd"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "artemsen"; + repo = "swaykbdd"; + rev = "v${version}"; + sha256 = "101mbf7pvm4ykmkh29g5xswrzdhdwq0rslzxqqfd5ksf1fphzgxd"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ json_c ]; + + meta = with lib; { + description = "Per-window keyboard layout for Sway"; + homepage = "https://github.com/artemsen/swaykbdd"; + license = licenses.mit; + maintainers = with maintainers; [ ivankovnatsky ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5aee51d878ac..a752aec24bb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1998,6 +1998,8 @@ in slurp = callPackage ../tools/wayland/slurp { }; + swaykbdd = callPackage ../tools/wayland/swaykbdd { }; + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wev = callPackage ../tools/wayland/wev { }; From 512284ed147abeca5eca8a2875a8de7c0fbca810 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Mar 2021 00:09:42 +0100 Subject: [PATCH 075/148] msitools: 0.99 -> 0.101 https://ftp.fau.de/gnome/sources/msitools/0.101/msitools-0.101.news --- .../tools/misc/msitools/default.nix | 71 +++++++++++++++++-- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 2db336a4991e..96ce9d405914 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,27 +1,86 @@ -{ lib, stdenv, fetchurl, bison, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, vala +, gobject-introspection +, perl +, bison +, gettext +, glib +, pkg-config +, libgsf +, gcab +, bzip2 +, gnome3 +}: stdenv.mkDerivation rec { pname = "msitools"; - version = "0.99"; + version = "0.101"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1HWTml4zayBesxN7rHM96Ambx0gpBA4GWwGxX2yLNjU="; + sha256 = "DMTS4NEI+m8rQIW5qX3VvG2fyt7N2TPyCU+Guv2+hf4="; }; - nativeBuildInputs = [ bison intltool pkg-config ]; - buildInputs = [ glib libgsf libuuid gcab bzip2 ]; + patches = [ + # Fix executable bit on tools (regression in Meson migration). + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/msitools/commit/25c4353cf173cddeb76c0a2dd6621bcb753cabf8.patch"; + sha256 = "VknfZCCn4jxwn9l9noXdGczv2kV+IbOsw9cNBE67P1U="; + }) + + # Fix failure on big-endian platforms. + # https://gitlab.gnome.org/GNOME/msitools/issues/31 + (fetchpatch { + url = "https://gitlab.gnome.org/skitt/msitools/commit/3668c8288085d5beefae7c1387330ce9599b8365.patch"; + sha256 = "x3Mp+9TRqBAJIdzVn68HyYt0lujyMk5h5xSBUQHe9Oo="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + vala + gobject-introspection + perl + bison + gettext + pkg-config + ]; + + buildInputs = [ + glib + libgsf + gcab + bzip2 + ]; + + doCheck = true; + + postPatch = '' + patchShebangs subprojects/bats-core/{bin,libexec} + ''; passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "none"; }; }; meta = with lib; { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = "https://wiki.gnome.org/msitools"; - license = [ licenses.gpl2 licenses.lgpl21 ]; + license = with licenses; [ + # Library + lgpl21Plus + # Tools + gpl2Plus + ]; maintainers = with maintainers; [ PlushBeaver ]; platforms = platforms.unix; }; From 2192b2abda68059018b7a4db2750861e2ab217fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 17:29:40 +0100 Subject: [PATCH 076/148] pythonPackages.defusedxml: execute tests --- pkgs/development/python-modules/defusedxml/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index 3abdd0fb792e..797fee025be4 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, python }: buildPythonPackage rec { @@ -14,6 +15,10 @@ buildPythonPackage rec { sha256 = "183fz8xwclhkirwpvpldyypn47r8lgzfz2mk9jgyg7b37jg5vcc6"; }; + checkPhase = '' + ${python.interpreter} tests.py + ''; + pythonImportsCheck = [ "defusedxml" ]; meta = with lib; { From 39d56d9865f41a8035c8ddbe8ef32fce1a6dc2d9 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 8 Mar 2021 01:29:14 +0800 Subject: [PATCH 077/148] scientifica: 2.1 -> 2.2 --- pkgs/data/fonts/scientifica/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/data/fonts/scientifica/default.nix b/pkgs/data/fonts/scientifica/default.nix index 2a2b237d5275..d8eda3e92326 100644 --- a/pkgs/data/fonts/scientifica/default.nix +++ b/pkgs/data/fonts/scientifica/default.nix @@ -1,25 +1,25 @@ { lib, fetchurl }: let - version = "2.1"; + version = "2.2"; in fetchurl rec { name = "scientifica-${version}"; - url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica-v${version}.tar"; + url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica.tar"; downloadToTemp = true; recursiveHash = true; - sha256 = "081faa48d6g86pacmgjqa96in72rjldavnwxq6bdq2br33h3qwrz"; + sha256 = "sha256-mkZnuW+CB20t6MEpEeQR1CWkIUtqgVwrKN4sezQRaB4="; postFetch = '' - tar xvf $downloadedFile + tar xf $downloadedFile mkdir -p $out/share/fonts/truetype mkdir -p $out/share/fonts/misc - cp scientifica/ttf/*.ttf $out/share/fonts/truetype - cp scientifica/otb/*.otb $out/share/fonts/misc - cp scientifica/bdf/*.bdf $out/share/fonts/misc + install scientifica/ttf/*.ttf $out/share/fonts/truetype + install scientifica/otb/*.otb $out/share/fonts/misc + install scientifica/bdf/*.bdf $out/share/fonts/misc ''; meta = with lib; { From 1d87b01a99cec99e6dce2892cd30e8b7bdcf74ce Mon Sep 17 00:00:00 2001 From: dadada Date: Fri, 5 Mar 2021 20:23:03 +0100 Subject: [PATCH 078/148] sieveshell: 0.6 -> 0.7 --- .../python-modules/managesieve/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/managesieve/default.nix b/pkgs/development/python-modules/managesieve/default.nix index e23c3621c2e9..136bd3f935b1 100644 --- a/pkgs/development/python-modules/managesieve/default.nix +++ b/pkgs/development/python-modules/managesieve/default.nix @@ -7,20 +7,24 @@ buildPythonPackage rec { pname = "managesieve"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "ee70e298e9b68eb81f93d52a1320a034fdc182f3927fdd551836fc93b0ed2c5f"; + sha256 = "1dx0j8hhjwip1ackaj2m4hqrrx2iiv846ic4wa6ymrawwb8iq8m6"; }; checkInputs = [ pytestrunner pytest ]; + checkPhase = '' + pytest + ''; + meta = with lib; { description = "ManageSieve client library for remotely managing Sieve scripts"; - homepage = "https://managesieve.readthedocs.io/"; - # PSFL for the python module, GPLv3 for sieveshell - license = with licenses; [ gpl3 psfl ]; + homepage = "https://managesieve.readthedocs.io/"; + # PSFL for the python module, GPLv3 only for sieveshell + license = with licenses; [ gpl3Only psfl ]; maintainers = with maintainers; [ dadada ]; }; } From 288f4a6173275a6480f7dcbeb6a9bc8aa29ae5e1 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Sun, 7 Mar 2021 15:49:36 +0100 Subject: [PATCH 079/148] dnsviz: init at 0.9.2 --- pkgs/tools/networking/dnsviz/default.nix | 51 +++++++++++++++++++++ pkgs/tools/networking/dnsviz/fix-path.patch | 18 ++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 71 insertions(+) create mode 100644 pkgs/tools/networking/dnsviz/default.nix create mode 100644 pkgs/tools/networking/dnsviz/fix-path.patch diff --git a/pkgs/tools/networking/dnsviz/default.nix b/pkgs/tools/networking/dnsviz/default.nix new file mode 100644 index 000000000000..1f33855017d3 --- /dev/null +++ b/pkgs/tools/networking/dnsviz/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, dnspython +, m2crypto +, pygraphviz +}: + +buildPythonApplication rec { + pname = "dnsviz"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "dnsviz"; + repo = "dnsviz"; + rev = "v${version}"; + sha256 = "sha256-tIxjlNtncZJSdfQelIR9fTohBDkyC0+YwEcs2gNfKec="; + }; + + patches = [ + # override DNSVIZ_INSTALL_PREFIX with $out + ./fix-path.patch + ]; + + propagatedBuildInputs = [ + dnspython + m2crypto + pygraphviz + ]; + + postPatch = '' + substituteInPlace dnsviz/config.py.in --replace '@out@' $out + ''; + + # Tests require network connection and /etc/resolv.conf + doCheck = false; + + pythonImportsCheck = [ "dnsviz" ]; + + meta = with lib; { + description = "Tool suite for analyzing and visualizing DNS and DNSSEC behavior"; + longDescription = '' + DNSViz is a tool suite for analysis and visualization of Domain Name System (DNS) behavior, + including its security extensions (DNSSEC). + + This tool suite powers the Web-based analysis available at https://dnsviz.net/ + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/pkgs/tools/networking/dnsviz/fix-path.patch b/pkgs/tools/networking/dnsviz/fix-path.patch new file mode 100644 index 000000000000..7906058cd98e --- /dev/null +++ b/pkgs/tools/networking/dnsviz/fix-path.patch @@ -0,0 +1,18 @@ +diff --git a/dnsviz/config.py.in b/dnsviz/config.py.in +index 373fde2..007f0f1 100644 +--- a/dnsviz/config.py.in ++++ b/dnsviz/config.py.in +@@ -26,12 +26,7 @@ from __future__ import unicode_literals + import os + import sys + +-_prefix = '__DNSVIZ_INSTALL_PREFIX__' +-if (hasattr(sys, 'real_prefix') or hasattr(sys, 'base_prefix')) and \ +- not _prefix: +- DNSVIZ_INSTALL_PREFIX = sys.prefix +-else: +- DNSVIZ_INSTALL_PREFIX = _prefix ++DNSVIZ_INSTALL_PREFIX = "@out@" + DNSVIZ_SHARE_PATH = os.path.join(DNSVIZ_INSTALL_PREFIX, 'share', 'dnsviz') + JQUERY_PATH = __JQUERY_PATH__ + JQUERY_UI_PATH = __JQUERY_UI_PATH__ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5aee51d878ac..1249bd24bfe3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3663,6 +3663,8 @@ in dnstop = callPackage ../tools/networking/dnstop { }; + dnsviz = python3Packages.callPackage ../tools/networking/dnsviz { }; + dnsx = callPackage ../tools/security/dnsx { }; dhcp = callPackage ../tools/networking/dhcp { }; From 2a0d3cc90764141a076995534a04be9f17e0c40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 7 Mar 2021 11:17:00 +0100 Subject: [PATCH 080/148] sccache: add sccache-dist target in build --- pkgs/development/tools/misc/sccache/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index c41ab92fb97d..214db2ff0121 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj"; - cargoBuildFlags = [ "--features=all" ]; + cargoBuildFlags = [ "--features=dist-client,dist-server" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; From 155a946c371dc77ae87950be51691da94fce1305 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 7 Mar 2021 18:28:37 +0100 Subject: [PATCH 081/148] gitAndTools.tig: 2.5.2 -> 2.5.3 ChangeLog: https://github.com/jonas/tig/releases/tag/tig-2.5.3 --- .../version-management/git-and-tools/tig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 1f2a77d20199..753a3443c315 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-kkH4px34VpnO/S1VjgQGU9Mm4/VpmiOtvlz2ubtStAk="; + sha256 = "sha256-BXs7aKUYiU5L2OjhhmJ+dkHvNcrnw5qREwOTB6npLnw="; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; From 49777a74308e79f8cdaab3b44613023dc2c52739 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 7 Mar 2021 18:29:57 +0100 Subject: [PATCH 082/148] gitea: 1.13.3 -> 1.13.4 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.13.4 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 00bc73c8541f..c9570bb134da 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -9,11 +9,11 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.13.3"; + version = "1.13.4"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-+uuadtpDC4br+DUHpoY2aOwklpD9LxvkSqcBMC0+UHE="; + sha256 = "sha256-Q9wM+TGgE9oFFzg6516bG7iFNjhxOxPMLKtTHghA/OU="; }; unpackPhase = '' From a42b2ff76137ded8b2a84884b22628c5dbb58785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 7 Mar 2021 19:27:10 +0100 Subject: [PATCH 083/148] python3Packages.fritzconnection: 1.4.1 -> 1.4.2 --- .../python-modules/fritzconnection/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 760091e567d5..8e54cb6897cc 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.4.1"; + version = "1.4.2"; # no tests on PyPI src = fetchFromGitHub { owner = "kbr"; repo = pname; rev = version; - sha256 = "1v8gyr91ddinxgl7507hw64snsvcpm3r7bmdjw2v5v6rmc0wl06s"; + sha256 = "02w1hwbfwbh5xlq433myzv6ms7jqxg8kn3d6znq4ic22zprzf5r2"; }; disabled = pythonOlder "3.6"; @@ -18,9 +18,12 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "fritzconnection" ]; + meta = with lib; { - description = "Python-Tool to communicate with the AVM FritzBox using the TR-064 protocol"; + description = "Python-Tool to communicate with the AVM Fritz!Box"; homepage = "https://github.com/kbr/fritzconnection"; + changelog = "https://fritzconnection.readthedocs.io/en/${version}/sources/changes.html"; license = licenses.mit; maintainers = with maintainers; [ dotlambda valodim ]; }; From d2af381b40b4d915c79e0cf248340c1f2bea6895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 7 Mar 2021 08:51:11 +0100 Subject: [PATCH 084/148] firefox: build in 32-bit systems Disabling "-g" and LTO so there aren't memory problems. --- .../networking/browsers/firefox/common.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index fb340ee1acee..7518e3993820 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -23,7 +23,7 @@ , ffmpegSupport ? true , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , waylandSupport ? true, libxkbcommon -, ltoSupport ? stdenv.isLinux, overrideCC, buildPackages +, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , gssSupport ? true, kerberos , pipewireSupport ? waylandSupport && webrtcSupport, pipewire @@ -111,6 +111,13 @@ let else stdenv; nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss; + + # --enable-release adds -ffunction-sections & LTO that require a big amount of + # RAM and the 32-bit memory space cannot handle that linking + # We also disable adding "-g" for easier linking + releaseFlags = if stdenv.is32bit + then [ "--disable-release" "--disable-debug-symbols" ] + else [ "--enable-release" ]; in buildStdenv.mkDerivation ({ @@ -296,9 +303,9 @@ buildStdenv.mkDerivation ({ ++ lib.optional drmSupport "--enable-eme=widevine" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] - else [ "--disable-debug" "--enable-release" + else ([ "--disable-debug" "--enable-optimize" - "--enable-strip" ]) + "--enable-strip" ] ++ releaseFlags)) ++ lib.optional enableOfficialBranding "--enable-official-branding" ++ extraConfigureFlags; From 0540dad5e18536b263bdccf349b0a3e8b7ee8fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 7 Mar 2021 20:26:21 +0100 Subject: [PATCH 085/148] sieveshell: switch to pytestCheckHook --- pkgs/development/python-modules/managesieve/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/managesieve/default.nix b/pkgs/development/python-modules/managesieve/default.nix index 136bd3f935b1..8559339b012a 100644 --- a/pkgs/development/python-modules/managesieve/default.nix +++ b/pkgs/development/python-modules/managesieve/default.nix @@ -1,8 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytestrunner -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -14,11 +13,7 @@ buildPythonPackage rec { sha256 = "1dx0j8hhjwip1ackaj2m4hqrrx2iiv846ic4wa6ymrawwb8iq8m6"; }; - checkInputs = [ pytestrunner pytest ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "ManageSieve client library for remotely managing Sieve scripts"; From f43497da9da8e3cce2eb290778918b21a44c7a60 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 5 Mar 2021 13:48:18 +0100 Subject: [PATCH 086/148] ocamlPackages.asn1-combinators: 0.2.4 -> 0.2.5 Contains a single bug fix, resolving an integer overflow. --- pkgs/development/ocaml-modules/asn1-combinators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index ddc181a49928..289f6a6cba4b 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { minimumOCamlVersion = "4.05"; pname = "asn1-combinators"; - version = "0.2.4"; + version = "0.2.5"; useDune2 = true; src = fetchurl { url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz"; - sha256 = "09rn5wwqhwg7x51b9ycl15s7007hgha6lwaz2bpw85fr70jq3i9r"; + sha256 = "1pbcdwm12hnfpd1jv2b7cjfkj5r7h61xp2gr8dysb8waa455kwln"; }; propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; From 40974d10dea75530052dd58ff7da01262c8f5910 Mon Sep 17 00:00:00 2001 From: omgbebebe Date: Mon, 8 Mar 2021 00:25:34 +0400 Subject: [PATCH 087/148] gxkb: init at 0.9.0 (#115323) Co-authored-by: Sandro --- pkgs/applications/misc/gxkb/default.nix | 29 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/misc/gxkb/default.nix diff --git a/pkgs/applications/misc/gxkb/default.nix b/pkgs/applications/misc/gxkb/default.nix new file mode 100644 index 000000000000..8f6284c7d606 --- /dev/null +++ b/pkgs/applications/misc/gxkb/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck3, libxklavier +, appindicatorSupport ? true, libayatana-appindicator-gtk3 +}: + +stdenv.mkDerivation rec { + pname = "gxkb"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "zen-tools"; + repo = "gxkb"; + rev = "v${version}"; + sha256 = "1fmppvpfz8rip71agsc464fdz423qw0xy8i3pcic14cy5gcwh069"; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ gtk3 libwnck3 libxklavier ] ++ lib.optional appindicatorSupport libayatana-appindicator-gtk3; + + configureFlags = lib.optional appindicatorSupport "--enable-appindicator=yes"; + outputs = [ "out" "man" ]; + + meta = with lib; { + description = "X11 keyboard indicator and switcher"; + homepage = "https://zen-tools.github.io/gxkb/"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.omgbebebe ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42325c2aa7cc..3e6416b0c0a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9097,6 +9097,8 @@ in xwallpaper = callPackage ../tools/X11/xwallpaper { }; + gxkb = callPackage ../applications/misc/gxkb { }; + xxkb = callPackage ../applications/misc/xxkb { }; ugarit = callPackage ../tools/backup/ugarit { From bdbde521d79b4755838e6b9dae3cf68119f1d182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 16:49:10 +0100 Subject: [PATCH 088/148] pythonPackages: remove inherit pkg-config --- pkgs/top-level/python-packages.nix | 109 +++++++++++++++-------------- 1 file changed, 56 insertions(+), 53 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf34e762cc8b..ba1393fbf9c9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -589,7 +589,7 @@ in { withPython = true; }); - av = callPackage ../development/python-modules/av { inherit (pkgs) pkg-config; }; + av = callPackage ../development/python-modules/av { }; avea = callPackage ../development/python-modules/avea { }; @@ -1674,7 +1674,9 @@ in { dbus-next = callPackage ../development/python-modules/dbus-next { }; - dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkg-config; }; + dbus-python = callPackage ../development/python-modules/dbus { + inherit (pkgs) dbus; + }; dbutils = callPackage ../development/python-modules/dbutils { }; @@ -2254,7 +2256,6 @@ in { callPackage ../development/python-modules/feedparser/5.nix { }; fenics = callPackage ../development/libraries/science/math/fenics { - inherit (pkgs) pkg-config; pytest = self.pytest_4; }; @@ -2497,7 +2498,9 @@ in { furl = callPackage ../development/python-modules/furl { }; - fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkg-config; }; + fuse = callPackage ../development/python-modules/fuse-python { + inherit (pkgs) fuse; + }; fusepy = callPackage ../development/python-modules/fusepy { }; @@ -2790,7 +2793,7 @@ in { inherit python; }); - gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkg-config; }; + gphoto2 = callPackage ../development/python-modules/gphoto2 { }; gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; }; @@ -2830,7 +2833,7 @@ in { graphql-server-core = callPackage ../development/python-modules/graphql-server-core { }; - graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { inherit (pkgs) pkg-config; }; + graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { }; graphtage = callPackage ../development/python-modules/graphtage { }; @@ -2875,7 +2878,7 @@ in { gssapi = callPackage ../development/python-modules/gssapi { inherit (pkgs) darwin krb5Full; }; gst-python = callPackage ../development/python-modules/gst-python { - inherit (pkgs) meson pkg-config; + inherit (pkgs) meson; gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; }; @@ -3031,7 +3034,7 @@ in { html5lib = callPackage ../development/python-modules/html5lib { }; - html5-parser = callPackage ../development/python-modules/html5-parser { inherit (pkgs) pkg-config; }; + html5-parser = callPackage ../development/python-modules/html5-parser { }; htmllaundry = callPackage ../development/python-modules/htmllaundry { }; @@ -3194,8 +3197,9 @@ in { importmagic = callPackage ../development/python-modules/importmagic { }; - imread = - callPackage ../development/python-modules/imread { inherit (pkgs) pkg-config libjpeg libpng libtiff libwebp; }; + imread = callPackage ../development/python-modules/imread { + inherit (pkgs) libjpeg libpng libtiff libwebp; + }; imutils = callPackage ../development/python-modules/imutils { }; @@ -3578,7 +3582,6 @@ in { kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { inherit (pkgs.kmsxx) stdenv; - inherit (pkgs) pkg-config; withPython = true; }).overrideAttrs (oldAttrs: { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; })); @@ -3668,7 +3671,7 @@ in { libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; }; - libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkg-config; }; + libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns; }; libcloud = if isPy27 then callPackage ../development/python-modules/libcloud/2.nix { } @@ -3780,13 +3783,16 @@ in { libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; - libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion pkg-config; }; + libversion = callPackage ../development/python-modules/libversion { + inherit (pkgs) libversion; + }; libvirt = if isPy3k then - (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkg-config; }) + (callPackage ../development/python-modules/libvirt { + inherit (pkgs) libvirt; + }) else (callPackage ../development/python-modules/libvirt/5.9.0.nix { - inherit (pkgs) pkg-config; libvirt = pkgs.libvirt_5_9_0; }); @@ -3842,8 +3848,8 @@ in { livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; llfuse = callPackage ../development/python-modules/llfuse { - inherit (pkgs) fuse pkg-config; - }; # use "real" fuse and pkg-config, not the python modules + inherit (pkgs) fuse; + }; llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_9; @@ -4022,7 +4028,6 @@ in { in callPackage path { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - inherit (pkgs) pkg-config; }; matrix-client = callPackage ../development/python-modules/matrix-client { }; @@ -4972,7 +4977,7 @@ in { pkce = callPackage ../development/python-modules/pkce { }; - pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkg-config; }; + pkgconfig = callPackage ../development/python-modules/pkgconfig { }; pkginfo = callPackage ../development/python-modules/pkginfo { }; @@ -5048,7 +5053,7 @@ in { poetry-core = callPackage ../development/python-modules/poetry-core { }; - poezio = callPackage ../applications/networking/instant-messengers/poezio { inherit (pkgs) pkg-config; }; + poezio = callPackage ../applications/networking/instant-messengers/poezio { }; polib = callPackage ../development/python-modules/polib { }; @@ -5067,7 +5072,6 @@ in { poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { inherit (pkgs.qt5) qtbase; inherit (pkgs.libsForQt5) poppler; - inherit (pkgs) pkg-config; }; portalocker = callPackage ../development/python-modules/portalocker { }; @@ -5291,7 +5295,9 @@ in { pyarlo = callPackage ../development/python-modules/pyarlo { }; - pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkg-config; }; + pyarrow = callPackage ../development/python-modules/pyarrow { + inherit (pkgs) arrow-cpp cmake; + }; pyasn1 = callPackage ../development/python-modules/pyasn1 { }; @@ -5299,7 +5305,7 @@ in { pyatmo = callPackage ../development/python-modules/pyatmo { }; - pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs) pkg-config; }; + pyatspi = callPackage ../development/python-modules/pyatspi { }; pyatv = callPackage ../development/python-modules/pyatv { }; @@ -5339,13 +5345,15 @@ in { pybullet = callPackage ../development/python-modules/pybullet { }; - pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkg-config; }; + pycairo = callPackage ../development/python-modules/pycairo { + inherit (pkgs) meson; + }; pycallgraph = callPackage ../development/python-modules/pycallgraph { }; py = callPackage ../development/python-modules/py { }; - pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { inherit (pkgs) pkg-config; }); + pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { }); pycapnp = callPackage ../development/python-modules/pycapnp { }; @@ -5571,19 +5579,19 @@ in { pygmt = callPackage ../development/python-modules/pygmt { }; - pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkg-config; }; + pygobject2 = callPackage ../development/python-modules/pygobject { }; pygobject3 = if isPy3k then - callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkg-config; } + callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson; } else - callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkg-config; }; + callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson; }; pygogo = callPackage ../development/python-modules/pygogo { }; pygpgme = callPackage ../development/python-modules/pygpgme { }; pygraphviz = callPackage ../development/python-modules/pygraphviz { - inherit (pkgs) graphviz pkg-config; + inherit (pkgs) graphviz; }; # not the python package pygreat = callPackage ../development/python-modules/pygreat { }; @@ -5592,14 +5600,15 @@ in { pygtail = callPackage ../development/python-modules/pygtail { }; - pygtk = callPackage ../development/python-modules/pygtk { - inherit (pkgs) pkg-config; - libglade = null; + pygtk = callPackage ../development/python-modules/pygtk { }; + + pyGtkGlade = self.pygtk.override { + inherit (pkgs.gnome2) libglade; }; pyGtkGlade = self.pygtk.override { libglade = pkgs.gnome2.libglade; }; - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkg-config; }; + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; pygtrie = callPackage ../development/python-modules/pygtrie { }; @@ -5924,7 +5933,7 @@ in { pyqt-builder = callPackage ../development/python-modules/pyqt-builder { }; - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkg-config; }; + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { }; pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; @@ -6073,7 +6082,7 @@ in { pysmb = callPackage ../development/python-modules/pysmb { }; - pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkg-config; }; + pysmbc = callPackage ../development/python-modules/pysmbc { }; pysmf = callPackage ../development/python-modules/pysmf { }; @@ -6405,7 +6414,7 @@ in { python-editor = callPackage ../development/python-modules/python-editor { }; - pythonefl = callPackage ../development/python-modules/python-efl { inherit (pkgs) pkg-config; }; + pythonefl = callPackage ../development/python-modules/python-efl { }; python-engineio = callPackage ../development/python-modules/python-engineio { }; @@ -6434,14 +6443,12 @@ in { python-http-client = callPackage ../development/python-modules/python-http-client { }; python-igraph = callPackage ../development/python-modules/python-igraph { - pkg-config = pkgs.pkg-config; - igraph = pkgs.igraph; + inherit (pkgs) igraph; }; pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; pythonix = callPackage ../development/python-modules/pythonix { - inherit (pkgs) pkg-config; meson = pkgs.meson.override { python3 = self.python; }; }; @@ -6494,9 +6501,9 @@ in { python-nest = callPackage ../development/python-modules/python-nest { }; pythonnet = callPackage - ../development/python-modules/pythonnet { # `mono >= 4.6` required to prevent crashes encountered with earlier versions. + ../development/python-modules/pythonnet { + # `mono >= 4.6` required to prevent crashes encountered with earlier versions. mono = pkgs.mono4; - inherit (pkgs) pkg-config; }; python-nmap = callPackage ../development/python-modules/python-nmap { }; @@ -6514,7 +6521,7 @@ in { python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { }; - python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkg-config; }; + python_openzwave = callPackage ../development/python-modules/python_openzwave { }; python-otr = callPackage ../development/python-modules/python-otr { }; @@ -6685,7 +6692,7 @@ in { pyvizio = callPackage ../development/python-modules/pyvizio { }; pyvips = callPackage ../development/python-modules/pyvips { - inherit (pkgs) pkg-config vips glib; + inherit (pkgs) vips glib; }; pyvlx = callPackage ../development/python-modules/pyvlx { }; @@ -6996,7 +7003,6 @@ in { robomachine = callPackage ../development/python-modules/robomachine { }; roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs) pkg-config; # use normal pkg-config, not the python package inherit (pkgs.qt5) qtbase; }; @@ -7232,7 +7238,7 @@ in { seccomp = callPackage ../development/python-modules/seccomp { }; - secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkg-config; }; + secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1; }; secretstorage = if isPy3k then callPackage ../development/python-modules/secretstorage { } @@ -7261,7 +7267,7 @@ in { sendgrid = callPackage ../development/python-modules/sendgrid { }; - sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkg-config; }; + sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece; }; sentinel = callPackage ../development/python-modules/sentinel { }; @@ -7725,7 +7731,7 @@ in { subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit pkg-config cppunit check; }; + subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit cppunit check; }; suds = callPackage ../development/python-modules/suds { }; @@ -7774,7 +7780,7 @@ in { else callPackage ../development/python-modules/sympy/1_5.nix { }; - systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) pkg-config systemd; }; + systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) systemd; }; sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; @@ -8346,7 +8352,7 @@ in { vine = callPackage ../development/python-modules/vine { }; - virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkg-config; }; + virtkey = callPackage ../development/python-modules/virtkey { }; virtual-display = callPackage ../development/python-modules/virtual-display { }; @@ -8543,11 +8549,9 @@ in { wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { wxGTK = pkgs.wxGTK30; - inherit (pkgs) pkg-config; }; wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { - inherit (pkgs) pkg-config; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL; wxGTK = pkgs.wxGTK30.override { withGtk2 = false; @@ -8556,7 +8560,6 @@ in { }; wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix { - inherit (pkgs) pkg-config; wxGTK = pkgs.wxGTK31.override { withGtk2 = false; withWebKit = true; @@ -8818,7 +8821,7 @@ in { zstandard = callPackage ../development/python-modules/zstandard { }; - zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkg-config; }; + zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd; }; zulip = callPackage ../development/python-modules/zulip { }; From d0bc5e0a8262ffa7eae6c08d535492f4bbd68271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 16:49:49 +0100 Subject: [PATCH 089/148] pythonPackages: format some inherits into new line --- pkgs/top-level/python-packages.nix | 54 +++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba1393fbf9c9..39626e8e7b8a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1622,7 +1622,9 @@ in { dask-gateway = callPackage ../development/python-modules/dask-gateway { }; - dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { inherit (pkgs) go; }; + dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { + inherit (pkgs) go; + }; dask-glm = callPackage ../development/python-modules/dask-glm { }; @@ -1640,7 +1642,9 @@ in { databricks-cli = callPackage ../development/python-modules/databricks-cli { }; - databricks-connect = callPackage ../development/python-modules/databricks-connect { inherit (pkgs) jdk; }; + databricks-connect = callPackage ../development/python-modules/databricks-connect { + inherit (pkgs) jdk; + }; dataclasses = callPackage ../development/python-modules/dataclasses { }; @@ -1840,8 +1844,8 @@ in { django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; - django_hijack = callPackage ../development/python-modules/django-hijack - { }; # This package may need an older version of Django. Override the package set and set e.g. `django = super.django_1_9`. See the Nixpkgs manual for examples on how to override the package set. + django_hijack = callPackage ../development/python-modules/django-hijack { }; + # This package may need an older version of Django. Override the package set and set e.g. `django = super.django_1_9`. See the Nixpkgs manual for examples on how to override the package set. django-ipware = callPackage ../development/python-modules/django-ipware { }; @@ -1929,7 +1933,9 @@ in { dkimpy = callPackage ../development/python-modules/dkimpy { }; - dlib = callPackage ../development/python-modules/dlib { inherit (pkgs) dlib; }; + dlib = callPackage ../development/python-modules/dlib { + inherit (pkgs) dlib; + }; dlx = callPackage ../development/python-modules/dlx { }; @@ -1992,7 +1998,9 @@ in { dotty-dict = callPackage ../development/python-modules/dotty-dict { }; - dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; }; + dot2tex = callPackage ../development/python-modules/dot2tex { + inherit (pkgs) graphviz; + }; dparse = callPackage ../development/python-modules/dparse { }; @@ -2010,11 +2018,15 @@ in { ds-store = callPackage ../development/python-modules/ds-store { }; - ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; }; + ds4drv = callPackage ../development/python-modules/ds4drv { + inherit (pkgs) bluez; + }; dtopt = callPackage ../development/python-modules/dtopt { }; - duckdb = callPackage ../development/python-modules/duckdb { duckdb = pkgs.duckdb; }; + duckdb = callPackage ../development/python-modules/duckdb { + inherit (pkgs) duckdb; + }; duecredit = callPackage ../development/python-modules/duecredit { }; @@ -2097,9 +2109,13 @@ in { enamlx = callPackage ../development/python-modules/enamlx { }; - entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; }; + entrance = callPackage ../development/python-modules/entrance { + routerFeatures = false; + }; - entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; }; + entrance-with-router-features = callPackage ../development/python-modules/entrance { + routerFeatures = true; + }; entrypoint2 = callPackage ../development/python-modules/entrypoint2 { }; @@ -2248,7 +2264,9 @@ in { feedgen = callPackage ../development/python-modules/feedgen { }; - feedgenerator = callPackage ../development/python-modules/feedgenerator { inherit (pkgs) glibcLocales; }; + feedgenerator = callPackage ../development/python-modules/feedgenerator { + inherit (pkgs) glibcLocales; + }; feedparser = if isPy3k then callPackage ../development/python-modules/feedparser { } @@ -2279,7 +2297,9 @@ in { fints = callPackage ../development/python-modules/fints { }; - fiona = callPackage ../development/python-modules/fiona { gdal_2 = pkgs.gdal_2; }; + fiona = callPackage ../development/python-modules/fiona { + gdal_2 = pkgs.gdal_2; + }; fipy = callPackage ../development/python-modules/fipy { }; @@ -3781,7 +3801,9 @@ in { else (toPythonModule (pkgs.libtorrent-rasterbar.override { inherit python; })).python; - libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; + libusb1 = callPackage ../development/python-modules/libusb1 { + inherit (pkgs) libusb1; + }; libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion; @@ -5606,8 +5628,6 @@ in { inherit (pkgs.gnome2) libglade; }; - pyGtkGlade = self.pygtk.override { libglade = pkgs.gnome2.libglade; }; - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; pygtrie = callPackage ../development/python-modules/pygtrie { }; @@ -7773,7 +7793,9 @@ in { sybil = callPackage ../development/python-modules/sybil { }; - symengine = callPackage ../development/python-modules/symengine { symengine = pkgs.symengine; }; + symengine = callPackage ../development/python-modules/symengine { + inherit (pkgs) symengine; + }; sympy = if isPy3k then callPackage ../development/python-modules/sympy { } From c34a2136cfdc61c1d5f7714388a5baa837385216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 16:12:18 +0100 Subject: [PATCH 090/148] pythonPackages.dask: format --- pkgs/development/python-modules/dask/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 45b6dd7b6e1d..adebed355e95 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -17,7 +17,6 @@ buildPythonPackage rec { pname = "dask"; version = "2021.03.0"; - disabled = pythonOlder "3.5"; src = fetchFromGitHub { @@ -59,16 +58,16 @@ buildPythonPackage rec { disabledTests = [ "test_argwhere_str" "test_count_nonzero_str" - "rolling_methods" # floating percision error ~0.1*10^8 small + "rolling_methods" # floating percision error ~0.1*10^8 small "num_workers_config" # flaky - "test_2args_with_array[pandas1-darray1-ldexp]" # flaky + "test_2args_with_array[pandas1-darray1-ldexp]" # flaky ]; - meta = { + meta = with lib; { description = "Minimal task scheduling abstraction"; homepage = "https://dask.org/"; changelog = "https://docs.dask.org/en/latest/changelog.html"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; }; } From 83f2ece67831732f223dcce221e720707dc78555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 20:36:50 +0100 Subject: [PATCH 091/148] pythonPackages.dask: add optional extra "complete" --- .../python-modules/dask/default.nix | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index adebed355e95..8f3e4d08583b 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,6 +12,9 @@ , dill , pandas , partd +, pytest-xdist +, withExtraComplete ? false +, distributed }: buildPythonPackage rec { @@ -26,13 +29,6 @@ buildPythonPackage rec { sha256 = "LACv7lWpQULQknNGX/9vH9ckLsypbqKDGnsNBgKT1eI="; }; - checkInputs = [ - pytestCheckHook - pytest-rerunfailures - ]; - - dontUseSetuptoolsCheck = true; - propagatedBuildInputs = [ bokeh cloudpickle @@ -42,8 +38,20 @@ buildPythonPackage rec { pandas partd toolz + ] ++ lib.optionals withExtraComplete [ + distributed ]; + doCheck = false; + + checkInputs = [ + pytestCheckHook + pytest-rerunfailures + pytest-xdist + ]; + + dontUseSetuptoolsCheck = true; + postPatch = '' # versioneer hack to set version of github package echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py @@ -53,14 +61,11 @@ buildPythonPackage rec { --replace "cmdclass=versioneer.get_cmdclass()," "" ''; - #pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; + pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; disabledTests = [ - "test_argwhere_str" - "test_count_nonzero_str" - "rolling_methods" # floating percision error ~0.1*10^8 small - "num_workers_config" # flaky - "test_2args_with_array[pandas1-darray1-ldexp]" # flaky + "test_annotation_pack_unpack" + "test_annotations_blockwise_unpack" ]; meta = with lib; { From e769eec5f142b53be442f80bd43ad75208fdf2f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 20:37:13 +0100 Subject: [PATCH 092/148] pythonPackages.datashader: format, dask with extra "complete", switch to pytestCheckHook --- .../python-modules/datashader/default.nix | 34 ++++++++++++------- pkgs/top-level/python-packages.nix | 4 ++- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 2b11b1ea2737..ecd244b43a62 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -19,14 +19,14 @@ , requests , scikitimage , scipy -, pytest +, pytestCheckHook , pytest-benchmark , flake8 , nbsmoke , fastparquet , testpath , nbconvert -, pytest_xdist +, pytest-xdist }: buildPythonPackage rec { @@ -37,12 +37,15 @@ buildPythonPackage rec { inherit pname version; sha256 = "b1f80415f72f92ccb660aaea7b2881ddd35d07254f7c44101709d42e819d6be6"; }; - patches = [ (fetchpatch { - # Unpins pyct==0.46 (Sep. 11, 2020). - # Will be incorporated into the next datashader release after 0.11.1 - url = "https://github.com/holoviz/datashader/pull/960/commits/d7a462fa399106c34fd0d44505a8a73789dbf874.patch"; - sha256 = "1wqsk9dpxnkxr49fa7y5q6ahin80cvys05lnirs2w2p1dja35y4x"; - })]; + + patches = [ + (fetchpatch { + # Unpins pyct==0.46 (Sep. 11, 2020). + # Will be incorporated into the next datashader release after 0.11.1 + url = "https://github.com/holoviz/datashader/pull/960/commits/d7a462fa399106c34fd0d44505a8a73789dbf874.patch"; + sha256 = "1wqsk9dpxnkxr49fa7y5q6ahin80cvys05lnirs2w2p1dja35y4x"; + }) + ]; propagatedBuildInputs = [ dask @@ -66,9 +69,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook pytest-benchmark - pytest_xdist # not needed + pytest-xdist # not needed flake8 nbsmoke fastparquet @@ -77,9 +80,14 @@ buildPythonPackage rec { ]; # dask doesn't do well with large core counts - checkPhase = '' - pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array and not test_simple_nested' - ''; + # checkPhase = '' + # pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array and not test_simple_nested' + # ''; + + pytestFlagsArray = [ + "-n $NIX_BUILD_CORES" + "datashader" + ]; meta = with lib; { description = "Data visualization toolchain based on aggregating into a grid"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf34e762cc8b..d72c523d3f97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1656,7 +1656,9 @@ in { datasette = callPackage ../development/python-modules/datasette { }; - datashader = callPackage ../development/python-modules/datashader { }; + datashader = callPackage ../development/python-modules/datashader { + dask = self.dask.override { withExtraComplete = true; }; + }; datashape = callPackage ../development/python-modules/datashape { }; From 92ccd0a06a57f65813da94eb194bf817207be39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 21:33:28 +0100 Subject: [PATCH 093/148] pythonPackages.datashader: 0.11.1 -> 0.12.0 --- .../python-modules/datashader/default.nix | 43 +++++-------------- 1 file changed, 10 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index ecd244b43a62..ad5cc8bfb03f 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -1,9 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , dask -, distributed , bokeh , toolz , datashape @@ -15,41 +13,26 @@ , colorcet , param , pyct -, pyyaml -, requests -, scikitimage , scipy , pytestCheckHook -, pytest-benchmark -, flake8 , nbsmoke , fastparquet -, testpath , nbconvert , pytest-xdist +, netcdf4 }: buildPythonPackage rec { pname = "datashader"; - version = "0.11.1"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "b1f80415f72f92ccb660aaea7b2881ddd35d07254f7c44101709d42e819d6be6"; + sha256 = "sha256-CnV6ne3cbMtoVUBDqXf4n3tlEMzuKp7H8Ju7Qrzn9es="; }; - patches = [ - (fetchpatch { - # Unpins pyct==0.46 (Sep. 11, 2020). - # Will be incorporated into the next datashader release after 0.11.1 - url = "https://github.com/holoviz/datashader/pull/960/commits/d7a462fa399106c34fd0d44505a8a73789dbf874.patch"; - sha256 = "1wqsk9dpxnkxr49fa7y5q6ahin80cvys05lnirs2w2p1dja35y4x"; - }) - ]; - propagatedBuildInputs = [ dask - distributed bokeh toolz datashape @@ -61,35 +44,29 @@ buildPythonPackage rec { colorcet param pyct - pyyaml - requests - scikitimage scipy - testpath ]; checkInputs = [ pytestCheckHook - pytest-benchmark pytest-xdist # not needed - flake8 nbsmoke fastparquet - pandas nbconvert + netcdf4 ]; - # dask doesn't do well with large core counts - # checkPhase = '' - # pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array and not test_simple_nested' - # ''; - pytestFlagsArray = [ "-n $NIX_BUILD_CORES" "datashader" ]; - meta = with lib; { + disabledTestPaths = [ + # 31/50 tests fail with TypeErrors + "datashader/tests/test_datatypes.py" + ]; + + meta = with lib;{ description = "Data visualization toolchain based on aggregating into a grid"; homepage = "https://datashader.org"; license = licenses.bsd3; From a2a44a90deea98243ae4d2cb151ce859395a97e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 16:17:33 +0100 Subject: [PATCH 094/148] pythonPackages.distributed: 2.30.1 -> 2021.3.0 --- .../python-modules/distributed/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 372b931bca27..8ce554e6f6be 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "distributed"; - version = "2.30.1"; + version = "2021.3.0"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e"; + sha256 = "sha256-Qn/n4Ee7rXQTxl1X5W+k1rHPkh/SBqPSyquUv5FTw9s="; }; propagatedBuildInputs = [ @@ -38,11 +38,11 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "distributed" ]; - meta = { + meta = with lib; { description = "Distributed computation in Python."; homepage = "https://distributed.readthedocs.io/en/latest/"; - license = lib.licenses.bsd3; - platforms = lib.platforms.x86; # fails on aarch64 - maintainers = with lib.maintainers; [ teh costrouc ]; + license = licenses.bsd3; + platforms = platforms.x86; # fails on aarch64 + maintainers = with maintainers; [ teh costrouc ]; }; } From 61da73e444106e481b2e47eebff16ee40d16391e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 7 Mar 2021 17:58:46 -0300 Subject: [PATCH 095/148] theme-jade1: 1.11 -> 1.12 --- pkgs/data/themes/jade1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index 122d0a4a6568..6eea90c71192 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.11"; + version = "1.12"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "0jljmychbs2lsf6g1pck83x4acljdqqsllkdjgiwv3nnlwahzlvs"; + sha256 = "1pawdfyvpbvhb6fa27rgjp49vlbmix9pq192wjlv2wgq7v4ip9y8"; }; sourceRoot = "."; From 67e8424421b262089233462eb28c02af6edc4d62 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Sun, 3 Jan 2021 18:30:27 +0000 Subject: [PATCH 096/148] prime-server: init at 0.6.7 --- .../libraries/prime-server/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/prime-server/default.nix diff --git a/pkgs/development/libraries/prime-server/default.nix b/pkgs/development/libraries/prime-server/default.nix new file mode 100644 index 000000000000..e50b855dddd4 --- /dev/null +++ b/pkgs/development/libraries/prime-server/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +, curl, zeromq, czmq, libsodium }: + +stdenv.mkDerivation rec { + pname = "prime-server"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "kevinkreiser"; + repo = "prime_server"; + rev = version; + sha256 = "027w3cqfnciyy2x78hfclpb77askn773fab37mzwf6r3mcc7vyl5"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ curl zeromq czmq libsodium ]; + + meta = with lib; { + description = "Non-blocking (web)server API for distributed computing and SOA based on zeromq"; + homepage = "https://github.com/kevinkreiser/prime_server"; + license = licenses.bsd2; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e6416b0c0a4..82b8bab68f78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16490,6 +16490,8 @@ in portmidi = callPackage ../development/libraries/portmidi {}; + prime-server = callPackage ../development/libraries/prime-server { }; + primesieve = callPackage ../development/libraries/science/math/primesieve { }; prison = callPackage ../development/libraries/prison { }; From f30662cec953ab87ee8c8c51e037e25dc5eeef4d Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Sun, 3 Jan 2021 18:37:19 +0000 Subject: [PATCH 097/148] libosmscout: init at 2017.06.30 --- .../libraries/libosmscout/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/libosmscout/default.nix diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/development/libraries/libosmscout/default.nix new file mode 100644 index 000000000000..2f83963d205f --- /dev/null +++ b/pkgs/development/libraries/libosmscout/default.nix @@ -0,0 +1,24 @@ +{ lib, mkDerivation, fetchgit, cmake, pkg-config +, marisa, qtlocation }: + +mkDerivation rec { + pname = "libosmscout"; + version = "2017.06.30"; + + src = fetchgit { + url = "git://git.code.sf.net/p/libosmscout/code"; + rev = "0c0fde4d9803539c99911389bc918377a93f350c"; + sha256 = "1pa459h52kw88mvsdvkz83f4p35vvgsfy2qfjwcj61gj4y9d2rq4"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ marisa qtlocation ]; + + meta = with lib; { + description = "Simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data"; + homepage = "http://libosmscout.sourceforge.net/"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82b8bab68f78..5f2281a99713 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15570,6 +15570,8 @@ in libosmocore = callPackage ../applications/misc/libosmocore { }; + libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { }; + libotr = callPackage ../development/libraries/libotr { }; libow = callPackage ../development/libraries/libow { }; From e3c1b424a4fdabfe670472d3d98fd51434698744 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Sun, 3 Jan 2021 19:41:02 +0000 Subject: [PATCH 098/148] valhalla: init at 3.1.0 --- .../libraries/valhalla/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/valhalla/default.nix diff --git a/pkgs/development/libraries/valhalla/default.nix b/pkgs/development/libraries/valhalla/default.nix new file mode 100644 index 000000000000..6eac19bcb2cd --- /dev/null +++ b/pkgs/development/libraries/valhalla/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +, zlib, curl, protobuf, prime-server, boost, sqlite, libspatialite +, luajit, geos, python3, zeromq }: + +stdenv.mkDerivation rec { + pname = "valhalla"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "valhalla"; + repo = "valhalla"; + rev = version; + sha256 = "04vxvzy6hnhdvb9lh1p5vqzzi2drv0g4l2gnbdp44glipbzgd4dr"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + zlib curl protobuf prime-server boost sqlite libspatialite + luajit geos python3 zeromq + ]; + + cmakeFlags = [ + "-DENABLE_TESTS=OFF" + "-DENABLE_BENCHMARKS=OFF" + ]; + + meta = with lib; { + description = "Open Source Routing Engine for OpenStreetMap"; + homepage = "https://valhalla.readthedocs.io/"; + license = licenses.mit; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f2281a99713..5b88083d8888 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17324,6 +17324,10 @@ in vale = callPackage ../tools/text/vale { }; + valhalla = callPackage ../development/libraries/valhalla { + boost = boost.override { enablePython = true; python = python38; }; + }; + vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { }; vc = callPackage ../development/libraries/vc { }; From bb2ee4c3b0514543b5a1b17d57201f08bdd7274f Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Sun, 3 Jan 2021 20:46:40 +0000 Subject: [PATCH 099/148] libpostal: init at 1.0.0 --- .../libraries/libpostal/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/libpostal/default.nix diff --git a/pkgs/development/libraries/libpostal/default.nix b/pkgs/development/libraries/libpostal/default.nix new file mode 100644 index 000000000000..e6c507ad2bff --- /dev/null +++ b/pkgs/development/libraries/libpostal/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "libpostal"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "openvenues"; + repo = "libpostal"; + rev = "v${version}"; + sha256 = "0qf5nkfkfjl2ylkrnw7kzax71y85gkr8i24glyp9rflyzmpj6giy"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + configureFlags = [ + "--disable-data-download" + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--disable-sse2" ]; + + meta = with lib; { + description = "A C library for parsing/normalizing street addresses around the world. Powered by statistical NLP and open geo data"; + homepage = "https://github.com/openvenues/libpostal"; + license = licenses.mit; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b88083d8888..05f4b56dcfc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15598,6 +15598,8 @@ in libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; + libpostal = callPackage ../development/libraries/libpostal { }; + libpaper = callPackage ../development/libraries/libpaper { }; libpfm = callPackage ../development/libraries/libpfm { }; From 4198e629872f95890e86d85dc6e843e2bc1baa1e Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Sun, 3 Jan 2021 21:10:21 +0000 Subject: [PATCH 100/148] osmscout-server: init at 1.17.1 --- .../misc/osmscout-server/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/applications/misc/osmscout-server/default.nix diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix new file mode 100644 index 000000000000..a3815dae00fc --- /dev/null +++ b/pkgs/applications/misc/osmscout-server/default.nix @@ -0,0 +1,65 @@ +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config +, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation +, libosmscout, mapnik, valhalla, libpostal, osrm-backend, protobuf +, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost +}: + +let + date = fetchFromGitHub { + owner = "HowardHinnant"; + repo = "date"; + rev = "a2fdba1adcb076bf9a8343c07524afdf09aa8dcc"; + sha256 = "00sf1pbaz0g0gsa0dlm23lxk4h46xm1jv1gzbjj5rr9sf1qccyr5"; + }; +in +mkDerivation rec { + pname = "osmscout-server"; + version = "1.17.1"; + + src = fetchFromGitHub { + owner = "rinigus"; + repo = "osmscout-server"; + rev = version; + sha256 = "0rpsi6nyhcz6bv0jab4vixkxhjmn84xi0q2xz15a097hn46cklx9"; + fetchSubmodules = true; + }; + + # Two patches required to work with valhalla 3.1 + patches = [ + # require C++14 to match latest Valhalla + (fetchpatch { + url = "https://github.com/rinigus/osmscout-server/commit/78b41b9b4c607fe9bfd6fbd61ae31cb7c8a725cd.patch"; + sha256 = "0gk9mdwa75awl0bj30gm8waj454d8k2yixxwh05m0p550cbv3lg0"; + }) + # add Valhalla 3.1 config + (fetchpatch { + url = "https://github.com/rinigus/osmscout-server/commit/584de8bd47700053960fa139a2d7f8d3d184c876.patch"; + sha256 = "0liz72n83q93bzzyyiqjkxa6hp9zjx7v9rgsmpwf88gc4caqm2dz"; + }) + ]; + + nativeBuildInputs = [ qmake pkg-config qttools ]; + buildInputs = [ + kirigami2 qtquickcontrols2 qtlocation + mapnik valhalla libosmscout osrm-backend libmicrohttpd_0_9_70 + libpostal sqlite marisa kyotocabinet boost protobuf date + ]; + + # OSMScout server currently defaults to an earlier version of valhalla, + # but valhalla 3.1 support has been added. (See patches above) + # Replace the default valhalla.json with the valhalla 3.1 version + postPatch = '' + mv data/valhalla.json-3.1 data/valhalla.json + ''; + + # Choose to build the kirigami UI variant + qmakeFlags = [ "SCOUT_FLAVOR=kirigami" ]; + + meta = with lib; { + description = "Maps server providing tiles, geocoder, and router"; + homepage = "https://github.com/rinigus/osmscout-server"; + license = licenses.gpl3Only; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05f4b56dcfc5..7dd10c0907f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24485,6 +24485,8 @@ in osmo = callPackage ../applications/office/osmo { }; + osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { }; + palemoon = callPackage ../applications/networking/browsers/palemoon { # https://developer.palemoon.org/build/linux/ stdenv = gcc8Stdenv; From 8c33902388c30954bb7b4dc345892072056fa92a Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Sun, 7 Mar 2021 21:53:44 +0100 Subject: [PATCH 101/148] mopidy-local: 3.2.0 -> 3.2.1 --- pkgs/applications/audio/mopidy/local.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/mopidy/local.nix b/pkgs/applications/audio/mopidy/local.nix index de748ea7b325..ebe9885e4954 100644 --- a/pkgs/applications/audio/mopidy/local.nix +++ b/pkgs/applications/audio/mopidy/local.nix @@ -1,16 +1,15 @@ { lib , mopidy , python3Packages -, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Local"; - version = "3.2.0"; + version = "3.2.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "14f78sb3wkg83dg3xcqlq77dh059zzcwry5l9ilyhnmvmyrkhqx0"; + sha256 = "18w39mxpv8p17whd6zfw5653d21q138f8xd6ili6ks2g2dbm25i9"; }; propagatedBuildInputs = [ @@ -22,14 +21,6 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook ]; - patches = [ - # Fix tests for Mopidyβ‰₯3.1.0. Remove with the next release. - (fetchpatch { - url = "https://github.com/mopidy/mopidy-local/commit/f1d7598d3a9587f0823acb97ecb615f4f4817fd2.patch"; - sha256 = "193kd5zwsr0qpp2y8icdy13vqpglmjdm7x1rw5hliwyq18a34vjp"; - }) - ]; - meta = with lib; { homepage = "https://github.com/mopidy/mopidy-local"; description = "Mopidy extension for playing music from your local music archive"; From 2b4c7c6cf3cf7c200a4ad4edc72711a581e6c082 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Mar 2021 19:01:41 +0000 Subject: [PATCH 102/148] android-udev-rules: 20201003 -> 20210302 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 3d69f5ce0e59..e542c0dbc634 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,24 +6,26 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20201003"; + version = "20210302"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "07s5fdjbk5q4km6gz9759ngdavrqdgbnkd2b7z9z5lqw1q0b2422"; + sha256 = "sha256-yIVHcaQAr2gKH/NZeN+vRmGS8OgyNeRsZkCYyqjsSsI="; }; installPhase = '' + runHook preInstall install -D 51-android.rules $out/lib/udev/rules.d/51-android.rules + runHook postInstall ''; meta = with lib; { homepage = "https://github.com/M0Rf30/android-udev-rules"; description = "Android udev rules list aimed to be the most comprehensive on the net"; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar ]; }; } From e0b6268a795ac81df2b4777593f8a8f9cbd4e8fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 8 Mar 2021 01:04:51 +0100 Subject: [PATCH 103/148] python3Packages.phonemizer: update patch to fix tests --- .../phonemizer/backend-paths.patch | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/phonemizer/backend-paths.patch b/pkgs/development/python-modules/phonemizer/backend-paths.patch index 1734addb0ef1..5f828aaaae13 100644 --- a/pkgs/development/python-modules/phonemizer/backend-paths.patch +++ b/pkgs/development/python-modules/phonemizer/backend-paths.patch @@ -1,8 +1,8 @@ diff --git a/phonemizer/backend/espeak.py b/phonemizer/backend/espeak.py -index 387c11c..ceb5e7e 100644 +index b4712bf..5628fd5 100644 --- a/phonemizer/backend/espeak.py +++ b/phonemizer/backend/espeak.py -@@ -81,10 +81,7 @@ class BaseEspeakBackend(BaseBackend): +@@ -82,10 +82,7 @@ class BaseEspeakBackend(BaseBackend): if _ESPEAK_DEFAULT_PATH: return _ESPEAK_DEFAULT_PATH @@ -15,10 +15,10 @@ index 387c11c..ceb5e7e 100644 @classmethod def is_available(cls): diff --git a/phonemizer/backend/festival.py b/phonemizer/backend/festival.py -index b5bc56d..0833160 100644 +index 3037be5..684ffff 100644 --- a/phonemizer/backend/festival.py +++ b/phonemizer/backend/festival.py -@@ -78,7 +78,7 @@ class FestivalBackend(BaseBackend): +@@ -80,7 +80,7 @@ class FestivalBackend(BaseBackend): if _FESTIVAL_DEFAULT_PATH: return _FESTIVAL_DEFAULT_PATH @@ -27,3 +27,16 @@ index b5bc56d..0833160 100644 @classmethod def is_available(cls): +diff --git a/test/test_punctuation.py b/test/test_punctuation.py +index 6ed642a..08060df 100644 +--- a/test/test_punctuation.py ++++ b/test/test_punctuation.py +@@ -28,7 +28,7 @@ ESPEAK_143 = (EspeakBackend.version(as_tuple=True) >= (1, 49, 3)) + ESPEAK_150 = (EspeakBackend.version(as_tuple=True) >= (1, 50)) + + # True if we are using festival>=2.5 +-FESTIVAL_25 = (FestivalBackend.version(as_tuple=True) >= (2, 5)) ++FESTIVAL_25 = False + + + @pytest.mark.parametrize( From 05aff5f84265cc2640d5a9f3f9e635ed2eab71d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 02:14:38 +0100 Subject: [PATCH 104/148] biboumi: format, remove unused input --- pkgs/servers/xmpp/biboumi/default.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index 74d8d9ae5208..50d2cfa964e0 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -1,6 +1,13 @@ -{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, - libiconv, botan2, systemd, pkg-config, udns, coreutils, python3Packages } : +{ lib, stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn +, libiconv, botan2, systemd, pkg-config, udns, python3Packages } : +let + louiz_catch = fetchgit { + url = "https://lab.louiz.org/louiz/Catch.git"; + rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1 + sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl"; + }; +in stdenv.mkDerivation rec { pname = "biboumi"; version = "9.0"; @@ -10,22 +17,16 @@ stdenv.mkDerivation rec { sha256 = "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy"; }; - louiz_catch = fetchgit { - url = "https://lab.louiz.org/louiz/Catch.git"; - rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1 - sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl"; - }; - patches = [ ./catch.patch ]; nativeBuildInputs = [ cmake pkg-config python3Packages.sphinx ]; - buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd - udns ]; + buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd udns ]; + buildFlags = [ "all" "man" ]; preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi - cp $louiz_catch/single_include/catch.hpp tests/ + cp ${louiz_catch}/single_include/catch.hpp tests/ ''; doCheck = true; From 2d3effa0d046d6ca12b551159c6b314358142680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 02:58:01 +0100 Subject: [PATCH 105/148] pythonPackages.cairosvg: 2.5.1 -> 2.5.2 --- .../python-modules/cairosvg/default.nix | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index 0244f772be11..58b8c2673065 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -1,25 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch -, cairocffi, cssselect2, defusedxml, pillow, tinycss2 -, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, cairocffi +, cssselect2 +, defusedxml +, pillow +, tinycss2 +, pytestCheckHook +, pytest-runner +, pytest-flake8 +, pytest-isort +}: buildPythonPackage rec { pname = "CairoSVG"; - version = "2.5.1"; - + version = "2.5.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bfa0deea7fa0b9b2f29e41b747a915c249dbca731a4667c2917e47ff96e773e0"; + sha256 = "sha256-sLmSnPXboAUXjXRqgDb88AJVUPSYylTbYYczIjhHg7w="; }; + buildInputs = [ pytest-runner ]; + propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + checkInputs = [ pytestCheckHook pytest-flake8 pytest-isort ]; + + pytestFlagsArray = [ + "cairosvg/test_api.py" + ]; + + pythonImportsCheck = [ "cairosvg" ]; meta = with lib; { homepage = "https://cairosvg.org"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; description = "SVG converter based on Cairo"; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 743c6a4187b9117d500576bc20b0e36650c34cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 02:58:56 +0100 Subject: [PATCH 106/148] pythonPackages.celery: add missing requirement --- pkgs/development/python-modules/celery/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index e1fb0b98ea0c..f0fe81f85e28 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, billiard, click, click-didyoumean, click-repl, kombu, pytz, vine +, billiard, click, click-didyoumean, click-plugins, click-repl, kombu, pytz, vine , boto3, case, moto, pytest, pytest-celery, pytest-subtests, pytest-timeout }: @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace "moto==1.3.7" moto ''; - propagatedBuildInputs = [ billiard click click-didyoumean click-repl kombu pytz vine ]; + propagatedBuildInputs = [ billiard click click-didyoumean click-plugins click-repl kombu pytz vine ]; checkInputs = [ boto3 case moto pytest pytest-celery pytest-subtests pytest-timeout ]; @@ -38,5 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/celery/celery/"; description = "Distributed task queue"; license = licenses.bsd3; + maintainers = [ ]; }; } From af3260763009ba50976502594a022d42a8b164b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 04:42:11 +0100 Subject: [PATCH 107/148] php-packages: cleanup --- pkgs/top-level/php-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c2ed5395e353..96d3e9b423b3 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -402,7 +402,7 @@ lib.makeScope pkgs.newScope (self: with self; { buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ valgrind.dev ]; - patches = [] ++ lib.optionals (lib.versionOlder php.version "7.4") [ + patches = lib.optionals (lib.versionOlder php.version "7.4") [ (pkgs.writeText "zend_file_cache_config.patch" '' --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c From 9718302d11cf50b3ff7a9b8114a3fb4157dc660b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 15:46:04 +0100 Subject: [PATCH 108/148] arb: format --- pkgs/development/libraries/arb/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index 1c356b59d8a7..527545e683f4 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -1,26 +1,32 @@ -{lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: +{ lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint }: + stdenv.mkDerivation rec { pname = "arb"; version = "2.17.0"; + src = fetchFromGitHub { owner = "fredrik-johansson"; repo = pname; rev = version; sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1"; }; - buildInputs = [mpir gmp mpfr flint]; + + buildInputs = [ mpir gmp mpfr flint ]; + configureFlags = [ "--with-gmp=${gmp}" "--with-mpir=${mpir}" "--with-mpfr=${mpfr}" "--with-flint=${flint}" ]; + doCheck = true; + meta = with lib; { description = "A library for arbitrary-precision interval arithmetic"; homepage = "https://arblib.org/"; - license = lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; maintainers = teams.sage.members; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } From b7befb3522f2338c71bf0a51eb9e7c0d24d947f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 15:47:42 +0100 Subject: [PATCH 109/148] palp: format --- pkgs/applications/science/math/palp/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index 97b5f88e55b4..2866b4b9469f 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , dimensions ? 6 # works for <= dimensions dimensions, but is only optimized for that exact value , doSymlink ? true # symlink the executables to the default location (without dimension postfix) @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { ''; preBuild = '' - echo Building PALP optimized for ${dim} dimensions - sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h + echo Building PALP optimized for ${dim} dimensions + sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h ''; # palp has no tests of its own. This test is an adapted sage test that failed @@ -42,14 +43,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p "$out/bin" + mkdir -p $out/bin for file in poly class cws nef mori; do - cp -p $file.x "$out/bin/$file-${dim}d.x" + cp -p $file.x "$out/bin/$file-${dim}d.x" done '' + lib.optionalString doSymlink '' - cd "$out/bin" + cd $out/bin for file in poly class cws nef mori; do - ln -sf $file-6d.x $file.x + ln -sf $file-6d.x $file.x done ''; From 0207c32effd1b991cdc6986aae6f25854f0ba15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 15:49:31 +0100 Subject: [PATCH 110/148] giac: remove ? null --- pkgs/applications/science/math/giac/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 8c391e253224..f89fe3e1db36 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,10 +1,9 @@ { stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas , gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty , readline, gettext, libpng, libao, gfortran, perl -, enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null +, enableGUI ? false, libGL, libGLU, xorg, fltk }: -assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null; assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { From 089b96e21799af481bfb51075660652aa0a93a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 15:52:22 +0100 Subject: [PATCH 111/148] csvkit: add pythonImportCheck, mark broken --- pkgs/tools/text/csvkit/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index 05e0cf119bf1..1e1018ae56df 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { patches = [ # Fixes a failing dbf related test. Won't be needed on 1.0.6 or later. - (fetchpatch{ + (fetchpatch { url = "https://github.com/wireservice/csvkit/commit/5f22e664121b13d9ff005a9206873a8f97431dca.patch"; sha256 = "1kg00z65x7l6dnm5nfsr5krs8m7mv23hhb1inkaqf5m5fpkpnvv7"; }) @@ -23,17 +23,22 @@ python3.pkgs.buildPythonApplication rec { agate-dbf agate-sql six - setuptools # `csvsql` requires pkg_resources https://github.com/NixOS/nixpkgs/issues/93594 + setuptools ]; checkInputs = with python3.pkgs; [ - nose pytestCheckHook + nose + pytestCheckHook ]; + pythonImportsCheck = [ "csvkit" ]; + meta = with lib; { description = "A suite of command-line tools for converting to and working with CSV"; maintainers = with maintainers; [ vrthra ]; license = licenses.mit; homepage = "https://github.com/wireservice/csvkit"; + # FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL) + broken = true; }; } From 17badcf58ad1a05e3a5d3b6eaf9db336bcb6121d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 15:53:42 +0100 Subject: [PATCH 112/148] pythonPackages.agate-sql: format, add pythonImportsCheck, mark broken --- .../python-modules/agate-sql/default.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 29bbfa81ed23..fb080bcc11b2 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -1,20 +1,24 @@ { lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: buildPythonPackage rec { - pname = "agate-sql"; - version = "0.5.5"; + pname = "agate-sql"; + version = "0.5.5"; - src = fetchPypi { - inherit pname version; - sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; + }; - propagatedBuildInputs = [ agate sqlalchemy crate ]; + propagatedBuildInputs = [ agate sqlalchemy crate ]; - meta = with lib; { - description = "Adds SQL read/write support to agate."; - homepage = "https://github.com/wireservice/agate-sql"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ vrthra ]; - }; + pythonImportsCheck = [ "agatesql" ]; + + meta = with lib; { + description = "Adds SQL read/write support to agate."; + homepage = "https://github.com/wireservice/agate-sql"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ vrthra ]; + # FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL) + broken = true; + }; } From c878b14107eea569142195b1e330191b3999f30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 19:45:50 +0100 Subject: [PATCH 113/148] zz: remove emojis from description --- pkgs/development/compilers/zz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix index dade163c5273..4713a1d9459b 100644 --- a/pkgs/development/compilers/zz/default.nix +++ b/pkgs/development/compilers/zz/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "πŸΊπŸ™ ZetZ a zymbolic verifier and tranzpiler to bare metal C"; + description = "ZetZ a zymbolic verifier and tranzpiler to bare metal C"; homepage = "https://github.com/zetzit/zz"; license = licenses.mit; maintainers = [ maintainers.marsam ]; From d5106e90dac8985a9a3acd33d1f25c24e7162fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 7 Mar 2021 20:37:20 +0100 Subject: [PATCH 114/148] pythonPackages.dopy: add python importsCheck --- pkgs/development/python-modules/dopy/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix index 538a861c9f4c..9bd32d1ba4a1 100644 --- a/pkgs/development/python-modules/dopy/default.nix +++ b/pkgs/development/python-modules/dopy/default.nix @@ -5,18 +5,22 @@ }: buildPythonPackage { - version = "2016-01-04"; pname = "dopy"; + version = "2016-01-04"; src = pkgs.fetchFromGitHub { owner = "Wiredcraft"; repo = "dopy"; rev = "cb443214166a4e91b17c925f40009ac883336dc3"; - sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56"; + sha256 = "0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56"; }; propagatedBuildInputs = [ requests six ]; + # contains no tests + doCheck = false; + pythonImportsCheck = [ "dopy" ]; + meta = with pkgs.lib; { description = "Digital Ocean API python wrapper"; homepage = "https://github.com/Wiredcraft/dopy"; From 53883bbdd1525d76150fc0b74298f3148c049085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 8 Mar 2021 03:26:00 +0100 Subject: [PATCH 115/148] lsd: 0.19.0 -> 0.20.1, add SuperSandro2000 as maintainer --- pkgs/tools/misc/lsd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index c3c9fab8c1ed..212cc997e768 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.19.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "Peltoche"; repo = pname; rev = version; - sha256 = "1iiczdsqw0i6cz492177z6lr8s7fikn151j8p76fmr77zk0bm6q2"; + sha256 = "sha256-r/Rllu+tgKqz+vkxA8BSN+3V0lUUd6dEATfickQp4+s="; }; - cargoSha256 = "1r2mkpicsyihlrim3bnmscgg5rnaijpvgq8c846zqj7ly8v8qqvg"; + cargoSha256 = "sha256-ZK4kKdW+TqT0NXzB1wtQwJA78cVRxvEoqImOIqLldvM="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Peltoche/lsd"; description = "The next gen ls command"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne marsam zowoq ]; + maintainers = with maintainers; [ Br1ght0ne marsam zowoq SuperSandro2000 ]; }; } From fb5d2e1220e5fe2073531d21de424fa0c6dc0358 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Mar 2021 00:14:59 +0000 Subject: [PATCH 116/148] libspectrum: 1.4.4 -> 1.5.0 --- pkgs/development/libraries/libspectrum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix index 8922bedccdc8..011531b1a23e 100644 --- a/pkgs/development/libraries/libspectrum/default.nix +++ b/pkgs/development/libraries/libspectrum/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, perl, pkg-config, audiofile, bzip2, glib, libgcrypt, zlib }: stdenv.mkDerivation rec { - name = "libspectrum-1.4.4"; + name = "libspectrum-1.5.0"; src = fetchurl { url = "mirror://sourceforge/fuse-emulator/${name}.tar.gz"; - sha256 = "1cc0jx617sym6qj1f9fm115q44cq5azsxplqq2cgrg0pmlmjpyzx"; + sha256 = "sha256-o1PLRumxooEGHYFjU+oBDQpv545qF6oLe3QnHKXkrPw="; }; nativeBuildInputs = [ perl pkg-config ]; From efcfa964412ef8fd14250daa620bb8527344ac0f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Mar 2021 01:23:26 +0000 Subject: [PATCH 117/148] nats-streaming-server: 0.20.0 -> 0.21.0 --- pkgs/servers/nats-streaming-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index 5726786e5b40..40a304bafbad 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -4,14 +4,14 @@ with lib; buildGoPackage rec { pname = "nats-streaming-server"; - version = "0.20.0"; + version = "0.21.0"; goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-vhUj3CVBM5jbwEtnzdgQD3eLguiHQguK01O69JZIUUk="; + sha256 = "sha256-vZFX5YDf722c7xc4oh4SoL91s7XuZsXzFxW+i//mOUw="; }; meta = { From 8a59b4e3d49c29fe925c58f5e0b9ac3737410fac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Mar 2021 09:28:44 +0000 Subject: [PATCH 118/148] frotz: 2.52 -> 2.53 --- pkgs/games/frotz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix index 58339e5d26f0..2e90176be7e6 100644 --- a/pkgs/games/frotz/default.nix +++ b/pkgs/games/frotz/default.nix @@ -8,7 +8,7 @@ , lib, stdenv }: stdenv.mkDerivation rec { - version = "2.52"; + version = "2.53"; pname = "frotz"; src = fetchFromGitLab { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "DavidGriffith"; repo = "frotz"; rev = version; - sha256 = "11ca1dz31b7s5vxjqncwjwmbbcr2m5v2rxjn49g4gnvwd6mqw48y"; + sha256 = "sha256-xVC/iE71W/Wdy5aPGH9DtcVAHWCcg3HkEA3iDV6OYUo="; }; buildInputs = [ libao libmodplug libsamplerate libsndfile libvorbis ncurses ]; From 04af068cbd211bf662a034f554e664e4ecadc7ce Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 8 Mar 2021 04:20:00 +0000 Subject: [PATCH 119/148] _3270font: 2.2.1 -> 2.3.0 https://github.com/rbanffy/3270font/releases/tag/v2.3.0 --- pkgs/data/fonts/3270font/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/3270font/default.nix b/pkgs/data/fonts/3270font/default.nix index dacfdfbcceae..d737c9383f15 100644 --- a/pkgs/data/fonts/3270font/default.nix +++ b/pkgs/data/fonts/3270font/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.2.1"; + version = "2.3.0"; in fetchzip { name = "3270font-${version}"; - url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_70de9c7.zip"; + url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_fd00815.zip"; - sha256 = "0spz9abp87r3bncjim6hs47fmhg86qbgips4x6nfpqzg5qh2xd2m"; + sha256 = "0ny2jcsfa1kfzkm979dfzqv756ijm5xirm02ln7a4kwhxxsm5xr1"; postFetch = '' mkdir -p $out/share/fonts/ From cd7edb91fde3b7d82374b3d865c8ef858a73e639 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Mar 2021 01:33:40 +0000 Subject: [PATCH 120/148] liquidprompt: 2.0.0 -> 2.0.2 --- pkgs/shells/liquidprompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index a84e2e14677c..5fa331b85401 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "liquidprompt"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "nojhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+qNH4Df0wCI3KE6LT3YWKpp7yzJcedmVlm/f1Myz108="; + sha256 = "sha256-FXBClOkGRUey/FnLw3g3uiHUJeNiB4tXqP4Na6CuwIM="; }; installPhase = '' From df069bf868de6a018632536a5366a43249d92808 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 28 Feb 2021 19:05:26 +0000 Subject: [PATCH 121/148] calibre: 5.11.0 -> 5.12.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 16541eaaa210..7f2ee5a288a2 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -26,11 +26,11 @@ mkDerivation rec { pname = "calibre"; - version = "5.11.0"; + version = "5.12.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-PI+KIMnslhoagv9U6Mcmo9Onfu8clVqASNlDir8JzUw="; + sha256 = "sha256-N3/y1kSWyM36LpwbimftJ67h4zfk2j9hcvUi/pQL3YU="; }; patches = [ From a094d0e0e4804dfa2a28eb81b4db683aee2d2604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 8 Mar 2021 08:00:18 +0100 Subject: [PATCH 122/148] sccache: change platforms to x86_64-linux Other platforms are not supported, see: https://github.com/mozilla/sccache/blob/master/src/bin/sccache-dist/main.rs#L70 --- pkgs/development/tools/misc/sccache/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 214db2ff0121..ccadaa8aeb47 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mozilla/sccache"; maintainers = with maintainers; [ doronbehar ]; license = licenses.asl20; - platforms = platforms.unix; + platforms = [ "x86_64-linux" ]; }; } From 091aa7d05cd870c9c1fc9f9905c499acae1b2f78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 28 Feb 2021 14:48:15 +0000 Subject: [PATCH 123/148] klayout: 0.26.9 -> 0.26.10 --- pkgs/applications/misc/klayout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 33f3c4144b5a..4c5a443ba0d6 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.26.9"; + version = "0.26.10"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "sha256-d0k8OQZ+ij+dslc3iAQkgy1TyYAL7Bf1xvSH21eTGO8="; + sha256 = "sha256-h2jCmLZ2pRlK8VblQosBX0ZcoHDnn4oYeSqzA3y1Tzg="; }; postPatch = '' From 3c24c9626507de2c2a55ac6436096b6c6bee9e00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Mar 2021 08:30:51 +0100 Subject: [PATCH 124/148] metasploit: 6.0.31 -> 6.0.33 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 34 ++++++------ pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 58 ++++++++++----------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index ff2d70f3924b..047c072c389e 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.31" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.33" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 60aa8ce9eb0c..a58e933d3c36 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 56ef940a085620b127d61a516bc10241a795f92b - ref: refs/tags/6.0.31 + revision: 76926232b9c92df4832d986513fe89b8c1d53f1f + ref: refs/tags/6.0.33 specs: - metasploit-framework (6.0.31) + metasploit-framework (6.0.33) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -31,7 +31,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.28) + metasploit-payloads (= 2.0.34) metasploit_data_models metasploit_payloads-mettle (= 1.0.6) mqtt @@ -123,14 +123,14 @@ GEM arel (9.0.0) arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) - aws-eventstream (1.1.0) - aws-partitions (1.428.0) - aws-sdk-core (3.112.0) + aws-eventstream (1.1.1) + aws-partitions (1.431.1) + aws-sdk-core (3.112.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.225.0) + aws-sdk-ec2 (1.226.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.48.0) @@ -139,11 +139,11 @@ GEM aws-sdk-kms (1.42.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.88.1) + aws-sdk-s3 (1.89.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.2) + aws-sigv4 (1.2.3) aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.16) bcrypt_pbkdf (1.1.0) @@ -186,7 +186,7 @@ GEM i18n (1.8.9) concurrent-ruby (~> 1.0) io-console (0.5.8) - irb (1.3.3) + irb (1.3.4) reline (>= 0.1.5) jmespath (1.4.0) jsobfu (0.4.2) @@ -214,7 +214,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.28) + metasploit-payloads (2.0.34) metasploit_data_models (4.1.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -228,7 +228,7 @@ GEM metasploit_payloads-mettle (1.0.6) method_source (1.0.0) mini_portile2 (2.5.0) - minitest (5.14.3) + minitest (5.14.4) mqtt (0.5.0) msgpack (1.4.2) multipart-post (2.1.1) @@ -239,7 +239,7 @@ GEM net-ssh (6.1.0) network_interface (0.0.2) nexpose (7.2.1) - nio4r (2.5.5) + nio4r (2.5.7) nokogiri (1.11.1) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -261,7 +261,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.2.1) + puma (5.2.2) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -285,7 +285,7 @@ GEM recog (2.3.19) nokogiri redcarpet (3.5.1) - reline (0.2.3) + reline (0.2.4) io-console (~> 0.5) rex-arch (0.1.14) rex-text @@ -332,7 +332,7 @@ GEM rex-socket rex-text rex-struct2 (0.1.3) - rex-text (0.2.31) + rex-text (0.2.33) rex-zip (0.1.4) rex-text rexml (3.2.4) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index a0fa76e9c7f6..0887f84410e8 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.31"; + version = "6.0.33"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-wt7VeS8NnmJHMhry/68W1S1f9jUnsSHnhUSrCQN1qNM="; + sha256 = "sha256-hIAXqohZyBJfVj4BxxYVpERZDU6sd6EnVgVax7MXQ7Q="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 429e685b8f04..c66c4c5880b6 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,40 +104,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; + sha256 = "0jfki5ikfr8ln5cdgv4iv1643kax0bjpp29jh78chzy713274jh3"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13rvpllihvpksf1jqwa2i5vbv2hhb34viaidw4rkxr3dyygkdpj8"; + sha256 = "08574xgyq39z07xhbgc12882v38lgkmj0jpznpcivjca1v7dk53l"; type = "gem"; }; - version = "1.428.0"; + version = "1.431.1"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15lynby6r91p9hh5h92pg4jr8xgnjr52px5ax0p0wncdw4vz0skp"; + sha256 = "0r5f7pb9dh95f7cb4rdj1z766c88735y6y6msbgzak0v8g8j3dw9"; type = "gem"; }; - version = "3.112.0"; + version = "3.112.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2f3jp8p7ag9kw7glkiq60ypqq26ra79qnhms4apqz5www86d4d"; + sha256 = "0xa39m2lsdq4i0n9r2bz19nv43pjkrs54dnas7q78gl3c467wqj9"; type = "gem"; }; - version = "1.225.0"; + version = "1.226.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -164,20 +164,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01zlv2icx3m0pq94z9fcsp1r9ivdqhfpnpbrv63fpr6m7yqww24y"; + sha256 = "0mznxmpsjqf3gmb6nxkmj2niswy4vvs4ykabf5z9cvamhbvvjhbv"; type = "gem"; }; - version = "1.88.1"; + version = "1.89.0"; }; aws-sigv4 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; + sha256 = "1d9zhmi3mpfzkkpg7yw7s9r1dwk157kh9875j3c7gh6cy95lmmaw"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; bcrypt = { groups = ["default"]; @@ -444,10 +444,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00c95xk8c9wzcs5imsrm85jk06y8l4dbnzhvqap98nprr9mxxnvl"; + sha256 = "1zf8n7s823rs5byzxpin626hd532ql0w5hdj1i3bds3h8h5gvxwb"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.4"; }; jmespath = { groups = ["default"]; @@ -524,12 +524,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "56ef940a085620b127d61a516bc10241a795f92b"; - sha256 = "1lx8fl1hkas4hpkj3c976pv5ybfm2spzzwhs693n57hd5xwxbpn2"; + rev = "76926232b9c92df4832d986513fe89b8c1d53f1f"; + sha256 = "1d232yrwfnh5aqks2xxc9q6mji542lbcf09yargi5j2ri2m1g044"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.31"; + version = "6.0.33"; }; metasploit-model = { groups = ["default"]; @@ -546,10 +546,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xln6zgdiimrbwjbdhi9008bjhmwqm13zky4310pvr7g8riffwqx"; + sha256 = "1n0npcd6im6h225pd3abcydsxg9n3hmarmdssy66x4g8wpiifbrp"; type = "gem"; }; - version = "2.0.28"; + version = "2.0.34"; }; metasploit_data_models = { groups = ["default"]; @@ -596,10 +596,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipjhdw8ds6q9h7bs3iw28bjrwkwp215hr4l3xf6215fsl80ky5j"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.3"; + version = "5.14.4"; }; mqtt = { groups = ["default"]; @@ -696,10 +696,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbrmq1pvmszrwf40lzwmf8krs2b56720i7wsz9gh274qljkzklf"; + sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5"; type = "gem"; }; - version = "2.5.5"; + version = "2.5.7"; }; nokogiri = { groups = ["default"]; @@ -816,10 +816,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10kj484ppkjdg1j8jac4bxdv1082bd6g6xhrj70chlp7lkgl8ggh"; + sha256 = "0wiprd0v4mjqv5p1vqaidr9ci2xm08lcxdz1k50mb1b6nrw6r74k"; type = "gem"; }; - version = "5.2.1"; + version = "5.2.2"; }; racc = { groups = ["default"]; @@ -936,10 +936,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18xpix2hn4x4hihn0fjsv6i7jr7zjfbwzs94hwn48klyq3yrym2h"; + sha256 = "15gcafrzp9qzfv65cjapifpqg7cckyr14m9xw86fi56d2b6jms8b"; type = "gem"; }; - version = "0.2.3"; + version = "0.2.4"; }; rex-arch = { groups = ["default"]; @@ -1106,10 +1106,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "078bdybz7cw3zd0mr59qgr1x6pifnn352636s74i1ncqzrzni46b"; + sha256 = "1933p6fri27d2gscws43k1v8jw1821l5j4yfi9z97ch5l80mv1zr"; type = "gem"; }; - version = "0.2.31"; + version = "0.2.33"; }; rex-zip = { groups = ["default"]; From ba8d4a5c865899dde6c73619c4a40dd6ce11dc11 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 5 Mar 2021 16:36:59 +0100 Subject: [PATCH 125/148] ocamlPackages.ca-certs: 0.1.3. -> 0.2.0 --- pkgs/development/ocaml-modules/ca-certs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix index 65b411c52d52..dacc181f751c 100644 --- a/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "ca-certs"; - version = "0.1.3"; + version = "0.2.0"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz"; - sha256 = "0jpghxjp2n8wx6ig0d2x87ycaql6mb92w8ai3xh3jb288m7g02zn"; + sha256 = "15jfb5zvahs90jsfs7ridqihlka5198z2xrvplj8ddchxfmpx868"; }; useDune2 = true; From 8b10d91d0c687ad0e3f781b8d3c2ab6a3ef8ba61 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 6 Mar 2021 12:37:32 +0100 Subject: [PATCH 126/148] ocamlPackages.optint: use dune 2 Necessary for compatibility with OCaml 4.12 and all packages depending on it use it anyways. --- pkgs/development/ocaml-modules/optint/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/optint/default.nix b/pkgs/development/ocaml-modules/optint/default.nix index 18e4bd1ae864..7f8ded5feb6c 100644 --- a/pkgs/development/ocaml-modules/optint/default.nix +++ b/pkgs/development/ocaml-modules/optint/default.nix @@ -9,6 +9,8 @@ buildDunePackage rec { sha256 = "1a7gabxqmfvii8qnxq1clx43md2h9glskxhac8y8r0rhzblx3s1a"; }; + useDune2 = true; + meta = { homepage = "https://github.com/mirage/optint"; description = "Abstract type of integer between x64 and x86 architecture"; From 2758f7bb1effe1f98b8f2eff27287ba79e51dc16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Mar 2021 08:48:54 +0100 Subject: [PATCH 127/148] python3Packages.agate-sql: 0.5.5 -> 0.5.6 --- .../python-modules/agate-sql/default.nix | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index fb080bcc11b2..7bbfc623d35b 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -1,15 +1,34 @@ -{ lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, agate +, sqlalchemy +, crate +, nose +, geojson +}: buildPythonPackage rec { pname = "agate-sql"; - version = "0.5.5"; + version = "0.5.6"; - src = fetchPypi { - inherit pname version; - sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "wireservice"; + repo = "agate-sql"; + rev = version; + sha256 = "16rijcnvxrvw9mmyk4228dalrr2qb74y649g1l6qifiabx5ij78s"; }; - propagatedBuildInputs = [ agate sqlalchemy crate ]; + propagatedBuildInputs = [ agate sqlalchemy ]; + + checkInputs = [ crate nose geojson ]; + + checkPhase = '' + nosetests + ''; pythonImportsCheck = [ "agatesql" ]; @@ -18,7 +37,5 @@ buildPythonPackage rec { homepage = "https://github.com/wireservice/agate-sql"; license = with licenses; [ mit ]; maintainers = with maintainers; [ vrthra ]; - # FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL) - broken = true; }; } From b1d385cf4b02126465b20ae884e276c2d635e9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Mar 2021 08:51:54 +0100 Subject: [PATCH 128/148] csvkit: not broken --- pkgs/tools/text/csvkit/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index 1e1018ae56df..56f5bae3123d 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -38,7 +38,5 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ vrthra ]; license = licenses.mit; homepage = "https://github.com/wireservice/csvkit"; - # FAIL: test_to_sql_create_statement_with_schema (tests.test_agatesql.TestSQL) - broken = true; }; } From 2b74b052c0e776f85abdea91ecfcfb7cf87eeb0e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Mar 2021 01:08:52 -0800 Subject: [PATCH 129/148] cvise: 2.1.0 -> 2.2.0 (#115382) --- pkgs/development/tools/misc/cvise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index 357e3e98f081..6684fdc88679 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "cvise"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "marxin"; repo = "cvise"; rev = "v${version}"; - sha256 = "0ljl0r5jqj6lrddrbxjkcphcz5p4njnn2hqz07jyh30jd9sm7dmj"; + sha256 = "116cicz4d506ds3m9bmnb7f9nkp07hyzcrw29ljhznh1i620msim"; }; patches = [ From 7c3f2c0ed6f81b0408e2558c62140c8c07b14fbe Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Sun, 7 Mar 2021 01:48:55 +0300 Subject: [PATCH 130/148] bindfs: enable darwin --- pkgs/tools/filesystems/bindfs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 12052100db32..44c5e5d0fe3b 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fuse, pkg-config }: +{ lib, stdenv, fetchurl, fuse, pkg-config, osxfuse }: stdenv.mkDerivation rec { version = "1.15.1"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fuse ]; + buildInputs = if stdenv.isDarwin + then [ osxfuse ] + else [ fuse ]; postFixup = '' ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs ''; From ebef12e7793bf28d75307e004aa69a04d7bb5d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Mar 2021 10:43:20 +0100 Subject: [PATCH 131/148] yubikey-neo-manager: drop --- .../misc/yubikey-neo-manager/default.nix | 28 ------------------- .../fix-pyside-requirement.diff | 17 ----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/tools/misc/yubikey-neo-manager/default.nix delete mode 100644 pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix deleted file mode 100644 index 3991b99fcdcf..000000000000 --- a/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, fetchurl, python27Packages -, libykneomgr, yubikey-personalization, libu2f-host }: - -python27Packages.buildPythonPackage rec { - namePrefix = ""; - name = "yubikey-neo-manager-${version}"; - version = "1.4.0"; - src = fetchurl { - url = "https://developers.yubico.com/yubikey-neo-manager/Releases/${name}.tar.gz"; - sha256 = "1isxvx27hk0avxwgwcwys2z8ickfs816ii1aklvmi09ak1rgrf1g"; - }; - - propagatedBuildInputs = with python27Packages; [ pyside pycrypto ]; - patches = [ ./fix-pyside-requirement.diff ]; - - # aid ctypes load_libary() - makeWrapperArgs = [ - "--set LD_PRELOAD '${libykneomgr}/lib/libykneomgr.so ${yubikey-personalization}/lib/libykpers-1.so ${libu2f-host}/lib/libu2f-host.so'" - ]; - - meta = with lib; { - homepage = "https://developers.yubico.com/yubikey-neo-manager"; - description = "Cross platform personalization tool for the YubiKey NEO"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ mbakke ]; - }; -} diff --git a/pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff b/pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff deleted file mode 100644 index d11a3a1cc6d9..000000000000 --- a/pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff +++ /dev/null @@ -1,17 +0,0 @@ -Description: Remove PySide requirement, since python-pyside does not register itself correctly -Author: Dain Nilsson -Forwarded: no ---- a/setup.py -+++ b/setup.py -@@ -44,8 +44,9 @@ - entry_points={ - 'gui_scripts': ['neoman=neoman.__main__:main'] - }, -- install_requires=['PySide', 'pycrypto'], -- yc_requires=['ctypes', 'qt'], -+ install_requires=['pycrypto'], -+ yc_requires=['ctypes'], -+ packages=['neoman', 'neoman.model', 'neoman.view', 'neoman.yubicommon', 'neoman.yubicommon.setup', 'neoman.yubicommon.ctypes', 'neoman.yubicommon.qt'], - cmdclass={'executable': executable, 'qt_resources': qt_resources('neoman')}, - classifiers=[ - 'License :: OSI Approved :: BSD License', diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cd6418e1e817..dee6b3138e80 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -786,6 +786,7 @@ mapAliases ({ xv = xxv; # added 2020-02-22 youtubeDL = youtube-dl; # added 2014-10-26 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; + yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08 yuzu = yuzu-mainline; # added 2021-01-25 zdfmediathk = mediathekview; # added 2019-01-19 gnome_user_docs = gnome-user-docs; # added 2019-11-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80e973fc02a1..f124529b5ef4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17559,8 +17559,6 @@ in pythonPackages = python3Packages; }; - yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { }; - yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { }; yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; From f4b327a9c2ce0c45ad6ccd94137e64a16ec89ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Mar 2021 11:04:59 +0100 Subject: [PATCH 132/148] python2nix: drop --- .../package-management/python2nix/default.nix | 19 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 pkgs/tools/package-management/python2nix/default.nix diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix deleted file mode 100644 index c36a488647a7..000000000000 --- a/pkgs/tools/package-management/python2nix/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, fetchFromGitHub, pythonPackages }: - -pythonPackages.buildPythonApplication { - name = "python2nix-20140927"; - - src = fetchFromGitHub { - owner = "proger"; - repo = "python2nix"; - rev = "84e3a5bbe82e5d9d694d6db8dabf73def4ac917b"; - sha256 = "022gr0gw6azfi3iq4ggb3fhkw2jljs6n5rncn45hb5liwakigj8i"; - }; - - propagatedBuildInputs = with pythonPackages; [ requests pip setuptools ]; - - meta = with lib; { - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cd6418e1e817..e212021362d7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -553,6 +553,7 @@ mapAliases ({ phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24 + python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80e973fc02a1..e9e6b4723264 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11576,8 +11576,6 @@ in # Should eventually be moved inside Python interpreters. python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { }; - python2nix = callPackage ../tools/package-management/python2nix { }; - pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); pypi2nix = callPackage ../development/tools/pypi2nix {}; From 11f4fa4a22af70647bf2004a1711cb2f803af80e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Mar 2021 11:06:24 +0100 Subject: [PATCH 133/148] doc: mention up-to-date tools for generating Python expressions --- doc/languages-frameworks/python.section.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 46491a785a7a..e569cdaa9357 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1188,7 +1188,8 @@ community to help save time. No tool is preferred at the moment. expressions for your Python project. Note that [sharing derivations from pypi2nix with nixpkgs is possible but not encouraged](https://github.com/nix-community/pypi2nix/issues/222#issuecomment-443497376). -- [python2nix](https://github.com/proger/python2nix) by Vladimir Kirillov. +- [nixpkgs-pytools](https://github.com/nix-community/nixpkgs-pytools) +- [poetry2nix](https://github.com/nix-community/poetry2nix) ### Deterministic builds From 00569fd374acc4aa3bf8be975cc2302251396dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Mar 2021 11:25:42 +0100 Subject: [PATCH 134/148] gmvault: drop The git repo has not seen any commit since 2016. It is insecure: https://github.com/gaubert/gmvault/issues/330 Login is mostly broken: https://github.com/gaubert/gmvault/issues/335 --- pkgs/tools/networking/gmvault/default.nix | 31 ----------------------- pkgs/tools/networking/gmvault/gmvault.py | 4 --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/tools/networking/gmvault/default.nix delete mode 100644 pkgs/tools/networking/gmvault/gmvault.py diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix deleted file mode 100644 index 31b91c01c2d6..000000000000 --- a/pkgs/tools/networking/gmvault/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ pkgs, fetchurl, pythonPackages }: - -pythonPackages.buildPythonApplication rec { - version = "1.9.1"; - pname = "gmvault"; - - src = fetchurl { - url = "https://bitbucket.org/gaubert/gmvault-official-download/downloads/gmvault-v${version}-src.tar.gz"; - name = "${pname}-${version}.tar.bz"; - sha256 = "0ffp8df3gdf6lf3pj75hzsmxmvmscppb6bjda58my1n4ppxp1rji"; - }; - - doCheck = false; - - propagatedBuildInputs = with pythonPackages; [ gdata IMAPClient Logbook chardet ]; - - startScript = ./gmvault.py; - - patchPhase = '' - cat ${startScript} > etc/scripts/gmvault - chmod +x etc/scripts/gmvault - substituteInPlace setup.py --replace "==" ">=" - substituteInPlace setup.py --replace "argparse" "" - ''; - - meta = { - description = "Backup and restore your gmail account"; - homepage = "http://gmvault.org"; - license = pkgs.lib.licenses.agpl3Plus; - }; -} diff --git a/pkgs/tools/networking/gmvault/gmvault.py b/pkgs/tools/networking/gmvault/gmvault.py deleted file mode 100644 index 127036577f38..000000000000 --- a/pkgs/tools/networking/gmvault/gmvault.py +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env python - -import gmv.gmv_cmd as runner -runner.bootstrap_run() diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cd6418e1e817..c8ccbf8fc13b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -232,6 +232,7 @@ mapAliases ({ }; glib_networking = glib-networking; # added 2018-02-25 gmailieer = lieer; # added 2020-04-19 + gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # added 2021-03-08 gnome-mpv = celluloid; # added 2019-08-22 gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10 gmic_krita_qt = gmic-qt-krita; # added 2019-09-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80e973fc02a1..68a90c72965c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4770,8 +4770,6 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; - gmvault = callPackage ../tools/networking/gmvault { }; - gnash = callPackage ../misc/gnash { autoreconfHook = buildPackages.autoreconfHook269; }; From de75622d5ff812e0d126866e0cd29619fd17c625 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Mar 2021 12:33:40 +0100 Subject: [PATCH 135/148] python3Packages.pypykatz: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/pypykatz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix index 2a7abe5bd859..4b52d3b290c4 100644 --- a/pkgs/development/python-modules/pypykatz/default.nix +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pypykatz"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "skelsec"; repo = pname; rev = version; - sha256 = "sha256-dTpkwBYEAITdyKsRTfeJk40hgO8+wmxD3d2XXkvWUpc="; + sha256 = "sha256-ows6zJyygdAwgKNKKCURWX+kl42f3CN23/xZrLjkfrw="; }; propagatedBuildInputs = [ From e4774d7ff348466f0d689d865adb7dd334ec2d01 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 8 Mar 2021 13:06:29 +0100 Subject: [PATCH 136/148] trezord: fix build on darwin --- pkgs/servers/trezord/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index cc0fb0d74217..d0c674c1512a 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -1,7 +1,9 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , trezor-udev-rules +, AppKit }: buildGoModule rec { @@ -17,7 +19,8 @@ buildGoModule rec { vendorSha256 = "0wb959xzyvr5zzjvkfqc422frmf97q5nr460f02wwx0pj6ch0y61"; - propagatedBuildInputs = [ trezor-udev-rules ]; + propagatedBuildInputs = lib.optionals stdenv.isLinux [ trezor-udev-rules ] + ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { description = "Trezor Communication Daemon aka Trezor Bridge"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c82854c62c09..4db2a84b6c92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8544,7 +8544,9 @@ in trezorctl = with python3Packages; toPythonApplication trezor; - trezord = callPackage ../servers/trezord { }; + trezord = callPackage ../servers/trezord { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; trezor_agent = with python3Packages; toPythonApplication trezor_agent; From edd6197acac6269680f2ac9787c896d64eafd3bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Mon, 8 Mar 2021 13:06:37 +0000 Subject: [PATCH 137/148] ledger-live-desktop: 2.21.3 -> 2.23.0 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 3d72a91551f2..8c928cafa52a 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.21.3"; + version = "2.23.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "11r6gwzg5qym7h40d8mrpw8c6zbdi534c2y7ghy2k0a4k3ybk8x1"; + sha256 = "0id9zbpfq3knv8qwkhplbl9pwrvdkn212pafwh4vpjbbp4yimhq5"; }; appimageContents = appimageTools.extractType2 { From 368bdd13f6552806057ea3b7285a3b56322b69b2 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Wed, 24 Feb 2021 05:35:03 +0100 Subject: [PATCH 138/148] linux: enable RANDOM_TRUST_CPU Allows the RDRAND instruction to seed the kernel RNG. This should lead to faster CRNG initialization, since the kernel can use the processors capabilities directly. This is default enabled in Debian [1] and Fedora [2] as well. [1]: https://salsa.debian.org/kernel-team/linux/-/blob/debian/5.10.13-1/debian/config/config#L459 [2]: https://src.fedoraproject.org/rpms/kernel/blob/rawhide/f/kernel-x86_64-fedora.config#_4907 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0d93dd485a40..4764f166684e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -435,6 +435,8 @@ let SECURITY_APPARMOR = yes; DEFAULT_SECURITY_APPARMOR = yes; + RANDOM_TRUST_CPU = yes; # allow RDRAND to seed the RNG + MODULE_SIG = no; # r13y, generates a random key during build and bakes it in # Depends on MODULE_SIG and only really helps when you sign your modules # and enforce signatures which we don't do by default. From 3e616e08748209cea5eadc15e3ec6ba8d40af1fb Mon Sep 17 00:00:00 2001 From: Ivar <41924494+IvarWithoutBones@users.noreply.github.com> Date: Mon, 8 Mar 2021 15:56:57 +0100 Subject: [PATCH 139/148] hacpack: init at 1.36 (#115357) --- pkgs/tools/compression/hacpack/default.nix | 30 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/compression/hacpack/default.nix diff --git a/pkgs/tools/compression/hacpack/default.nix b/pkgs/tools/compression/hacpack/default.nix new file mode 100644 index 000000000000..e60d483574bd --- /dev/null +++ b/pkgs/tools/compression/hacpack/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "hacpack"; + version = "1.36"; + + src = fetchFromGitHub { + owner = "The-4n"; + repo = "hacpack"; + rev = "v${version}"; + sha256 = "0d846l36w1n9rxv79fbyhl2zdbqhlgrvk21b9vzr9x77yki89ygs"; + }; + + preConfigure = '' + mv config.mk.template config.mk + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./hacpack $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/The-4n/hacPack"; + description = "Make and repack Nintendo Switch NCAs/NSPs"; + license = licenses.gpl2Only; + maintainers = [ maintainers.ivar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ccf6eefa0fe..e46dd575db8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22915,6 +22915,8 @@ in hamster = callPackage ../applications/misc/hamster { }; + hacpack = callPackage ../tools/compression/hacpack { }; + hashit = callPackage ../tools/misc/hashit { }; hactool = callPackage ../tools/compression/hactool { }; From ecce29eba2206e4fc8db91c61d5e6272583ece9e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 11:49:08 -0500 Subject: [PATCH 140/148] kernel: RANDOM_TRUST_CPU for >= 4.19 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4764f166684e..b72809918b47 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -435,7 +435,7 @@ let SECURITY_APPARMOR = yes; DEFAULT_SECURITY_APPARMOR = yes; - RANDOM_TRUST_CPU = yes; # allow RDRAND to seed the RNG + RANDOM_TRUST_CPU = whenAtLeast "4.19" yes; # allow RDRAND to seed the RNG MODULE_SIG = no; # r13y, generates a random key during build and bakes it in # Depends on MODULE_SIG and only really helps when you sign your modules From 56964bcb77db64bf70d00858d94cd66e041a5337 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 11:53:07 -0500 Subject: [PATCH 141/148] python3Packages.sagemaker: 2.28.0 -> 2.29.0 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 116f4b6f676e..d6ed0546242b 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.28.0"; + version = "2.29.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SOk4VM227gAlLX615xPy0lcATRzth7M3HGH557iF2Wc="; + sha256 = "sha256-xhm9KJiJdg8LD8Q33A61V6zXz1K9S4cROxy9iCxjK7M="; }; pythonImportsCheck = [ From 955bcff28fc9ed4e8ed0e4905fea9d1ba9a46721 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 11:54:02 -0500 Subject: [PATCH 142/148] sbt: 1.4.7 -> 1.4.8 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 7ea10ac90abb..09c1485e81c2 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "sha256-wqdZ/kCjwhoWtaiNAM1m869vByHk6mG2OULfuDotVP0="; + sha256 = "sha256-WXItvaPW0dfsfcPiHWGi6AAjAwpCQ4I+7q3XftnFo50="; }; postPatch = '' From 52b6f5f1d791e9339acea05d0444e0be6f166ffa Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 16:55:34 +0000 Subject: [PATCH 143/148] =?UTF-8?q?sbt-extras:=202021-03-03=20=E2=86=92=20?= =?UTF-8?q?2021-03-08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/tools/build-managers/sbt-extras/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index f25dfe6c28a7..db988bb16e75 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "2c582cdbb37dd487bf2140010ddd2e20f3c1394e"; - version = "2021-03-03"; + rev = "6db3d3d1c38082dd4c49cce9933738d9bff50065"; + version = "2021-03-08"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "1j4j46gzw05bis7akvzfdj36xdwxcabq66wyf917z8vsy31vvajp"; + sha256 = "0sd9a6ldcl3pgs2rjg4pydk72ciavhggbpwfar3bj1h7vsgafnng"; }; dontBuild = true; From 8c36da303ed8566bc6d46b3e416dacc139ede2ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 09:21:50 +0100 Subject: [PATCH 144/148] python39Packages.geoip2: switch to pytestCheckHook --- .../python-modules/geoip2/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 05a73c316759..c0e6580e8a94 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -1,15 +1,16 @@ -{ buildPythonPackage, lib, fetchPypi, isPy27 +{ buildPythonPackage, lib, fetchPypi, pythonOlder , aiohttp , maxminddb , mocket , requests , requests-mock +, pytestCheckHook }: buildPythonPackage rec { version = "4.1.0"; pname = "geoip2"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -22,11 +23,17 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp requests maxminddb ]; - checkInputs = [ mocket requests-mock ]; + checkInputs = [ + mocket + requests-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "geoip2" ]; meta = with lib; { - description = "MaxMind GeoIP2 API"; - homepage = "https://www.maxmind.com/en/home"; + description = "Python client for GeoIP2 webservice client and database reader"; + homepage = "https://github.com/maxmind/GeoIP2-python"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From 4805fb4f652b55412c18dbaccd7c1afbd15272ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 09:22:14 +0100 Subject: [PATCH 145/148] python3Packages.sopel: add pythonImportsCheck --- pkgs/development/python-modules/sopel/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index c541751bd243..b7569efadf5d 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -51,6 +51,8 @@ buildPythonPackage rec { popd ''; + pythonImportsCheck = [ "sopel" ]; + meta = with lib; { description = "Simple and extensible IRC bot"; homepage = "http://sopel.chat"; From 5c2c66d21831392c37aa513ab73f8ff3f5916bfb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Mar 2021 00:01:40 +0100 Subject: [PATCH 146/148] python3Packages.pook: init at 1.0.1 --- .../python-modules/pook/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/pook/default.nix diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix new file mode 100644 index 000000000000..480dc7dcba64 --- /dev/null +++ b/pkgs/development/python-modules/pook/default.nix @@ -0,0 +1,57 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, furl +, jsonschema +, nose +, pytestCheckHook +, pythonOlder +, requests +, xmltodict +}: + +buildPythonPackage rec { + pname = "pook"; + version = "1.0.1"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "h2non"; + repo = pname; + rev = "v${version}"; + sha256 = "0z48vswj07kr2sdvq5qzrwqyijpmj2rlnh2z2b32id1mckr6nnz8"; + }; + + patches = [ + (fetchpatch { + # Will be fixed with the new release, https://github.com/h2non/pook/issues/69 + name = "use-match-keyword-in-pytest.patch"; + url = "https://github.com/h2non/pook/commit/2071da27701c82ce02b015e01e2aa6fd203e7bb5.patch"; + sha256 = "0i3qcpbdqqsnbygi46dyqamgkh9v8rhpbm4lkl75riw48j4n080k"; + }) + ]; + + propagatedBuildInputs = [ + aiohttp + furl + jsonschema + requests + xmltodict + ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "pook" ]; + + meta = with lib; { + description = "HTTP traffic mocking and testing made simple in Python"; + homepage = "https://github.com/h2non/pook"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2b8afa2c56b..c933b99d7fd5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5095,6 +5095,8 @@ in { pooch = callPackage ../development/python-modules/pooch { }; + pook = callPackage ../development/python-modules/pook { }; + poolsense = callPackage ../development/python-modules/poolsense { }; poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { From 8e25152e689ed14dc19930b054954007c06184c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Mar 2021 16:21:46 +0100 Subject: [PATCH 147/148] python3Packages.mocket: 3.9.39 -> 3.9.40 --- .../python-modules/mocket/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 6a9301d61e37..76b64be7430b 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -1,10 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, isPy3k , decorator , http-parser -, importlib-metadata -, python , python_magic -, six , urllib3 , pytestCheckHook , pytest-mock @@ -13,15 +14,17 @@ , redis , requests , sure +, pook }: buildPythonPackage rec { pname = "mocket"; version = "3.9.40"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "dbe4349a0ed30ed0c5d04684dd5d98517f8d1e4585fe0da4832747e2f01f3c18"; + sha256 = "061w3zqf4ir7hfj0vzl58lg8szsik1fxv126s32x03nk1sd39r6v"; }; propagatedBuildInputs = [ @@ -29,8 +32,7 @@ buildPythonPackage rec { http-parser python_magic urllib3 - six - ] ++ lib.optionals (isPy27) [ six ]; + ]; checkInputs = [ pytestCheckHook @@ -40,13 +42,14 @@ buildPythonPackage rec { redis requests sure + pook ]; pytestFlagsArray = [ - "--ignore=tests/main/test_pook.py" # pook is not packaged - "--ignore=tests/main/test_redis.py" # requires a live redis instance + # Requires a live Redis instance + "--ignore=tests/main/test_redis.py" ] ++ lib.optionals (pythonOlder "3.8") [ - # uses IsolatedAsyncioTestCase which is only available >= 3.8 + # Uses IsolatedAsyncioTestCase which is only available >= 3.8 "--ignore=tests/tests38/test_http_aiohttp.py" ]; @@ -61,6 +64,7 @@ buildPythonPackage rec { "test_truesendall_with_recording_https" "test_truesendall_after_mocket_session" "test_real_request_session" + "test_asyncio_record_replay" ]; pythonImportsCheck = [ "mocket" ]; From 5c8b025584e8f61f3047cb8ecf20a3d713403f00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Mar 2021 16:48:10 +0100 Subject: [PATCH 148/148] python3Packages.furl: fix build --- .../python-modules/furl/default.nix | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index 72089da11e10..da52bfb8fbcd 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, flake8 +, orderedmultidict +, pytestCheckHook +, six +}: buildPythonPackage rec { pname = "furl"; @@ -9,17 +17,33 @@ buildPythonPackage rec { sha256 = "08dnw3bs1mk0f1ccn466a5a7fi1ivwrp0jspav9arqpf3wd27q60"; }; - checkInputs = [ flake8 pytest ]; + patches = [ + (fetchpatch { + name = "tests_overcome_bpo42967.patch"; + url = "https://github.com/gruns/furl/files/6030371/tests_overcome_bpo42967.patch.txt"; + sha256 = "1l0lxmcp9x73kxy0ky2bh7zxa4n1cf1qxyyax97n90d1s3dc7k2q"; + }) + ]; - propagatedBuildInputs = [ six orderedmultidict ]; + propagatedBuildInputs = [ + orderedmultidict + six + ]; - # see https://github.com/gruns/furl/issues/121 - checkPhase = '' - pytest -k 'not join' - ''; + checkInputs = [ + flake8 + pytestCheckHook + ]; + + disabledTests = [ + # see https://github.com/gruns/furl/issues/121 + "join" + ]; + + pythonImportsCheck = [ "furl" ]; meta = with lib; { - description = "furl is a small Python library that makes parsing and manipulating URLs easy"; + description = "Python library that makes parsing and manipulating URLs easy"; homepage = "https://github.com/gruns/furl"; license = licenses.unlicense; maintainers = with maintainers; [ vanzef ];