From ba0a1611fcd67b826eaa8f7dc238105aec93d3c7 Mon Sep 17 00:00:00 2001 From: oddlama Date: Fri, 24 Mar 2023 18:38:52 +0100 Subject: [PATCH 01/32] nixos/nginx: fix warning about duplicate mime entry --- nixos/modules/services/web-servers/nginx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 064c86a9a7e2..a18690fa4c0e 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -31,6 +31,7 @@ let # Mime.types values are taken from brotli sample configuration - https://github.com/google/ngx_brotli # and Nginx Server Configs - https://github.com/h5bp/server-configs-nginx + # "text/html" is implicitly included in {brotli,gzip,zstd}_types compressMimeTypes = [ "application/atom+xml" "application/geo+json" @@ -55,7 +56,6 @@ let "text/calendar" "text/css" "text/csv" - "text/html" "text/javascript" "text/markdown" "text/plain" From f4b0afe9f56ced1adce1f6bc65c91e0fc880c6c3 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 1 Apr 2023 07:00:52 +0000 Subject: [PATCH 02/32] pre-commit: 3.1.0 -> 3.2.1 --- pkgs/tools/misc/pre-commit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 7ea5b8e7ae32..fac2d23fa729 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -17,7 +17,7 @@ with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "3.1.0"; + version = "3.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonApplication rec { owner = "pre-commit"; repo = "pre-commit"; rev = "v${version}"; - hash = "sha256-riAXvpJmuQHOfruwebijiAgN2AvqpUUI07p758qO+4k="; + hash = "sha256-WRQdxFlTpLmQpX9x3swlkSr2iv0alSiCRtTjhQC164c="; }; patches = [ From 64953434f2a34fa81f71989a1187e63a4ea0dbae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Apr 2023 17:59:36 +0000 Subject: [PATCH 03/32] matcha-gtk-theme: 2022-11-15 -> 2023-04-03 --- pkgs/data/themes/matcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 570febd7114a..eccff020ce58 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "aliz" "azul" "sea" "pueril" "a stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-11-15"; + version = "2023-04-03"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "Rx22O8C7kbYADxqJF8u6kdcQnXNA5aS+NWOnx/X4urY="; + sha256 = "mr9X7p/H8H2QKZxAQC9j/8OLK4D3EnWLxriFlh16diE="; }; nativeBuildInputs = [ From 3d5b79368ae6fd5a787945f855a691c0acd952cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Apr 2023 00:42:23 +0000 Subject: [PATCH 04/32] goeland: 0.13.0 -> 0.14.0 --- .../applications/networking/feedreaders/goeland/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/applications/networking/feedreaders/goeland/default.nix index 4c82bcdd3168..c750decc30b1 100644 --- a/pkgs/applications/networking/feedreaders/goeland/default.nix +++ b/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "goeland"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "slurdge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MD8wdXOZ8Kmun8AYv/zlRKwgAcGu2A349Xr8d7SVX4s="; + sha256 = "sha256-O4/dKTphgvcL5V66pMk2blXZ1cVsUgazMBaZCoAAwkY="; }; - vendorHash = "sha256-BErLmtzgVqDKLFAnKugDBwj3Vgm8rM6BfWcMOhu4SWY="; + vendorHash = "sha256-jOtIA7+rM/2qObhR61utvmXD+Rxi/+dEvzgYkGR76I8="; ldflags = [ "-s" From 9c82fd294f2488c59388bd40e95c974723bc6e41 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 7 Apr 2023 01:08:45 -0400 Subject: [PATCH 05/32] brave: 1.49.128 -> 1.50.114 https://community.brave.com/t/release-channel-1-50-114/480649/1 --- 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 64e2c7d6cb10..7deb802e5b67 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.49.128"; + version = "1.50.114"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-TXAPzhNRupv8R2rKj/mFdubAVjOrnmbdBtmasTnqfyU="; + sha256 = "sha256-aZuNxO4whVRUb4Up0VwyMiI50OumWuCDfzm15ywGdIk="; }; dontConfigure = true; From b4ef4bca0e2ce77f663ac6616c6e450dd1e26ffd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Apr 2023 06:35:46 +0000 Subject: [PATCH 06/32] python310Packages.vallox-websocket-api: 3.1.0 -> 3.2.1 --- .../python-modules/vallox-websocket-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 5697ff812994..44392d00b917 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "3.1.0"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-JbTuBzRSgMTPSgWEEAJGc8R44VLHiMr4qocbBjpJBmk="; + hash = "sha256-KtjyTSD7osIdThq/Ota4oCyeseBHxqaYaL47wiVicsI="; }; nativeBuildInputs = [ From 88e204147e71c00127242f8e1e1690ee29fb064d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 7 Apr 2023 11:57:10 +0000 Subject: [PATCH 07/32] okteto: 2.13.0 -> 2.14.2 --- pkgs/development/tools/okteto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index f726e0ad6954..d1137c3def38 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.13.0"; + version = "2.14.2"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-0fgxDUCgjYzrWflsoCGe4WRy3C/NO7FmrSw/LJ/NiUE="; + hash = "sha256-2bO6konOAyrCD+t31ZJ2+Ptp26ylY9wr1uArFu9rlnI="; }; - vendorHash = "sha256-d5z6uuUOHUjARIiRTVJmdQ+9VBaercIcUrcgDsN1zCs="; + vendorHash = "sha256-b2qxvP9spXEJVYOq7o0VG2WOxzUchwtLaY97/2IYoV4="; postPatch = '' # Disable some tests that need file system & network access. From 8ddb5204bc8c3b2eedd5268e392ae2970e0f6498 Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 7 Apr 2023 23:30:39 +0800 Subject: [PATCH 08/32] dfilemanager: unstable-2020-09-04 -> unstable-2021-02-20 --- pkgs/applications/file-managers/dfilemanager/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/file-managers/dfilemanager/default.nix b/pkgs/applications/file-managers/dfilemanager/default.nix index 6a9453eb583a..2c374511af54 100644 --- a/pkgs/applications/file-managers/dfilemanager/default.nix +++ b/pkgs/applications/file-managers/dfilemanager/default.nix @@ -2,13 +2,13 @@ mkDerivation { pname = "dfilemanager"; - version = "unstable-2020-09-04"; + version = "unstable-2021-02-20"; src = fetchFromGitHub { owner = "probonopd"; repo = "dfilemanager"; - rev = "c592d643d76942dc2c2ccb6e4bfdf53f5e805e48"; - sha256 = "7hIgaWjjOck5i4QbeVeQK7yrjK4yDoAZ5qY9RhM5ABY="; + rev = "61179500a92575e05cf9a71d401c388726bfd73d"; + sha256 = "sha256-BHd2dZDVxy82vR6PyXIS5M6zBGJ4bQfOhdBCdOww4kc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 781d5efafc71..da3259d90edd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29484,6 +29484,8 @@ with pkgs; dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; + dfilemanager = libsForQt5.callPackage ../applications/file-managers/dfilemanager { }; + dht = callPackage ../applications/networking/p2p/dht { }; dia = callPackage ../applications/graphics/dia { }; From fcc5bc2af4cb45e47ab7fc05d65016754707f4e0 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Fri, 7 Apr 2023 16:41:37 -0400 Subject: [PATCH 09/32] oracle-instantclient: 19.16.0.0.0 -> 21.9.0.0.0 (x86_64-linux) --- .../libraries/oracle-instantclient/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 129874c1dfba..6b3bb5f62310 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -22,13 +22,13 @@ let # determine the version number, there might be different ones per architecture version = { - x86_64-linux = "19.16.0.0.0"; + x86_64-linux = "21.9.0.0.0"; aarch64-linux = "19.10.0.0.0"; x86_64-darwin = "19.3.0.0.0"; }.${stdenv.hostPlatform.system} or throwSystem; directory = { - x86_64-linux = "1916000"; + x86_64-linux = "219000"; aarch64-linux = "191000"; x86_64-darwin = "193000"; }.${stdenv.hostPlatform.system} or throwSystem; @@ -36,11 +36,11 @@ let # hashes per component and architecture hashes = { x86_64-linux = { - basic = "sha256-Sq1rWvbC1YME7EjSYPaP2g+1Xxxkk4ZkGaBmLo2cKcQ="; - sdk = "sha256-yJ8f/Hlq6vZoPxv+dfY4z1E7rWvcqlK+ou0SU0KKlEI="; - sqlplus = "sha256-C44srukpCB9et9UWm59daJmU83zr0HAktnWv7R42Irw="; - tools = "sha256-GP4E1REIoU3lctVYmLsAiwTJEvGRpCmOFlRuZk+A8HE="; - odbc = "sha256-JECxK7Ia1IJtve2goZJdTkvm5NJjqB2rc6k5BXUt3oA="; + basic = "sha256-wiygUvZFYvjp5pndv3b9yTPxe8sC5HZkJ7jZqO1Mss8="; + sdk = "sha256-ehqHV52yLRe8ehrKqpLaN0HnN3zjHU7WrfjtqvQadgY="; + sqlplus = "sha256-tYvoG+7l5jXyTpxFUYZXaHCT0xGDeah78AinJ2qIsE8="; + tools = "sha256-6K2Ni0ZqqpqCrGFrBD06s0QNjNEDtNPrvDQ1U97lTKY="; + odbc = "sha256-yTANMLhaEqm9/ZEVqhEn1Gl8eJukgvqpqdaMRjxWxgs="; }; aarch64-linux = { basic = "sha256-DNntH20BAmo5kOz7uEgW2NXaNfwdvJ8l8oMnp50BOsY="; @@ -143,7 +143,7 @@ stdenv.mkDerivation { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ flokli dylanmtaylor ]; hydraPlatforms = [ ]; }; } From da787e098958ba15700fa96c24d2ab84f753f00f Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Fri, 7 Apr 2023 16:56:19 -0400 Subject: [PATCH 10/32] oracle-instantclient: 19.3.0.0.0 -> 19.8.0.0.0 (x86_64-darwin) --- .../libraries/oracle-instantclient/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 6b3bb5f62310..597c461ed00d 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -24,13 +24,13 @@ let version = { x86_64-linux = "21.9.0.0.0"; aarch64-linux = "19.10.0.0.0"; - x86_64-darwin = "19.3.0.0.0"; + x86_64-darwin = "19.8.0.0.0"; }.${stdenv.hostPlatform.system} or throwSystem; directory = { x86_64-linux = "219000"; aarch64-linux = "191000"; - x86_64-darwin = "193000"; + x86_64-darwin = "198000"; }.${stdenv.hostPlatform.system} or throwSystem; # hashes per component and architecture @@ -50,11 +50,11 @@ let odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms="; }; x86_64-darwin = { - basic = "f4335c1d53e8188a3a8cdfb97494ff87c4d0f481309284cf086dc64080a60abd"; - sdk = "b46b4b87af593f7cfe447cfb903d1ae5073cec34049143ad8cdc9f3e78b23b27"; - sqlplus = "f7565c3cbf898b0a7953fbb0017c5edd9d11d1863781588b7caf3a69937a2e9e"; - tools = "b2bc474f98da13efdbc77fd05f559498cd8c08582c5b9038f6a862215de33f2c"; - odbc = "f91da40684abaa866aa059eb26b1322f2d527670a1937d678404c991eadeb725"; + basic = "sha256-V+1BmPOhDYPNXdwkcsBY1MOwt4Yka66/a7/HORzBIIc="; + sdk = "sha256-D6iuTEQYqmbOh1z5LnKN16ga6vLmjnkm4QK15S/Iukw="; + sqlplus = "sha256-08uoiwoKPZmTxLZLYRVp0UbN827FXdhOukeDUXvTCVk="; + tools = "sha256-1xFFGZapFq9ogGQ6ePSv4PrXl5qOAgRZWAp4mJ5uxdU="; + odbc = "sha256-S6+5P4daK/+nXwoHmOkj4DIkHtwdzO5GOkCCI612bRY="; }; }.${stdenv.hostPlatform.system} or throwSystem; From c8131513026841e21253f65d24a74e699afeef5f Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Fri, 7 Apr 2023 23:34:40 +0200 Subject: [PATCH 11/32] fnott: 1.3.0 -> 1.4.0 Also removes the dot at the end of the description, which should not be there per the style-guides. Signed-off-by: Christoph Heiss --- pkgs/applications/misc/fnott/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index 8c730a2b48b7..5a76ef9028ed 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "fnott"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fnott"; rev = version; - sha256 = "sha256-6NMMU39v8+Ir3rf7kVwBdEOuYnZC1MqtZnim8+0A7wM="; + sha256 = "sha256-cJ7XmnC4x8lhZ+JRqobeQxTTps4Oz95zYdlFtr3KC1A="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://codeberg.org/dnkl/fnott"; - description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors."; + description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors"; license = licenses.mit; maintainers = with maintainers; [ polykernel ]; platforms = platforms.linux; From 9071d06d01ed34c80c97d44de879da93e98512fb Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 7 Apr 2023 19:36:52 -0300 Subject: [PATCH 12/32] abcl: follow up fixes for #223317 Signed-off-by: lucasew --- pkgs/development/compilers/abcl/default.nix | 6 ++++-- pkgs/development/compilers/abcl/update.sh | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index 46b369cce416..94f74e81906e 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -29,9 +29,11 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - buildInputs = [ jre ant jdk jre ]; + buildInputs = [ jre ]; - nativeBuildInputs = [ makeWrapper ]; + # note for the future: + # if you use makeBinaryWrapper, you will trade bash for glibc, the closure will be slightly larger + nativeBuildInputs = [ makeWrapper ant jdk ]; buildPhase = '' runHook preBuild diff --git a/pkgs/development/compilers/abcl/update.sh b/pkgs/development/compilers/abcl/update.sh index e3f05b8a394b..a8b38e776f25 100755 --- a/pkgs/development/compilers/abcl/update.sh +++ b/pkgs/development/compilers/abcl/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update curl +#!nix-shell -i bash -p nix-update subversion -new_version=$(curl https://armedbear.common-lisp.dev/ | grep abcl-src | sed 's;[^>]*>abcl-src-\(.*\).tar[^$]*;\1;' | head -n 1) +new_version=$(svn ls https://abcl.org/svn/tags | tail -1 | tr -d /) nix-update abcl --version "$new_version" From 7344ae11ab37423865c34533d317ebeb2c2feb4d Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 8 Apr 2023 16:47:37 +0200 Subject: [PATCH 13/32] fnott: add zlib license to list fnott bundles nanosvg in-tree and builds with it, which is licensed under the zlib license. The `license` meta-attr should reflect this (as this more or less means nanosvg is part of the project), thus add the zlib license to it. See the pull-request discussion [0] and other precedents like [1]. [0] https://github.com/NixOS/nixpkgs/pull/225224 [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=982145#74 Signed-off-by: Christoph Heiss --- pkgs/applications/misc/fnott/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index 5a76ef9028ed..311e532c1267 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://codeberg.org/dnkl/fnott"; description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors"; - license = licenses.mit; + license = with licenses; [ mit zlib ]; maintainers = with maintainers; [ polykernel ]; platforms = platforms.linux; }; From 993f9defe1246cefae13dccf285979f5adbe8943 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Apr 2023 19:58:28 +0200 Subject: [PATCH 14/32] python310Packages.immutabledict: 2.2.3 -> 2.2.4 https://github.com/corenting/immutabledict/blob/v2.2.4/CHANGELOG.md --- pkgs/development/python-modules/immutabledict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix index 8fef0641b1f1..249f789513d2 100644 --- a/pkgs/development/python-modules/immutabledict/default.nix +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "2.2.3"; + version = "2.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "corenting"; repo = "immutabledict"; rev = "v${version}"; - hash = "sha256-GeQ1BEBt+66YhohyaXt7rIVNpEk6mINwsC3JrmYNjRI="; + hash = "sha256-cykTZw3p6P35rHaJmfmiXIqybc+ZeqUkxneoPot7E9Q="; }; nativeBuildInputs = [ From 398f1d6b14f19f6e37a5b98f252cfd2566c9b7c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Apr 2023 20:14:11 +0200 Subject: [PATCH 15/32] mozphab: 1.1.0 -> 1.4.3 --- pkgs/applications/misc/mozphab/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/mozphab/default.nix b/pkgs/applications/misc/mozphab/default.nix index 82cf9b3d9515..28f1e4b2d98c 100644 --- a/pkgs/applications/misc/mozphab/default.nix +++ b/pkgs/applications/misc/mozphab/default.nix @@ -10,22 +10,30 @@ python3.pkgs.buildPythonApplication rec { pname = "mozphab"; - version = "1.1.0"; - format = "setuptools"; + version = "1.4.3"; + format = "pyproject"; src = fetchFromGitHub { owner = "mozilla-conduit"; repo = "review"; rev = "refs/tags/${version}"; - hash = "sha256-vLHikGjTYOeXd6jDRsoCkq3i0eh6Ttd4KdvlixjzdZ4="; + hash = "sha256-FUHT4MPzSxO3MCNYWodNxvFR2kL0P4eGmSHPtCt0Cug="; }; postPatch = '' - substituteInPlace setup.py \ + substituteInPlace pyproject.toml \ --replace "glean-sdk>=50.0.1,==50.*" "glean-sdk" ''; + nativeBuildInputs = with python3.pkgs; [ + setuptools + setuptools-scm + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = with python3.pkgs; [ + colorama distro glean-sdk packaging From cb9c4a59f9ab153a57c8a9d1c53936020d26d7f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Apr 2023 22:34:36 +0200 Subject: [PATCH 16/32] exploitdb: 2023-04-07 -> 2023-04-08 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-04-07...2023-04-08 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 7956d01f8b20..be749febae75 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-04-07"; + version = "2023-04-08"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PcrnqlbhoE9clYCsGX6ttMr92a+2BhuDP8aT6wG9aN0="; + hash = "sha256-dleCqYSfmp0XU1UbX/HSq7EbwTcUcr6PbsTEri72Hoo="; }; nativeBuildInputs = [ From 608f3a1885dfb10561b4eb049d599523ffe12282 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 00:01:23 +0200 Subject: [PATCH 17/32] cpuid: 20230228 -> 20230406 --- pkgs/os-specific/linux/cpuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index 68c058789bbb..57b03ba8bdb0 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20230228"; + version = "20230406"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-EYLFnFqpp7ljNzlABgQ+YN7hQIh6DBeERm1dLAhH7fM="; + sha256 = "sha256-9ARd5TXzDjTowBKwVM5m9ArDmRRNbjw4lr2AwN7u8bA="; }; # For pod2man during the build process. From 6e5ce485536b190b76992a25e99f197844dbd3b0 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Thu, 6 Apr 2023 17:29:17 +0100 Subject: [PATCH 18/32] cloudlog: 2.4 -> 2.4.1 --- pkgs/applications/radio/cloudlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 76c18839bff7..9f303dc7b518 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.4"; + version = "2.4.1"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - sha256 = "sha256-aF1f6EmlcUgZOkHJgrW6P923QW56vWMH8CZ4cnYiiSk="; + sha256 = "sha256-tFerQJhe/FemtOaP56b2XhLtXH2a8CRT2E69v/77Qz0="; }; postPath = '' From 3f76f631c5bf758ace15b072f2da4fa80c485ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 9 Apr 2023 08:39:54 +0200 Subject: [PATCH 19/32] python3Packages.flask-babel: 3.0.1 -> 3.1.0 https://github.com/python-babel/flask-babel/releases/tag/v3.1.0 This fixes build after .pytz update from PR #223278 https://hydra.nixos.org/log/wm3q4k49xrw96q7c1ly1pry53k0sbclx-python3.10-flask-babel-3.0.1.drv The patch was also included in this release. --- .../python-modules/flask-babel/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index c573521bc970..63e393a40afb 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -23,24 +23,16 @@ buildPythonPackage rec { pname = "flask-babel"; - version = "3.0.1"; + version = "3.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "python-babel"; repo = "flask-babel"; rev = "refs/tags/v${version}"; - hash = "sha256-bHsB1f7dbZW4k8JteyZOwVCgWRDZMu21XdMcjM5NYjk="; + hash = "sha256-KoTHBrGD6M3rkXoxUadRXhroRUbWKaL/rE6Rd2mxw4c="; }; - patches = [ - (fetchpatch { - # https://github.com/python-babel/flask-babel/pull/222 - url = "https://github.com/python-babel/flask-babel/commit/756cace7d96e9eacef66813c8df653d2bb349da0.patch"; - hash = "sha256-hp/QPS/ZyRMUnyqU+fvMJKPISBECc9kqdCu8U6Hnd5g="; - }) - ]; - outputs = [ "out" "doc" From 569784d50be3560d211e3af2720b81ac2cc66df0 Mon Sep 17 00:00:00 2001 From: Arnav Vijaywargiya Date: Fri, 7 Apr 2023 11:48:34 +0530 Subject: [PATCH 20/32] minetest: 5.6.1 -> 5.7.0 --- pkgs/games/minetest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index a23868a50202..0f645ce37967 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -128,9 +128,9 @@ let }; v5 = { - version = "5.6.1"; - sha256 = "sha256-1mUmtM09jqJhD2RcLCAjaI+JkqP52QYH3KLkY5MZ860="; - dataSha256 = "sha256-Ye8MihrOqjSoy+vNr/CM/C/sNXdexe08dxrmoMxsG/A="; + version = "5.7.0"; + sha256 = "sha256-9AL6gTmy05yTeYfCq3EMK4gqpBWdHwvJ5Flpzj8hFAE="; + dataSha256 = "sha256-wWgeO8513N5jQdWvZrq357fPpAU5ik06mgZraWCQawo="; }; mkClient = version: generic (version // { buildClient = true; buildServer = false; }); From 418cc5813e268f167d767fda776434f83074af95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 9 Apr 2023 09:38:28 +0200 Subject: [PATCH 21/32] dsniff: fixup build https://hydra.nixos.org/build/215252689 --- pkgs/tools/networking/dsniff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix index 592ec2308657..24e1ef29ef31 100644 --- a/pkgs/tools/networking/dsniff/default.nix +++ b/pkgs/tools/networking/dsniff/default.nix @@ -1,5 +1,5 @@ { gcc9Stdenv, lib, fetchFromGitLab, autoreconfHook, libpcap, db, glib, libnet, libnids, symlinkJoin, openssl -, rpcsvc-proto, libtirpc, libnsl +, rpcsvc-proto, libtirpc, libnsl, libnl }: # We compile with GCC 9 since GCC 10 segfaults on the code @@ -59,8 +59,8 @@ in gcc9Stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook rpcsvc-proto ]; - buildInputs = [ glib pcap libtirpc libnsl ]; - NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ltirpc"; + buildInputs = [ glib pcap libtirpc libnsl libnl ]; + NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ltirpc -lnl-3 -lnl-genl-3"; env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; postPatch = '' for patch in debian/patches/*.patch; do From fd284a179f4d7e44ac506b556c6b0d77d9b0c5f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 10:10:36 +0200 Subject: [PATCH 22/32] python310Packages.mkdocstrings: 0.20.0 -> 0.21.2 Diff: https://github.com/mkdocstrings/mkdocstrings/compare/refs/tags/0.20.0...0.21.2 Changelog: https://github.com/mkdocstrings/mkdocstrings/blob/0.21.2/CHANGELOG.md --- pkgs/development/python-modules/mkdocstrings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index 4d367c809d44..fbbdb91feb2d 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.20.0"; + version = "0.21.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eFHcwbYEIwVWvDJWlmeUvEdqp3NYAF8SgdHJGw6bEMc="; + hash = "sha256-pi0BEe/zhG/V9wh2CO91Cc7Mze93+2tbVo6/2LGQ6Nw="; }; postPatch = '' From a2d13a6801ecf2c0ee783717f247f7e8a0ec7a55 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 9 Apr 2023 02:11:55 -0600 Subject: [PATCH 23/32] fwupd: 1.8.13 -> 1.8.14 https://github.com/fwupd/fwupd/compare/1.8.13...1.8.14 Contains a fix for https://github.com/fwupd/fwupd/issues/5656. --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 307b34a8b4ec..2264e212ec67 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -122,7 +122,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.8.13"; + version = "1.8.14"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-UBKFC/hq4kkrjkuHTqIimbR332Vk/X4VQeYROGeAVi8="; + hash = "sha256-xq9J44yhnF3bTutlkOLIMFM96XHMmoCL8i37tSxgPp0="; }; patches = [ From fa6b4799a6a487faf0f588608855c54e534df0fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Apr 2023 10:13:37 +0200 Subject: [PATCH 24/32] python310Packages.pontos: 23.4.0 -> 23.4.1 Diff: https://github.com/greenbone/pontos/compare/refs/tags/v23.4.0...v23.4.1 Changelog: https://github.com/greenbone/pontos/releases/tag/v23.4.1 --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 674699bb0e91..9a65b03701dc 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.4.0"; + version = "23.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nMuf8k7o7cCpvk9IUp7lz6jM7rqCxHq4uT51R1w8jtM="; + hash = "sha256-siaOZClcqivFZlscPiEo3skL6oVjDEWrabP8I+IvQJ8="; }; nativeBuildInputs = [ From 08078f6ab7b2136ad81bf2df54b3b9139f5cad0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 01:54:44 +0000 Subject: [PATCH 25/32] irrlichtmt: 1.9.0mt8 -> 1.9.0mt10 --- pkgs/development/libraries/irrlichtmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/irrlichtmt/default.nix b/pkgs/development/libraries/irrlichtmt/default.nix index c5d2bcf17691..8a080c1d4a97 100644 --- a/pkgs/development/libraries/irrlichtmt/default.nix +++ b/pkgs/development/libraries/irrlichtmt/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "irrlichtmt"; - version = "1.9.0mt8"; + version = "1.9.0mt10"; src = fetchFromGitHub { owner = "minetest"; repo = "irrlicht"; rev = version; - sha256 = "sha256-bwpALhBk16KugYqKuN57M3t5Ba7rdyrYWn/iBoi8hpg="; + sha256 = "sha256-PA+gz77XkwxQ3TtubaT0ov9dsT7s3ZlrQxrOkD5ku3g="; }; nativeBuildInputs = [ From bfb7a581c85a74bffca2f459e698a07fa8a3c987 Mon Sep 17 00:00:00 2001 From: iopq Date: Sun, 9 Apr 2023 16:19:45 +0800 Subject: [PATCH 26/32] xray: fix GUI compatibility While the package itself will look for assets in both folders, ./xray and ./v2ray the GUIs don't always support this, so since we use the v2ray-assets we should also set the V2RAY_LOCATION_ASSET variable to hint them to look at the ./v2ray folder --- pkgs/tools/networking/xray/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index 621de22e4c00..7b6282907dcc 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -51,7 +51,7 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/xray \ - --suffix XRAY_LOCATION_ASSET : $assetsDrv/share/v2ray + --suffix V2RAY_LOCATION_ASSET : $assetsDrv/share/v2ray ''; passthru = { From a3f6d55533380b3e94805499bcb1a9f516880a34 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 7 Apr 2023 10:42:00 +0300 Subject: [PATCH 27/32] pistol: 0.3.2 -> 0.3.3 Diff: https://github.com/doronbehar/pistol/compare/v0.3.2...v0.3.3 Switch to postInstall from postBuild - See: https://discourse.nixos.org/t/cant-update-a-go-package-getting-go-inconsistent-vendoring/27063/6 --- pkgs/tools/misc/pistol/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 930554d18696..97acb528abae 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DGbWlEDI/qGNpdT8N79RsLxnUm4Sw8lHFRIBFd1GmK0="; + sha256 = "sha256-6V3Du3+0YliwzsvZolapBAnyqbsv1WZhWQkaldDR+Ok="; }; - vendorSha256 = "sha256-poTd0lXRaJeDxwcw+h76NPC0mFB9nwm2vLLB5UUK1dk="; + vendorSha256 = "sha256-jURN0NSc9SFHFMS8QdaEqqBwOHnAEEJQlQXHTUDRiyE="; doCheck = false; @@ -30,7 +30,7 @@ buildGoModule rec { installShellFiles asciidoctor ]; - postBuild = '' + postInstall = '' asciidoctor -b manpage -d manpage README.adoc installManPage pistol.1 ''; From 7f8f94d0a7b75257828bef4a385b4e5e078ef767 Mon Sep 17 00:00:00 2001 From: Thomas BESSOU Date: Sun, 9 Apr 2023 10:57:43 +0200 Subject: [PATCH 28/32] smartgithg: 22.1.4 -> 22.1.5 --- pkgs/applications/version-management/smartgithg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 32dc11d4527d..ecef523a0ec8 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "22.1.4"; + version = "22.1.5"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "sha256-e5bgIA7dblRDWvwC2dqRFR+Sp6uMAWQbhlMqG8a4vZk="; + sha256 = "sha256-s31sYEC1g7eLMhT9UkmjbBnHePY9wnQPmgGQXgVX4j4="; }; nativeBuildInputs = [ wrapGAppsHook ]; From 5b84ccce78843b2b13721c67aa9a3fa10eb14ac5 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 9 Apr 2023 11:06:45 +0200 Subject: [PATCH 29/32] exercism: add update script --- pkgs/applications/misc/exercism/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index f13d45059473..c440c0cc8206 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -1,22 +1,24 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nix-update-script }: buildGoModule rec { pname = "exercism"; version = "3.1.0"; src = fetchFromGitHub { - owner = "exercism"; - repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-9GdkQaxYvxMGI5aFwUtQnctjpZfjZaKP3CsMjC/ZBSo"; + owner = "exercism"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-9GdkQaxYvxMGI5aFwUtQnctjpZfjZaKP3CsMjC/ZBSo="; }; - vendorSha256 = "sha256-EW9SNUqJHgPQlNpeErYaooJRXGcDrNpXLhMYpmZPVSw"; + vendorHash = "sha256-EW9SNUqJHgPQlNpeErYaooJRXGcDrNpXLhMYpmZPVSw="; doCheck = false; subPackages = [ "./exercism" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { inherit (src.meta) homepage; description = "A Go based command line tool for exercism.io"; From dee43206d8f519882f86cafdd7a3f268e36b2d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 9 Apr 2023 11:06:49 +0200 Subject: [PATCH 30/32] pypy*: fixup build https://hydra.nixos.org/build/215259697 This is most likely fallout from PR #209870 --- pkgs/development/interpreters/python/pypy/prebuilt.nix | 1 + pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 69508742148b..4b47c642eca4 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -70,6 +70,7 @@ in with passthru; stdenv.mkDerivation { ncurses6 sqlite zlib + stdenv.cc.cc.libgcc or null ] ++ lib.optionals stdenv.isLinux [ tcl-8_5 tk-8_5 diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index c4b676271673..37a06f9f61ed 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -70,6 +70,7 @@ in with passthru; stdenv.mkDerivation { ncurses6 sqlite zlib + stdenv.cc.cc.libgcc or null ] ++ lib.optionals stdenv.isLinux [ tcl-8_5 tk-8_5 From bd81c94de08beb58aa6a2f090f7e751961e9dbc6 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 9 Apr 2023 11:32:52 +0200 Subject: [PATCH 31/32] rustic-rs: add update script --- pkgs/tools/backup/rustic-rs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/rustic-rs/default.nix b/pkgs/tools/backup/rustic-rs/default.nix index 5487a2641750..91d25cbb9859 100644 --- a/pkgs/tools/backup/rustic-rs/default.nix +++ b/pkgs/tools/backup/rustic-rs/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, stdenv, Security, installShellFiles }: +{ lib, fetchFromGitHub, rustPlatform, stdenv, Security, installShellFiles, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "rustic-rs"; @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-r4hOjX/LKv2wX720FMEztUo9rf2hDBLfcHtENSZNA3U="; }; @@ -28,6 +28,8 @@ rustPlatform.buildRustPackage rec { installShellCompletion rustic.{ba,fi}sh ''; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/rustic-rs/rustic"; changelog = "https://github.com/rustic-rs/rustic/blob/${src.rev}/changelog/${version}.txt"; From f9adb566707a492bd3d17fee1e223695d939b52a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 9 Apr 2023 12:08:42 +0200 Subject: [PATCH 32/32] =?UTF-8?q?ocamlPackages.hpack:=200.9.0=20=E2=86=92?= =?UTF-8?q?=200.10.0=20(#225270)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ocamlPackages.hpack: 0.9.0 → 0.10.0 ocamlPackages.paf: 0.4.0 → 0.5.0 ocamlPackages.http-mirage-client: 0.0.2 → 0.0.3 * ocamlPackages.httpaf: use Dune 3 --- .../ocaml-modules/hpack/default.nix | 7 +-- .../http-mirage-client/default.nix | 13 +----- .../ocaml-modules/httpaf/default.nix | 7 +-- pkgs/development/ocaml-modules/paf/cohttp.nix | 1 - .../development/ocaml-modules/paf/default.nix | 13 +----- pkgs/development/ocaml-modules/paf/le.nix | 44 ------------------- pkgs/top-level/ocaml-packages.nix | 2 - 7 files changed, 12 insertions(+), 75 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/paf/le.nix diff --git a/pkgs/development/ocaml-modules/hpack/default.nix b/pkgs/development/ocaml-modules/hpack/default.nix index 5ebb14f30b88..20a0456d7449 100644 --- a/pkgs/development/ocaml-modules/hpack/default.nix +++ b/pkgs/development/ocaml-modules/hpack/default.nix @@ -7,14 +7,15 @@ buildDunePackage rec { pname = "hpack"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz"; - sha256 = "sha256-7gjRhJs2mufQbImAXiKFT9mZ1kHGSHHwjCVZM5f0C14="; + hash = "sha256-n9avpVL6HD2KBON2FpnUeuH3HOUDOA29iSmjdcxMRvE="; }; - minimalOCamlVersion = "4.04"; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ angstrom diff --git a/pkgs/development/ocaml-modules/http-mirage-client/default.nix b/pkgs/development/ocaml-modules/http-mirage-client/default.nix index 08b3758d53ed..434482bdc3bc 100644 --- a/pkgs/development/ocaml-modules/http-mirage-client/default.nix +++ b/pkgs/development/ocaml-modules/http-mirage-client/default.nix @@ -1,6 +1,5 @@ { lib , fetchurl -, fetchpatch , buildDunePackage , h2 , httpaf @@ -17,24 +16,16 @@ buildDunePackage rec { pname = "http-mirage-client"; - version = "0.0.2"; + version = "0.0.3"; duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz"; - hash = "sha256-stom13t3Kn1ehkeURem39mxhd3Lmlz8z9m3tHGcp5vY="; + hash = "sha256-6PMxZQfPiDTFbj9gOO2tW5FHF0MUP5tOySjkYg+QwGA="; }; - # Make tests use mirage-crypto - patches = lib.lists.map fetchpatch [ - { url = "https://github.com/roburio/http-mirage-client/commit/c6cd38db9c23ac23e7c3e4cf2d41420f58034e8d.patch"; - hash = "sha256-b3rurqF0DxLpVQEhVfROwc7qyul0Fjfl3zhD8AkzemU="; } - { url = "https://github.com/roburio/http-mirage-client/commit/0a5367e7c6d9b7f45c88493f7a596f7a83e8c7d5.patch"; - hash = "sha256-Q6YlfuiAfsyhty9EvoBetvekuU25KjrH5wwGwYTAAiA="; } - ]; - propagatedBuildInputs = [ h2 httpaf diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix index 508b2e4b7f76..f262d51ee7dc 100644 --- a/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/pkgs/development/ocaml-modules/httpaf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, ocaml +{ lib, fetchFromGitHub, fetchpatch, buildDunePackage , angstrom, faraday, alcotest }: @@ -6,7 +6,8 @@ buildDunePackage rec { pname = "httpaf"; version = "0.7.1"; - useDune2 = true; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "inhabitedtype"; @@ -17,7 +18,7 @@ buildDunePackage rec { checkInputs = [ alcotest ]; propagatedBuildInputs = [ angstrom faraday ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = { description = "A high-performance, memory-efficient, and scalable web server for OCaml"; diff --git a/pkgs/development/ocaml-modules/paf/cohttp.nix b/pkgs/development/ocaml-modules/paf/cohttp.nix index e7e0273e5234..2f2891493061 100644 --- a/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -22,7 +22,6 @@ buildDunePackage { inherit (paf) version src - patches ; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index 6345499ca283..3fddb162d465 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -1,7 +1,6 @@ { buildDunePackage , lib , fetchurl -, fetchpatch , mirage-stack , mirage-time , h2 @@ -25,21 +24,13 @@ buildDunePackage rec { pname = "paf"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; - hash = "sha256-ux8fk4XDdih4Ua9NGOJVSuPseJBPv6+6ND/esHrluQE="; + hash = "sha256-oWRvwb8DhtF3ltWaZ6moKmgadFUngruo1UOIaGNV/oM="; }; - patches = [ - # Compatibility with mirage-crypto 0.11.0 - (fetchpatch { - url = "https://github.com/dinosaure/paf-le-chien/commit/2f308c1c4d3ff49d42136f8ff86a4385661e4d1b.patch"; - hash = "sha256-jmSeUpoRoUMPUNEH3Av2LxgRZs+eAectK+CpoH+SdpY="; - }) - ]; - minimalOCamlVersion = "4.08"; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/paf/le.nix b/pkgs/development/ocaml-modules/paf/le.nix deleted file mode 100644 index a31575d4690b..000000000000 --- a/pkgs/development/ocaml-modules/paf/le.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildDunePackage -, paf -, dns-client-mirage -, duration -, emile -, httpaf -, letsencrypt -, mirage-stack -, mirage-time -, tls-mirage -, x509 -}: - -buildDunePackage { - pname = "paf-le"; - - inherit (paf) - version - src - patches - ; - - duneVersion = "3"; - - propagatedBuildInputs = [ - paf - dns-client-mirage - duration - emile - httpaf - letsencrypt - mirage-stack - mirage-time - tls-mirage - x509 - ]; - - doCheck = true; - - meta = paf.meta // { - description = "A CoHTTP client with its HTTP/AF implementation"; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bbe5c59e1f48..4ce6162788d3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1259,8 +1259,6 @@ let paf-cohttp = callPackage ../development/ocaml-modules/paf/cohttp.nix { }; - paf-le = callPackage ../development/ocaml-modules/paf/le.nix { }; - parany = callPackage ../development/ocaml-modules/parany { }; parmap = callPackage ../development/ocaml-modules/parmap { };