From 4f1f0e5451925eb820a982f58619d70f216804e0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 5 Dec 2021 15:55:25 +0000 Subject: [PATCH 01/99] tcptrack: fix build on ncurses-6.3 Without the change the build fails on ncurses-6.3 as: TextUI.cc: In member function 'void TextUI::drawui()': TextUI.cc:312:34: error: format '%d' expects argument of type 'int', but argument 2 has type 'time_t' {aka 'long int'} [-Werror=format] 312 | printw("%ds",ic->getIdleSeconds()); | ~^ ~~~~~~~~~~~~~~~~~~~~ | int time_t {aka long int} | %ld --- .../tools/misc/tcptrack/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index 5b1fd72a7f51..d4691bc093a6 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -1,16 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }: stdenv.mkDerivation rec { pname = "tcptrack"; - version = "1.4.3"; + version = "1.4.3+unstable=2017-04-29"; src = fetchFromGitHub { owner = "bchretien"; repo = "tcptrack"; - rev = "d05fe08154ff1e46578e92be49e4cfa2c6543283"; - sha256 = "08lh3l67wn4kq9q0nfspc7rj0jvp9dzwjgxpvqliwcif8cy5mi45"; + rev = "2b096ac103af2884bbd7648cff8adcbadbda9394"; + sha256 = "0084g9s0ynv1az67j08q9nz4p07bqqz9k6w5lprzj3ljlh0x10gj"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/bchretien/tcptrack/pull/10 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/bchretien/tcptrack/commit/409007afbce8ec5a81312a2a4123dd83b62b4494.patch"; + sha256 = "00641jyr52ksww5bbzvxlprmbb36jnvzg2w1aj1jgnm75jiajcfc"; + }) + ]; + buildInputs = [ ncurses libpcap ]; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; From 2438d1a5a9a100db0ca04f298aad736590a673c3 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 6 Dec 2021 09:16:06 +0000 Subject: [PATCH 02/99] pamix: fix pending upstream inclusion for ncurses-6.3 Without the change the build fails as: src/pamix_ui.cpp:132:25: error: format not a string literal and no format arguments [-Werror=format-security] 132 | mvprintw(curY, curX + remainingChars + 1, displayName.c_str()); | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- pkgs/applications/audio/pamix/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index fb076797fb5f..869469944a8e 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , pkg-config, cmake , libpulseaudio, ncurses }: @@ -13,6 +13,21 @@ stdenv.mkDerivation rec { sha256 = "1d44ggnwkf2gff62959pj45v3a2k091q8v154wc5pmzamam458wp"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/patroclos/PAmix/pull/73 + (fetchpatch { + name = "ncurses-6.3-p1.patch"; + url = "https://github.com/patroclos/PAmix/commit/3400b9c048706c572373e4617b4d5fcdb8dd2505.patch"; + sha256 = "0rw56a844pz876ad9p8hfvn2fkd5rh29gpp47h55g08spf0vwb2z"; + }) + (fetchpatch { + name = "ncurses-6.3-p2.patch"; + url = "https://github.com/patroclos/PAmix/commit/5ef67fc5ef6fc0dc0b48ff07ba48093881561d9c.patch"; + sha256 = "0f8shpdv2swxdz04bkqgmkvl6c17r5mn4slzr7xd6pvw8hh51p4h"; + }) + ]; + preConfigure = '' substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc/xdg" ''; From bdbd1639d0ccc638287ce1945b1a63b45a6884cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 14:52:24 +0000 Subject: [PATCH 03/99] skypeforlinux: 8.77.0.97 -> 8.79.0.92 --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 7550e72277f5..feb6a0c4b77f 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.77.0.97"; + version = "8.79.0.92"; rpath = lib.makeLibraryPath [ alsa-lib @@ -69,7 +69,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-0u1fpKJrsEgbvTwdkqJZ/SwCRDmJwEi9IXHbMmY8MJI="; + sha256 = "sha256-wGt0zNBmJf5NJGGOopWNUoBoy8sr4jWp8UKLd8AudnM="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; From b6747e699b44114eb67b26903ba8a0d6cdca8aa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 19:29:09 +0000 Subject: [PATCH 04/99] ocamlPackages.sha: 1.14 -> 1.15.1 --- pkgs/development/ocaml-modules/sha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/sha/default.nix b/pkgs/development/ocaml-modules/sha/default.nix index 80a5205a2301..c1a76e4149e6 100644 --- a/pkgs/development/ocaml-modules/sha/default.nix +++ b/pkgs/development/ocaml-modules/sha/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "sha"; - version = "1.14"; + version = "1.15.1"; src = fetchurl { url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "114vydrfdp7fayigvgk3ckiby0kh4n49c1j53v8k40gk6nzm3l19"; + sha256 = "sha256-cRtjydvwgXgimi6F3C48j7LrWgfMO6m9UJKjKlxvp0Q="; }; useDune2 = true; From c4003d15fce75c6b8f51f8d216fc2a37693f5ee1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 17:57:44 +0000 Subject: [PATCH 05/99] opera: 76.0.4017.94 -> 82.0.4227.23 --- .../networking/browsers/opera/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 0bad6c58d0a1..c53d4c132f4f 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -13,6 +13,7 @@ , glib , gnome2 , gtk3 +, gtk4 , lib , libX11 , libxcb @@ -50,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "76.0.4017.94"; + version = "82.0.4227.23"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-vjSfzkl1jIQ9P1ARDa0eOuD8CmKHIEZ+IwMB2wIVjE8="; + sha256 = "sha256-jA8fglRLH0aqhjsD65bsieplCLCJXgdBViPGrAu9sSQ="; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; @@ -111,12 +112,16 @@ in stdenv.mkDerivation rec { # brings up the crash report, which also crashes. `strace -f` hints at a # missing libudev.so.0. (lib.getLib systemd) + + # Error at startup: + # "Illegal instruction (core dumped)" + gtk3 + gtk4 ]; installPhase = '' mkdir -p $out cp -r . $out/ - mv $out/lib/*/opera/*.so $out/lib/ ''; meta = with lib; { From f3d539868fd938490817ffc5b4deeeffdc2d483a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 19:13:57 +0000 Subject: [PATCH 06/99] masterpdfeditor: 5.7.90 -> 5.8.20 --- pkgs/applications/misc/masterpdfeditor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 4f2f800ebd25..a1788587d701 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "masterpdfeditor"; - version = "5.7.90"; + version = "5.8.20"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz"; - sha256 = "sha256-wUHLesJ/YV3QyTJfGUr1lFD55JBnfSmjO2VvriaqlII="; + sha256 = "sha256-2YfjTRTC/ZvgnV4tEY4wwoqUeUG8+0SCYuRPBzQ8ba4="; }; nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; From f88bd76fcd132e3f525a84bea976cac08a545afd Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 10 Dec 2021 10:50:46 -0300 Subject: [PATCH 07/99] nixos-rebuild: switch to tmpDir during rebuilds This is a workaround for issue #144811 until this issue is either fixed on nix itself. --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index e5e40dca086e..7f6d6ce22827 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -362,14 +362,16 @@ if [ "$action" = edit ]; then exit 1 fi - +ORIGIN_PWD="$PWD" tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX) SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60" +cd "$tmpDir" cleanup() { for ctrl in "$tmpDir"/ssh-*; do ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true done + cd "$ORIGIN_PWD" rm -rf "$tmpDir" } trap cleanup EXIT From e5ea863c1c35ad2de109ce192f0385684cd4fbf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Dec 2021 15:48:14 +0000 Subject: [PATCH 08/99] grip: 4.2.2 -> 4.2.3 --- pkgs/applications/misc/grip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 6a6666763c18..478a4fe74d13 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "grip"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { url = "mirror://sourceforge/grip/grip-${version}.tar.gz"; - sha256 = "sha256-nXtGgJeNYM8lyllNi9UdmsnVcHOCXfryWmKGZ9QFTHE="; + sha256 = "sha256-5Qgsf4+xs0ckhYJk2csKulXC3nWaLRAsQ15qaTkKkjw="; }; nativeBuildInputs = [ pkg-config libtool ]; From b48d89d3270ed9c662394c3ddf23995e3ea4f0a2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 11 Dec 2021 08:30:29 +0000 Subject: [PATCH 09/99] Update pkgs/applications/audio/pamix/default.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- pkgs/applications/audio/pamix/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index 869469944a8e..4a2ad9ab779e 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix pending upstream inclusion for ncurses-6.3 support: - # https://github.com/patroclos/PAmix/pull/73 + # ncurses-6.3 support, included in next release (fetchpatch { name = "ncurses-6.3-p1.patch"; url = "https://github.com/patroclos/PAmix/commit/3400b9c048706c572373e4617b4d5fcdb8dd2505.patch"; From 1b1d7bfb5f25a4cda356d62818702c8782c2d31b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 11 Dec 2021 08:31:13 +0000 Subject: [PATCH 10/99] Update pkgs/development/tools/misc/tcptrack/default.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- pkgs/development/tools/misc/tcptrack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index d4691bc093a6..25121bf1ad7d 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tcptrack"; - version = "1.4.3+unstable=2017-04-29"; + version = "unstable-2017-04-29"; src = fetchFromGitHub { owner = "bchretien"; From 4be6d12bc41e7898dcab1d0ab1c945d71657be27 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 12 Dec 2021 04:20:00 +0000 Subject: [PATCH 11/99] tflint: 0.33.2 -> 0.34.0 https://github.com/terraform-linters/tflint/releases/tag/v0.34.0 --- pkgs/development/tools/analysis/tflint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 0bf9715de6fb..cbdd2d37d80d 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tflint"; - version = "0.33.2"; + version = "0.34.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CjpeBB1krbRJxwfvBbhhHUf5IDOZFWRds/t9h22iLE0="; + sha256 = "sha256-MdA1bS8ZPsfwnmnmIKBissuvwWY9HHxoLJEfGcJQ3j0="; }; vendorSha256 = "sha256-y+bPFCjgTu+C5Cx85lYRjUbLd6c5PcckXRpg102d1zk="; From fe16aec731c46702103254153446a639f1bb1487 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 12 Dec 2021 04:20:00 +0000 Subject: [PATCH 12/99] docker-slim: 1.37.2 -> 1.37.3 https://github.com/docker-slim/docker-slim/releases/tag/1.37.3 --- pkgs/applications/virtualization/docker-slim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index ebfaac0bde1f..cd8a1f5041aa 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.37.2"; + version = "1.37.3"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "1svhi9xf71zrk843bnwkpmq4iaaln07dpfrdvq0vdqhj5xvbx47g"; + sha256 = "sha256-jzwQ3nrhLDiQXcVkPiXrRAmpLQOD8ILBnoCEUiEbxzw="; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; From 07e9488aed042f0c4f5c50f08a536985ab67200a Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 12 Dec 2021 02:35:05 -0500 Subject: [PATCH 13/99] starsector: 0.95a-RC15 -> 0.95.1a-RC5 --- pkgs/games/starsector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index de1201e39c39..4aac0afb22b1 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "starsector"; - version = "0.95a-RC15"; + version = "0.95.1a-RC5"; src = fetchzip { url = "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-${version}.zip"; - sha256 = "sha256-/5ij/079aOad7otXSFFcmVmiYQnMX/0RXGOr1j0rkGY="; + sha256 = "sha256-V8/WQPvPIrF3Tg7JVO+GfeYqWhkWWrnHSVcFXGQqDAA="; }; nativeBuildInputs = [ From 89f9319f09b3bf4cc49d371024660e271257ec03 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Sun, 12 Dec 2021 14:13:58 +0100 Subject: [PATCH 14/99] copper: 4.4 -> 4.6 --- pkgs/development/compilers/copper/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/copper/default.nix b/pkgs/development/compilers/copper/default.nix index 736004fb580d..67d31f6f5e10 100644 --- a/pkgs/development/compilers/copper/default.nix +++ b/pkgs/development/compilers/copper/default.nix @@ -4,16 +4,15 @@ }: stdenv.mkDerivation rec { pname = "copper"; - version = "4.4"; + version = "4.6"; src = fetchurl { url = "https://tibleiz.net/download/copper-${version}-src.tar.gz"; - sha256 = "1nf0bw143rjhd019yms3k6k531rahl8anidwh6bif0gm7cngfwfw"; + sha256 = "sha256-tyxAMJp4H50eBz8gjt2O3zj5fq6nOIXKX47wql8aUUg="; }; buildInputs = [ libffi ]; postPatch = '' - substituteInPlace Makefile --replace "-s scripts/" "scripts/" patchShebangs . ''; buildPhase = '' From 0241614f27d28c23212ee6bec355b48b29d74246 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Sun, 12 Dec 2021 14:23:00 +0100 Subject: [PATCH 15/99] code-browser: 7.1.20 -> 8.0 --- .../editors/code-browser/default.nix | 49 +++++++++++-------- pkgs/top-level/all-packages.nix | 8 ++- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/editors/code-browser/default.nix b/pkgs/applications/editors/code-browser/default.nix index ea4398cc4a5c..b9f9ce1608a1 100644 --- a/pkgs/applications/editors/code-browser/default.nix +++ b/pkgs/applications/editors/code-browser/default.nix @@ -1,46 +1,55 @@ { lib, stdenv , fetchurl , copper -, ruby , python3 -, qtbase -, gtk3 , pkg-config -, withQt ? false -, withGtk ? false, wrapQtAppsHook ? null +, withQt ? false, qtbase ? null, wrapQtAppsHook ? null +, withGtk2 ? false, gtk2 +, withGtk3 ? false, gtk3 +, mkDerivation ? stdenv.mkDerivation }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "code-browser"; - version = "7.1.20"; + version = "8.0"; src = fetchurl { url = "https://tibleiz.net/download/code-browser-${version}-src.tar.gz"; - sha256 = "1svi0v3h42h2lrb8c7pjvqc8019v1p20ibsnl48pfhl8d96mmdnz"; + sha256 = "sha256-beCp4lx4MI1+hVgWp2h3piE/zu51zfwQdB5g7ImgmwY="; }; postPatch = '' substituteInPlace Makefile --replace "LFLAGS=-no-pie" "LFLAGS=-no-pie -L." - substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o" patchShebangs . - ''; + '' + + lib.optionalString withQt '' + substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o" + substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: qt" + '' + + lib.optionalString withGtk2 '' + substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk2" + '' + + lib.optionalString withGtk3 '' + substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk" + '' + ; nativeBuildInputs = [ copper python3 - ruby - qtbase - gtk3 pkg-config ] - ++ lib.optionals withQt [ wrapQtAppsHook ]; + ++ lib.optionals withGtk2 [ gtk2 ] + ++ lib.optionals withGtk3 [ gtk3 ] + ++ lib.optionals withQt [ qtbase wrapQtAppsHook ]; buildInputs = lib.optionals withQt [ qtbase ] - ++ lib.optionals withGtk [ gtk3 ]; + ++ lib.optionals withGtk2 [ gtk2 ] + ++ lib.optionals withGtk3 [ gtk3 ]; makeFlags = [ "prefix=$(out)" "COPPER=${copper}/bin/copper-elf64" "with-local-libs" - "QINC=${qtbase.dev}/include" ] - ++ lib.optionals withQt [ "UI=qt" ] - ++ lib.optionals withGtk [ "UI=gtk" ]; - - dontWrapQtApps = true; + ++ lib.optionals withQt [ "QINC=${qtbase.dev}/include" + "UI=qt" + ] + ++ lib.optionals withGtk2 [ "UI=gtk2" ] + ++ lib.optionals withGtk3 [ "UI=gtk" ]; meta = with lib; { description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b40f026c9d5..e8880c923136 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4283,11 +4283,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; - }; - code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk = true; - qtbase = qt5.qtbase; - }; + code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; }; + code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; }; + code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; }; c14 = callPackage ../applications/networking/c14 { }; From 460bc2ed55ab009e7ccbb06488e442e6c57315ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 15:47:48 +0000 Subject: [PATCH 16/99] soft-serve: 0.1.0 -> 0.1.2 --- pkgs/servers/soft-serve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index fce9544f4813..b289177e7997 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "0z88699q34a9cbhcz12y2qs2qrspfd8yx4ay0r8jzvkgax9ylrlk"; + sha256 = "sha256-sRlEF1ee+oBnYOGSN6rDOvNr3OnfAqV+1Wx5XOyIylw="; }; - vendorSha256 = "1g2iznfh08l23i81x7g2bhc7l8cppshzlyynxik4jshswlpv80sr"; + vendorSha256 = "sha256-FukkmuBTPPhY0UTe3r1iU3nbGoMsPTcRKTLBd+VMGUk="; doCheck = false; From 08482a3d039543667fd5ef2fad72e0f2538f1ec4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 17:45:00 +0000 Subject: [PATCH 17/99] python38Packages.manimpango: 0.3.1 -> 0.4.0 --- pkgs/development/python-modules/manimpango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 95e035864711..5ff88388818f 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "manimpango"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; rev = "v${version}"; - sha256 = "ldZfvv5kloQ0uj0agxOP8cRh+Ix8f9Z0PT+pnhWYjiQ="; + sha256 = "1qffb04bz4s2anb6a7nm6dpqwdlvq6626z1whqwrwsvn8z9sry76"; }; postPatch = '' From 1f4809b3f4eaa018a21aa59baf90a479b3a852f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Dec 2021 21:48:47 +0100 Subject: [PATCH 18/99] gomapenum: init at 1.0.0 --- pkgs/tools/security/gomapenum/default.nix | 29 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/security/gomapenum/default.nix diff --git a/pkgs/tools/security/gomapenum/default.nix b/pkgs/tools/security/gomapenum/default.nix new file mode 100644 index 000000000000..f77b513c42da --- /dev/null +++ b/pkgs/tools/security/gomapenum/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gomapenum"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "nodauf"; + repo = "GoMapEnum"; + rev = "v${version}"; + sha256 = "sha256-6WZTmRse3mj1bimHE81JdSc4VKpMFbcJN3U4zgHMzJc="; + }; + + vendorSha256 = "sha256-Z/uLZIPKd75P9nI7kTFOwzWFkRTVwUojYEQms4OJ6Bk="; + + postInstall = '' + mv $out/bin/src $out/bin/$pname + ''; + + meta = with lib; { + description = "Tools for user enumeration and password bruteforce"; + homepage = "https://github.com/nodauf/GoMapEnum"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a698cf8fb640..db909cf934df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1797,6 +1797,8 @@ with pkgs; gomatrix = callPackage ../applications/misc/gomatrix { }; + gomapenum = callPackage ../tools/security/gomapenum { }; + gopacked = callPackage ../applications/misc/gopacked { }; gucci = callPackage ../tools/text/gucci { }; From 9398d9a866bfe87f2afa52548b2d88f4cd650860 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 13 Dec 2021 22:29:57 +0200 Subject: [PATCH 19/99] perlPackages.PPR: init at 0.000028 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9609c122727a..cf6ef9f875cd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18219,6 +18219,20 @@ let }; }; + PPR = buildPerlPackage { + pname = "PPR"; + version = "0.000028"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCONWAY/PPR-0.000028.tar.gz"; + sha256 = "1adrd189rnfl1fgv14inchvrgjqjbpnviisqsz3y8ds3gisafzfk"; + }; + meta = { + description = "Pattern-based Perl Recognizer"; + license = lib.licenses.artistic2; + maintainers = [ maintainers.artturin ]; + }; + }; + ProcBackground = buildPerlPackage { pname = "Proc-Background"; version = "1.21"; From bd0ded59a1cf956d169ea7aa2acbbd7d41e8ab58 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 13 Dec 2021 22:34:32 +0200 Subject: [PATCH 20/99] perlPackages.Future: 0.46 -> 0.47 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cf6ef9f875cd..459c602fd938 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9043,10 +9043,10 @@ let Future = buildPerlModule { pname = "Future"; - version = "0.46"; + version = "0.47"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.46.tar.gz"; - sha256 = "0zx4cabzz5zyzvyvc7mvl0cc7zkslp0jnxsv41yii76dal8blcbq"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.47.tar.gz"; + sha256 = "1pmhkhrmvaf8c3jbrfqqhmxjrzcsxdn2q7apj033gwxggland88h"; }; buildInputs = [ TestFatal TestIdentity TestRefcount ]; meta = { From a3406d42772298b953b7ff1852b847b0817004a0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 13 Dec 2021 22:41:22 +0200 Subject: [PATCH 21/99] perlPackages.PerlCritic: 1.138 -> 1.140 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 459c602fd938..931d26168dc4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17635,10 +17635,10 @@ let PerlCritic = buildPerlModule { pname = "Perl-Critic"; - version = "1.138"; + version = "1.140"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.138.tar.gz"; - sha256 = "2ad194f91ef24df4698369c2562d4164e9bf74f2d5565c681841abf79789ed82"; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.140.tar.gz"; + sha256 = "1nzxpn71mrpp85yxrxlraj52q2skvf9ja887ls11d57h6smg1vmz"; }; buildInputs = [ TestDeep ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; From 6f8793ef98bd5181fb0be8b3a4700ea5f04b2308 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 13 Dec 2021 22:48:44 +0200 Subject: [PATCH 22/99] perlPackages.PerlTidy: 20201207 -> 20211029 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 931d26168dc4..13ddf6bf9eda 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17849,10 +17849,10 @@ let PerlTidy = buildPerlPackage rec { pname = "Perl-Tidy"; - version = "20201207"; + version = "20211029"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20201207.tar.gz"; - sha256 = "049x02awvpfr7m8dai04ya61jzs6cl45qplxzx7nf8x6jgj08i9f"; + url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20211029.tar.gz"; + sha256 = "1nhfi3gb8gif9p34m4ycqw0k8992yy42c21hk9b99l2pdbiv20zc"; }; meta = { description = "Indent and reformat perl scripts"; From 61d396e81ecd1aac6ea4bdf46d9144a0ec4c0b60 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 13 Dec 2021 22:49:14 +0200 Subject: [PATCH 23/99] perlPackages.PLS: init at 0.897 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 13ddf6bf9eda..339b237493cf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18090,6 +18090,22 @@ let }; }; + PLS = buildPerlPackage { + pname = "PLS"; + version = "0.897"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MR/MREISNER/PLS-0.897.tar.gz"; + sha256 = "0278anidj7bgassj32g20cbki2kkqakkr3axyq4k90nj4snw7p6x"; + }; + propagatedBuildInputs = [ Future IOAsync PPI PPR PathTiny PerlCritic PerlTidy PodMarkdown URI ]; + meta = { + homepage = "https://github.com/FractalBoy/perl-language-server"; + description = "Perl Language Server"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.artturin ]; + }; + }; + Po4a = callPackage ../development/perl-modules/Po4a { }; PodMinimumVersion = buildPerlPackage { From b454158a7c72bbc8f28a6b969c810117b5603696 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 13 Dec 2021 18:59:15 -0500 Subject: [PATCH 24/99] ncspot: 0.9.2 -> 0.9.3 https://github.com/hrkfdn/ncspot/releases/tag/v0.9.3 --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index d9df34c41f78..6ba52306e8c4 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "sha256-fZ0yQGLGnEFxt+OiG9J+niYzvttybudfciu5xo104Qo="; + sha256 = "sha256-k4EGyQjjJCvUhp56OjYl63n+giI05GiIS2++I1SVhCg="; }; - cargoSha256 = "sha256-i3/96rVfP8TbIz3pNArTp8w27rfp1aPhohfFMMHgubo="; + cargoSha256 = "sha256-YsjInqmkPnAwqgRBDiwcLH0DDqCF0NElrn+WO2v+ATM="; nativeBuildInputs = [ pkg-config ]; From 6a1f4a51eb24fb6ce592e41a9b18586503e71ca6 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 14 Dec 2021 12:42:47 +1100 Subject: [PATCH 25/99] subread: init 2.0.3 --- .../science/biology/subread/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/science/biology/subread/default.nix diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix new file mode 100644 index 000000000000..431bd3788e7d --- /dev/null +++ b/pkgs/applications/science/biology/subread/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchurl +, zlib +}: + +stdenv.mkDerivation rec { + pname = "subread"; + version = "2.0.3"; + + src = fetchurl { + url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz"; + sha256 = "sha256-Vs7zovkU1DJxMGnVwoL0iDHDoezIlDKtVYDKoyKl9Ws="; + }; + + buildInputs = [ + zlib + ]; + + configurePhase = '' + cd src + cp Makefile.${if stdenv.isLinux then "Linux" else "MacOS"} Makefile + ''; + + makeFlags = [ "CC_EXEC=cc" ]; + + installPhase = '' + mkdir $out + cp -r ../bin $out + ''; + + meta = with lib; { + description = "High-performance read alignment, quantification and mutation discovery"; + license = licenses.gpl3; + maintainers = with maintainers; [ jbedo ]; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + homepage = "http://subread.sourceforge.net/"; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0940dc15be86..0b7bb5d62b31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31565,6 +31565,8 @@ with pkgs; sage = callPackage ../applications/science/math/sage { }; sageWithDoc = sage.override { withDoc = true; }; + subread = callPackage ../applications/science/biology/subread { }; + suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { }; suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse/4.4.nix {}; suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse {}; From f759bc611f91ecfb65e3901a495b1b48dcaf86dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Dec 2021 02:31:28 +0000 Subject: [PATCH 26/99] python38Packages.flask-appbuilder: 3.4.0 -> 3.4.1 --- pkgs/development/python-modules/flask-appbuilder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 52d1daa14d0f..afb81cc103bc 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "3.4.0"; + version = "3.4.1"; src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - sha256 = "a5dfb559a0e96dd06bf5ff023f72bb3cc855e6db68e573e70f30caa31840f50f"; + sha256 = "c0830935077c4d06d57237ca4791fcabfc682fe3e315c1c9444a2bd6f94e7514"; }; # See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch From e284a5b994ad949637f6fa1c8903a02cc61abe05 Mon Sep 17 00:00:00 2001 From: Joel Date: Tue, 14 Dec 2021 13:24:58 +1000 Subject: [PATCH 27/99] spotifyd: 0.3.2 -> 0.3.3 --- pkgs/applications/audio/spotifyd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index dacf91e56229..bfeb8a7dab3a 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -9,16 +9,16 @@ rustPackages.rustPlatform.buildRustPackage rec { pname = "spotifyd"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; rev = "v${version}"; - sha256 = "1a578h13iv8gqmskzlncfr42jlg5gp0zfcizv4wbd48y9hl8fh2l"; + sha256 = "1liql2wp7cx0x4ha1578wx3m4byd295m4ph268s05yw2wrnr3v6c"; }; - cargoSha256 = "07dxfc0csrnfl01p9vdrqvca9f574svlf37dk3dz8p6q08ki0n1z"; + cargoSha256 = "1plvqd55d1gj0ydimv3154pwgj2sh1fqx2182nw8akzdfmzg1150"; nativeBuildInputs = [ pkg-config ]; From 3aa526c44bdc8ab6522effde401f68e15a122839 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Dec 2021 08:13:49 +0000 Subject: [PATCH 28/99] python38Packages.casbin: 1.15.0 -> 1.15.1 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 944136840f63..53bebb6affa2 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.15.0"; + version = "1.15.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "05jg8qm0ix02qvcjqcfalp15j22hzlf9wfdnhrll57bnwgk4kkf8"; + sha256 = "1majsbpldsch3wgg7pdm87vk9dhqll9nk2pjjvqp8rvg93x2kkww"; }; propagatedBuildInputs = [ From 24900aca897253cf61bd5cddeec31898ee1666e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Dec 2021 09:28:37 +0000 Subject: [PATCH 29/99] python38Packages.open-meteo: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/open-meteo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix index 6a7d5cfeb6e0..520af3062eac 100644 --- a/pkgs/development/python-modules/open-meteo/default.nix +++ b/pkgs/development/python-modules/open-meteo/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "open-meteo"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-open-meteo"; rev = "v${version}"; - sha256 = "tuAuY43HRz8zFTOhsm4TxSppP4CYTGPqQndDMxW3URs="; + sha256 = "0i8jmhd29vvkpfxs9l5wy8525ngs79mnc7si2j9b1nc41xrv91f6"; }; nativeBuildInputs = [ From 1fc1a1e012e80831ae03d75ab308be74aab34d33 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 14 Dec 2021 13:26:56 +0200 Subject: [PATCH 30/99] python3.pkgs.pint: 0.14 -> 0.18 Add @doronbehar as maintainer. --- pkgs/development/python-modules/pint/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index f39caef6e59d..c5a9148f0e54 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -7,6 +7,7 @@ , packaging # Check Inputs , pytestCheckHook +, pytest-subtests , numpy , matplotlib , uncertainties @@ -14,12 +15,12 @@ buildPythonPackage rec { pname = "pint"; - version = "0.14"; + version = "0.18"; src = fetchPypi { inherit version; pname = "Pint"; - sha256 = "0wkzb7g20wzpqr3xaqpq96dlfv6irw202icsz81ys8npp7mm194s"; + sha256 = "sha256-jEvOiEwmkFH+t6vGnb/RhAPAx2SryD2hMuinIi+LqAE="; }; disabled = pythonOlder "3.6"; @@ -32,6 +33,7 @@ buildPythonPackage rec { # Test suite explicitly requires pytest checkInputs = [ pytestCheckHook + pytest-subtests numpy matplotlib uncertainties @@ -42,7 +44,7 @@ buildPythonPackage rec { description = "Physical quantities module"; license = licenses.bsd3; homepage = "https://github.com/hgrecco/pint/"; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc doronbehar ]; }; } From 2324db83999d0f76bc190c12b8eaba73f062fc36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Dec 2021 13:46:54 +0000 Subject: [PATCH 31/99] python38Packages.vehicle: 0.2.2 -> 0.3.0 --- pkgs/development/python-modules/vehicle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index 9d5f15a3e1b1..7447ce14cfca 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "vehicle"; - version = "0.2.2"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-vehicle"; rev = "v${version}"; - sha256 = "sha256-3DkfS8gx3C1/Vj8+IE7uxZ5i0cKJk0mJpBWQqAgb2Xo="; + sha256 = "0blpyh246l16bn6jy8ifym2br13k8qxagggbwpzwrwfxkb3kdz5x"; }; nativeBuildInputs = [ From 4ee9de55f0855a68dbc56e0fb7ab860958c0d64a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Dec 2021 17:57:28 +0000 Subject: [PATCH 32/99] python38Packages.somajo: 2.1.5 -> 2.1.6 --- 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 5d17a907caeb..8701fa98e67d 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.5"; + version = "2.1.6"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "17v1vmbjwpxwql25vlbm7xsair7945ljmyaricxx8fd6fxvgn9rr"; + sha256 = "1q88x05729qdnl1gbahisjk3s97wha0b5dj3n63kq2qyvyy0929s"; }; propagatedBuildInputs = [ regex ]; From 1a17a3a2879db7ce1f3306b1422d1b2b4307cf02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lio=E6=9D=8E=E6=AD=90?= Date: Tue, 14 Dec 2021 10:22:08 -0800 Subject: [PATCH 33/99] ldc: add aarch64-linux --- pkgs/development/compilers/ldc/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix index 93ee83cb0abe..93423d5a1b29 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/development/compilers/ldc/generic.nix @@ -132,6 +132,6 @@ stdenv.mkDerivation rec { # from https://github.com/ldc-developers/ldc/blob/master/LICENSE license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; maintainers = with maintainers; [ ThomasMader lionello ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } From 9b79576fdbfa6a5bd88ae08f5d3b1d6951009075 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Tue, 14 Dec 2021 21:16:48 +0200 Subject: [PATCH 34/99] tree-sitter: update grammars --- .../parsing/tree-sitter/grammars/tree-sitter-c-sharp.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-go.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-nix.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-norg.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-php.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-ruby.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-rust.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-zig.json | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index ad7e72f61d12..efd5be612847 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "69921685a7688361626600543a2beaf82b67a64d", - "date": "2021-11-03T12:36:17+00:00", - "path": "/nix/store/f4rd6avwf2flqr9yv0dvy9288qrgn2bs-tree-sitter-c-sharp", - "sha256": "18yzr0yvkbp5wf2slcfn04fc23jn0ray72ica0jyv92jkp5pxc03", + "rev": "3104df21065af0f3d51e05a96cd0e2ff16a6f982", + "date": "2021-12-09T21:13:54+00:00", + "path": "/nix/store/1xgrz7rm6mc6j2svaidj4x0zyda0ahz4-tree-sitter-c-sharp", + "sha256": "14g8x5q4xc87s2wpycws6r6ci083j7pk1jdw6sr8qp96zyzs17pp", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index 3839bd61dc1f..7e7ef382bae2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "7f6bfd0161b2fe97f03564edad3287ebea0494a3", - "date": "2021-10-04T13:10:27-04:00", - "path": "/nix/store/64xzxzc8z4fmwhfb7wbdkcxlk7r3bia2-tree-sitter-go", - "sha256": "12naks95vzb0sf219i39myvfpkycr2dh3lv7i7i6kwddmlhqsjnl", + "rev": "1203c11e422c73350e672445c5c32b8c0f79266d", + "date": "2021-12-03T14:22:11-08:00", + "path": "/nix/store/5h584m7qgvlh0s5k10503zj3idggandz-tree-sitter-go", + "sha256": "03i63mh5g21y424pf9whl42p7shqp9xlrx90xpyrd12dlc9zhh2j", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index e04d8f81ff63..801634201c86 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,9 +1,9 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "83ee5993560bf15854c69b77d92e34456f8fb655", - "date": "2021-07-21T20:36:40-05:00", - "path": "/nix/store/n5pq9gba570874akpwpvs052d7vyalhh-tree-sitter-nix", - "sha256": "03jhvyrsxq49smk9p2apjj839wmzjmrzy045wcxawz1g7xssp9pr", + "rev": "6d6aaa50793b8265b6a8b6628577a0083d3b923d", + "date": "2021-11-29T00:27:21-06:00", + "path": "/nix/store/6cjadxvqbrh205lsqnk2rnzq3badxdxv-tree-sitter-nix", + "sha256": "0cbk6dqppasrvnm87pwfgm718z6b0xmy9m7zj8ysil0h8bklz1w9", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json index dbf88190fb39..7feaee05a865 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json @@ -1,9 +1,9 @@ { "url": "https://github.com/nvim-neorg/tree-sitter-norg", - "rev": "995d7e0be4dc2a9655d2285405c0ef3fededf63c", - "date": "2021-11-05T21:28:42+01:00", - "path": "/nix/store/1l5dq21x6sln1gvixf20gx3pkadjad4d-tree-sitter-norg", - "sha256": "181y8p91hl5j7mrff0pmnx91d9vr24nvklgx12qvc0297vdp8c5v", + "rev": "665736e400cfd52ae92ead244ca9f5d44db98151", + "date": "2021-12-14T15:04:57+01:00", + "path": "/nix/store/crbl24rj54f8c9pjq8igadz3wqcw6qrw-tree-sitter-norg", + "sha256": "0hxar07a7n3ghqagr0qjxbz4sgzcpyxwgd4dbj1vvy4xnk07i0br", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index c680b87b76d4..e64e3f6bff36 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "435fa00006c0d1515c37fbb4dd6a9de284af75ab", - "date": "2021-10-17T09:05:36+02:00", - "path": "/nix/store/0vgi25jrbc6fks97sxkya80dvwa0gzbk-tree-sitter-php", - "sha256": "05k4h58gi616gv41r0qqdb1x4rs8y94vghn2r10yczisgzq4vbad", + "rev": "57f855461aeeca73bd4218754fb26b5ac143f98f", + "date": "2021-11-19T17:22:11+01:00", + "path": "/nix/store/lxl3r0lykb9b3r0sdqb3sqixlnaf6015-tree-sitter-php", + "sha256": "1v7xzc8w8nilmgnx6whdvq03dbi1z8j57aarwwzx9xbb86z2qhvc", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index 86320373d7ea..e9df62ad10fd 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd", - "date": "2021-03-03T16:54:30-08:00", - "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby", - "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v", + "rev": "888e2e563ed3b43c417f17e57f7e29c39ce9aeea", + "date": "2021-12-03T16:33:06+01:00", + "path": "/nix/store/6g101r5pwy6iqicch9srlhwfz9xdrvzd-tree-sitter-ruby", + "sha256": "0xfcqafslxlpkw7agw4a179w3c6k6ivi3fzlf32pqfd5bjrlx9d7", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 8e8af00423b8..2f6ac50b07da 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "cc7bdd3e6d14677e8aa77da64f6a3f57b6f8b00a", - "date": "2021-08-17T11:21:11-07:00", - "path": "/nix/store/aw8bi91hz7a26swc5qrfqwn2lrdmiymr-tree-sitter-rust", - "sha256": "15qz4rwz1fkpcy78g0aspfgk9pgykvzv5sxmhgm37nfpgyi7vlg1", + "rev": "d045b04b66d51c0ba8671e7ce1ee23a9f286b7d7", + "date": "2021-12-12T10:08:54-08:00", + "path": "/nix/store/2h6vkl05jxqgp4738a0dxccmg40yhqvj-tree-sitter-rust", + "sha256": "0ckyaw1ll3yazyg18wd40kc09h6f0zmwqmahsm07bwgfyc2nvf3h", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 100bb09fce20..98a30d08ac44 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -1,9 +1,9 @@ { "url": "https://github.com/maxxnino/tree-sitter-zig", - "rev": "63e8a11f1858c7351a299223b231c8134ed61612", - "date": "2021-10-13T22:25:30+09:00", - "path": "/nix/store/2dy3wrmjss5mnmdv6xf50cjj3k9bfpp0-tree-sitter-zig", - "sha256": "1izvw3dv5ydklqlh8n4fslyzqdal9n8kark0g4xslcrnji3q71wg", + "rev": "cf93353d5682c3e9d8112d448ff24d4de7b2304e", + "date": "2021-11-25T20:46:40+09:00", + "path": "/nix/store/jwrs3fdgdqymjkrni6mlz1j0f0ai6h9y-tree-sitter-zig", + "sha256": "04ja9w28zprw575s4734d02ibi498whh3z7cxm3m1fdydhjsdlrj", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From 8e06903998ac7332c1cfa2f9e3a9e50659f66a5a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Dec 2021 20:08:20 +0100 Subject: [PATCH 35/99] matrix-synapse.tools.synapse-rust-compress-state: 0.1.0 -> 0.1.2 --- .../tools/rust-synapse-compress-state.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix b/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix index c81058b47b0f..3734d7c602da 100644 --- a/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix +++ b/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix @@ -1,17 +1,25 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, python3, fetchFromGitHub, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "rust-synapse-compress-state"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = pname; rev = "v${version}"; - sha256 = "15jvkpbq6pgdc91wnni8fj435yqlwqgx3bb0vqjgsdyxs5lzalfh"; + sha256 = "sha256-uL7uoJPvZoTbrmEFY7jiBphvjWSRpH9pyk3x7s3Yvrs="; }; - cargoSha256 = "173nylp9xj88cm42yggj41iqvgb25s3awhf1dqssy8f1zyw2cf3d"; + cargoSha256 = "sha256-3w5RyVrpCnetXnxnzgVl94kUZa+1i9bU2O8vp7sb3lY="; + + cargoBuildFlags = [ + "--all" + ]; + + nativeBuildInputs = [ python3 pkg-config ]; + + buildInputs = [ openssl ]; meta = with lib; { description = "A tool to compress some state in a Synapse instance's database"; From f2027d7f7fb3756361c3a0ffc45307fed9de072f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 14 Dec 2021 21:11:53 +0100 Subject: [PATCH 36/99] signal-desktop: 5.25.1 -> 5.26.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 5cd3520149a8..f9fb19a80f97 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.25.1"; # Please backport all updates to the stable channel. + version = "5.26.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1b634sy2bac5i548g1z1fd5qqy8jr6abl5kbhq50d1kmwnqy1a5l"; + sha256 = "1l61m976x2pha3bvlcjppkgwn6b8ws1nqfa9zk7xwq4c5qz9mpj2"; }; nativeBuildInputs = [ From a58cbb03698cd2ccd744b303e615dbd4605df5a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Dec 2021 21:01:17 +0000 Subject: [PATCH 37/99] python38Packages.tailscale: 0.1.4 -> 0.1.5 --- pkgs/development/python-modules/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index 94de671acaf6..329ec20e2090 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tailscale"; - version = "0.1.4"; + version = "0.1.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-tailscale"; rev = "v${version}"; - sha256 = "sha256-xRVkmofD2pOco0kJfVcmUaPow2ZZNEZrhvNmldUjQuw="; + sha256 = "1a33xibkbavl442sc7phvj6d6w17x91zh64f59w0xrsccabn25b1"; }; nativeBuildInputs = [ From f172eba7ae725f6a0f5e8735c751fa9ab5a7373d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Dec 2021 19:27:38 +0100 Subject: [PATCH 38/99] log4jcheck: init at unstable-2021-12-14 --- pkgs/tools/security/log4jcheck/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/security/log4jcheck/default.nix diff --git a/pkgs/tools/security/log4jcheck/default.nix b/pkgs/tools/security/log4jcheck/default.nix new file mode 100644 index 000000000000..291bf1ff96b4 --- /dev/null +++ b/pkgs/tools/security/log4jcheck/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "log4jcheck"; + version = "unstable-2021-12-14"; + format = "other"; + + src = fetchFromGitHub { + owner = "NorthwaveSecurity"; + repo = pname; + rev = "736f1f4044e8a9b7bf5db515e2d1b819253f0f6d"; + sha256 = "sha256-1al7EMYbE/hFXKV4mYZlkEWTUIKYxgXYU3qBLlczYvs="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + requests + ]; + + installPhase = '' + runHook preInstall + install -vD nw_log4jcheck.py $out/bin/${pname} + runHook postInstall + ''; + + meta = with lib; { + description = "Tool to check for vulnerable Log4j (CVE-2021-44228) systems"; + homepage = "https://github.com/NorthwaveSecurity/log4jcheck"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa04903087f7..7bd7e17d2fa0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7465,6 +7465,8 @@ with pkgs; log4j-scan = callPackage ../tools/security/log4j-scan { }; + log4jcheck = callPackage ../tools/security/log4jcheck { }; + logcheck = callPackage ../tools/system/logcheck { }; logmein-hamachi = callPackage ../tools/networking/logmein-hamachi { }; From e0d9f1bb03e4e84f8f00368bc318788fa687e72e Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Tue, 14 Dec 2021 22:50:03 +0100 Subject: [PATCH 39/99] php: skip performance sensitive tests --- pkgs/development/interpreters/php/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 7a1ee2a2ebaf..bf2ff11158ec 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -212,6 +212,7 @@ let ; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; + SKIP_PERF_SENSITIVE = 1; configureFlags = # Disable all extensions From 497d334c141e34f4c6851f9176200912677d77fc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 20 Nov 2021 23:52:50 +0300 Subject: [PATCH 40/99] youtrack service: restart on failure --- nixos/modules/services/web-apps/youtrack.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix index 7a70ae6cd523..b83265ffeab6 100644 --- a/nixos/modules/services/web-apps/youtrack.nix +++ b/nixos/modules/services/web-apps/youtrack.nix @@ -128,6 +128,7 @@ in Type = "simple"; User = "youtrack"; Group = "youtrack"; + Restart = "on-failure"; ExecStart = ''${cfg.package}/bin/youtrack --J-Xmx${cfg.maxMemory} --J-XX:MaxMetaspaceSize=${cfg.maxMetaspaceSize} ${cfg.jvmOpts} ${cfg.address}:${toString cfg.port}''; }; }; From 3b6a6505f1b1a8630cc2c6758ecb96c29d534089 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 21 Nov 2021 01:25:51 +0300 Subject: [PATCH 41/99] youtrack: 2021.1.13597 -> 2021.4.35970 Log4j vulnerability fix, move to JDK 17. --- pkgs/servers/jetbrains/youtrack.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index ac144f166063..07de22e41acf 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, makeWrapper, jdk11, gawk }: +{ lib, stdenv, fetchurl, makeWrapper, jdk17, gawk }: stdenv.mkDerivation rec { pname = "youtrack"; - version = "2021.1.13597"; + version = "2021.4.35970"; jar = fetchurl { url = "https://download.jetbrains.com/charisma/${pname}-${version}.jar"; - sha256 = "0lc0ra95ix5bs1spfjnx5akh8jm754v8lc3yja8dc438zi221qhh"; + sha256 = "sha256-HB515TS0XXEAiT463nVHP/naeoF7nmeB+6EK0NJ+5c0="; }; nativeBuildInputs = [ makeWrapper ]; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - makeWrapper ${jdk11}/bin/java $out/bin/youtrack \ + makeWrapper ${jdk17}/bin/java $out/bin/youtrack \ --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" \ --prefix PATH : "${lib.makeBinPath [ gawk ]}" \ - --set JRE_HOME ${jdk11} + --set JRE_HOME ${jdk17} runHook postInstall ''; From 864beccfb610a7ac8dda4bbf09ad13f9706831d6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 14 Dec 2021 18:20:23 -0500 Subject: [PATCH 42/99] httplz: 1.12.1 -> 1.12.2 --- pkgs/tools/networking/httplz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index 52654a49d65f..1d482f2bebf1 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.12.1"; + version = "1.12.2"; src = fetchCrate { inherit version; pname = "https"; - sha256 = "sha256-vMhQHWzsZlqMVkEQHCZTB8T4ETTaf8iAS9QhgYdfcx0="; + sha256 = "sha256-FhxNYss6n0AJEszpJ7+6CAJE2sdsflWQkvSLakTnFdY="; }; - cargoSha256 = "sha256-9gnKVZ3HQs3kNj4i1cgC+Jl3dhjx7QRaHSih1HOB3nI="; + cargoSha256 = "sha256-wyksA3RYpGkD6nhllNv8WkUwEdml4TiPM2a4GzfBD1o="; nativeBuildInputs = [ installShellFiles From e21ca17af22c625b15eb23d973c0ece879d60731 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Wed, 15 Dec 2021 00:08:19 +0000 Subject: [PATCH 43/99] vscode: 1.63.0 -> 1.63.1 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index fd56434e7b04..0cf3ba1bd2c8 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1w28rmb9fi45s85rrlzzh6r826dnyisd6lh3j8ir4hx6d34cawsf"; - x86_64-darwin = "1fyg3ygqk0z3jcj5bskgprlq8k9j134y75xq06z4xbv1dhgwhswj"; - aarch64-linux = "0hha9ksbj51zmq0p3d1fwni4jd0yp0wab0w19carmbhnydhrgh22"; - aarch64-darwin = "1cmrh621z7ddl4qh95hm0nwzazshl71a43c6113jf4w6b1kvy5m5"; - armv7l-linux = "1kipvqc5hrpgsfw7x2ab5jydf7zksdd3q8qr2mg20kjsdi4skwy4"; + x86_64-linux = "0xn2gcvqjbj2adfwq2s0pz1n4yxg6spq4hifhvwavb34pn9yc9p9"; + x86_64-darwin = "13kgsxhjdfcdgz8xbhzpd7x1xh6am255dwxpbr03cg4p8iwfd3ig"; + aarch64-linux = "166ag0k0j8wixm3arl1ld4a4qi92ff1zvb6whhqshzdv0s39pys3"; + aarch64-darwin = "08g8qjbvlp27i37z7jcsvzgg6vm0grppnlh0jyji6lz31ksib6pz"; + armv7l-linux = "15l9kr01f0jxfi0a9dnldsjrwzv9x60ljgvmlh0zhx4h0q1x0n7l"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.63.0"; + version = "1.63.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 5f6277fdf2b8593b3fb9ed9a355411350de8f065 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Wed, 15 Dec 2021 08:18:47 +0800 Subject: [PATCH 44/99] fortune: 3.6.1 -> 3.8.0 --- pkgs/tools/misc/fortune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 6f77c54e30b4..4c230b2dab74 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fortune-mod"; - version = "3.6.1"; + version = "3.8.0"; # We use fetchurl instead of fetchFromGitHub because the release pack has some # special files. src = fetchurl { url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "1cw7xf9xhh6d73y4h4q57g6akjhc1gq6xv37k57sx0wx77wjxqdp"; + sha256 = "sha256-HXQYYWZhfYIT7wEr9FAymaQWEfg0DcaWT0z7yvcZ+BI="; }; nativeBuildInputs = [ cmake perl ]; From 9482691069501f408fc77d66278599ca50749c80 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 13 Dec 2021 16:53:47 +0000 Subject: [PATCH 45/99] cloud-hypervisor: 20.0 -> 20.1 --- .../virtualization/cloud-hypervisor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 7b45656c5e9c..f68c1ddc8a50 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "20.0"; + version = "20.1"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "1j2p2phv1fxsa2mdr66gyswqgij33m3sdaa460xrf98dm581bqw2"; + sha256 = "1r55ykxwa0xr1f9sp7mnv8nqf0dr7vw62b1w8r7mmyrndwnq6z5b"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "12fmpq1y29mawa3xdwbwa3fw2hnhy5rqhlx54qp0s3x9g2jd7gsa"; + cargoSha256 = "07wpfhlp82hp3hr8vc52vhkrxd8xpyvdvfqh1dn1fnhxk3b1z7lz"; meta = with lib; { homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"; From 7b55233af3c90c6130a55c9cb394fc15d8bf194e Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 15 Dec 2021 01:21:16 +0100 Subject: [PATCH 46/99] mktorrent: fix link to homepage The SourceForge link is dead (404), replace it with a different link. Also change the GitHub owner from Rudde to pobrn as GitHub will automatically redirect otherwise and it would look weird if the link to the homepage had a different owner compared to the one in `fetchFromGitHub`. --- pkgs/tools/misc/mktorrent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 194a0c62721d..089caac7884a 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchFromGitHub { - owner = "Rudde"; + owner = "pobrn"; repo = "mktorrent"; rev = "v${version}"; sha256 = "17pdc5mandl739f8q26n5is8ga56s83aqcrwhlnnplbxwx2inidr"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; meta = { - homepage = "http://mktorrent.sourceforge.net/"; + homepage = "https://github.com/pobrn/mktorrent/wiki"; license = lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; maintainers = with lib.maintainers; [Profpatsch]; From dee0a18b6dfd957390d2fcf08135d6ba02ff8ba5 Mon Sep 17 00:00:00 2001 From: davidak Date: Mon, 13 Dec 2021 19:14:09 +0100 Subject: [PATCH 47/99] fbmark: init at 0.3 --- pkgs/tools/misc/fbmark/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/fbmark/default.nix diff --git a/pkgs/tools/misc/fbmark/default.nix b/pkgs/tools/misc/fbmark/default.nix new file mode 100644 index 000000000000..fe8bca0e2240 --- /dev/null +++ b/pkgs/tools/misc/fbmark/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "fbmark"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "caramelli"; + repo = pname; + rev = "v${version}"; + sha256 = "0n2czl2sy1k6r5ri0hp7jgq84xcwrx4x43bqvw1b4na99mqhyahn"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Linux Framebuffer Benchmark"; + homepage = "https://github.com/caramelli/fbmark"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ davidak ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0940dc15be86..291a63ce2a34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32406,6 +32406,8 @@ with pkgs; fahcontrol = callPackage ../applications/science/misc/foldingathome/control.nix {}; fahviewer = callPackage ../applications/science/misc/foldingathome/viewer.nix {}; + fbmark = callPackage ../tools/misc/fbmark { }; + foma = callPackage ../tools/misc/foma { }; foo2zjs = callPackage ../misc/drivers/foo2zjs {}; From e992c183e9ec93c400feea117c6d77ff35b5c078 Mon Sep 17 00:00:00 2001 From: Yannik Sander Date: Wed, 15 Dec 2021 02:25:38 +0100 Subject: [PATCH 48/99] gotypist: fix maintainer metadata --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/games/gotypist/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 22dc8578b26f..7adf629cc0ab 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9044,6 +9044,12 @@ githubId = 116740; name = "Paweł Pacana"; }; + pb- = { + email = "pbaecher@gmail.com"; + github = "pb-"; + githubId = 84886; + name = "Paul Baecher"; + }; pbogdan = { email = "ppbogdan@gmail.com"; github = "pbogdan"; diff --git a/pkgs/games/gotypist/default.nix b/pkgs/games/gotypist/default.nix index 00fc30718182..d7c9c33d7574 100644 --- a/pkgs/games/gotypist/default.nix +++ b/pkgs/games/gotypist/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { ''; homepage = "https://github.com/pb-/gotypist"; license = licenses.mit; - maintainers = [ "Paul Baecher" ]; + maintainers = with maintainers; [ pb- ]; }; } From 29a064842df5f4ff5ff9df4e1b7c939b0a5e23cd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Dec 2021 09:46:59 +0800 Subject: [PATCH 49/99] pantheon.elementary-dock: unstable-2021-11-08 -> unstable-2021-12-08 --- .../desktops/pantheon/apps/elementary-dock/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index f23120c0b6dd..5aa61062a8f6 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -28,17 +28,15 @@ stdenv.mkDerivation rec { pname = "elementary-dock"; - version = "unstable-2021-11-08"; + version = "unstable-2021-12-08"; outputs = [ "out" "dev" ]; - repoName = "dock"; - src = fetchFromGitHub { owner = "elementary"; - repo = repoName; - rev = "51e8d3ddfbed0dfce3158d80f997ab183e92567b"; - sha256 = "sha256-w6HGxEAXNod/uMEEfSz9nRNTRrCbcEqJCP9EFkVbX1U="; + repo = "dock"; + rev = "5e4b5ba2eec3b522e107ad834a59c0f1271d4699"; + sha256 = "sha256-/Ul21t9VFxhmlQbfx4eY86UKU33hiRfXF9OPHBzPe5o="; }; nativeBuildInputs = [ From 5041f6f672e0c275f58f44cc810d685d57f333fa Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 15 Dec 2021 01:51:17 +0100 Subject: [PATCH 50/99] mp3fs: 0.91 -> 1.1.1 https://github.com/khenriks/mp3fs/releases/tag/v1.1.1 Also update the long description to match the GitHub README. --- pkgs/tools/filesystems/mp3fs/default.nix | 41 +++++++++++++------ .../mp3fs/fix-statfs-operation.patch | 39 ------------------ 2 files changed, 29 insertions(+), 51 deletions(-) delete mode 100644 pkgs/tools/filesystems/mp3fs/fix-statfs-operation.patch diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 1b80adc843a6..292030ce398a 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -1,18 +1,35 @@ -{ lib, stdenv, fetchurl, flac, fuse, lame, libid3tag, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, flac +, fuse +, lame +, libid3tag +, libvorbis +, autoreconfHook +, pkg-config +, pandoc +}: stdenv.mkDerivation rec { pname = "mp3fs"; - version = "0.91"; + version = "1.1.1"; - src = fetchurl { - url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "14ngiqg24p3a0s6hp33zjl4i46d8qn4v9id36psycq3n3csmwyx4"; + src = fetchFromGitHub { + owner = "khenriks"; + repo = "mp3fs"; + rev = "v${version}"; + sha256 = "sha256-dF+DfkNKvYOucS6KjYR1MMGxayM+1HVS8mbmaavmgKM="; }; - patches = [ ./fix-statfs-operation.patch ]; + postPatch = '' + substituteInPlace src/mp3fs.cc \ + --replace "#include " "" \ + --replace "osxfuse_version()" "fuse_version()" + ''; - buildInputs = [ flac fuse lame libid3tag ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ flac fuse lame libid3tag libvorbis ]; + nativeBuildInputs = [ autoreconfHook pkg-config pandoc ]; enableParallelBuilding = true; @@ -20,10 +37,10 @@ stdenv.mkDerivation rec { description = "FUSE file system that transparently transcodes to MP3"; longDescription = '' A read-only FUSE filesystem which transcodes between audio formats - (currently only FLAC to MP3) on the fly when files are opened and read. - It can let you use a FLAC collection with software and/or hardware - which only understands the MP3 format, or transcode files through - simple drag-and-drop in a file browser. + (currently FLAC and Ogg Vorbis to MP3) on the fly when opened and read. + This can let you use a FLAC or Ogg Vorbis collection with software + and/or hardware which only understands the MP3 format, or transcode + files through simple drag-and-drop in a file browser. ''; homepage = "https://khenriks.github.io/mp3fs/"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/filesystems/mp3fs/fix-statfs-operation.patch b/pkgs/tools/filesystems/mp3fs/fix-statfs-operation.patch deleted file mode 100644 index 9b3094e60053..000000000000 --- a/pkgs/tools/filesystems/mp3fs/fix-statfs-operation.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fea072084ff9d7c4d2c688059a2462bb0e59a2ec Mon Sep 17 00:00:00 2001 -From: K Henriksson -Date: Wed, 27 Aug 2014 21:55:18 -0700 -Subject: [PATCH] Fix statfs operation - -The statfs implementation does not properly translate names back to the -original, since the major encoding rewrite. This corrects that, and -should fix issue #27. ---- - src/fuseops.c | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/src/fuseops.c b/src/fuseops.c -index e7b4e7e..c333cbd 100644 ---- a/src/fuseops.c -+++ b/src/fuseops.c -@@ -337,9 +337,20 @@ static int mp3fs_statfs(const char *path, struct statvfs *stbuf) { - if (!origpath) { - goto translate_fail; - } -- -+ -+ /* pass-through for regular files */ -+ if (statvfs(origpath, stbuf) == 0) { -+ goto passthrough; -+ } else { -+ /* Not really an error. */ -+ errno = 0; -+ } -+ -+ find_original(origpath); -+ - statvfs(origpath, stbuf); -- -+ -+passthrough: - free(origpath); - translate_fail: - return -errno; From 5cf147123283790ee4fa07d488f0da67e3e6b10d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 15 Dec 2021 02:32:01 +0100 Subject: [PATCH 51/99] mp3fs: add Luflosi as maintainer --- pkgs/tools/filesystems/mp3fs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 292030ce398a..6f872500e6b1 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://khenriks.github.io/mp3fs/"; license = licenses.gpl3Plus; platforms = platforms.unix; + maintainers = with maintainers; [ Luflosi ]; }; } From 3558190aa075816003c6ab838fd87fbe27f453a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Dec 2021 02:58:50 +0000 Subject: [PATCH 52/99] vscodium: 1.63.0 -> 1.63.1 --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 4b795fceba2d..a224c88b761b 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "17kck7pkklhifm6hpsd93wmnyk06vi9sa55gp62m3diymp1b129z"; - x86_64-darwin = "1japc6yyvw07rll53pf2jfg89m2g9jqj5daghg10v1gqk98j7r3x"; - aarch64-linux = "0zg05q0hyldnw5g8b9zdf0ls4s07fixib7v830wa5dyi2sjcv149"; - armv7l-linux = "0mky66cyxhx3cfm35sa4vlwh8m1878rc80jml9mqxdhlrpnxgdiy"; + x86_64-linux = "1p7rbpvmllpdvghk3avg8f0xrbfhgyyj7l0ajjp0pcx24g3ijdwq"; + x86_64-darwin = "1ggcvdvciq5dkiknlxsrxkx96gj0g8vw0h2v1bj1xvv1mqjv0kwk"; + aarch64-linux = "0ypi7n99c6s99vxl78j5zw4l8jysgnz3bzch3l9yqpp1faq2zim5"; + armv7l-linux = "1rb1b4ixvm98y5s40i6qhzl6c5rv1jkbvcbwrv4s2g122j002dwn"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.63.0"; + version = "1.63.1"; pname = "vscodium"; executableName = "codium"; From c3c776954c83dd53d917de9c0fa65268c6146210 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Dec 2021 04:14:27 +0000 Subject: [PATCH 53/99] brave: 1.32.115 -> 1.33.106 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 9ff1182c1c8a..464085d2116d 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -93,11 +93,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.32.115"; + version = "1.33.106"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "6DY3gLyaMSkjZEPR9o1hiuFFsL22bTeq2SN9Nt3DCSc="; + sha256 = "XSqlQyc6gJthchfmq29d5+OVVSaxYG7zpVZNFZpl67s="; }; dontConfigure = true; From 5db828dbdee4809c593a7ff98852967f7205c29e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Dec 2021 05:34:42 +0000 Subject: [PATCH 54/99] fluxcd: 0.24.0 -> 0.24.1 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 2c8ecbebdc13..54eaf06e12fb 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.24.0"; - sha256 = "025dynxkfqrnpqrvdq39394biky2ra1mfjirrigamngchifav3b3"; - manifestsSha256 = "0sbbvv40c66qdrhlvas42qcdmpgg1mb8zzcdrfr5yrkqwxnzis7x"; + version = "0.24.1"; + sha256 = "18jzf5kd06c10f45y4crvaqa5r10dhq2ashlhppzrmhigiyavxac"; + manifestsSha256 = "0qbdik65irnwgw7klj5w0z00jxflm855gikpnqb9gsxd7rbw8ysk"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "0w1qzsri3dkyzwfh6s13np52j3xzxxhk02pqgfh7297djwbppnbs"; + vendorSha256 = "sha256-HoAVdY+kZLpUEl3mE7obbTzAJUyt5MBPjGhs6ZDSnzU="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From 3fbc7b4cd2c697ab25c0e2721c074698c4c10f70 Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 15 Dec 2021 07:53:29 +0100 Subject: [PATCH 55/99] ocamlPackages.wayland: 0.2 -> 1.0; wayland-proxy-virtwl: unstable-2021-04-15 -> unstable-2021-12-05 (#150714) * ocamlPackages.wayland: 0.2 -> 1.0 https://github.com/talex5/ocaml-wayland/releases/tag/v1.0 * wayland-proxy-virtwl: unstable-2021-04-15 -> unstable-2021-12-05 --- pkgs/development/ocaml-modules/wayland/default.nix | 6 +++--- .../tools/wayland/wayland-proxy-virtwl/default.nix | 14 +++++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix index 82764af64f53..7dfb46ce63cf 100644 --- a/pkgs/development/ocaml-modules/wayland/default.nix +++ b/pkgs/development/ocaml-modules/wayland/default.nix @@ -12,15 +12,15 @@ buildDunePackage rec { pname = "wayland"; - version = "0.2"; + version = "1.0"; minimumOCamlVersion = "4.08"; useDune2 = true; src = fetchurl { - url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-v${version}.tbz"; - sha256 = "4eb323e42a8c64e9e49b15a588342bfcc1e99640305cb261d128c75612d9458c"; + url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz"; + sha256 = "bf8fd0057242d11f1c265c11cfa5de3c517ec0ad5994eae45e1efe3aac034510"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 8673200172e4..4008461cc15f 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -1,17 +1,18 @@ { lib , fetchFromGitHub , ocamlPackages +, buildPackages }: ocamlPackages.buildDunePackage rec { pname = "wayland-proxy-virtwl"; - version = "unstable-2021-04-15"; + version = "unstable-2021-12-05"; src = fetchFromGitHub { owner = "talex5"; repo = pname; - rev = "09321a28f3d4c0fa7e41ebb3014106b62090b649"; - sha256 = "03rc2jp5d2y9y7mfis6kk9gchd49gvq0jg6fq5gi9r21ckb4k5v4"; + rev = "d7f58d405514dd031f2f12e402c8c6a58e62a885"; + sha256 = "0riwaqdlrx2gzkrb02v4zdl4ivpmz9g5w87lj3bhqs0l3s6c249s"; }; postPatch = '' @@ -22,12 +23,19 @@ ocamlPackages.buildDunePackage rec { useDune2 = true; minimumOCamlVersion = "4.08"; + nativeBuildInputs = [ + buildPackages.ocamlPackages.ppx_cstruct + ]; + buildInputs = with ocamlPackages; [ wayland cmdliner logs + cstruct-lwt ]; + doCheck = true; + meta = { homepage = "https://github.com/talex5/wayland-virtwl-proxy"; description = "Proxy Wayland connections across a VM boundary"; From c7e48917ad4b319406d6d1c2d463bef3ec3bef85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Dec 2021 17:22:32 +0100 Subject: [PATCH 56/99] log4shell-detector: init at unstable-2021-12-14 --- .../security/log4shell-detector/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/security/log4shell-detector/default.nix diff --git a/pkgs/tools/security/log4shell-detector/default.nix b/pkgs/tools/security/log4shell-detector/default.nix new file mode 100644 index 000000000000..27a0eb41ad5c --- /dev/null +++ b/pkgs/tools/security/log4shell-detector/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "log4shell-detector"; + version = "unstable-2021-12-14"; + format = "other"; + + src = fetchFromGitHub { + owner = "Neo23x0"; + repo = pname; + rev = "7bc368f376b8d95282193eac6ea3970c363577d5"; + sha256 = "sha256-MLKd2moMLwAZXqZ5I/pIYzV0PqVwSpze3gNM0IioI1E="; + }; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + installPhase = '' + runHook preInstall + install -vD ${pname}.py $out/bin/${pname} + runHook postInstall + ''; + + meta = with lib; { + description = "Detector for Log4Shell exploitation attempts"; + homepage = "https://github.com/Neo23x0/log4shell-detector"; + # https://github.com/Neo23x0/log4shell-detector/issues/24 + license = licenses.unfree; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cd1ec6c48f7..507a1c73daed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7467,6 +7467,8 @@ with pkgs; log4jcheck = callPackage ../tools/security/log4jcheck { }; + log4shell-detector = callPackage ../tools/security/log4shell-detector { }; + logcheck = callPackage ../tools/system/logcheck { }; logmein-hamachi = callPackage ../tools/networking/logmein-hamachi { }; From c0aa017887551d8eb3a34ccb369974e0d2bfcbf4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Dec 2021 20:59:55 +0100 Subject: [PATCH 57/99] log4j-detect: init at unstable-2021-12-14 --- pkgs/tools/security/log4j-detect/default.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/security/log4j-detect/default.nix diff --git a/pkgs/tools/security/log4j-detect/default.nix b/pkgs/tools/security/log4j-detect/default.nix new file mode 100644 index 000000000000..aaad1fb94efb --- /dev/null +++ b/pkgs/tools/security/log4j-detect/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "log4j-detect"; + version = "unstable-2021-12-14"; + format = "other"; + + src = fetchFromGitHub { + owner = "takito1812"; + repo = pname; + rev = "2f5b7a598a6d0b4aee8111bb574ea72c6a1c76d6"; + sha256 = "sha256-fFKW7uPBfrnze0UoPL3Mfwd4sFOuHYuDP7kv6VtdM3o="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + requests + ]; + + postPatch = '' + sed -i "1 i #!/usr/bin/python" ${pname}.py + ''; + + installPhase = '' + runHook preInstall + install -vD ${pname}.py $out/bin/${pname} + runHook postInstall + ''; + + meta = with lib; { + description = "Tool to detect the log4j vulnerability"; + homepage = "https://github.com/takito1812/log4j-detect"; + license = licenses.unfree; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 507a1c73daed..007ea0ae89c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7463,6 +7463,8 @@ with pkgs; localtime = callPackage ../tools/system/localtime { }; + log4j-detect = callPackage ../tools/security/log4j-detect { }; + log4j-scan = callPackage ../tools/security/log4j-scan { }; log4jcheck = callPackage ../tools/security/log4jcheck { }; From 1cca7ef379b3e42bea6454dca735075d4ad1c646 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Dec 2021 16:48:55 +0100 Subject: [PATCH 58/99] log4j-vuln-scanner: init at 0.6 --- .../security/log4j-vuln-scanner/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/log4j-vuln-scanner/default.nix diff --git a/pkgs/tools/security/log4j-vuln-scanner/default.nix b/pkgs/tools/security/log4j-vuln-scanner/default.nix new file mode 100644 index 000000000000..f15a439a3822 --- /dev/null +++ b/pkgs/tools/security/log4j-vuln-scanner/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "log4j-vuln-scanner"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "hillu"; + repo = "local-log4j-vuln-scanner"; + rev = "v${version}"; + sha256 = "sha256-6LbKwDu3YZFRaIUOcepbLVZC9OYnqb0Tl0ElGDIzW48="; + }; + + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + meta = with lib; { + description = "Local log4j vulnerability scanner"; + homepage = "https://github.com/hillu/local-log4j-vuln-scanner"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 007ea0ae89c9..e63728661cfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7467,6 +7467,8 @@ with pkgs; log4j-scan = callPackage ../tools/security/log4j-scan { }; + log4j-vuln-scanner = callPackage ../tools/security/log4j-vuln-scanner { }; + log4jcheck = callPackage ../tools/security/log4jcheck { }; log4shell-detector = callPackage ../tools/security/log4shell-detector { }; From 4e42f6bcb3506355cb84a71b9a8af501e936b976 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Fri, 10 Dec 2021 22:03:06 +0100 Subject: [PATCH 59/99] writers.writePython2: remove --- .../manual/release-notes/rl-2205.section.md | 2 ++ pkgs/build-support/writers/aliases.nix | 35 +++++++++++++++++++ pkgs/build-support/writers/default.nix | 31 +++++----------- pkgs/build-support/writers/test.nix | 27 -------------- 4 files changed, 46 insertions(+), 49 deletions(-) create mode 100644 pkgs/build-support/writers/aliases.nix diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 2c75718bb1ed..aceb4134bbba 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -34,6 +34,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2. Please switch to `claws-mail`, which is Claws Mail's latest release based on GTK+3 and Python 3. +- The `writers.writePython2` and corrersponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter. + ## Other Notable Changes {#sec-release-22.05-notable-changes} - The option [services.redis.servers](#opt-services.redis.servers) was added diff --git a/pkgs/build-support/writers/aliases.nix b/pkgs/build-support/writers/aliases.nix new file mode 100644 index 000000000000..fb108a6fd857 --- /dev/null +++ b/pkgs/build-support/writers/aliases.nix @@ -0,0 +1,35 @@ +lib: prev: + +let + # Removing recurseForDerivation prevents derivations of aliased attribute + # set to appear while listing all the packages available. + removeRecurseForDerivations = alias: with lib; + if alias.recurseForDerivations or false then + removeAttrs alias ["recurseForDerivations"] + else alias; + + # Disabling distribution prevents top-level aliases for non-recursed package + # sets from building on Hydra. + removeDistribute = alias: with lib; + if isDerivation alias then + dontDistribute alias + else alias; + + # Make sure that we are not shadowing something from + # writers. + checkInPkgs = n: alias: if builtins.hasAttr n prev + then throw "Alias ${n} is still in writers" + else alias; + + mapAliases = aliases: + lib.mapAttrs (n: alias: removeDistribute + (removeRecurseForDerivations + (checkInPkgs n alias))) + aliases; + +in +mapAliases ({ + /* Cleanup before 22.05, Added 2021-12-11 */ + writePython2 = "Python 2 is EOL and the use of writers.writePython2 is deprecated."; + writePython2Bin = "Python 2 is EOL and the use of writers.writePython2Bin is deprecated."; +}) diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 3797df56afa5..e16c00534f83 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -1,7 +1,9 @@ -{ pkgs, buildPackages, lib, stdenv, libiconv, gawk, gnused, gixy }: +{ pkgs, config, buildPackages, lib, stdenv, libiconv, gawk, gnused, gixy }: -with lib; -rec { +let + aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else prev: {}; + + writers = with lib; rec { # Base implementation for non-compiled executables. # Takes an interpreter, for example `${pkgs.bash}/bin/bash` # @@ -245,24 +247,6 @@ rec { ''); } name; - # writePython2 takes a name an attributeset with libraries and some python2 sourcecode and - # returns an executable - # - # Example: - # writePython2 "test_python2" { libraries = [ pkgs.python2Packages.enum ]; } '' - # from enum import Enum - # - # class Test(Enum): - # a = "success" - # - # print Test.a - # '' - writePython2 = makePythonWriter pkgs.python2 pkgs.python2Packages; - - # writePython2Bin takes the same arguments as writePython2 but outputs a directory (like writeScriptBin) - writePython2Bin = name: - writePython2 "/bin/${name}"; - # writePython3 takes a name an attributeset with libraries and some python3 sourcecode and # returns an executable # @@ -280,4 +264,7 @@ rec { # writePython3Bin takes the same arguments as writePython3 but outputs a directory (like writeScriptBin) writePython3Bin = name: writePython3 "/bin/${name}"; -} + +}; +in +writers // (aliases writers) diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 69bc7dd2c61a..8b7007e38699 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -3,7 +3,6 @@ , lib , nodePackages , perlPackages -, python2Packages , python3Packages , runCommand , writers @@ -54,17 +53,6 @@ let print "success\n" if true; ''; - python2 = writePython2Bin "test-writers-python2-bin" { libraries = [ python2Packages.enum ]; } '' - from enum import Enum - - - class Test(Enum): - a = "success" - - - print Test.a - ''; - python3 = writePython3Bin "test-writers-python3-bin" { libraries = [ python3Packages.pyyaml ]; } '' import yaml @@ -111,17 +99,6 @@ let print "success\n" if true; ''; - python2 = writePython2 "test-writers-python2" { libraries = [ python2Packages.enum ]; } '' - from enum import Enum - - - class Test(Enum): - a = "success" - - - print Test.a - ''; - python3 = writePython3 "test-writers-python3" { libraries = [ python3Packages.pyyaml ]; } '' import yaml @@ -131,10 +108,6 @@ let print(y[0]['test']) ''; - python2NoLibs = writePython2 "test-writers-python2-no-libs" {} '' - print("success") - ''; - python3NoLibs = writePython3 "test-writers-python3-no-libs" {} '' print("success") ''; From b93e478777f80dc259a003228130e4c1f8666d35 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Sat, 11 Dec 2021 14:02:38 +0100 Subject: [PATCH 60/99] writers.PyPy{2,3}: init --- .../from_md/release-notes/rl-2205.section.xml | 23 ++++++++- .../manual/release-notes/rl-2205.section.md | 5 +- pkgs/build-support/writers/default.nix | 36 +++++++++++++ pkgs/build-support/writers/test.nix | 50 +++++++++++++++++++ 4 files changed, 112 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 2a65b2f11a88..d02f951a03ca 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -83,11 +83,22 @@ release based on GTK+3 and Python 3. + + + The writers.writePython2 and corresponding + writers.writePython2Bin convenience + functions to create executable Python 2 scripts in the store + were removed in preparation of removal of the Python 2 + interpreter. Scripts have to be converted to Python 3 for use + with writers.writePython3 or + writers.writePyPy2 needs to be used. + +
Other Notable Changes - + The option @@ -113,6 +124,16 @@ socket /run/redis-${serverName}/redis.sock. + + + The + writers.writePyPy2/writers.writePyPy3 + and corresponding + writers.writePyPy2Bin/writers.writePyPy3Bin + convenience functions to create executable Python 2/3 scripts + using the PyPy interpreter were added. + +
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index aceb4134bbba..11e5462b3316 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -34,7 +34,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2. Please switch to `claws-mail`, which is Claws Mail's latest release based on GTK+3 and Python 3. -- The `writers.writePython2` and corrersponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter. +- The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter. + Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used. ## Other Notable Changes {#sec-release-22.05-notable-changes} @@ -53,3 +54,5 @@ In addition to numerous new and upgraded packages, this release has the followin are only accessible by default to the members of the Unix group `redis-${serverName}` through the Unix socket `/run/redis-${serverName}/redis.sock`. + +- The `writers.writePyPy2`/`writers.writePyPy3` and corresponding `writers.writePyPy2Bin`/`writers.writePyPy3Bin` convenience functions to create executable Python 2/3 scripts using the PyPy interpreter were added. diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index e16c00534f83..30301e3b2e54 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -247,6 +247,24 @@ let ''); } name; + # writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and + # returns an executable + # + # Example: + # writePyPy2 "test_pypy2" { libraries = [ pkgs.pypy2Packages.enum ]; } '' + # from enum import Enum + # + # class Test(Enum): + # a = "success" + # + # print Test.a + # '' + writePyPy2 = makePythonWriter pkgs.pypy2 pkgs.pypy2Packages; + + # writePyPy2Bin takes the same arguments as writePyPy2 but outputs a directory (like writeScriptBin) + writePyPy2Bin = name: + writePyPy2 "/bin/${name}"; + # writePython3 takes a name an attributeset with libraries and some python3 sourcecode and # returns an executable # @@ -265,6 +283,24 @@ let writePython3Bin = name: writePython3 "/bin/${name}"; + # writePyPy3 takes a name an attributeset with libraries and some pypy3 sourcecode and + # returns an executable + # + # Example: + # writePyPy3 "test_pypy3" { libraries = [ pkgs.pypy3Packages.pyyaml ]; } '' + # import yaml + # + # y = yaml.load(""" + # - test: success + # """) + # print(y[0]['test']) + # '' + writePyPy3 = makePythonWriter pkgs.pypy3 pkgs.pypy3Packages; + + # writePyPy3Bin takes the same arguments as writePyPy3 but outputs a directory (like writeScriptBin) + writePyPy3Bin = name: + writePyPy3 "/bin/${name}"; + }; in writers // (aliases writers) diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 8b7007e38699..decd7e42d5cc 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -3,7 +3,9 @@ , lib , nodePackages , perlPackages +, pypy2Packages , python3Packages +, pypy3Packages , runCommand , writers , writeText @@ -53,6 +55,17 @@ let print "success\n" if true; ''; + pypy2 = writePyPy2Bin "test-writers-pypy2-bin" { libraries = [ pypy2Packages.enum ]; } '' + from enum import Enum + + + class Test(Enum): + a = "success" + + + print Test.a + ''; + python3 = writePython3Bin "test-writers-python3-bin" { libraries = [ python3Packages.pyyaml ]; } '' import yaml @@ -61,6 +74,15 @@ let """) print(y[0]['test']) ''; + + pypy3 = writePyPy3Bin "test-writers-pypy3-bin" { libraries = [ pypy3Packages.pyyaml ]; } '' + import yaml + + y = yaml.load(""" + - test: success + """) + print(y[0]['test']) + ''; }; simple = { @@ -99,6 +121,17 @@ let print "success\n" if true; ''; + pypy2 = writePyPy2 "test-writers-pypy2" { libraries = [ pypy2Packages.enum ]; } '' + from enum import Enum + + + class Test(Enum): + a = "success" + + + print Test.a + ''; + python3 = writePython3 "test-writers-python3" { libraries = [ python3Packages.pyyaml ]; } '' import yaml @@ -108,9 +141,26 @@ let print(y[0]['test']) ''; + pypy3 = writePyPy3 "test-writers-pypy3" { libraries = [ pypy3Packages.pyyaml ]; } '' + import yaml + + y = yaml.load(""" + - test: success + """) + print(y[0]['test']) + ''; + + pypy2NoLibs = writePyPy2 "test-writers-pypy2-no-libs" {} '' + print("success") + ''; + python3NoLibs = writePython3 "test-writers-python3-no-libs" {} '' print("success") ''; + + pypy3NoLibs = writePyPy3 "test-writers-pypy3-no-libs" {} '' + print("success") + ''; }; From a2ac149774f7e8edfd1cb5c934b16df1f567f7c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Dec 2021 09:11:02 +0000 Subject: [PATCH 61/99] oh-my-zsh: 2021-12-13 -> 2021-12-13 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index deec8d9b838b..66f9a724986c 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { version = "2021-12-13"; pname = "oh-my-zsh"; - rev = "9a3d853481645ae0f961e9cc8421fc5d84e2c3c3"; + rev = "5403db85998ff0c087bc97d972e1e76551127b7e"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "TFktV7xBm3KaRfW+cUGdwIZZD7TfU0gaq4J8cKBjtMM="; + sha256 = "xv/qruRy96omAaboedcG6+KTkR3CkaFDgw/agihTCNs="; }; installPhase = '' From 788c11592816d8455e722895eaa80c6ef8551f00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Dec 2021 10:21:20 +0100 Subject: [PATCH 62/99] log4j-vuln-scanner: 0.6 -> 0.7.1 --- pkgs/tools/security/log4j-vuln-scanner/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/log4j-vuln-scanner/default.nix b/pkgs/tools/security/log4j-vuln-scanner/default.nix index f15a439a3822..ae51ecef192f 100644 --- a/pkgs/tools/security/log4j-vuln-scanner/default.nix +++ b/pkgs/tools/security/log4j-vuln-scanner/default.nix @@ -5,17 +5,22 @@ buildGoModule rec { pname = "log4j-vuln-scanner"; - version = "0.6"; + version = "0.7.1"; src = fetchFromGitHub { owner = "hillu"; repo = "local-log4j-vuln-scanner"; rev = "v${version}"; - sha256 = "sha256-6LbKwDu3YZFRaIUOcepbLVZC9OYnqb0Tl0ElGDIzW48="; + sha256 = "sha256-YEXYZtjcZTl+9IgRuSRK/pvnISuW6Jbwuv+dqr4pork="; }; vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + postInstall = '' + mv $out/bin/scanner $out/bin/$pname + mv $out/bin/patcher $out/bin/log4j-vuln-patcher + ''; + meta = with lib; { description = "Local log4j vulnerability scanner"; homepage = "https://github.com/hillu/local-log4j-vuln-scanner"; From 92faf59b4417790f510022cc368f260280ab8677 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Wed, 15 Dec 2021 10:27:59 +0100 Subject: [PATCH 63/99] sbt: 1.5.6 -> 1.5.7 --- 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 eeb7fe56a79f..76855e670a95 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.5.6"; + version = "1.5.7"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "sha256-PC0ndJkv4nNIdZMCtZhi3XRp/dRlXXx1yHvK8bAwIGg="; + sha256 = "sha256-6dnG02A0azpycsfdQOyh9GLewvezZl3s8esmIqWJfBk="; }; postPatch = '' From 8e84252247d2d1d9c48638e833ff89261f8f5e0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Dec 2021 09:46:36 +0000 Subject: [PATCH 64/99] palemoon: 29.4.2.1 -> 29.4.3 --- 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 8a257ee626ff..a536bf15cfec 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -44,12 +44,12 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.2.1"; + version = "29.4.3"; src = fetchzip { name = "${pname}-${version}"; url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz"; - sha256 = "sha256-iTn1jbbsw7u+rVe/1J9yJbS0wi5Rlkcy4rO8nWcXu2I="; + sha256 = "sha256-9Qut7zgzDrU6T/sWbSF2Me7E02VJVL/B2bzJw14KWFs="; }; nativeBuildInputs = [ From 35a11522bac95ea20e47d93be3ec5c36b46b1590 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Dec 2021 18:32:11 +0100 Subject: [PATCH 65/99] openssl_3_0: 3.0.0 -> 3.0.1 --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index ca2e240dd869..e9935317cdf0 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -207,8 +207,8 @@ in { }; openssl_3_0 = common { - version = "3.0.0"; - sha256 = "sha256-We7fy0bCUhTJvTftYHgpe03wHQEiZ/6enu4x9hvHBTY="; + version = "3.0.1"; + sha256 = "sha256-wxGthTNTvOeW7a0BqGLFCopYf2Ln4hAO9GWrU+ybBtE="; patches = [ ./3.0/nix-ssl-cert-file.patch From 0a3303415210bf52c3025e4b8ddecc33ed715824 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Dec 2021 11:20:32 +0100 Subject: [PATCH 66/99] lmp: init at 1.0 --- pkgs/tools/security/lmp/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/lmp/default.nix diff --git a/pkgs/tools/security/lmp/default.nix b/pkgs/tools/security/lmp/default.nix new file mode 100644 index 000000000000..945bbbbd15c3 --- /dev/null +++ b/pkgs/tools/security/lmp/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "lmp"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "0xInfection"; + repo = "LogMePwn"; + rev = "v${version}"; + sha256 = "sha256-EDhNnNmIVBtBj+zHjLzW60sdI0dH8cLvXDQBmVgM4hM="; + }; + + vendorSha256 = "sha256-X7Djcp4reOXL6SX4jiSLicolENu7Uo5webSePYrPKug="; + + meta = with lib; { + description = "Scanning and validation toolkit for the Log4J vulnerability"; + homepage = "https://github.com/0xInfection/LogMePwn"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c057511d2cb9..e4c1ce59df78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7461,6 +7461,8 @@ with pkgs; liquidctl = with python3Packages; toPythonApplication liquidctl; + lmp = callPackage ../tools/security/lmp { }; + localtime = callPackage ../tools/system/localtime { }; logcheck = callPackage ../tools/system/logcheck { }; From 0cedccceeef60dc03609ec65c2149e17cc17b50b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Dec 2021 10:31:44 +0000 Subject: [PATCH 67/99] plexRaw: 1.25.1.5286-34f965be8 -> 1.25.2.5319-c43dc0277 --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index fa0edc934e34..980e64577113 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.25.1.5286-34f965be8"; + version = "1.25.2.5319-c43dc0277"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0w707j0mn13xdqyffbyl51nvliiaqwnpyjqh52n40s81iid2jlg5"; + sha256 = "09kkkyli5fygyvlzqd46jzi0y4jp0a24d92ayvfm95gm3fcxl73x"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "05bcpwkpim2clv55k7g0610pp1bpd4wn56azbvhqv52vyd7q3q9j"; + sha256 = "17whd724sjblqxz6d79jb6hrqvkgg5mbh3bh1lr9b8sswa3pxb07"; }; outputs = [ "out" "basedb" ]; From 00141904d5dbd669f4a98ed53faccd3d93f92382 Mon Sep 17 00:00:00 2001 From: cw789 <789@c-w.li> Date: Wed, 15 Dec 2021 09:39:30 +0100 Subject: [PATCH 68/99] beamPackages.hex: 0.21.2 -> 1.0.1 --- pkgs/development/beam-modules/hex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 836740a79331..c9e45c480610 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -8,13 +8,13 @@ let pkg = self: stdenv.mkDerivation rec { pname = "hex"; - version = "0.21.2"; + version = "1.0.1"; src = fetchFromGitHub { owner = "hexpm"; repo = "hex"; rev = "v${version}"; - sha256 = "18vwrc5b7pyi3nifmx5hd5wbz8fy3h6sfvkmskjg5acmz66fys0g"; + sha256 = "sha256-5g2MDbStlUrAPQCv1xWp+oPyRIOqARmlsKo/ONLTLnY="; }; setupHook = writeText "setupHook.sh" '' From 8fbc313d9a1d88146de7b6ed5de04e7eb4e0ab9a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Dec 2021 11:58:39 +0100 Subject: [PATCH 69/99] log4shell-detector: unstable-2021-12-14 -> unstable-2021-12-15 --- pkgs/tools/security/log4shell-detector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/log4shell-detector/default.nix b/pkgs/tools/security/log4shell-detector/default.nix index 27a0eb41ad5c..bf46793fe824 100644 --- a/pkgs/tools/security/log4shell-detector/default.nix +++ b/pkgs/tools/security/log4shell-detector/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "log4shell-detector"; - version = "unstable-2021-12-14"; + version = "unstable-2021-12-15"; format = "other"; src = fetchFromGitHub { owner = "Neo23x0"; repo = pname; - rev = "7bc368f376b8d95282193eac6ea3970c363577d5"; - sha256 = "sha256-MLKd2moMLwAZXqZ5I/pIYzV0PqVwSpze3gNM0IioI1E="; + rev = "66d974af40049c0cab7b0d7f988e5d705031f3af"; + sha256 = "sha256-wKNJWbnDPY3+k7RwEjJws1h4nIqL22Dr2m88CbJZ/rg="; }; checkInputs = with python3.pkgs; [ From caba927c4a1efe31f8663fedff38e70890badc17 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 15 Dec 2021 14:23:03 +0300 Subject: [PATCH 70/99] lttng-ust: 2.13.0 -> 2.13.1, make generic --- .../tools/misc/lttng-ust/default.nix | 44 ++----------------- .../tools/misc/lttng-ust/generic.nix | 44 +++++++++++++++++++ 2 files changed, 47 insertions(+), 41 deletions(-) create mode 100644 pkgs/development/tools/misc/lttng-ust/generic.nix diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 244d6442c15f..3bace16de56d 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,42 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, liburcu, numactl, python3 }: - -# NOTE: -# ./configure ... -# [...] -# LTTng-UST will be built with the following options: -# -# Java support (JNI): Disabled -# sdt.h integration: Disabled -# [...] -# -# Debian builds with std.h (systemtap). - -stdenv.mkDerivation rec { - pname = "lttng-ust"; - version = "2.13.0"; - - src = fetchurl { - url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; - sha256 = "0l0p6y2zrd9hgd015dhafjmpcj7waz762n6wf5ws1xlwcwrwkr2l"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ numactl python3 ]; - - preConfigure = '' - patchShebangs . - ''; - - propagatedBuildInputs = [ liburcu ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "LTTng Userspace Tracer libraries"; - homepage = "https://lttng.org/"; - license = with licenses; [ lgpl21Only gpl2Only mit ]; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; - +import ./generic.nix { + version = "2.13.1"; + sha256 = "sha256-Vme/Amnh5i4tnLl0xFb/huBAG9eqO/yNX9uXIzJJ7dw="; } diff --git a/pkgs/development/tools/misc/lttng-ust/generic.nix b/pkgs/development/tools/misc/lttng-ust/generic.nix new file mode 100644 index 000000000000..e6e67352c859 --- /dev/null +++ b/pkgs/development/tools/misc/lttng-ust/generic.nix @@ -0,0 +1,44 @@ +{ version, sha256 }: + +{ lib, stdenv, fetchurl, pkg-config, liburcu, numactl, python3 }: + +# NOTE: +# ./configure ... +# [...] +# LTTng-UST will be built with the following options: +# +# Java support (JNI): Disabled +# sdt.h integration: Disabled +# [...] +# +# Debian builds with std.h (systemtap). + +stdenv.mkDerivation rec { + pname = "lttng-ust"; + inherit version; + + src = fetchurl { + url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; + inherit sha256; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ numactl python3 ]; + + preConfigure = '' + patchShebangs . + ''; + + propagatedBuildInputs = [ liburcu ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "LTTng Userspace Tracer libraries"; + homepage = "https://lttng.org/"; + license = with licenses; [ lgpl21Only gpl2Only mit ]; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + +} From c07e19fc00a7174c5bca2c2aa431d8d7ea920997 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 15 Dec 2021 14:23:33 +0300 Subject: [PATCH 71/99] lttng-ust_2_12: init at 2.12.2 --- pkgs/development/tools/misc/lttng-ust/2.12.nix | 4 ++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 pkgs/development/tools/misc/lttng-ust/2.12.nix diff --git a/pkgs/development/tools/misc/lttng-ust/2.12.nix b/pkgs/development/tools/misc/lttng-ust/2.12.nix new file mode 100644 index 000000000000..b3ef1fe65e7f --- /dev/null +++ b/pkgs/development/tools/misc/lttng-ust/2.12.nix @@ -0,0 +1,4 @@ +import ./generic.nix { + version = "2.12.2"; + sha256 = "sha256-vNDwZLbKiMcthOdg6sNHKuXIKEEcY0Q1kivun841n8c="; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa04903087f7..6417afe27d51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14932,6 +14932,8 @@ with pkgs; lttng-ust = callPackage ../development/tools/misc/lttng-ust { }; + lttng-ust_2_12 = callPackage ../development/tools/misc/lttng-ust/2.12.nix { }; + lttv = callPackage ../development/tools/misc/lttv { }; luaformatter = callPackage ../development/tools/luaformatter From 59a6898da56bd6e0c6071749d0746c9ab7ba5942 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 5 Apr 2021 16:01:43 +0000 Subject: [PATCH 72/99] dotnet: fix tracing and createdump --- pkgs/development/compilers/dotnet/build-dotnet.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 3080873bb96a..3ebe6ca40dd4 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -12,6 +12,7 @@ assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; , libuuid , zlib , curl +, lttng-ust_2_12 }: let @@ -40,14 +41,17 @@ let in stdenv.mkDerivation rec { inherit pname version; + # Some of these dependencies are `dlopen()`ed. rpath = lib.makeLibraryPath [ + stdenv.cc.cc + lttng-ust_2_12 + zlib + curl icu libunwind libuuid openssl - stdenv.cc.cc - zlib ]; src = fetchurl { @@ -73,7 +77,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/dotnet patchelf --set-rpath "${rpath}" $out/dotnet find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \; - find $out -type f -name "apphost" -exec patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" --set-rpath '$ORIGIN:${rpath}' {} \; + find $out -type f \( -name "apphost" -or -name "createdump" \) -exec patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" --set-rpath '$ORIGIN:${rpath}' {} \; ''; doInstallCheck = true; From 03898f6991b56ccdbe4dc3113faca2ccca73927c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Dec 2021 12:28:51 +0100 Subject: [PATCH 73/99] checkov: 2.0.659 -> 2.0.660 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index ae56f9ba0ec2..db12b5caf3ce 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -46,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.659"; + version = "2.0.660"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-oxR4hji7BWnbAihZXLdOlCZlzpvZcs6RNoyGwQe+PlQ="; + sha256 = "sha256-ebVOEtJTlYaj9sYJsJ8BBxx+2PSyzbwivQIph3slaho="; }; nativeBuildInputs = with py.pkgs; [ From 834ff9a60412f510b755ce97dd7ff0678c4399fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Dec 2021 16:51:21 +0100 Subject: [PATCH 74/99] python3Packages.fastcore: init at 1.3.27 --- .../python-modules/fastcore/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/fastcore/default.nix diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix new file mode 100644 index 000000000000..4783b8d33c78 --- /dev/null +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, packaging +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "fastcore"; + version = "1.3.27"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "fastai"; + repo = pname; + rev = version; + sha256 = "sha256-ogCNDh18FHP9KY0q0BIbsjPH5vGGioGh4FFUUb3c3Jc="; + }; + + propagatedBuildInputs = [ + packaging + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "fastcore" + ]; + + meta = with lib; { + description = "Python module for Fast AI"; + homepage = "https://github.com/fastai/fastcore"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 679625d51a6c..0c29df70d3da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2680,6 +2680,8 @@ in { fastcache = callPackage ../development/python-modules/fastcache { }; + fastcore = callPackage ../development/python-modules/fastcore { }; + fastdiff = callPackage ../development/python-modules/fastdiff { }; fastdtw = callPackage ../development/python-modules/fastdtw { }; From 16c153f7d79f682cb278a3b89be2a739bb274f66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Dec 2021 16:55:11 +0100 Subject: [PATCH 75/99] python3Packages.ghapi: init at 0.1.19 --- .../python-modules/ghapi/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/ghapi/default.nix diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix new file mode 100644 index 000000000000..428215eeee59 --- /dev/null +++ b/pkgs/development/python-modules/ghapi/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, fastcore +, packaging +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ghapi"; + version = "0.1.19"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "fastai"; + repo = "ghapi"; + rev = version; + sha256 = "sha256-UV2cfotRad9jg/X3pOysKJyMi4/XKt24kf6F4aw4vcI="; + }; + + propagatedBuildInputs = [ + fastcore + packaging + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "ghapi" + ]; + + meta = with lib; { + description = "Python interface to GitHub's API"; + homepage = "https://github.com/fastai/ghapi"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c29df70d3da..b56c7119a310 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3146,6 +3146,8 @@ in { gflags = callPackage ../development/python-modules/gflags { }; + ghapi = callPackage ../development/python-modules/ghapi { }; + ghdiff = callPackage ../development/python-modules/ghdiff { }; ghp-import = callPackage ../development/python-modules/ghp-import { }; From 91f4e98e28303418902b20331a6bd8aebf58bdff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Dec 2021 12:42:08 +0100 Subject: [PATCH 76/99] ghdorker: init at 0.3.2 --- pkgs/tools/security/ghdorker/default.nix | 35 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/security/ghdorker/default.nix diff --git a/pkgs/tools/security/ghdorker/default.nix b/pkgs/tools/security/ghdorker/default.nix new file mode 100644 index 000000000000..c6882fb110a8 --- /dev/null +++ b/pkgs/tools/security/ghdorker/default.nix @@ -0,0 +1,35 @@ +{ lib +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ghdorker"; + version = "0.3.2"; + format = "setuptools"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "sha256-wF4QoXxH55SpdYgKLHf4sCwUk1rkCpSdnIX5FvFi/BU="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + ghapi + glom + python-dotenv + pyyaml + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "GHDorker" + ]; + + meta = with lib; { + description = "Extensible GitHub dorking tool"; + homepage = "https://github.com/dtaivpp/ghdorker"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 884890c46ac9..828d4f53b755 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3080,6 +3080,8 @@ with pkgs; gh-ost = callPackage ../tools/misc/gh-ost { }; + ghdorker = callPackage ../tools/security/ghdorker { }; + ghidra-bin = callPackage ../tools/security/ghidra { }; gif-for-cli = callPackage ../tools/misc/gif-for-cli { }; From 35711c24a0428781ca51567cb4b6a0d215546ed6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Dec 2021 12:01:49 +0000 Subject: [PATCH 77/99] python38Packages.adafruit-platformdetect: 3.17.2 -> 3.18.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 17e304b6802c..9e32e903e82f 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.17.2"; + version = "3.18.0"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-IA846zNFmBqSUc0oXJ0eA5wj6PzQ28jxO22z5WNOT24="; + sha256 = "593f3719580b31b3dffab0817414a3aa548ed609659ad216ceb8cf31cc51ec9b"; }; nativeBuildInputs = [ From a834d62839f40c6330537e67cabdddac954f85ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Dec 2021 12:31:25 +0000 Subject: [PATCH 78/99] python38Packages.aiostream: 0.4.3 -> 0.4.4 --- pkgs/development/python-modules/aiostream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index e15271bafdbc..060da226b937 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiostream"; - version = "0.4.3"; + version = "0.4.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "vxgmichel"; repo = pname; rev = "v${version}"; - sha256 = "1r3x9qwl08yscmzvhafc6gsmq84lr17s6p7a1qxr49cmdvjzsc13"; + sha256 = "07if27z1h0mg236sj9lc8nl0bqy9sdrj83ls73mrc69h76bzg5xi"; }; checkInputs = [ pytestCheckHook pytest-cov pytest-asyncio ]; From 789c36322bc8f8112da7d9fb264e8346e609b4ad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Dec 2021 04:43:42 -0800 Subject: [PATCH 79/99] python38Packages.PyChromecast: 10.1.1 -> 10.2.1 (#150832) --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index f4b244b5ea67..49eba4812c23 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "10.1.1"; + version = "10.2.1"; format = "setuptools"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "sha256-M6R9VRrotvkxKVZIKOcuf03LJsn4gSMohwzzAO5FQ48="; + sha256 = "1b5f0ce62374d01f7eef027adcc87f87e7c519b1ef2f7168e28be9c2adff5153"; }; propagatedBuildInputs = [ From a77548dd3e02d09aaded6761b4d599aee5201c2f Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 15 Dec 2021 13:12:56 +0100 Subject: [PATCH 80/99] include-what-you-use: 0.16 -> 0.17 https://github.com/include-what-you-use/include-what-you-use/releases/tag/0.17 --- .../tools/analysis/include-what-you-use/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 8ba381bc5443..bc1be4e5ba5e 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "include-what-you-use"; # Also bump llvmPackages in all-packages.nix to the supported version! - version = "0.16"; + version = "0.17"; src = fetchurl { - sha256 = "sha256-jW/JslU0O8Hl7EWeOVEt8dUcYOA1YpheAHYDYRn/Whw="; + sha256 = "sha256-7KfAT4tBa2OF7QDjNmmn+kaTzSbLcrUizeVYgo6wxmU="; url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 884890c46ac9..f0b0db347b60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14797,7 +14797,7 @@ with pkgs; img = callPackage ../development/tools/img { }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_12; + llvmPackages = llvmPackages_13; }; indent = callPackage ../development/tools/misc/indent { }; From 37aeed381fc1310c9e767b83868cfab9f4242447 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 15 Dec 2021 11:43:47 +0100 Subject: [PATCH 81/99] ocamlPackages.mirage{,-runtime}: 3.10.4 -> 3.10.7 https://github.com/mirage/mirage/blob/v3.10.7/CHANGES.md --- pkgs/development/ocaml-modules/mirage/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index 4a876658d181..ce50ffd2c3ae 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "mirage-runtime"; - version = "3.10.4"; + version = "3.10.7"; useDune2 = true; @@ -11,7 +11,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz"; - sha256 = "c2ea22b6faf16bed783cac0e0bafd87f321756a91798f56c9a930f0edb5d9116"; + sha256 = "fec4492239c6d1fdd73db4da0782e33e66202e19595bf1d52aa98972296cc72d"; }; propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ]; From fe9680ea647039bbf831f801a74424b224826fa8 Mon Sep 17 00:00:00 2001 From: OmnipotentEntity Date: Wed, 15 Dec 2021 09:20:40 -0500 Subject: [PATCH 82/99] geant4: 10.7.1 -> 11.0.0, remove tmplt from maintainers (#150129) Co-authored-by: Dmitry Kalinkin --- .../libraries/physics/geant4/datasets.nix | 30 +++++++++---------- .../libraries/physics/geant4/default.nix | 18 +++-------- 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index 4c6906c9c2e3..e9b7f54e2a48 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -36,84 +36,84 @@ in { name = "G4NDL"; version = "4.6"; - sha256 = "022l2jjhi57frfdv9nk6s6q23gmr9zkix06fmni8gf0gmvr7qa4x"; + sha256 = "sha256-nSh88q4PuIeirc6AHudPub4hsNFm2rSby+6UCKUUVAg="; envvar = "NEUTRONHP"; } { name = "G4EMLOW"; - version = "7.13"; - sha256 = "0scczd4ismvd4g3vfshbvwv92bzkdjz0ma7y21n6qxxy96v9cj1p"; + version = "8.0"; + sha256 = "sha256-2Rmo5YOGiCV7kkimE5EOsqdjMFngMMi1DAosKtn9Kzs="; envvar = "LE"; } { name = "G4PhotonEvaporation"; version = "5.7"; - sha256 = "1rg7fygfxx06h98ywlci6b0b9ih74q8diygr76c3vppxdzjl47kn"; + sha256 = "sha256-dh5C5W/93j2YOfn52BAmB8a0wDKRUe5Rggb07p535+U="; envvar = "LEVELGAMMA"; } { name = "G4RadioactiveDecay"; version = "5.6"; - sha256 = "1w8d9zzc4ss7sh1f8cxv5pmrx2b74p1y26377rw9hnlfkiy0g1iq"; + sha256 = "sha256-OIYHfJyOWph4PmcY4cMlZ4me6y27M+QC1Edrwv5PDfE="; envvar = "RADIOACTIVE"; } { name = "G4SAIDDATA"; version = "2.0"; - sha256 = "149fqy801n1pj2g6lcai2ziyvdz8cxdgbfarax6y8wdakgksh9hx"; + sha256 = "sha256-HSao55uqceRNV1m59Vpn6Lft4xdRMWqekDfYAJDHLpE="; envvar = "SAIDXS"; } { name = "G4PARTICLEXS"; - version = "3.1.1"; - sha256 = "1nmgy8w1s196php7inrkbsi0f690qa2dsyj9s1sp75mndkfpxhb6"; + version = "4.0"; + sha256 = "sha256-k4EDlwPD8rD9NqtJmTYqLItP+QgMMi+QtOMZKBEzypU="; envvar = "PARTICLEXS"; } { name = "G4ABLA"; version = "3.1"; - sha256 = "1v97q28g1xqwnav0lwzwk7hc3b87yrmbvkgadf4bkwcbnm9b163n"; + sha256 = "sha256-dpiwUrWL8bmIa+rNvWr2B63B4Jn8cwq2shz38JDAJ+0="; envvar = "ABLA"; } { name = "G4INCL"; version = "1.0"; - sha256 = "0z9nqk125vvf4f19lhgb37jy60jf9zrjqg5zbxbd1wz93a162qbi"; + sha256 = "sha256-cWFhghrp89BWX788LPNPTgLj5RnrQZqCI27vIsLENn0="; envvar = "INCL"; } { name = "G4PII"; version = "1.3"; - sha256 = "09p92rk1sj837m6n6yd9k9a8gkh6bby2bfn6k0f3ix3m4s8as9b2"; + sha256 = "sha256-YiWtkCZ19DgcmMa6JfxaBs6HVJqpeWNNPQNJHWYW6SY="; envvar = "PII"; } { name = "G4ENSDFSTATE"; version = "2.3"; - sha256 = "00wjir59rrrlk0a12vi8rsnhyya71rdi1kmark9sp487hbhcai4l"; + sha256 = "sha256-lETF4IIHkavTzKrOEFsOR3kPrc4obhEUmDTnnEqOkgM="; envvar = "ENSDFSTATE"; } { name = "G4RealSurface"; version = "2.2"; - sha256 = "08382y1258ifs7nap6zaaazvabg72blr0dkqgwk32lrg07hdwm4r"; + sha256 = "sha256-mVTe4AEvUzEmf3g2kOkS5y21v1Lqm6vs0S6iIoIXaCA="; envvar = "REALSURFACE"; } { name = "G4TENDL"; - version = "1.3.2"; - sha256 = "0jdqmz3rz5a7yrq1mli6dj3bnmn73igf4fdxwfbl3rxywg38fa9v"; + version = "1.4"; + sha256 = "sha256-S3J0AgzItO1Wm4ku8YwuCI7c22tm850lWFzO4l2XIeA="; envvar = "PARTICLEHP"; } ]) diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 8d2f2f1ef55d..6f29b5909810 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -49,24 +49,14 @@ let in stdenv.mkDerivation rec { - version = "10.7.1"; + version = "11.0.0"; pname = "geant4"; src = fetchurl{ - url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.p01.tar.gz"; - sha256 = "07if874aljizkjyp21qj6v193pmyifyfmwi5kg8jm71x79sn2laj"; + url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; + sha256 = "sha256-PMin350/8ceiGmLS6zoQvhX2uxWNOTI78yEzScnvdbk="; }; - boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}"; - postPatch = '' - # Fix for boost 1.67+ - substituteInPlace environments/g4py/CMakeLists.txt \ - --replace "REQUIRED python" \ - "REQUIRED COMPONENTS $boost_python_lib" - substituteInPlace environments/g4py/G4PythonHelpers.cmake \ - --replace "Boost::python" "Boost::$boost_python_lib" - ''; - cmakeFlags = [ "-DGEANT4_INSTALL_DATA=OFF" "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}" @@ -137,7 +127,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.geant4.org"; license = licenses.g4sl; - maintainers = with maintainers; [ tmplt omnipotententity ]; + maintainers = with maintainers; [ omnipotententity ]; platforms = platforms.linux; }; } From fd8478ac7b3a0c50d8cf8007f4f54b144309a51b Mon Sep 17 00:00:00 2001 From: Artur Cygan Date: Wed, 15 Dec 2021 15:21:35 +0100 Subject: [PATCH 83/99] libff: fix build on aarch64 --- pkgs/development/libraries/libff/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libff/default.nix b/pkgs/development/libraries/libff/default.nix index 72d2406aa82b..35b7a33cc38f 100644 --- a/pkgs/development/libraries/libff/default.nix +++ b/pkgs/development/libraries/libff/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libff"; - version = "1.0.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "scipr-lab"; @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - cmakeFlags = [ "-DWITH_PROCPS=Off" ]; + cmakeFlags = [ "-DWITH_PROCPS=Off" ] + ++ lib.optional stdenv.isAarch64 [ "-DCURVE=ALT_BN128" "-DUSE_ASM=OFF" ]; # CMake is hardcoded to always build static library which causes linker # failure for Haskell applications depending on haskellPackages.hevm on macOS. From f56e263460afe6847c3cec048895967b2d7f526a Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Wed, 15 Dec 2021 11:30:27 -0300 Subject: [PATCH 84/99] k9s: 0.25.8 -> 0.25.12 --- pkgs/applications/networking/cluster/k9s/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index e7d50527b31e..14e030784933 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.25.8"; + version = "0.25.12"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-ZHIFMNY6eW3t604Kd6Cb9Ex9DbsG31ShD4ITKnDAUbs="; + sha256 = "sha256-S+roKkAtiGJmp/MHFeB+8mLQDL9okzLuJW6DMz3dQDk="; }; ldflags = [ From 4ed53f00610ca06085269d327acfe63ce31f0810 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Wed, 15 Dec 2021 11:35:35 -0300 Subject: [PATCH 85/99] rancher-cli: 2.4.13 -> 2.6.0 --- pkgs/applications/networking/cluster/rancher/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/rancher/default.nix b/pkgs/applications/networking/cluster/rancher/default.nix index 665b2091edc6..7c219725d7c9 100644 --- a/pkgs/applications/networking/cluster/rancher/default.nix +++ b/pkgs/applications/networking/cluster/rancher/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rancher-cli"; - version = "2.4.13"; + version = "2.6.0"; src = fetchFromGitHub { owner = "rancher"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-tkAnbQP35P+ZEE/WTpjgjdmvt0eJ0esKJ+I21cWraEI="; + sha256 = "sha256-RfhcTo10nkHmKGwmS8WdjBioZhDIGSQ9vPPOv3Wg0Y4="; }; ldflags = [ @@ -19,7 +19,7 @@ buildGoModule rec { "-static" ]; - vendorSha256 = "sha256-agXztvvrMEoa6bo/bQr3qhinOSj7bFnZ4kzTx4F0VxQ="; + vendorSha256 = "sha256-Nay4YkUNXuH7vTK3ergILF0efCF1XyJZd2wBiT6fims="; postInstall = '' mv $out/bin/cli $out/bin/rancher From fdfcaa3fd3e9039a65d208c9ec52c260dcde06b9 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Wed, 15 Dec 2021 11:39:04 -0300 Subject: [PATCH 86/99] gojsontoyaml: unstable-2020-12-16 -> 0.1.0 --- pkgs/development/tools/gojsontoyaml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gojsontoyaml/default.nix b/pkgs/development/tools/gojsontoyaml/default.nix index 659532e04e01..02f5421ca004 100644 --- a/pkgs/development/tools/gojsontoyaml/default.nix +++ b/pkgs/development/tools/gojsontoyaml/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gojsontoyaml"; - version = "unstable-2020-12-16"; + version = "0.1.0"; src = fetchFromGitHub { owner = "brancz"; repo = "gojsontoyaml"; - rev = "202f76bf8c1f8fb74941a845b349941064603185"; - sha256 = "sha256-N49iHQh28nAZBGJnLKG/aZPdn5fwPKQpdrXXtX28yss="; + rev = "v${version}"; + sha256 = "sha256-ebxz2uTH7XwD3j6JnsfET6aCGYjvsCjow/sU9pagg50="; }; vendorSha256 = null; From cd600120e3ddcd45435d620b2075025d88824607 Mon Sep 17 00:00:00 2001 From: Artur Cygan Date: Wed, 15 Dec 2021 15:56:29 +0100 Subject: [PATCH 87/99] haskellPackages.sbv: fix build on aarch64 --- pkgs/development/haskell-modules/configuration-nix.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index df3c42b5de3e..19ceea978743 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -502,12 +502,15 @@ self: super: builtins.intersectAttrs super { postPatch = '' sed -i -e 's|"abc"|"${pkgs.abc-verifier}/bin/abc"|' Data/SBV/Provers/ABC.hs sed -i -e 's|"boolector"|"${pkgs.boolector}/bin/boolector"|' Data/SBV/Provers/Boolector.hs - sed -i -e 's|"cvc4"|"${pkgs.cvc4}/bin/cvc4"|' Data/SBV/Provers/CVC4.hs sed -i -e 's|"yices-smt2"|"${pkgs.yices}/bin/yices-smt2"|' Data/SBV/Provers/Yices.hs sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs - + '' + (if pkgs.stdenv.isAarch64 then '' + sed -i -e 's|\[abc, boolector, cvc4, mathSAT, yices, z3, dReal\]|[abc, boolector, yices, z3]|' SBVTestSuite/SBVConnectionTest.hs + '' + else '' + sed -i -e 's|"cvc4"|"${pkgs.cvc4}/bin/cvc4"|' Data/SBV/Provers/CVC4.hs sed -i -e 's|\[abc, boolector, cvc4, mathSAT, yices, z3, dReal\]|[abc, boolector, cvc4, yices, z3]|' SBVTestSuite/SBVConnectionTest.hs - ''; + ''); }) super.sbv; # The test-suite requires a running PostgreSQL server. From c9cf5729cf63b2e1b45b8a40833fb18cb8d4b8af Mon Sep 17 00:00:00 2001 From: Yves-Stan Le Cornec Date: Tue, 14 Dec 2021 18:40:07 +0100 Subject: [PATCH 88/99] maintainers: add ylecornec --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7adf629cc0ab..68cf8b30d546 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12834,6 +12834,12 @@ githubId = 11229748; name = "Lin Yinfeng"; }; + ylecornec = { + email = "yves.stan.lecornec@tweag.io"; + github = "ylecornec"; + githubId = 5978566; + name = "Yves-Stan Le Cornec"; + }; ylwghst = { email = "ylwghst@onionmail.info"; github = "ylwghst"; From 5fed9ba8e867cbd5a59255f49abefffdf612cf45 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Wed, 15 Dec 2021 18:33:25 +0100 Subject: [PATCH 89/99] gradle: 7.3.1 -> 7.3.2 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 0c154079ff4e..eadcc80a5363 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -89,9 +89,9 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_7 = gen { - version = "7.3.1"; + version = "7.3.2"; nativeVersion = "0.22-milestone-21"; - sha256 = "0rkb9pdmvq0zidv8lv4im2j7gs949lg35r79l1hwf4pwi2k3ryws"; + sha256 = "14jk1mhk59flzml55alwi9r5picmf8657q1nhd5mygrnmj79zf13"; defaultJava = jdk17; }; From 9dae960dc08268e56404fb017809d85db8e2cf4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Dec 2021 18:00:27 +0000 Subject: [PATCH 90/99] spglib: 1.16.2 -> 1.16.3 --- pkgs/development/libraries/spglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index 9f50c80bf7a1..6d973f36c02b 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spglib"; - version = "1.16.2"; + version = "1.16.3"; src = fetchFromGitHub { owner = "atztogo"; repo = "spglib"; rev = "v${version}"; - sha256 = "1sbrk26xyvlhqxxv9cq2ycxwbiafgmh7lf221377zpqq8q3iavd7"; + sha256 = "sha256-sM6+RBAVc2aJYlWatdD4nYZkFnaTFVjBzd/VDSSA+kk="; }; nativeBuildInputs = [ cmake ]; From 3a4bb069a0c4f7e6447f4db538daea3393ff5503 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Wed, 15 Dec 2021 19:26:45 +0100 Subject: [PATCH 91/99] code-browser: ensure only one backend is enabled --- pkgs/applications/editors/code-browser/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/code-browser/default.nix b/pkgs/applications/editors/code-browser/default.nix index b9f9ce1608a1..0efdae2ea65d 100644 --- a/pkgs/applications/editors/code-browser/default.nix +++ b/pkgs/applications/editors/code-browser/default.nix @@ -8,6 +8,8 @@ , withGtk3 ? false, gtk3 , mkDerivation ? stdenv.mkDerivation }: +let onlyOneEnabled = xs: 1 == builtins.length (builtins.filter lib.id xs); +in assert onlyOneEnabled [ withQt withGtk2 withGtk3 ]; mkDerivation rec { pname = "code-browser"; version = "8.0"; From 77b099d8f64180211e78429e18b19b5ffc9e884a Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Wed, 15 Dec 2021 19:34:38 +0100 Subject: [PATCH 92/99] bitwarden: 1.29.1 -> 1.30.0 --- pkgs/tools/security/bitwarden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 050621cd20ef..198295fcdfe0 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "bitwarden"; - version = "1.29.1"; + version = "1.30.0"; src = fetchurl { url = "https://github.com/bitwarden/desktop/releases/download/v${version}/Bitwarden-${version}-amd64.deb"; - sha256 = "0rxy19bazi7a6m2bpx6wadg5d9p0k324h369vgr5ppmxb69d6zp8"; + sha256 = "sha256-x0i7MUVr0nhPy8M/dTVtRjaLfJQlzqhzLQ/JHLRmL6E="; }; desktopItem = makeDesktopItem { From af2536fe77d0bbc4c714a3c6acb299e5a54f3317 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 15 Dec 2021 19:35:33 +0100 Subject: [PATCH 93/99] ungoogled-chromium: 96.0.4664.93 -> 96.0.4664.110 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c3a62b4fd2f7..7f1be9b303f8 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "96.0.4664.93", - "sha256": "14rlm91pzpdll6x2r1sxdswiv19h1ykxcq0csi9k9g0a9s71yyvw", - "sha256bin64": "15233njj6ln7q3c112ssfh9s4m3shhp920zw8648z9dr7k8512qb", + "version": "96.0.4664.110", + "sha256": "1s3ilq0ik36qgqp7l88gfd1yx97zscn8yr2kprsrjfp9q8lrva9n", + "sha256bin64": "17cyj1jx47fz6y26f196xhlngrw5gnjgcvapvgkgswlwd7y67jcb", "deps": { "gn": { "version": "2021-09-24", @@ -55,8 +55,8 @@ "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" }, "ungoogled-patches": { - "rev": "96.0.4664.93-1", - "sha256": "0r8cwriaxbmzy9sxa6mx71h8n1a0x7pdx3kmqc1sg97b2qwmg15r" + "rev": "96.0.4664.110-1", + "sha256": "098mfcd1lr2hhlic0i1l5gxsq71axvqnn4gayr4r9j6nbj9byf4h" } } } From bce6cb1dd528036694f5e355f161ba313876484e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 Dec 2021 10:03:35 +0100 Subject: [PATCH 94/99] =?UTF-8?q?ocamlPackages.mdx:=201.11.0=20=E2=86=92?= =?UTF-8?q?=201.11.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mdx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 2677f56584e7..e5132d64d4d5 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -5,12 +5,12 @@ buildDunePackage rec { pname = "mdx"; - version = "1.11.0"; + version = "1.11.1"; useDune2 = true; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - sha256 = "1hk8ffh3d9hiibrj6691khnbmjnfs9psmiawnrbgi0577bw030wx"; + sha256 = "sha256:1q6169gmynnbrvlnzlmx7lpd6hwv6vwxg5j8ibc88wgs5s0r0fb0"; }; nativeBuildInputs = [ cppo ]; From 0d0a74f2e57dd261777905443019bdf7fdf6f431 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 Dec 2021 11:16:52 +0100 Subject: [PATCH 95/99] =?UTF-8?q?ocamlPackages.yaml:=20enable=20tests=20wi?= =?UTF-8?q?th=20OCaml=20=E2=89=A5=204.08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/yaml/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/yaml/default.nix b/pkgs/development/ocaml-modules/yaml/default.nix index 2b8714ed1034..43481e4c7f38 100644 --- a/pkgs/development/ocaml-modules/yaml/default.nix +++ b/pkgs/development/ocaml-modules/yaml/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage +{ lib, fetchurl, buildDunePackage, ocaml , dune-configurator , bos, ctypes, fmt, logs, rresult , mdx, alcotest, crowbar, junit_alcotest, ezjsonm @@ -17,7 +17,9 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ bos ctypes rresult ]; - checkInputs = [ fmt logs mdx alcotest crowbar junit_alcotest ezjsonm ]; + # crowbar is not available for OCaml < 4.08 + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkInputs = [ fmt logs mdx.bin alcotest crowbar junit_alcotest ezjsonm ]; meta = { description = "Parse and generate YAML 1.1 files"; From 0af523ae779642cfd078316d82e808020367e496 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Wed, 15 Dec 2021 20:55:31 +0100 Subject: [PATCH 96/99] phpExtensions: skip performance sensitive tests --- pkgs/top-level/php-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 6426b7846f5d..76ca0c8252cf 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -107,7 +107,11 @@ lib.makeScope pkgs.newScope (self: with self; { (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") internalDeps} ''; - checkPhase = "runHook preCheck; NO_INTERACTON=yes make test; runHook postCheck"; + checkPhase = '' + runHook preCheck + NO_INTERACTON=yes SKIP_PERF_SENSITIVE=yes make test + runHook postCheck + ''; outputs = [ "out" "dev" ]; installPhase = '' mkdir -p $out/lib/php/extensions From 01d5310c192e32d3b9244f9d69873f78d7f16780 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 15 Dec 2021 23:57:29 +0300 Subject: [PATCH 97/99] =?UTF-8?q?gqrx:=202.14.6=20=E2=86=92=202.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/radio/gqrx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index d18fca6f91bb..3e19dc2befb7 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -24,13 +24,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradio3_8Minimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.14.6"; + version = "2.15"; src = fetchFromGitHub { - owner = "csete"; + owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - sha256 = "sha256-DMmQXcGPudAVOwuc+LVrcIzfwMMQVBZPbM6Bt1w56D8="; + sha256 = "sha256-m3YV5Hbu5+3eS+LOy+x6HjpdiJo1iObbeEKuQXXmAak="; }; nativeBuildInputs = [ From 62f6b04a8419aa4e5641b189243be5cd3a684bfa Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Wed, 15 Dec 2021 12:46:52 -0800 Subject: [PATCH 98/99] unifi6: 6.5.54 -> 6.5.55 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 3d3ac89e6c0d..b4c1d9739efd 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -52,7 +52,7 @@ in rec { }; unifi6 = generic { - version = "6.5.54"; - sha256 = "sha256-M2gYqKZi0czFgfWx0tTW43b+aUVqS6Mg+misRB9/Fes="; + version = "6.5.55"; + sha256 = "sha256-NUGRO+f6JzWvYPwiitZsgp+LQwnGSncnost03mgNVxA="; }; } From 39bbfe3c4daee25557f3001cdedadf89d433362f Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Wed, 15 Dec 2021 22:57:11 +0100 Subject: [PATCH 99/99] zellij: 0.22.0 -> 0.22.1 --- pkgs/tools/misc/zellij/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 78ef8d3c29da..9ee819065bf5 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-bia1q2IPrlVeSLsD/HGkWwAUW8THAuzXQR2Iw0v8TKM="; + sha256 = "sha256-BOUZ26XeBwWZezSS38Dek1Zgu7TyTqMkCb7UHLZBkrI="; }; - cargoSha256 = "sha256-ptM0QrrWFy9rb/CpLYuzRE48Wr429lcE9xnV8uA8mGs="; + cargoSha256 = "sha256-oDFq6+RZ6ubBAnEq2l21EhJlUiKAQtaoO6U1UjY4RPY="; nativeBuildInputs = [ installShellFiles