From 0ce09b94c307c5fa7e54a51c0ddc770c1d5ad079 Mon Sep 17 00:00:00 2001 From: loco-choco Date: Fri, 29 Mar 2024 20:10:58 -0300 Subject: [PATCH 01/56] irpf: add update script --- pkgs/applications/finance/irpf/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix index 9bf9c1f2d0cc..4b358c62a13e 100644 --- a/pkgs/applications/finance/irpf/default.nix +++ b/pkgs/applications/finance/irpf/default.nix @@ -7,6 +7,7 @@ , makeWrapper , unzip , xdg-utils +, writeScript }: stdenvNoCC.mkDerivation rec { @@ -22,6 +23,16 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-7Eh5XhZKs2DAQC33ICUG+mgjEU7H3jdYZSeiHNJ6I6Q="; }; + passthru.updateScript = writeScript "update-irpf" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pup common-updater-scripts + + set -eu -o pipefail + #parses the html with the install links for the containers that contain the instalation files of type 'file archive, gets the version number of each version, and sorts to get the latest one on the website + version="$(curl -s https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf | pup '.rfb_container .rfb_ositem:parent-of(.fa-file-archive) attr{href}' | grep -oP "IRPF\K(\d+)-[\d.]+\d" | sort -r | head -1)" + update-source-version irpf "$version" + ''; + nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; desktopItems = [ From df0ba5c92d6853e48101814f585af52df253850e Mon Sep 17 00:00:00 2001 From: loco-choco Date: Fri, 29 Mar 2024 20:18:47 -0300 Subject: [PATCH 02/56] irpf: move derivation to /pkgs/by-name/ir/irpf --- .../finance/irpf/default.nix => by-name/ir/irpf/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/finance/irpf/default.nix => by-name/ir/irpf/package.nix} (100%) diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/by-name/ir/irpf/package.nix similarity index 100% rename from pkgs/applications/finance/irpf/default.nix rename to pkgs/by-name/ir/irpf/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e871887f3ec..d9a80db0b581 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5547,8 +5547,6 @@ with pkgs; iotools = callPackage ../tools/misc/iotools { }; - irpf = callPackage ../applications/finance/irpf { }; - jellycli = callPackage ../applications/audio/jellycli { }; jellyfin = callPackage ../servers/jellyfin { From 0bd8b0ed2f639f9d37cb275ea540ebb35ca31a39 Mon Sep 17 00:00:00 2001 From: loco-choco Date: Fri, 29 Mar 2024 20:23:46 -0300 Subject: [PATCH 03/56] irpf: change from using rec to finalAttrs syntax --- pkgs/by-name/ir/irpf/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix index 4b358c62a13e..1fc304f6f680 100644 --- a/pkgs/by-name/ir/irpf/package.nix +++ b/pkgs/by-name/ir/irpf/package.nix @@ -10,16 +10,16 @@ , writeScript }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "irpf"; version = "2024-1.1"; # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf # Para outros sistemas operacionais -> Multi src = let - year = lib.head (lib.splitVersion version); + year = lib.head (lib.splitVersion finalAttrs.version); in fetchzip { - url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip"; + url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip"; hash = "sha256-7Eh5XhZKs2DAQC33ICUG+mgjEU7H3jdYZSeiHNJ6I6Q="; }; @@ -37,8 +37,8 @@ stdenvNoCC.mkDerivation rec { desktopItems = [ (makeDesktopItem { - name = pname; - exec = pname; + name = finalAttrs.pname; + exec = finalAttrs.pname; icon = "rfb64"; desktopName = "Imposto de Renda Pessoa Física"; comment = "Programa Oficial da Receita para elaboração do IRPF"; @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - BASEDIR="$out/share/${pname}" + BASEDIR="$out/share/${finalAttrs.pname}" mkdir -p "$BASEDIR" cp --no-preserve=mode -r help lib lib-modulos "$BASEDIR" @@ -57,10 +57,10 @@ stdenvNoCC.mkDerivation rec { install -Dm644 irpf.jar Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR" # make xdg-open overrideable at runtime - makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ + makeWrapper ${jdk11}/bin/java $out/bin/${finalAttrs.pname} \ --add-flags "-Dawt.useSystemAAFontSettings=on" \ --add-flags "-Dswing.aatext=true" \ - --add-flags "-jar $BASEDIR/${pname}.jar" \ + --add-flags "-jar $BASEDIR/${finalAttrs.pname}.jar" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ --set _JAVA_AWT_WM_NONREPARENTING 1 \ --set AWT_TOOLKIT MToolkit @@ -85,4 +85,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ atila bryanasdev000 ]; mainProgram = "irpf"; }; -} +}) From cef69659f9e0143d47381d3a4df56fe35f4b2edf Mon Sep 17 00:00:00 2001 From: Locochoco Date: Fri, 21 Jun 2024 22:11:19 -0300 Subject: [PATCH 04/56] irpf: 2024-1.1 -> 2024-1.2 --- pkgs/by-name/ir/irpf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix index 1fc304f6f680..ad21b37c5c73 100644 --- a/pkgs/by-name/ir/irpf/package.nix +++ b/pkgs/by-name/ir/irpf/package.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "irpf"; - version = "2024-1.1"; + version = "2024-1.2"; # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf # Para outros sistemas operacionais -> Multi @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { year = lib.head (lib.splitVersion finalAttrs.version); in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip"; - hash = "sha256-7Eh5XhZKs2DAQC33ICUG+mgjEU7H3jdYZSeiHNJ6I6Q="; + hash = "sha256-gwYWNnvpGej9B1EyFswYGYXh4i4wiyOG67VN1PWX3A0="; }; passthru.updateScript = writeScript "update-irpf" '' From 81756aaba124e580e8826c65e466ec3a6a7e8621 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 9 Jul 2024 10:18:52 -0400 Subject: [PATCH 05/56] dcm2niix: 1.0.20230411 -> 1.0.20240202 --- .../science/biology/dcm2niix/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index a7f30dbc075d..acf43e52764d 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -21,15 +21,15 @@ let sha256 = "sha256-8HNFUGx2uuEb8UrGUiqkN+uVDX83YIisT2uO1Z7GCxc="; }; in -stdenv.mkDerivation rec { - version = "1.0.20230411"; +stdenv.mkDerivation (finalAttrs: { + version = "1.0.20240202"; pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; repo = "dcm2niix"; - rev = "v${version}"; - sha256 = "sha256-kOVEoqrk4l6sH8iDVx1QmOYP5tCufxsWnCnn9BibZ08="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-vJUPv/6KNCsU8UjwfktHdTlsweG7+UGgAEZeESfBkD8="; }; patches = lib.optionals withCloudflareZlib [ @@ -55,15 +55,16 @@ stdenv.mkDerivation rec { "-DZLIB_IMPLEMENTATION=Cloudflare" ]; - meta = with lib; { + meta = { description = "DICOM to NIfTI converter"; mainProgram = "dcm2niix"; longDescription = '' dcm2niix is designed to convert neuroimaging data from the DICOM format to the NIfTI format. ''; homepage = "https://www.nitrc.org/projects/dcm2nii"; - license = licenses.bsd3; - maintainers = with maintainers; [ ashgillman rbreslow ]; - platforms = platforms.all; + changelog = "https://github.com/rordenlab/dcm2niix/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ashgillman rbreslow ]; + platforms = lib.platforms.all; }; -} +}) From fd349176eccf3c1300751f5c6b6de7c1508e1cb3 Mon Sep 17 00:00:00 2001 From: ruby0b <106119328+ruby0b@users.noreply.github.com> Date: Tue, 16 Jul 2024 18:07:28 +0200 Subject: [PATCH 06/56] pyload-ng: fix build for python312 As js2py currently does not work on 3.12, pyload-ng replaced it with dukpy. --- .../networking/pyload-ng/default.nix | 77 ++++++++++--------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/networking/pyload-ng/default.nix b/pkgs/applications/networking/pyload-ng/default.nix index 61c62fb95e94..aae05e4cf10b 100644 --- a/pkgs/applications/networking/pyload-ng/default.nix +++ b/pkgs/applications/networking/pyload-ng/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchPypi, nixosTests, python3 }: +{ + lib, + fetchPypi, + nixosTests, + python3, +}: python3.pkgs.buildPythonApplication rec { version = "0.5.0b3.dev85"; @@ -22,48 +27,48 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # relax version bounds - sed -i 's/\([A-z0-9]*\)~=.*$/\1/' setup.cfg + sed -i -E 's/([A-z0-9]*)~=[^;]*(.*)/\1\2/' setup.cfg ''; - propagatedBuildInputs = with python3.pkgs; [ - bitmath - certifi - cheroot - cryptography - filetype - flask - flask-babel - flask-caching - flask-compress - flask-session - flask-themes2 - js2py - pycurl - semver - setuptools - ]; + dependencies = + with python3.pkgs; + [ + bitmath + certifi + cheroot + cryptography + filetype + flask + flask-babel + flask-caching + flask-compress + flask-session + flask-themes2 + pycurl + semver + setuptools + ] + ++ (if pythonOlder "3.12" then [ js2py ] else [ dukpy ]); - passthru = { - optional-dependencies = { - plugins = with python3.pkgs; [ - beautifulsoup4 # for some plugins - colorlog # colorful console logging - pillow # for some CAPTCHA plugin - send2trash # send some files to trash instead of deleting them - slixmpp # XMPP plugin - ]; - }; - - tests = { - inherit (nixosTests) pyload; - }; + optional-dependencies = { + plugins = with python3.pkgs; [ + beautifulsoup4 # for some plugins + colorlog # colorful console logging + pillow # for some CAPTCHA plugin + send2trash # send some files to trash instead of deleting them + slixmpp # XMPP plugin + ]; }; - meta = with lib; { + passthru.tests = { + inherit (nixosTests) pyload; + }; + + meta = { description = "Free and open-source download manager with support for 1-click-hosting sites"; homepage = "https://github.com/pyload/pyload"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ ruby0b ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ ruby0b ]; mainProgram = "pyload"; }; } From f77a180298fd7f9fa2d436b13c9cef838797ac07 Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 18 Jul 2024 10:06:53 +0000 Subject: [PATCH 07/56] syshud: 0-unstable-2024-07-08 -> 0-unstable-2024-07-16 --- pkgs/by-name/sy/syshud/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index 4ece5e05274f..e70a64bf8518 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2024-07-08"; + version = "0-unstable-2024-07-16"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "602d3b3062dfe589a00b0debd07c3aaae9b98390"; - hash = "sha256-rEigWAkzR5ZclsLg/rFMBM0AuSOCVr2/lsPtKk46FYo="; + rev = "d60c3bb6c8eefba743478fe7c183055fa057e69e"; + hash = "sha256-2aVqCXUZYGtv6xIqbZ1yk3SZK45igZVgPl0byxTXu8E="; }; postPatch = '' @@ -51,6 +51,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postConfigure ''; + # syshud manually `dlopen`'s its library component + postInstall = '' + wrapProgram $out/bin/syshud --prefix LD_LIBRARY_PATH : $out/lib + ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version" "branch" ]; }; From a137a798dc40f85c5bc757aa4d0cfb8e04981596 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Thu, 18 Jul 2024 06:17:32 -0400 Subject: [PATCH 08/56] android-studio-tools: init at 11076708 --- .../an/android-studio-tools/package.nix | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/an/android-studio-tools/package.nix diff --git a/pkgs/by-name/an/android-studio-tools/package.nix b/pkgs/by-name/an/android-studio-tools/package.nix new file mode 100644 index 000000000000..06af624a8e26 --- /dev/null +++ b/pkgs/by-name/an/android-studio-tools/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenvNoCC, + fetchzip, + makeWrapper, + openjdk, +}: + +stdenvNoCC.mkDerivation { + pname = "android-studio-tools"; + version = "11076708"; + + src = fetchzip { + # The only difference between the Linux and Mac versions is a single comment at the top of all the scripts + # Therefore, we will use the Linux version and just patch the comment + url = "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip"; + hash = "sha256-NjxJzHRT2/zZ9YzzjqaMVxpOELkDneQgc1/y1GUnZow="; + }; + + postPatch = '' + find . -type f -not -path "./bin/*" -exec chmod -x {} \; + '' + lib.optionalString stdenvNoCC.isDarwin '' + for f in cmdline-tools/bin/*; do + sed -i 's|start up script for Linux|start up script for Mac|' $f + done + ''; + + nativeBuildInputs = [ makeWrapper ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r . $out + + for f in $out/bin/*; do + wrapProgram $f --set JAVA_HOME "${openjdk}" + done + + runHook postInstall + ''; + + meta = { + description = "Android Studio CLI Tools"; + homepage = "https://developer.android.com/studio"; + downloadPage = "https://developer.android.com/studio"; + changelog = "https://developer.android.com/studio/releases"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ pandapip1 ]; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; # The 'binaries' are actually shell scripts + }; +} From 5182f25f5bbe33e936ed43ad04affd14e34c3698 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 12:48:55 +0000 Subject: [PATCH 09/56] keycloak: 25.0.1 -> 25.0.2 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 48d9ecec2b01..bc97af7d3fae 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "25.0.1"; + version = "25.0.2"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-gwnBCH65s8KGca2FNBxfBfNKox9OFTN3oEAPcYhSx9o="; + hash = "sha256-DYuK1W8dXI/UUB+9HzMnjiJdpJulS3QuIpmr3AA4OLo="; }; nativeBuildInputs = [ makeWrapper jre ]; From 151406c8ff032348ffb94fa3a8ccd97506790c5a Mon Sep 17 00:00:00 2001 From: Guillaume Lostis Date: Thu, 18 Jul 2024 15:26:51 +0200 Subject: [PATCH 10/56] autorandr: 1.14 -> 1.15 --- pkgs/tools/misc/autorandr/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index cc196de6230b..eb7f8c16c86d 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "autorandr"; - version = "1.14"; + version = "1.15"; format = "other"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "autorandr"; rev = "refs/tags/${version}"; - hash = "sha256-Ru3nQF0DB98rKSew6QtxAZQEB/9nVlIelNX3M7bNYHk="; + hash = "sha256-8FMfy3GCN4z/TnfefU2DbKqV3W35I29/SuGGqeOrjNg"; }; nativeBuildInputs = [ installShellFiles desktop-file-utils ]; @@ -42,9 +42,7 @@ python3.pkgs.buildPythonApplication rec { installShellCompletion --cmd autorandr \ --bash contrib/bash_completion/autorandr \ --zsh contrib/zsh_completion/_autorandr \ - --fish contrib/fish_copletion/autorandr.fish - # In the line above there's a typo that needs to be fixed in the next - # release + --fish contrib/fish_completion/autorandr.fish make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out From 77342742b3453934fd77b63bfc06234eb60dec64 Mon Sep 17 00:00:00 2001 From: Redyf Date: Tue, 16 Jul 2024 11:39:54 -0300 Subject: [PATCH 11/56] affine: 0.15.2 -> 0.15.6 --- pkgs/by-name/af/affine/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 1717de9bc934..ed2615ed7fab 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -18,10 +18,10 @@ stdenvNoCC.mkDerivation (finalAttrs: let }; in { pname = "affine"; - version = "0.15.2"; + version = "0.15.6"; src = fetchurl { url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; - hash = "sha256-Nu5s/0sP4exRtfjd058tD5jzDezPHnHjm5CJxOLJvVE="; + hash = "sha256-0XlKmjL9rYUYIMgpJ9knM+RbtLlzB1P5Rk62naTmznw="; }; nativeBuildInputs = [ copyDesktopItems @@ -61,7 +61,7 @@ in { homepage = "https://affine.pro/"; downloadPage = "https://affine.pro/download"; license = licenses.mit; - maintainers = with maintainers; [richar]; + maintainers = with maintainers; [richar redyf]; mainProgram = "affine"; platforms = ["x86_64-linux"]; }; From aa91bca6f17a42df33988dc68ebf91f289b82230 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 9 Jul 2024 22:10:41 +0200 Subject: [PATCH 12/56] arrow-cpp: reformat --- pkgs/by-name/ar/arrow-cpp/package.nix | 332 ++++++++++++++------------ 1 file changed, 179 insertions(+), 153 deletions(-) diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 534c5f243057..14e6d4968e39 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchurl -, fetchFromGitHub -, fixDarwinDylibNames -, autoconf -, aws-sdk-cpp -, aws-sdk-cpp-arrow ? aws-sdk-cpp.override { +{ + stdenv, + lib, + fetchurl, + fetchFromGitHub, + fixDarwinDylibNames, + autoconf, + aws-sdk-cpp, + aws-sdk-cpp-arrow ? aws-sdk-cpp.override { apis = [ "cognito-identity" "config" @@ -14,50 +15,51 @@ "sts" "transfer" ]; - } -, boost -, brotli -, bzip2 -, c-ares -, cmake -, crc32c -, curl -, flatbuffers -, gflags -, glog -, google-cloud-cpp -, grpc -, gtest -, libbacktrace -, lz4 -, minio -, ninja -, nlohmann_json -, openssl -, perl -, protobuf -, python3 -, rapidjson -, re2 -, snappy -, sqlite -, thrift -, tzdata -, utf8proc -, which -, zlib -, zstd -, testers -, enableShared ? !stdenv.hostPlatform.isStatic -, enableFlight ? true -, enableJemalloc ? !stdenv.isDarwin -, enableS3 ? true -, enableGcs ? !stdenv.isDarwin + }, + boost, + brotli, + bzip2, + c-ares, + cmake, + crc32c, + curl, + flatbuffers, + gflags, + glog, + google-cloud-cpp, + grpc, + gtest, + libbacktrace, + lz4, + minio, + ninja, + nlohmann_json, + openssl, + perl, + protobuf, + python3, + rapidjson, + re2, + snappy, + sqlite, + thrift, + tzdata, + utf8proc, + which, + zlib, + zstd, + testers, + enableShared ? !stdenv.hostPlatform.isStatic, + enableFlight ? true, + enableJemalloc ? !stdenv.isDarwin, + enableS3 ? true, + enableGcs ? !stdenv.isDarwin, }: -assert lib.asserts.assertMsg - ((enableS3 && stdenv.isDarwin) -> (lib.versionOlder boost.version "1.69" || lib.versionAtLeast boost.version "1.70")) - "S3 on Darwin requires Boost != 1.69"; +assert lib.asserts.assertMsg ( + (enableS3 && stdenv.isDarwin) + -> (lib.versionOlder boost.version "1.69" || lib.versionAtLeast boost.version "1.70") +) "S3 on Darwin requires Boost != 1.69"; let arrow-testing = fetchFromGitHub { @@ -126,38 +128,44 @@ stdenv.mkDerivation (finalAttrs: { autoconf # for vendored jemalloc flatbuffers ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ - boost - brotli - bzip2 - flatbuffers - gflags - glog - gtest - libbacktrace - lz4 - nlohmann_json # alternative JSON parser to rapidjson - protobuf # substrait requires protobuf - rapidjson - re2 - snappy - thrift - utf8proc - zlib - zstd - ] ++ lib.optionals enableFlight [ - grpc - openssl - protobuf - sqlite - ] ++ lib.optionals enableS3 [ aws-sdk-cpp-arrow openssl ] - ++ lib.optionals enableGcs [ - crc32c - curl - google-cloud-cpp - grpc - nlohmann_json - ]; + buildInputs = + [ + boost + brotli + bzip2 + flatbuffers + gflags + glog + gtest + libbacktrace + lz4 + nlohmann_json # alternative JSON parser to rapidjson + protobuf # substrait requires protobuf + rapidjson + re2 + snappy + thrift + utf8proc + zlib + zstd + ] + ++ lib.optionals enableFlight [ + grpc + openssl + protobuf + sqlite + ] + ++ lib.optionals enableS3 [ + aws-sdk-cpp-arrow + openssl + ] + ++ lib.optionals enableGcs [ + crc32c + curl + google-cloud-cpp + grpc + nlohmann_json + ]; preConfigure = '' patchShebangs build-support/ @@ -165,53 +173,57 @@ stdenv.mkDerivation (finalAttrs: { --replace 'discover_tz_dir();' '"${tzdata}/share/zoneinfo";' ''; - cmakeFlags = [ - "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" - "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}" - "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}" - "-DARROW_BUILD_TESTS=ON" - "-DARROW_BUILD_INTEGRATION=ON" - "-DARROW_BUILD_UTILITIES=ON" - "-DARROW_EXTRA_ERROR_CONTEXT=ON" - "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON" - "-DARROW_DEPENDENCY_SOURCE=SYSTEM" - "-Dxsimd_SOURCE=AUTO" - "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}" - "-DARROW_COMPUTE=ON" - "-DARROW_CSV=ON" - "-DARROW_DATASET=ON" - "-DARROW_FILESYSTEM=ON" - "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}" - "-DARROW_HDFS=ON" - "-DARROW_IPC=ON" - "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}" - "-DARROW_JSON=ON" - "-DARROW_USE_GLOG=ON" - "-DARROW_WITH_BACKTRACE=ON" - "-DARROW_WITH_BROTLI=ON" - "-DARROW_WITH_BZ2=ON" - "-DARROW_WITH_LZ4=ON" - "-DARROW_WITH_NLOHMANN_JSON=ON" - "-DARROW_WITH_SNAPPY=ON" - "-DARROW_WITH_UTF8PROC=ON" - "-DARROW_WITH_ZLIB=ON" - "-DARROW_WITH_ZSTD=ON" - "-DARROW_MIMALLOC=ON" - "-DARROW_SUBSTRAIT=ON" - "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}" - "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}" - "-DARROW_S3=${if enableS3 then "ON" else "OFF"}" - "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}" - # Parquet options: - "-DARROW_PARQUET=ON" - "-DPARQUET_BUILD_EXECUTABLES=ON" - "-DPARQUET_REQUIRE_ENCRYPTION=ON" - ] ++ lib.optionals (!enableShared) [ - "-DARROW_TEST_LINKAGE=static" - ] ++ lib.optionals stdenv.isDarwin [ - "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables - ] ++ lib.optionals (!stdenv.isx86_64) [ "-DARROW_USE_SIMD=OFF" ] - ++ lib.optionals enableS3 [ "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h" ]; + cmakeFlags = + [ + "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" + "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}" + "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}" + "-DARROW_BUILD_TESTS=ON" + "-DARROW_BUILD_INTEGRATION=ON" + "-DARROW_BUILD_UTILITIES=ON" + "-DARROW_EXTRA_ERROR_CONTEXT=ON" + "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON" + "-DARROW_DEPENDENCY_SOURCE=SYSTEM" + "-Dxsimd_SOURCE=AUTO" + "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}" + "-DARROW_COMPUTE=ON" + "-DARROW_CSV=ON" + "-DARROW_DATASET=ON" + "-DARROW_FILESYSTEM=ON" + "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}" + "-DARROW_HDFS=ON" + "-DARROW_IPC=ON" + "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}" + "-DARROW_JSON=ON" + "-DARROW_USE_GLOG=ON" + "-DARROW_WITH_BACKTRACE=ON" + "-DARROW_WITH_BROTLI=ON" + "-DARROW_WITH_BZ2=ON" + "-DARROW_WITH_LZ4=ON" + "-DARROW_WITH_NLOHMANN_JSON=ON" + "-DARROW_WITH_SNAPPY=ON" + "-DARROW_WITH_UTF8PROC=ON" + "-DARROW_WITH_ZLIB=ON" + "-DARROW_WITH_ZSTD=ON" + "-DARROW_MIMALLOC=ON" + "-DARROW_SUBSTRAIT=ON" + "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}" + "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}" + "-DARROW_S3=${if enableS3 then "ON" else "OFF"}" + "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}" + # Parquet options: + "-DARROW_PARQUET=ON" + "-DPARQUET_BUILD_EXECUTABLES=ON" + "-DPARQUET_REQUIRE_ENCRYPTION=ON" + ] + ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ] + ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables + ] + ++ lib.optionals (!stdenv.isx86_64) [ "-DARROW_USE_SIMD=OFF" ] + ++ lib.optionals enableS3 [ + "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h" + ]; doInstallCheck = true; ARROW_TEST_DATA = lib.optionalString finalAttrs.doInstallCheck "${arrow-testing}/data"; @@ -219,33 +231,38 @@ stdenv.mkDerivation (finalAttrs: { GTEST_FILTER = let # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11398 - filteredTests = lib.optionals stdenv.hostPlatform.isAarch64 [ - "TestFilterKernelWithNumeric/3.CompareArrayAndFilterRandomNumeric" - "TestFilterKernelWithNumeric/7.CompareArrayAndFilterRandomNumeric" - "TestCompareKernel.PrimitiveRandomTests" - ] ++ lib.optionals enableS3 [ - "S3OptionsTest.FromUri" - "S3RegionResolutionTest.NonExistentBucket" - "S3RegionResolutionTest.PublicBucket" - "S3RegionResolutionTest.RestrictedBucket" - "TestMinioServer.Connect" - "TestS3FS.*" - "TestS3FSGeneric.*" - ] ++ lib.optionals stdenv.isDarwin [ - # TODO: revisit at 12.0.0 or when - # https://github.com/apache/arrow/commit/295c6644ca6b67c95a662410b2c7faea0920c989 - # is available, see - # https://github.com/apache/arrow/pull/15288#discussion_r1071244661 - "ExecPlanExecution.StressSourceSinkStopped" - ]; + filteredTests = + lib.optionals stdenv.hostPlatform.isAarch64 [ + "TestFilterKernelWithNumeric/3.CompareArrayAndFilterRandomNumeric" + "TestFilterKernelWithNumeric/7.CompareArrayAndFilterRandomNumeric" + "TestCompareKernel.PrimitiveRandomTests" + ] + ++ lib.optionals enableS3 [ + "S3OptionsTest.FromUri" + "S3RegionResolutionTest.NonExistentBucket" + "S3RegionResolutionTest.PublicBucket" + "S3RegionResolutionTest.RestrictedBucket" + "TestMinioServer.Connect" + "TestS3FS.*" + "TestS3FSGeneric.*" + ] + ++ lib.optionals stdenv.isDarwin [ + # TODO: revisit at 12.0.0 or when + # https://github.com/apache/arrow/commit/295c6644ca6b67c95a662410b2c7faea0920c989 + # is available, see + # https://github.com/apache/arrow/pull/15288#discussion_r1071244661 + "ExecPlanExecution.StressSourceSinkStopped" + ]; in lib.optionalString finalAttrs.doInstallCheck "-${lib.concatStringsSep ":" filteredTests}"; __darwinAllowLocalNetworking = true; - nativeInstallCheckInputs = [ perl which sqlite ] - ++ lib.optionals enableS3 [ minio ] - ++ lib.optionals enableFlight [ python3 ]; + nativeInstallCheckInputs = [ + perl + which + sqlite + ] ++ lib.optionals enableS3 [ minio ] ++ lib.optionals enableFlight [ python3 ]; installCheckPhase = let @@ -270,7 +287,11 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://arrow.apache.org/docs/cpp/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ tobim veprbl cpcloud ]; + maintainers = with maintainers; [ + tobim + veprbl + cpcloud + ]; pkgConfigModules = [ "arrow" "arrow-acero" @@ -288,7 +309,12 @@ stdenv.mkDerivation (finalAttrs: { ]; }; passthru = { - inherit enableFlight enableJemalloc enableS3 enableGcs; + inherit + enableFlight + enableJemalloc + enableS3 + enableGcs + ; tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; }) From e03058e6fe33039fb0d6a9fadd314d6359384d01 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 9 Jul 2024 22:10:58 +0200 Subject: [PATCH 13/56] arrow-cpp: remove unused input --- pkgs/by-name/ar/arrow-cpp/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 14e6d4968e39..4cec34a0f7f5 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -19,7 +19,6 @@ boost, brotli, bzip2, - c-ares, cmake, crc32c, curl, From 3666c4592b9ffd42490996111cbbf3909e9e8f72 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 9 Jul 2024 22:47:36 +0200 Subject: [PATCH 14/56] arrow-cpp: 16.0.0 -> 17.0.0 --- pkgs/by-name/ar/arrow-cpp/package.nix | 20 ++++++++++--------- .../python-modules/pyarrow/default.nix | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 4cec34a0f7f5..1cc21b5b56dc 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -65,8 +65,8 @@ let name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "25d16511e8d42c2744a1d94d90169e3a36e92631"; - hash = "sha256-fXeWM/8jBfJY7KL6PVfRbzB8i4sp6PHsnMSHCX5kzfI="; + rev = "735ae7128d571398dd798d7ff004adebeb342883"; + hash = "sha256-67KwnSt+EeEDvk+9kxR51tErL2wJqEPRITKb/dN+HMQ="; }; parquet-testing = fetchFromGitHub { @@ -80,14 +80,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; - version = "16.0.0"; + version = "17.0.0"; - src = fetchurl { - url = "mirror://apache/arrow/arrow-${finalAttrs.version}/apache-arrow-${finalAttrs.version}.tar.gz"; - hash = "sha256-n0BRrpRzyXmR2a+AHi+UrjRVBncZyn+QuBN/nppwC40="; + src = fetchFromGitHub { + owner = "apache"; + repo = "arrow"; + rev = "apache-arrow-17.0.0"; + hash = "sha256-ZQqi1RFb4Ey0A0UVCThuIxM7DoFfkLwaeRAc2z8u9so="; }; - sourceRoot = "apache-arrow-${finalAttrs.version}/cpp"; + sourceRoot = "source/cpp"; # versions are all taken from # https://github.com/apache/arrow/blob/apache-arrow-${version}/cpp/thirdparty/versions.txt @@ -110,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: { ARROW_XSIMD_URL = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; - rev = "9.0.1"; - hash = "sha256-onALN6agtrHWigtFlCeefD9CiRZI4Y690XTzy2UDnrk="; + rev = "13.0.0"; + hash = "sha256-qElJYW5QDj3s59L3NgZj5zkhnUMzIP2mBa1sPks3/CE="; }; ARROW_SUBSTRAIT_URL = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index d275e44f649d..5c90ed002745 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - sourceRoot = "apache-arrow-${version}/python"; + sourceRoot = "source/python"; nativeBuildInputs = [ cmake From b63136687006c38e1cc5ea9c57a9466379eea9f1 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Thu, 18 Jul 2024 16:28:33 +0300 Subject: [PATCH 15/56] test.testers: add failing tests for testers.testEqualContents This change adds tests for tests.testEqualContents to demonstrate that the current implementation is failing in some cases. --- pkgs/build-support/testers/test/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix index a815fe63e416..ae7bbe810fa9 100644 --- a/pkgs/build-support/testers/test/default.nix +++ b/pkgs/build-support/testers/test/default.nix @@ -99,19 +99,35 @@ lib.recurseIntoAttrs { }; testEqualContents = lib.recurseIntoAttrs { - happy = testers.testEqualContents { + equalDir = testers.testEqualContents { assertion = "The same directory contents at different paths are recognized as equal"; expected = runCommand "expected" {} '' mkdir -p $out/c echo a >$out/a echo b >$out/b echo d >$out/c/d + echo e >$out/e + chmod a+x $out/e ''; actual = runCommand "actual" {} '' mkdir -p $out/c echo a >$out/a echo b >$out/b echo d >$out/c/d + echo e >$out/e + chmod a+x $out/e + ''; + }; + + equalExe = testers.testEqualContents { + assertion = "The same executable file contents at different paths are recognized as equal"; + expected = runCommand "expected" { } '' + echo test >$out + chmod a+x $out + ''; + actual = runCommand "actual" { } '' + echo test >$out + chmod a+x $out ''; }; From fc5c829532a9a275fe51959b1d0158622ee69ae6 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Thu, 18 Jul 2024 17:01:35 +0300 Subject: [PATCH 16/56] testers.testEqualContents: use diffoscope instead of diffing find output Before this change, testers.testEqualContents implementation had several bugs (e.g. executables at different paths were not considered equal). So we switch to diffoscope that that is designed to handle exactly these kinds of comparisons and gives more insights into the differences in the output. --- pkgs/build-support/testers/default.nix | 27 ++++++++------------------ 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index 516ab90db503..20d2957134c3 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgsLinux, buildPackages, lib, callPackage, runCommand, stdenv, substituteAll, testers }: +{ pkgs, pkgsLinux, buildPackages, diffoscopeMinimal, lib, callPackage, runCommand, stdenv, substituteAll, testers }: # Documentation is in doc/build-helpers/testers.chapter.md { # See https://nixos.org/manual/nixpkgs/unstable/#tester-lycheeLinkCheck @@ -27,33 +27,22 @@ expected, }: runCommand "equal-contents-${lib.strings.toLower assertion}" { inherit assertion actual expected; + nativeBuildInputs = [ diffoscopeMinimal ]; } '' echo "Checking:" - echo "$assertion" - if ! diff -U5 -r "$actual" "$expected" --color=always + printf '%s\n' "$assertion" + if ! diffoscope --no-progress --text-color=always --exclude-directory-metadata=no -- "$actual" "$expected" then echo echo 'Contents must be equal, but were not!' echo echo "+: expected, at $expected" echo "-: unexpected, at $actual" - exit 1 + false else - find "$expected" -type f -executable > expected-executables | sort - find "$actual" -type f -executable > actual-executables | sort - if ! diff -U0 actual-executables expected-executables --color=always - then - echo - echo "Contents must be equal, but some files' executable bits don't match" - echo - echo "+: make this file executable in the actual contents" - echo "-: make this file non-executable in the actual contents" - exit 1 - else - echo "expected $expected and actual $actual match." - echo 'OK' - touch $out - fi + echo "expected $expected and actual $actual match." + echo OK + touch -- "$out" fi ''; From c994033a5e62e17097a87070531e69c6c3ab504f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Wed, 17 Jul 2024 22:32:57 +0200 Subject: [PATCH 17/56] spice-autorandr: add all linux platforms --- pkgs/by-name/sp/spice-autorandr/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sp/spice-autorandr/package.nix b/pkgs/by-name/sp/spice-autorandr/package.nix index bcb063b9dd1a..4e3ba971fd02 100644 --- a/pkgs/by-name/sp/spice-autorandr/package.nix +++ b/pkgs/by-name/sp/spice-autorandr/package.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ dmytrokyrychuk ]; - platforms = [ "x86_64-linux" ]; + platforms = lib.platforms.linux; }; } From 1582bc8f6d189c74fb5a6c2405ff7169badc7161 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jul 2024 08:37:00 +0200 Subject: [PATCH 18/56] python312Packages.tencentcloud-sdk-python: 3.0.1190 -> 3.0.1192 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1190...3.0.1192 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1192/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index a36966aff4b4..95bb690d00b1 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1190"; + version = "3.0.1192"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-bf9WZauTily9V4fKNxQifxUzdbj51rH7LvAogiZmX6U="; + hash = "sha256-gQK8MindCfero/TXPyS3EuhUX9i24kHzJeg9iLYg2qI="; }; build-system = [ setuptools ]; From 5b542c767a8a8423a4768f47e7436522ea78872c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Jul 2024 21:46:52 +0200 Subject: [PATCH 19/56] python312Packages.tencentcloud-sdk-python: 3.0.1192 -> 3.0.1193 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1192...3.0.1193 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1193/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 95bb690d00b1..65893df8ae33 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1192"; + version = "3.0.1193"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-gQK8MindCfero/TXPyS3EuhUX9i24kHzJeg9iLYg2qI="; + hash = "sha256-14WFIGBGnZD8UpcGs9ArKSS3d3tOoOyjyqj/5N0APRU="; }; build-system = [ setuptools ]; From 6d8f17b018e96c50b9a8d545e174bc125676610d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Jul 2024 21:57:40 +0200 Subject: [PATCH 20/56] python312Packages.boto3-stubs: 1.34.144 -> 1.34.145 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index fd5431bdd931..21cf7f9303a0 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.144"; + version = "1.34.145"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-wZ0MQ4bsFg5sBlZ7lgtvfHZazE7UDwHzccjnoLUUUgs="; + hash = "sha256-LRXM/ERAe6rol9OlMfnrCCbiB9cOkvUmjocDE5vsLbo="; }; build-system = [ setuptools ]; From 030bcecac7f640a44469662c7b87fb39e5e48bb7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Jul 2024 21:57:49 +0200 Subject: [PATCH 21/56] python312Packages.botocore-stubs: 1.34.144 -> 1.34.145 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 21a724a5f3a8..af8afca0d46f 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.144"; + version = "1.34.145"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-PrMltLGG6NjknUhc/jg/R4q4wH4PRpDl7pvLb6zuxK8="; + hash = "sha256-abz8DIHu4pTmgdyASbfKKkeo8FELiMBXEPB9um0Hhcc="; }; nativeBuildInputs = [ poetry-core ]; From 95c766ef166947e240e5c253395265f293db34f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 21:24:14 +0000 Subject: [PATCH 22/56] strictdoc: 0.0.57 -> 0.0.58 --- pkgs/by-name/st/strictdoc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix index aa0adea474be..668addd1ab4d 100644 --- a/pkgs/by-name/st/strictdoc/package.nix +++ b/pkgs/by-name/st/strictdoc/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "strictdoc"; - version = "0.0.57"; + version = "0.0.58"; pyproject = true; src = fetchFromGitHub { owner = "strictdoc-project"; repo = "strictdoc"; rev = "refs/tags/${version}"; - hash = "sha256-1zURXE3y6um1wYu4Di7G4mrU5sl9QIY1HKEQlni+aEg="; + hash = "sha256-0X74Lv25pUdOUgQzqQU6p+fjuxhC/JqfKEFI7c5t67U="; }; nativeBuildInputs = [ From f5e6e1135b229ca0ccf2db156758670f4a2937a0 Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 27 Jun 2024 14:58:25 +0200 Subject: [PATCH 23/56] quirc: Use dylib with absolute install name on Darwin Updated the vendored patch to disable building of Linux specific demos on Darwin to be able to use fetchpatch for upstream-accepted patches and hopefully to make the next version bump not require figuring out what to do with the patch. --- ...mos.patch => 0001-Don-t-build-demos.patch} | 27 ++++++++++---- pkgs/tools/graphics/quirc/default.nix | 37 ++++++++++++------- 2 files changed, 43 insertions(+), 21 deletions(-) rename pkgs/tools/graphics/quirc/{0001-dont-build-demos.patch => 0001-Don-t-build-demos.patch} (54%) diff --git a/pkgs/tools/graphics/quirc/0001-dont-build-demos.patch b/pkgs/tools/graphics/quirc/0001-Don-t-build-demos.patch similarity index 54% rename from pkgs/tools/graphics/quirc/0001-dont-build-demos.patch rename to pkgs/tools/graphics/quirc/0001-Don-t-build-demos.patch index 5e11a5207508..0b52417b45c4 100644 --- a/pkgs/tools/graphics/quirc/0001-dont-build-demos.patch +++ b/pkgs/tools/graphics/quirc/0001-Don-t-build-demos.patch @@ -1,8 +1,17 @@ +From 7435b2e12c2004cb0c497ff313288902f2a6f39a Mon Sep 17 00:00:00 2001 +From: toonn +Date: Fri, 19 Jul 2024 21:53:58 +0200 +Subject: [PATCH] Don't build demos + +--- + Makefile | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + diff --git a/Makefile b/Makefile -index 2d5b745..ecef988 100644 +index 8327b4e..7901cc5 100644 --- a/Makefile +++ b/Makefile -@@ -37,7 +37,7 @@ DEMO_UTIL_OBJ = \ +@@ -45,7 +45,7 @@ DEMO_UTIL_OBJ = \ OPENCV_CFLAGS := $(shell pkg-config --cflags opencv4 2>&1) OPENCV_LIBS = $(shell pkg-config --libs opencv4) @@ -11,19 +20,23 @@ index 2d5b745..ecef988 100644 .PHONY: all v4l sdl opencv install uninstall clean -@@ -85,14 +85,11 @@ libquirc.so.$(LIB_VERSION): $(LIB_OBJ) +@@ -93,15 +93,12 @@ libquirc.$(VERSIONED_LIB_SUFFIX): $(LIB_OBJ) .cxx.o: $(CXX) $(QUIRC_CXXFLAGS) -o $@ -c $< --install: libquirc.a libquirc.so.$(LIB_VERSION) quirc-demo quirc-scanner -+install: libquirc.a libquirc.so.$(LIB_VERSION) +-install: libquirc.a libquirc.$(LIB_SUFFIX) quirc-demo quirc-scanner ++install: libquirc.a libquirc.$(LIB_SUFFIX) install -o root -g root -m 0644 lib/quirc.h $(DESTDIR)$(PREFIX)/include install -o root -g root -m 0644 libquirc.a $(DESTDIR)$(PREFIX)/lib - install -o root -g root -m 0755 libquirc.so.$(LIB_VERSION) \ + install -o root -g root -m 0755 libquirc.$(VERSIONED_LIB_SUFFIX) \ $(DESTDIR)$(PREFIX)/lib + cp -d libquirc.$(LIB_SUFFIX) $(DESTDIR)$(PREFIX)/lib - install -o root -g root -m 0755 quirc-demo $(DESTDIR)$(PREFIX)/bin - # install -o root -g root -m 0755 quirc-demo-opencv $(DESTDIR)$(PREFIX)/bin - install -o root -g root -m 0755 quirc-scanner $(DESTDIR)$(PREFIX)/bin uninstall: - rm -f $(DESTDIR)$(PREFIX)/include/quirc.h \ No newline at end of file + rm -f $(DESTDIR)$(PREFIX)/include/quirc.h +-- +2.42.2 + diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index 12bc652cd02d..938b9c37872f 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, SDL_gfx, SDL, libjpeg, libpng, opencv -, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch2, SDL_gfx, SDL, libjpeg, libpng +, opencv, pkg-config }: stdenv.mkDerivation (finalAttrs: { pname = "quirc"; @@ -25,29 +25,38 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" ]; env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL}/include/SDL -I${SDL_gfx}/include/SDL"; - # Disable building of linux-only demos on darwin systems - patches = lib.optionals stdenv.isDarwin [ ./0001-dont-build-demos.patch ]; - - buildPhase = lib.optionalString stdenv.isDarwin '' - runHook preBuild - make libquirc.so - make qrtest - runHook postBuild - ''; + patches = [ + (fetchpatch2 { + url = "https://github.com/dlbeer/quirc/commit/2c350d8aaf37246e538a2c93b2cce8c78600d2fc.patch?full_index=1"; + hash = "sha256-ZTcy/EoOBoyOjtXjmT+J/JcbX8lxGKmbWer23lymbWo="; + }) + (fetchpatch2 { + url = "https://github.com/dlbeer/quirc/commit/257c6c94d99960819ecabf72199e5822f60a3bc5.patch?full_index=1"; + hash = "sha256-WLQK7vy34VmgJzppTnRjAcZoSGWVaXQSaGq9An8W0rw="; + }) + ] ++ lib.optionals stdenv.isDarwin [ + # Disable building of linux-only demos on darwin systems + ./0001-Don-t-build-demos.patch + ]; preInstall = '' mkdir -p "$out"/{bin,lib,include} # install all binaries - find -maxdepth 1 -type f -executable ! -name '*.so.*' | xargs cp -t "$out"/bin + find -maxdepth 1 -type f -executable ! -name '*.so.*' ! -name '*.dylib' \ + | xargs cp -t "$out"/bin ''; postInstall = '' # don't install static library rm $out/lib/libquirc.a - + '' + (if stdenv.isDarwin then '' + # Set absolute install name to avoid the need for DYLD_LIBRARY_PATH + dylib=$out/lib/libquirc.${finalAttrs.version}.dylib + ${stdenv.cc.targetPrefix}install_name_tool -id "$dylib" "$dylib" + '' else '' ln -s $out/lib/libquirc.so.* $out/lib/libquirc.so - ''; + ''); meta = { description = "Small QR code decoding library"; From 9c3675fb65052d07ee2b59644209c298b3b667f2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 19 Jul 2024 23:40:51 +0200 Subject: [PATCH 24/56] vimPlugins.cmake-tools-nvim: add plenary dependency https://github.com/Civitasv/cmake-tools.nvim?tab=readme-ov-file#sparkles-installation --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 6cf4dca3ddf7..0aa89541ed2f 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -226,6 +226,10 @@ ''; }; + cmake-tools-nvim = super.cmake-tools-nvim.overrideAttrs { + dependencies = with self; [ plenary-nvim ]; + }; + cmp-ai = super.cmp-ai.overrideAttrs { dependencies = with self; [ nvim-cmp plenary-nvim ]; }; From 85e7aa50be8a9d19815d070d57a8b5d01b820d79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 23:49:22 +0000 Subject: [PATCH 25/56] srm-cuarzo: 0.6.1-1 -> 0.6.3-1 --- pkgs/by-name/sr/srm-cuarzo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index a1c3c741d30e..ce1e7bd2787c 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.6.1-1"; + version = "0.6.3-1"; rev = "v${self.version}"; - hash = "sha256-jc5JnVNaVw3nBlBUss4IjBnPGVSkImKPfLb/XMsKOg8="; + hash = "sha256-nQucfh/Eri2BM70NFYqJQnBgVlHO/5eNHVFX/6RYoZA="; src = fetchFromGitHub { inherit (self) rev hash; From 16bc3e48ab0fb6de1425a488df4cb6c5890de840 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 00:11:31 +0000 Subject: [PATCH 26/56] haven-cli: 4.0.0 -> 4.0.2 --- pkgs/applications/blockchains/haven-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index 4e0ae70425a2..32ec63a3f8cc 100644 --- a/pkgs/applications/blockchains/haven-cli/default.nix +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "haven-cli"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "haven-protocol-org"; repo = "haven-main"; rev = "v${version}"; - hash = "sha256-craPgQtavSatoVzduIQCWuakIBeXWFWa9E0ALau4AcI="; + hash = "sha256-XjRxpUW7NC12T5G7fol4avWLJDOOawxJbAHOp5eZ0Fk="; fetchSubmodules = true; }; From 151fad4485c129c01ed9733cde111bbeac64eb3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 00:32:01 +0000 Subject: [PATCH 27/56] emacsPackages.lspce: 1.1.0-unstable-2024-07-13 -> 1.1.0-unstable-2024-07-14 --- .../emacs/elisp-packages/manual-packages/lspce/module.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix index 10f25af5ba40..1a1f8612f64e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage { pname = "lspce-module"; - version = "1.1.0-unstable-2024-07-13"; + version = "1.1.0-unstable-2024-07-14"; src = fetchFromGitHub { owner = "zbelial"; repo = "lspce"; - rev = "01b77a4f544a912409857083842db51a20bfdbf3"; - hash = "sha256-oew5EujNYGjk/agBw3ECAVe7GZl8rw/4M5t32JM+1T8="; + rev = "fd320476df89cfd5d10f1b70303c891d3b1e3c81"; + hash = "sha256-KnERYq/CvJhJIdQkpH/m82t9KFMapPl+CyZkYyujslU="; }; - cargoHash = "sha256-YLcSaFHsm/Iw7Q3y/YkfdbYKUPW0DRmaZnZ1A9vKR14="; + cargoHash = "sha256-I2OobRu1hc6xc4bRrIO1FImPYBbFy1jXPcTsivbbskk="; checkFlags = [ # flaky test From 1a94e0f389b1e68eb3c172ca082eb3ffac25bc88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 01:11:31 +0000 Subject: [PATCH 28/56] python312Packages.app-model: 0.2.7 -> 0.2.8 --- pkgs/development/python-modules/app-model/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix index bf2130e22417..da4854d547b0 100644 --- a/pkgs/development/python-modules/app-model/default.nix +++ b/pkgs/development/python-modules/app-model/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "app-model"; - version = "0.2.7"; + version = "0.2.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "app-model"; rev = "refs/tags/v${version}"; - hash = "sha256-ISMSt7c8CoxffMhg7XC/ebKkgXFTBihDr1fGkqMCBoc="; + hash = "sha256-vGSFo2ZckIDI3TjBSTKZagTEYdILt1/5Wyws3P7FNiQ="; }; build-system = [ From 5f1a5c1383c38c2894c639bedc6cbfc9f5314ffc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 01:14:31 +0000 Subject: [PATCH 29/56] python312Packages.lmfit: 1.3.1 -> 1.3.2 --- pkgs/development/python-modules/lmfit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix index f62cdc60622d..926944ee55e3 100644 --- a/pkgs/development/python-modules/lmfit/default.nix +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "lmfit"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vDhiRK29EO8aKixPnRez3vkFVSwKZK74VPCtRswwnMU="; + hash = "sha256-Mb7q4fAnwbjBTc1/LoSIqAt1+zied/ymd1Sb3C/ll7s="; }; postPatch = '' From b40d043d5a2a1fb473f1c6c853dac444ceadab62 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Thu, 18 Jul 2024 18:34:26 +0300 Subject: [PATCH 30/56] test.testers: update tests for testers.testEqualContents Updates tests for testers.testEqualContents with diffoscope and fixes some bugs in tests (e.g. fileDiff always succeed because subshell does not inherit errexit option). --- pkgs/build-support/testers/test/default.nix | 214 ++++++++++---------- 1 file changed, 108 insertions(+), 106 deletions(-) diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix index ae7bbe810fa9..8e8886342f1e 100644 --- a/pkgs/build-support/testers/test/default.nix +++ b/pkgs/build-support/testers/test/default.nix @@ -1,4 +1,4 @@ -{ testers, lib, pkgs, hello, runCommand, ... }: +{ testers, lib, pkgs, hello, runCommand, emptyFile, emptyDirectory, ... }: let pkgs-with-overlay = pkgs.extend(final: prev: { proof-of-overlay-hello = prev.hello; @@ -101,131 +101,133 @@ lib.recurseIntoAttrs { testEqualContents = lib.recurseIntoAttrs { equalDir = testers.testEqualContents { assertion = "The same directory contents at different paths are recognized as equal"; - expected = runCommand "expected" {} '' - mkdir -p $out/c - echo a >$out/a - echo b >$out/b - echo d >$out/c/d - echo e >$out/e - chmod a+x $out/e + expected = runCommand "expected" { } '' + mkdir -p -- "$out/c" + echo a >"$out/a" + echo b >"$out/b" + echo d >"$out/c/d" + echo e >"$out/e" + chmod a+x -- "$out/e" ''; - actual = runCommand "actual" {} '' - mkdir -p $out/c - echo a >$out/a - echo b >$out/b - echo d >$out/c/d - echo e >$out/e - chmod a+x $out/e + actual = runCommand "actual" { } '' + mkdir -p -- "$out/c" + echo a >"$out/a" + echo b >"$out/b" + echo d >"$out/c/d" + echo e >"$out/e" + chmod a+x -- "$out/e" ''; }; + fileMissing = testers.testBuildFailure ( + testers.testEqualContents { + assertion = "Directories with different file list are not recognized as equal"; + expected = runCommand "expected" { } '' + mkdir -p -- "$out/c" + echo a >"$out/a" + echo b >"$out/b" + echo d >"$out/c/d" + ''; + actual = runCommand "actual" { } '' + mkdir -p -- "$out/c" + echo a >"$out/a" + echo d >"$out/c/d" + ''; + } + ); + equalExe = testers.testEqualContents { assertion = "The same executable file contents at different paths are recognized as equal"; expected = runCommand "expected" { } '' - echo test >$out - chmod a+x $out + echo test >"$out" + chmod a+x -- "$out" ''; actual = runCommand "actual" { } '' - echo test >$out - chmod a+x $out + echo test >"$out" + chmod a+x -- "$out" ''; }; - unequalExe = - runCommand "testEqualContents-unequalExe" { - log = testers.testBuildFailure (testers.testEqualContents { - assertion = "The same directory contents at different paths are recognized as equal"; - expected = runCommand "expected" {} '' - mkdir -p $out/c - echo a >$out/a - chmod a+x $out/a - echo b >$out/b - echo d >$out/c/d - ''; - actual = runCommand "actual" {} '' - mkdir -p $out/c - echo a >$out/a - echo b >$out/b - chmod a+x $out/b - echo d >$out/c/d - ''; - }); - } '' - ( - set -x - grep -F -- "executable bits don't match" $log/testBuildFailure.log - grep -E -- '+.*-actual/a' $log/testBuildFailure.log - grep -E -- '-.*-actual/b' $log/testBuildFailure.log - grep -F -- "--- actual-executables" $log/testBuildFailure.log - grep -F -- "+++ expected-executables" $log/testBuildFailure.log - ) || { - echo "Test failed: could not find pattern in build log $log" - exit 1 - } - echo 'All good.' - touch $out - ''; + unequalExe = testers.testBuildFailure ( + testers.testEqualContents { + assertion = "Different file mode bits are not recognized as equal"; + expected = runCommand "expected" { } '' + touch -- "$out" + chmod a+x -- "$out" + ''; + actual = runCommand "actual" { } '' + touch -- "$out" + ''; + } + ); + + unequalExeInDir = testers.testBuildFailure ( + testers.testEqualContents { + assertion = "Different file mode bits are not recognized as equal in directory"; + expected = runCommand "expected" { } '' + mkdir -p -- "$out/a" + echo b >"$out/b" + chmod a+x -- "$out/b" + ''; + actual = runCommand "actual" { } '' + mkdir -p -- "$out/a" + echo b >"$out/b" + ''; + } + ); + + nonExistentPath = testers.testBuildFailure ( + testers.testEqualContents { + assertion = "Non existent paths are not recognized as equal"; + expected = "${emptyDirectory}/foo"; + actual = "${emptyDirectory}/bar"; + } + ); + + emptyFileAndDir = testers.testBuildFailure ( + testers.testEqualContents { + assertion = "Empty file and directory are not recognized as equal"; + expected = emptyFile; + actual = emptyDirectory; + } + ); fileDiff = - runCommand "testEqualContents-fileDiff" { - log = testers.testBuildFailure (testers.testEqualContents { - assertion = "The same directory contents at different paths are recognized as equal"; - expected = runCommand "expected" {} '' - mkdir -p $out/c - echo a >$out/a - echo b >$out/b - echo d >$out/c/d - ''; - actual = runCommand "actual" {} '' - mkdir -p $out/c - echo a >$out/a - echo B >$out/b - echo d >$out/c/d - ''; - }); - } '' + let + log = testers.testBuildFailure ( + testers.testEqualContents { + assertion = "Different files are not recognized as equal in subdirectories"; + expected = runCommand "expected" { } '' + mkdir -p -- "$out/b" + echo a >"$out/a" + echo EXPECTED >"$out/b/c" + ''; + actual = runCommand "actual" { } '' + mkdir -p "$out/b" + echo a >"$out/a" + echo ACTUAL >"$out/b/c" + ''; + } + ); + in + runCommand "testEqualContents-fileDiff" { inherit log; } '' ( set -x - grep -F -- "Contents must be equal but were not" $log/testBuildFailure.log - grep -E -- '+++ .*-actual/b' $log/testBuildFailure.log - grep -E -- '--- .*-actual/b' $log/testBuildFailure.log - grep -F -- "-B" $log/testBuildFailure.log - grep -F -- "+b" $log/testBuildFailure.log + # Note: use `&&` operator to chain commands because errexit (set -e) + # does not work in this context (even when set explicitly and with + # inherit_errexit), otherwise the subshell exits with the status of + # the last run command and ignores preceding failures. + grep -F -- 'Contents must be equal, but were not!' "$log/testBuildFailure.log" && + grep -E -- '\+\+\+ .*-expected/b/c' "$log/testBuildFailure.log" && + grep -E -- '--- .*-actual/b/c' "$log/testBuildFailure.log" && + grep -F -- -ACTUAL "$log/testBuildFailure.log" && + grep -F -- +EXPECTED "$log/testBuildFailure.log" ) || { echo "Test failed: could not find pattern in build log $log" - exit 1 + false } echo 'All good.' - touch $out - ''; - - fileMissing = - runCommand "testEqualContents-fileMissing" { - log = testers.testBuildFailure (testers.testEqualContents { - assertion = "The same directory contents at different paths are recognized as equal"; - expected = runCommand "expected" {} '' - mkdir -p $out/c - echo a >$out/a - echo b >$out/b - echo d >$out/c/d - ''; - actual = runCommand "actual" {} '' - mkdir -p $out/c - echo a >$out/a - echo d >$out/c/d - ''; - }); - } '' - ( - set -x - grep -F -- "Contents must be equal but were not" $log/testBuildFailure.log - grep -E -- 'Only in .*-expected: b' $log/testBuildFailure.log - ) || { - echo "Test failed: could not find pattern in build log $log" - exit 1 - } - echo 'All good.' - touch $out + touch -- "$out" ''; }; } From ee12a84c708ec8809e37c3b22e9418848cd53c32 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Sat, 20 Jul 2024 04:41:16 +0300 Subject: [PATCH 31/56] .github/labeler.yml: add pkgs/build-support/testers/** --- .github/labeler.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index a233749e74d7..2e7ad654d79b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -345,6 +345,7 @@ # *developed in this repo*; # - not individual tests # - not packages for test frameworks + - pkgs/build-support/testers/** - nixos/lib/testing/** - nixos/lib/test-driver/** - nixos/tests/nixos-test-driver/** From bb1b6afbe28c0b89f6d92df7a488eee40b4c0989 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 02:04:06 +0000 Subject: [PATCH 32/56] mark: 9.12.0 -> 9.13.0 --- pkgs/tools/text/mark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index 5d1517b28337..2f6dbcb1c2e3 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "9.12.0"; + version = "9.13.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-GbtwC361BI02mI1xzwdH9iqTIrY5ItiAKfZ7C3uk5ms="; + sha256 = "sha256-Y3mvseVIvKFuHuY7bSRAzbiAfa6lGYk1PfdhSiG6Is8="; }; - vendorHash = "sha256-3OTHHhRgY9N6l6GXN6HCbmPAgpXyfyJ/3KAZWLltz24="; + vendorHash = "sha256-DMjT4ja6yUaetTc+AHJBqf9hRU2KpE0+LGX36NgHzqU="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From 510ff7e57879d63060180f20728a863be3a01fd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 05:48:09 +0000 Subject: [PATCH 33/56] beanhub-cli: 1.2.2 -> 1.2.3 --- pkgs/development/python-modules/beanhub-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix index 61d95d881245..98b5c8faed11 100644 --- a/pkgs/development/python-modules/beanhub-cli/default.nix +++ b/pkgs/development/python-modules/beanhub-cli/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "beanhub-cli"; - version = "1.2.2"; + version = "1.2.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-cli"; rev = "refs/tags/${version}"; - hash = "sha256-ZN384KN6+pkDDsCk825sr+LsArQ5Vaf09ASLN8IemhM="; + hash = "sha256-oHlI3hloquD86fHr3AgwW5SqKxUw2gphP76wi6mCy44="; }; build-system = [ poetry-core ]; From 4408f22cc95ef3b904646f0548bdcd36a10a51e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 02:40:19 +0000 Subject: [PATCH 34/56] python312Packages.gtts: 2.5.1 -> 2.5.2 --- pkgs/development/python-modules/gtts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index c4fc265a14fb..a2533376cc5f 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.5.1"; - format = "pyproject"; + version = "2.5.2"; + pyproject = true; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "refs/tags/v${version}"; - hash = "sha256-CCxD73fpHGsO4zSifWLQtgDkbPvPEnA2357umhOCNoI="; + hash = "sha256-4GIrj5pIk27euo2gzSKpRQaXNyI6aH0E6HNAivJthCE="; }; build-system = [ setuptools ]; From e4df72e3287eab32cc4437661cfb3ff1608306e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 08:13:25 +0000 Subject: [PATCH 35/56] python312Packages.quaternion: 2023.0.3 -> 2023.0.4 --- pkgs/development/python-modules/quaternion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/quaternion/default.nix b/pkgs/development/python-modules/quaternion/default.nix index fac428090a51..0a109427b8ed 100644 --- a/pkgs/development/python-modules/quaternion/default.nix +++ b/pkgs/development/python-modules/quaternion/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "quaternion"; - version = "2023.0.3"; + version = "2023.0.4"; format = "pyproject"; src = fetchFromGitHub { owner = "moble"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vSkFHYXcT14aW3OTfqYymVQbpWnKFEVkhh3IQTi5xS4="; + hash = "sha256-i+UPi+DrhItplfc6EvDhmr3CEH2/cHODoHVBElM7jY8="; }; propagatedBuildInputs = [ From a978b3f9bb5ca6028bdfa3732afa69265d8be9ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 09:52:07 +0000 Subject: [PATCH 36/56] python312Packages.cohere: 5.6.0 -> 5.6.1 --- pkgs/development/python-modules/cohere/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 3a94a3e70cb3..bdddf54820ee 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.6.0"; + version = "5.6.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "cohere-ai"; repo = "cohere-python"; rev = "refs/tags/${version}"; - hash = "sha256-zv4zSUQzt2jjuKumaV5vI3GbhZWKEjALohfuxQp6i7Q="; + hash = "sha256-uHUCU3vZAvP14+TJcuHffeclTRJ8hc+aqtOfvTRlfa4="; }; build-system = [ poetry-core ]; From 2e0e46fd3848a9d5b5a3e3eff818cba7d10daa24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 12:03:11 +0000 Subject: [PATCH 37/56] bemenu: 0.6.22 -> 0.6.23 --- pkgs/applications/misc/bemenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index d00314d81f04..3e53137ab5e1 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bemenu"; - version = "0.6.22"; + version = "0.6.23"; src = fetchFromGitHub { owner = "Cloudef"; repo = "bemenu"; rev = finalAttrs.version; - hash = "sha256-wdOrVX4AgGXySlwmqFRp9OWoSkEYBIZumBGTrFfyNpg="; + hash = "sha256-0vpqJ2jydTt6aVni0ma0g+80PFz+C4xJ5M77sMODkSg="; }; strictDeps = true; From 32cc50a240ee8badcd62f0d4e9a128a8694a9c1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 12:10:30 +0000 Subject: [PATCH 38/56] kubernetes-helmPlugins.helm-git: 0.17.0 -> 1.3.0 --- .../applications/networking/cluster/helm/plugins/helm-git.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index e6f7508cced8..ab4a912aab29 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "helm-git"; - version = "0.17.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "aslafy-z"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vzDSuWaq3ShKz1ckv3BxQtu8tR3QKl0xhcO5IZDbgps="; + sha256 = "sha256-o9y1C4O1uG2Z7f3kCEoK1tSmSuQh1zJxB/CZBv/GPus="; }; nativeBuildInputs = [ makeWrapper ]; From 7fd39bfeb3985731de890627c707539eed610857 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 12:25:39 +0000 Subject: [PATCH 39/56] python312Packages.python-smarttub: 0.0.36 -> 0.0.37 --- pkgs/development/python-modules/python-smarttub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index a16246c4331a..928dd5f4a2a2 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.36"; + version = "0.0.37"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mdz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cng19NW5Eq3arysl0B3dfK2Hy6lQFBFh7g2hxvxeklU="; + hash = "sha256-Dy7Nsq3qhVWb9W6ledD+Gq3fMQ/qLsxGmTBB+AQ5IZc="; }; propagatedBuildInputs = [ From 28922c4421b4a8d8f583913607da4f6db59e65a2 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 20 Jul 2024 09:47:25 -0400 Subject: [PATCH 40/56] incus: fix OVMF path backward compatibility incus 6.3.0 changed the OVMF path, but our module needs to support LTS as well. Also move the newer OCI deps to be conditional on version. --- nixos/modules/virtualisation/incus.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 8cb42adc0368..f4c904ff670c 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -44,19 +44,21 @@ let qemu-utils qemu_kvm rsync - skopeo squashfs-tools-ng squashfsTools sshfs swtpm systemd thin-provisioning-tools - umoci util-linux virtiofsd xdelta xz ] + ++ lib.optionals (lib.versionAtLeast cfg.package.version "6.3.0") [ + skopeo + umoci + ] ++ lib.optionals config.security.apparmor.enable [ apparmor-bin-utils @@ -111,10 +113,11 @@ let environment = lib.mkMerge [ { INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; - INCUS_EDK2_PATH = ovmf; INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids"; PATH = lib.mkForce serverBinPath; } + (lib.mkIf (lib.versionOlder cfg.package.version "6.3.0") { INCUS_OVMF_PATH = ovmf; }) + (lib.mkIf (lib.versionAtLeast cfg.package.version "6.3.0") { INCUS_EDK2_PATH = ovmf; }) (lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; }) ]; From 321c7fffaa8cb500da8166a73d57a09a07531c45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 15:40:33 +0000 Subject: [PATCH 41/56] python312Packages.formulae: 0.5.3 -> 0.5.4 --- pkgs/development/python-modules/formulae/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/formulae/default.nix b/pkgs/development/python-modules/formulae/default.nix index 526be820c131..57c26378761f 100644 --- a/pkgs/development/python-modules/formulae/default.nix +++ b/pkgs/development/python-modules/formulae/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "formulae"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bambinos"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-A0CI0bpoRYFAcPiNAf5haQu9BEqmBgxF7HfIl4qcML0="; + hash = "sha256-SSyQa7soIp+wSXX5wek9LG95q7J7K34mztzx01lPiWo="; }; nativeBuildInputs = [ From cd57bc844b5e542b3f9319c0078ab2fe2687ab2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 15:51:28 +0000 Subject: [PATCH 42/56] python312Packages.tplink-omada-client: 1.4.0 -> 1.4.1 --- .../python-modules/tplink-omada-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index f534eb40ac50..22a136daddcd 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-P7kb8gzPjRwl6KpKbh/k7QqjGU6m+HVBbMCuoabG+5M="; + hash = "sha256-2YGUm37i3gAKXLygtjLYVB+kGk0+84pY70CUyU3BzbY="; }; build-system = [ hatchling ]; From 700c95c3ce77335bbbca0b91bb7c94f4a776d156 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 15:56:10 +0000 Subject: [PATCH 43/56] tui-journal: 0.9.0 -> 0.9.1 --- pkgs/applications/misc/tui-journal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index 4af9f8e2559a..d861601364e1 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-FAN0F54cCEfqoSr1La+X+et5MGTzB2Wb466Xr8eyeiI="; + hash = "sha256-GmLhBlNHVyO0oUvjOBpTEqQiPYZ68MdgwAqt9v2oMdU="; }; - cargoHash = "sha256-y6gAv4Xf0yxpbOAdYhp3nDBH8skiyAI10+Ylz/uxf7w="; + cargoHash = "sha256-+5rWjq3/0xfJ5Nbq0kReombuaJkcFmHoqVzzQ4x68Hc="; nativeBuildInputs = [ pkg-config From 1456a3e237209732a405880298514a40b1b74bca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 16:02:15 +0000 Subject: [PATCH 44/56] wstunnel: 9.7.2 -> 9.7.4 --- pkgs/by-name/ws/wstunnel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index 4beeef570eff..42b58649493e 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -7,7 +7,7 @@ }: let - version = "9.7.2"; + version = "9.7.4"; in rustPlatform.buildRustPackage { @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage { owner = "erebe"; repo = "wstunnel"; rev = "v${version}"; - hash = "sha256-5hpkY8MoSo59KmhXsPuLCmWq4KaUzuHBpesQMtgn7hw="; + hash = "sha256-OFm0Jk06Mxzr4F7KrMBGFqcDSuTtrMvBSK99bbOgua4="; }; - cargoHash = "sha256-kv+DX98SjI3m2CdM4RHoMMISZyrFmlhlSaBor0dFUSE="; + cargoHash = "sha256-JMRcXuw6AKfwViOgYAgFdSwUeTo04rEkKj+t+W8wjGI="; checkFlags = [ # Tries to launch a test container From a174092571796e7c624b9bca4161a0ec50cb303d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 20 Jul 2024 19:45:55 +0200 Subject: [PATCH 45/56] vscode-extensions.charliermarsh.ruff: 2024.4.0 -> 2024.34.0 --- .../extensions/charliermarsh.ruff/default.nix | 44 +++++++++++++++++++ .../editors/vscode/extensions/default.nix | 38 +--------------- 2 files changed, 45 insertions(+), 37 deletions(-) create mode 100644 pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix new file mode 100644 index 000000000000..d54b702e5175 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix @@ -0,0 +1,44 @@ +{ + stdenvNoCC, + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = + let + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + hash = "sha256-KiCTJbLDut0Az7BmcYPQbFweT94RWnsE+JYvqVZ2P7s="; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + hash = "sha256-Szy+bE/42cNzcEa2yKCyvxr5OBqH2dPVgJnCS57z3nY="; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + hash = "sha256-Bw1gdrb40baSXdrIgM0tlCLa18aGpRv1q7YN5wJRjNs="; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + hash = "sha256-xcHL/2dliPD69mNEsbEpbtn5QLV1P3gqu9ftDOn58qM="; + }; + }; + in + { + name = "ruff"; + publisher = "charliermarsh"; + version = "2024.34.0"; + } + // sources.${stdenvNoCC.system} or (throw "Unsupported system ${stdenvNoCC.system}"); + + meta = { + license = lib.licenses.mit; + changelog = "https://marketplace.visualstudio.com/items/charliermarsh.ruff/changelog"; + description = "Visual Studio Code extension with support for the Ruff linter"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff"; + homepage = "https://github.com/astral-sh/ruff-vscode"; + maintainers = [ lib.maintainers.azd325 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c047d5aa742c..1353e1307970 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -887,43 +887,7 @@ let }; }; - charliermarsh.ruff = buildVscodeMarketplaceExtension { - mktplcRef = - let - sources = { - "x86_64-linux" = { - arch = "linux-x64"; - hash = "sha256-2c0tH/MlDOqeyffcV8ZCy4woogBTcf1GCuPPO8JXaWc="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-euvGIlO7931N56R5BWKu3F9nSEoDgf+DXk7Hgl1qSUw="; - }; - "aarch64-linux" = { - arch = "linux-arm64"; - hash = "sha256-dGpIHChnfrQbxRZDuoAi4imgStyyPdxdvTQ3lknMYu0="; - }; - "aarch64-darwin" = { - arch = "darwin-arm64"; - hash = "sha256-tElX4C0I5AmpxSHMtqOsxSAUImD1tqArB5fnvhw4LFc="; - }; - }; - in - { - name = "ruff"; - publisher = "charliermarsh"; - version = "2024.4.0"; - } - // sources.${stdenv.system} or (throw "Unsupported system ${stdenv.system}"); - meta = { - license = lib.licenses.mit; - changelog = "https://marketplace.visualstudio.com/items/charliermarsh.ruff/changelog"; - description = "Visual Studio Code extension with support for the Ruff linter"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff"; - homepage = "https://github.com/astral-sh/ruff-vscode"; - maintainers = [ lib.maintainers.azd325 ]; - }; - }; + charliermarsh.ruff = callPackage ./charliermarsh.ruff { }; cameron.vscode-pytest = buildVscodeMarketplaceExtension { mktplcRef = { From 914c26bf0889b105f48c7e2c4c43771891f1438a Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Sat, 20 Jul 2024 14:40:58 +0200 Subject: [PATCH 46/56] maintainers: add amadejkastelic --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 87051d27b230..1f25d3342016 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1085,6 +1085,12 @@ name = "alyaeanyx"; keys = [ { fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; } ]; }; + amadejkastelic = { + email = "amadejkastelic7@gmail.com"; + github = "amadejkastelic"; + githubId = 26391003; + name = "Amadej Kastelic"; + }; aman9das = { email = "amandas62640@gmail.com"; github = "Aman9das"; From 4e7c116a912a45576c728cdd45e9d529755d8f05 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Sat, 20 Jul 2024 14:43:20 +0200 Subject: [PATCH 47/56] vscode-extensions.ms-python.flake8: init at 2023.10.0 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 66b3362cc9c4..1cff0aca05eb 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3190,6 +3190,23 @@ let }; }; + ms-python.flake8 = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "flake8"; + publisher = "ms-python"; + version = "2023.10.0"; + hash = "sha256-4Vjw8yJPrxLg0hcoTw8AEBEcmQ9sEUNqFaHLxICks0E="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-python.flake8/changelog"; + description = "Python linting support for VS Code using Flake8"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.flake8"; + homepage = "https://github.com/microsoft/vscode-flake8"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.amadejkastelic ]; + }; + }; + ms-python.isort = buildVscodeMarketplaceExtension { mktplcRef = { name = "isort"; From 612f04e5592f3f417e3cbd1dc06994674b80b8f0 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Sat, 20 Jul 2024 14:47:48 +0200 Subject: [PATCH 48/56] vscode-extensions.ms-python.pylint: init at 2023.10.1 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1cff0aca05eb..2dc5bb749f69 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3223,6 +3223,23 @@ let }; }; + ms-python.pylint = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pylint"; + publisher = "ms-python"; + version = "2023.10.1"; + hash = "sha256-1tI5u33c5CHFQxkJZ/OxW3ZA5qPr4RoCIf6dqIMPykQ="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-python.pylint/changelog"; + description = "Python linting support for VS Code using Pylint"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.pylint"; + homepage = "https://github.com/microsoft/vscode-pylint"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.amadejkastelic ]; + }; + }; + ms-python.python = callPackage ./ms-python.python { }; ms-python.debugpy = buildVscodeMarketplaceExtension { From 2a8375b956a0777735df1b341a0853a55c58bfcf Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Sat, 20 Jul 2024 14:49:19 +0200 Subject: [PATCH 49/56] vscode-extensions.ms-python.black-formatter: 2023.4.1 -> 2024.2.0 --- .../editors/vscode/extensions/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2dc5bb749f69..0dba31589448 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3178,15 +3178,19 @@ let mktplcRef = { name = "black-formatter"; publisher = "ms-python"; - version = "2023.4.1"; - hash = "sha256-IJaLke0WF1rlKTiuwJHAXDQB1SS39AoQhc4iyqqlTyY="; + version = "2024.2.0"; + hash = "sha256-qIO+YqTXjwgznzUlnPSts1R2BM6iN8B9vESkelGPgZM="; }; - meta = with lib; { + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-python.black-formatter/changelog"; description = "Formatter extension for Visual Studio Code using black"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.black-formatter"; homepage = "https://github.com/microsoft/vscode-black-formatter"; - license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + amadejkastelic + sikmir + ]; }; }; From c9ea1b965605c0be5f94ba1e8ede53fc7bf44a98 Mon Sep 17 00:00:00 2001 From: Tochi4h4 <74688871+Tochiaha@users.noreply.github.com> Date: Sat, 20 Jul 2024 18:34:21 +0100 Subject: [PATCH 50/56] unhide-gui: init at 20220611 Releases: https://github.com/YJesus/Unhide/releases/tag/v20220611 --- pkgs/by-name/un/unhide-gui/package.nix | 61 ++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100755 pkgs/by-name/un/unhide-gui/package.nix diff --git a/pkgs/by-name/un/unhide-gui/package.nix b/pkgs/by-name/un/unhide-gui/package.nix new file mode 100755 index 000000000000..5fd01f39b503 --- /dev/null +++ b/pkgs/by-name/un/unhide-gui/package.nix @@ -0,0 +1,61 @@ +{ + fetchFromGitHub, + lib, + python3Packages, + python3, + unhide, +}: + +python3Packages.buildPythonApplication rec { + pname = "unhide-gui"; + version = "20220611"; + format = "other"; + + src = fetchFromGitHub { + owner = "YJesus"; + repo = "Unhide"; + rev = "v${version}"; + hash = "sha256-v4otbDhKKRLywH6aP+mbMR0olHbW+jk4TXTBY+iaxdo="; + }; + + propagatedBuildInputs = with python3Packages; [ tkinter ]; + + buildInputs = [ unhide ]; + + postPatch = '' + substituteInPlace unhideGui.py \ + --replace-fail "\This" "This" \ + --replace-fail "__credits__" "#__credits__" \ + --replace-fail "./unhide-linux" "${unhide}/bin/unhide-linux" \ + --replace-fail "./unhide-tcp" "${unhide}/bin/unhide-tcp" + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/unhideGui} + cp -R *.py $out/share/unhideGui + + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + + makeWrapper "${python3Packages.python.interpreter}" "$out/bin/unhideGui" \ + --set PYTHONPATH "$PYTHONPATH" \ + --add-flags "$out/share/unhideGui/unhideGui.py" + + runHook postFixup + ''; + + meta = { + description = "Forensic tool to find hidden processes and TCP/UDP ports by rootkits, LKMs or other hiding technique"; + homepage = "https://github.com/YJesus/Unhide"; + changelog = "https://github.com/YJesus/Unhide/blob/${src.rev}/NEWS"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ tochiaha ]; + mainProgram = "unhide-gui"; + platforms = lib.platforms.all; + }; +} From f709e908130c380efd8fe257eb4cd9e0d8b17bdf Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 17 Jul 2024 10:00:23 +0100 Subject: [PATCH 51/56] any-nix-shell: move to pkgs/by-name --- .../default.nix => by-name/an/any-nix-shell/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{shells/any-nix-shell/default.nix => by-name/an/any-nix-shell/package.nix} (100%) diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/by-name/an/any-nix-shell/package.nix similarity index 100% rename from pkgs/shells/any-nix-shell/default.nix rename to pkgs/by-name/an/any-nix-shell/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a74f872aacd6..8b09f7c016d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14783,8 +14783,6 @@ with pkgs; agdsn-zsh-config = callPackage ../shells/zsh/agdsn-zsh-config { }; - any-nix-shell = callPackage ../shells/any-nix-shell { }; - nix-your-shell = callPackage ../shells/nix-your-shell { }; bash = lowPrio (callPackage ../shells/bash/5.nix { }); From aed4a5070d92f3338239ca01b8a46f42d79fc2a0 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 17 Jul 2024 10:00:56 +0100 Subject: [PATCH 52/56] any-nix-shell: reformat with RFC166 --- pkgs/by-name/an/any-nix-shell/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/an/any-nix-shell/package.nix b/pkgs/by-name/an/any-nix-shell/package.nix index fd4807e6d675..ce1b825d9eca 100644 --- a/pkgs/by-name/an/any-nix-shell/package.nix +++ b/pkgs/by-name/an/any-nix-shell/package.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, bash }: +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + bash, +}: stdenv.mkDerivation rec { pname = "any-nix-shell"; From 119f78fd477a2b33f9ea84e3d3d3135227d26169 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 17 Jul 2024 10:27:53 +0100 Subject: [PATCH 53/56] any-nix-shell: add runtime dependencies --- pkgs/by-name/an/any-nix-shell/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/an/any-nix-shell/package.nix b/pkgs/by-name/an/any-nix-shell/package.nix index ce1b825d9eca..51891b952875 100644 --- a/pkgs/by-name/an/any-nix-shell/package.nix +++ b/pkgs/by-name/an/any-nix-shell/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, makeWrapper, bash, + gnused, + which, }: stdenv.mkDerivation rec { @@ -23,7 +25,13 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -r bin $out - wrapProgram $out/bin/any-nix-shell --prefix PATH ":" $out/bin + wrapProgram $out/bin/any-nix-shell --prefix PATH ":" ${ + lib.makeBinPath [ + (placeholder "out") + gnused + which + ] + } ''; meta = with lib; { From 9a8e69dd4ea3cd27fca6a71143eace1a3a5cf3de Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 17 Jul 2024 10:51:15 +0100 Subject: [PATCH 54/56] any-nix-shell: update description --- pkgs/by-name/an/any-nix-shell/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/an/any-nix-shell/package.nix b/pkgs/by-name/an/any-nix-shell/package.nix index 51891b952875..9aac73163581 100644 --- a/pkgs/by-name/an/any-nix-shell/package.nix +++ b/pkgs/by-name/an/any-nix-shell/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "fish and zsh support for nix-shell"; + description = "fish, xonsh and zsh support for nix-shell"; license = licenses.mit; homepage = "https://github.com/haslersn/any-nix-shell"; maintainers = with maintainers; [ haslersn ]; From 31798c17aa3e4ff62d396d95d1e59db557295b89 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 17 Jul 2024 11:16:13 +0100 Subject: [PATCH 55/56] any-nix-shell: run preInstall/postInstall hooks, remove `with lib` --- pkgs/by-name/an/any-nix-shell/package.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/any-nix-shell/package.nix b/pkgs/by-name/an/any-nix-shell/package.nix index 9aac73163581..b22894c9b34a 100644 --- a/pkgs/by-name/an/any-nix-shell/package.nix +++ b/pkgs/by-name/an/any-nix-shell/package.nix @@ -20,9 +20,14 @@ stdenv.mkDerivation rec { }; strictDeps = true; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ]; + installPhase = '' + runHook preInstall + mkdir -p $out/bin cp -r bin $out wrapProgram $out/bin/any-nix-shell --prefix PATH ":" ${ @@ -32,13 +37,15 @@ stdenv.mkDerivation rec { which ] } + + runHook postInstall ''; - meta = with lib; { + meta = { description = "fish, xonsh and zsh support for nix-shell"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/haslersn/any-nix-shell"; - maintainers = with maintainers; [ haslersn ]; + maintainers = with lib.maintainers; [ haslersn ]; mainProgram = "any-nix-shell"; }; } From 54ca7f9154964c2fb6d4d4edbd48e1e1f02124ac Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 20 Jul 2024 21:21:37 +0100 Subject: [PATCH 56/56] any-nix-shell: 1.2.1 -> 2.0.0 --- pkgs/by-name/an/any-nix-shell/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/any-nix-shell/package.nix b/pkgs/by-name/an/any-nix-shell/package.nix index b22894c9b34a..16fe36cecf24 100644 --- a/pkgs/by-name/an/any-nix-shell/package.nix +++ b/pkgs/by-name/an/any-nix-shell/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "any-nix-shell"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "haslersn"; repo = "any-nix-shell"; rev = "v${version}"; - sha256 = "0q27rhjhh7k0qgcdcfm8ly5za6wm4rckh633d0sjz87faffkp90k"; + hash = "sha256-n4+aokW5o3EuXKqyc12vRsn5Mlkvdso27AdpahhySYw="; }; strictDeps = true;