From d542d77c58c975784e850e253a484e2a0fa2933f Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 12 Jun 2024 15:59:49 -0300 Subject: [PATCH 01/45] p4: 2022.2.2407422 -> 2024.1/2596294 --- .../version-management/p4/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 695e596e8c85..7fb7f3c8f3ac 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -10,6 +10,7 @@ , CoreServices , Foundation , Security +, testers }: let @@ -31,14 +32,14 @@ let { name = "contrib"; path = "${src}/contrib"; } ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "p4"; - version = "2022.2.2407422"; + version = "2024.1/2596294"; src = fetchurl { # Upstream replaces minor versions, so use archived URL. - url = "https://web.archive.org/web/20230512173806id_/https://ftp.perforce.com/perforce/r22.2/bin.tools/p4source.tgz"; - sha256 = "4355375def3f3d2256d4a92ac1b9960173e7aa97404346c0c74caf23a0905e1b"; + url = "https://web.archive.org/web/20240526153453id_/https://ftp.perforce.com/perforce/r24.1/bin.tools/p4source.tgz"; + sha256 = "sha256-6+DOJPeVzP4x0UsN9MlZRAyusapBTICX0BuyvVBQBC8="; }; nativeBuildInputs = [ jam ]; @@ -92,11 +93,16 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $bin/bin $dev $out cp bin.unix/p4 $bin/bin - cp -r bin.unix/p4api-${version}/include $dev - cp -r bin.unix/p4api-${version}/lib $out + cp -r bin.unix/p4api-*/include $dev + cp -r bin.unix/p4api-*/lib $out runHook postInstall ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "p4 -V"; + }; + meta = with lib; { description = "Perforce Helix Core command-line client and APIs"; homepage = "https://www.perforce.com"; @@ -105,4 +111,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ corngood impl ]; }; -} +}) From 206d55763bb43c9644b181397881a58139fe2f9c Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Fri, 14 Jun 2024 14:20:55 -0400 Subject: [PATCH 02/45] peertube: limit threads used for compression step --- pkgs/servers/peertube/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 3c46db2f34b3..837d26682c63 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation rec { # Create static gzip and brotli files fd -e css -e eot -e html -e js -e json -e svg -e webmanifest -e xlf \ - --type file --search-path $out/client/dist \ + --type file --search-path $out/client/dist --threads $NIX_BUILD_CORES \ --exec gzip -9 -n -c {} > {}.gz \;\ --exec brotli --best -f {} -o {}.br ''; From 94750008787d0a406b2ef2868f09081fc8d16dcf Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 16 Jun 2024 10:14:02 +0200 Subject: [PATCH 03/45] nixos-rebuild: reverse some conditionals and factor out getNixDrv in "building nix" section, removes indent clutter --- .../linux/nixos-rebuild/nixos-rebuild.sh | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index fb7c8b2322a7..364c3dc4c003 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -490,31 +490,35 @@ prebuiltNix() { fi } -if [[ -n $buildNix && -z $flake ]]; then - log "building Nix..." +getNixDrv() { nixDrv= - if ! nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then - if ! nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A nix "${extraBuildFlags[@]}")"; then - if ! nixStorePath="$(runCmd nix-instantiate --eval '' -A "$(nixSystem)" | sed -e 's/^"//' -e 's/"$//')"; then - nixStorePath="$(prebuiltNix "$(uname -m)")" - fi - if ! runCmd nix-store -r "$nixStorePath" --add-root "${tmpDir}/nix" --indirect \ - --option extra-binary-caches https://cache.nixos.org/; then - log "warning: don't know how to get latest Nix" - fi - # Older version of nix-store -r don't support --add-root. - [ -e "$tmpDir/nix" ] || ln -sf "$nixStorePath" "$tmpDir/nix" - if [ -n "$buildHost" ]; then - remoteNixStorePath="$(runCmd prebuiltNix "$(buildHostCmd uname -m)")" - remoteNix="$remoteNixStorePath/bin" - if ! buildHostCmd nix-store -r "$remoteNixStorePath" \ - --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then - remoteNix= - log "warning: don't know how to get latest Nix" - fi - fi + + if nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then return; fi + if nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A nix "${extraBuildFlags[@]}")"; then return; fi + + if ! nixStorePath="$(runCmd nix-instantiate --eval '' -A "$(nixSystem)" | sed -e 's/^"//' -e 's/"$//')"; then + nixStorePath="$(prebuiltNix "$(uname -m)")" + fi + if ! runCmd nix-store -r "$nixStorePath" --add-root "${tmpDir}/nix" --indirect \ + --option extra-binary-caches https://cache.nixos.org/; then + log "warning: don't know how to get latest Nix" + fi + # Older version of nix-store -r don't support --add-root. + [ -e "$tmpDir/nix" ] || ln -sf "$nixStorePath" "$tmpDir/nix" + if [ -n "$buildHost" ]; then + remoteNixStorePath="$(runCmd prebuiltNix "$(buildHostCmd uname -m)")" + remoteNix="$remoteNixStorePath/bin" + if ! buildHostCmd nix-store -r "$remoteNixStorePath" \ + --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then + remoteNix= + log "warning: don't know how to get latest Nix" fi fi +} + +if [[ -n $buildNix && -z $flake ]]; then + log "building Nix..." + getNixDrv if [ -a "$nixDrv" ]; then nix-store -r "$nixDrv"'!'"out" --add-root "$tmpDir/nix" --indirect >/dev/null if [ -n "$buildHost" ]; then From 58d100778bded884dcbaefe3c03fd95449afe2f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 21 Jun 2024 09:07:26 -0700 Subject: [PATCH 04/45] udiskie: 2.5.2 -> 2.5.3 Diff: https://github.com/coldfix/udiskie/compare/v2.5.2...v2.5.3 Changelog: https://github.com/coldfix/udiskie/blob/v2.5.3/CHANGES.rst --- pkgs/applications/misc/udiskie/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 7df3f1d23b9c..0041d5153d54 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { pname = "udiskie"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { owner = "coldfix"; repo = "udiskie"; rev = "v${version}"; - hash = "sha256-r9ppuWYY3e2thsfFh4ooOgfqNvmCVw7fS0SpJCJcysQ="; + hash = "sha256-asrVQR0d+5l76COsXp88srtGZQHU+AwbP3HwDiwRlnE="; }; patches = [ @@ -39,10 +39,13 @@ python3.pkgs.buildPythonApplication rec { asciidoc # Man page gobject-introspection installShellFiles - python3.pkgs.setuptools wrapGAppsHook3 ]; + build-system = with python3.pkgs; [ + setuptools + ]; + dontWrapGApps = true; buildInputs = [ @@ -53,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { udisks2 ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ docopt keyutils pygobject3 From 2204ed73c473b1943ac093f7dfaf898281d002b5 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 13 Jun 2024 08:34:42 -0300 Subject: [PATCH 05/45] p4v: 2022.2.2336701 -> 2024.2/2606884 --- .../version-management/p4v/default.nix | 22 ++++++++++--------- .../version-management/p4v/linux.nix | 17 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 1004661499be..2824ed82cfa2 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -2,28 +2,30 @@ , fetchurl , lib , callPackage -, libsForQt5 +, qt6Packages }: let # Upstream replaces minor versions, so use archived URLs. - srcs = { - "x86_64-linux" = fetchurl { - url = "https://web.archive.org/web/20220902181457id_/https://ftp.perforce.com/perforce/r22.2/bin.linux26x86_64/p4v.tgz"; - sha256 = "8fdade4aafe25f568a61cfd80823aa90599c2a404b7c6b4a0862c84b07a9f8d2"; + srcs = rec { + x86_64-linux = fetchurl { + url = "https://web.archive.org/web/20240612193642id_/https://ftp.perforce.com/perforce/r24.2/bin.linux26x86_64/p4v.tgz"; + sha256 = "sha256-HA99fHcmgli/vVnr0M8ZJEsaZ2ZLzpG3M8S77oDYJyE="; }; - "x86_64-darwin" = fetchurl { - url = "https://web.archive.org/web/20220902194716id_/https://ftp.perforce.com/perforce/r22.2/bin.macosx1015x86_64/P4V.dmg"; - sha256 = "c4a9460c0f849be193c68496c500f8a785c740f5bea5b5e7f617969c20be3cd7"; + aarch64-darwin = fetchurl { + url = "https://web.archive.org/web/20240612194532id_/https://ftp.perforce.com/perforce/r24.2/bin.macosx12u/P4V.dmg"; + sha256 = "sha256-PS7gfDdWspyL//YWLkrsGi5wh6SIeAry2yef1/V0d6o="; }; + # this is universal + x86_64-darwin = aarch64-darwin; }; mkDerivation = if stdenv.isDarwin then callPackage ./darwin.nix { } - else libsForQt5.callPackage ./linux.nix { }; + else qt6Packages.callPackage ./linux.nix { }; in mkDerivation { pname = "p4v"; - version = "2022.2.2336701"; + version = "2024.2/2606884"; src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/version-management/p4v/linux.nix b/pkgs/applications/version-management/p4v/linux.nix index 6a9d6ba6aad4..316ff8dbeb19 100644 --- a/pkgs/applications/version-management/p4v/linux.nix +++ b/pkgs/applications/version-management/p4v/linux.nix @@ -17,8 +17,12 @@ , libxcb , libxkbcommon , nss +, qtbase +, qtmultimedia +, qtsvg , qttools , qtwebengine +, qtwebview , xcbutilimage , xcbutilkeysyms , xcbutilrenderutil @@ -50,8 +54,12 @@ let libxcb libxkbcommon nss + qtbase + qtmultimedia + qtsvg qttools qtwebengine + qtwebview xcbutilimage xcbutilkeysyms xcbutilrenderutil @@ -63,10 +71,19 @@ let # Don't wrap the Qt apps; upstream has its own wrapper scripts. dontWrapQtApps = true; + postPatch = '' + rm -r lib/plugins lib/libQt6* lib/libssl* lib/libicu* lib/libcrypto* + ''; + installPhase = '' mkdir -p $out cp -r bin lib $out addAutoPatchelfSearchPath $out/lib + ln -s "${qtbase}/${qtbase.qtPluginPrefix}" $out/lib/plugins + ''; + + preFixup = '' + patchelf --clear-symbol-version close $out/bin/p4{v,admin}.bin ''; }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9db30d2993b..323307dd2524 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33091,7 +33091,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Foundation Security; }; p4d = callPackage ../applications/version-management/p4d { }; - p4v = callPackage ../applications/version-management/p4v { }; + p4v = qt6Packages.callPackage ../applications/version-management/p4v { }; parson = callPackage ../development/libraries/parson { }; From 0bf9c7660fbcd2d2a75730cc442b232d090275b4 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 14 Jun 2024 23:16:20 +0900 Subject: [PATCH 06/45] bpftrace: fix tcp*.bt/runqlat.bt scripts tcp*.bt scripts tried to include glibc headers, which didn't work on nixos because bpftrace tried to call clang-major with some options to get the paths, but we never told it where to find it. Give bpftrace the path directly instead of giving it a path to clang. runqlat.bt doesn't work with glibc headers and requires kernel headers which are no longer extracted, just provide its value. Note the default clang output also had some clang-internal headers, but these seem to be included anyway through libclang API without having to give them here, so we only pass the glibc ones. While here: - also backport another bpftrace patch that made the tcp*.bt tools to actually not require these includes - and add tests that we can include these. Co-authored-by: Arian van Putten --- nixos/tests/bpf.nix | 7 +- .../bp/bpftrace/override-system-headers.patch | 94 +++++++++++++++ pkgs/by-name/bp/bpftrace/package.nix | 12 +- .../bp/bpftrace/runqlat-bt-no-includes.patch | 45 +++++++ .../bp/bpftrace/tcp-bt-no-includes.patch | 114 ++++++++++++++++++ 5 files changed, 268 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/bp/bpftrace/override-system-headers.patch create mode 100644 pkgs/by-name/bp/bpftrace/runqlat-bt-no-includes.patch create mode 100644 pkgs/by-name/bp/bpftrace/tcp-bt-no-includes.patch diff --git a/nixos/tests/bpf.nix b/nixos/tests/bpf.nix index 150ed0958862..0020c7ee2d69 100644 --- a/nixos/tests/bpf.nix +++ b/nixos/tests/bpf.nix @@ -16,14 +16,14 @@ import ./make-test-python.nix ({ pkgs, ... }: { # list probes machine.succeed("bpftrace -l") # simple BEGIN probe (user probe on bpftrace itself) - print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\"); exit(); }'")) + print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\\n\"); exit(); }'")) # tracepoint print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit() }'")) # kprobe print(machine.succeed("bpftrace -e 'kprobe:schedule { print(probe); exit() }'")) # BTF print(machine.succeed("bpftrace -e 'kprobe:schedule { " - " printf(\"tgid: %d\", ((struct task_struct*) curtask)->tgid); exit() " + " printf(\"tgid: %d\\n\", ((struct task_struct*) curtask)->tgid); exit() " "}'")) # module BTF (bpftrace >= 0.17) # test is currently disabled on aarch64 as kfunc does not work there yet @@ -32,5 +32,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { "bpftrace -e 'kfunc:nft_trans_alloc_gfp { " " printf(\"portid: %d\\n\", args->ctx->portid); " "} BEGIN { exit() }'")) + # glibc includes + print(machine.succeed("bpftrace -e '#include \n" + "BEGIN { printf(\"ok %d\\n\", EINVAL); exit(); }'")) ''; }) diff --git a/pkgs/by-name/bp/bpftrace/override-system-headers.patch b/pkgs/by-name/bp/bpftrace/override-system-headers.patch new file mode 100644 index 000000000000..624c4d6c7eff --- /dev/null +++ b/pkgs/by-name/bp/bpftrace/override-system-headers.patch @@ -0,0 +1,94 @@ +From c1737d4ab6ab263932caa9e3ac170ebe3e28d404 Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Fri, 14 Jun 2024 21:56:46 +0900 +Subject: [PATCH] clang_parser system_include_paths: allow overriding at + compile time + +While bpftrace depends on libclang it can be installed without a clang +frontend, so some distributions might want to make these paths fixed as +they are unlikely to change. + +In particular, this is necessary to include system libraries as used by +older versions of tcpaccept.bt (they now no longer require these since +#3152, but that illustrate this was a recurring problem) + +(cherry picked from commit 5bf5f86313600b16c8c23e03b31337941cbefdd0) +--- + CMakeLists.txt | 2 ++ + src/CMakeLists.txt | 4 +++- + src/clang_parser.cpp | 19 +++++++++++++++---- + 3 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cd620d0e56e5..ade33c503efb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,6 +21,8 @@ set(VENDOR_GTEST OFF CACHE BOOL "Clone gtest from github") + set(BUILD_FUZZ OFF CACHE BOOL "Build bpftrace for fuzzing") + set(USE_LIBFUZZER OFF CACHE BOOL "Use libfuzzer for fuzzing") + set(FUZZ_TARGET "codegen" CACHE STRING "Fuzzing target") ++set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory") ++set(SYSTEM_INCLUDE_PATHS "auto" CACHE STRING "Hard-code system include paths (colon separated, the default value \"auto\" queries clang at runtime)") + + set(ENABLE_SKB_OUTPUT ON CACHE BOOL "Enable skb_output, will include libpcap") + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 88f5928c8a75..eadb11207052 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -88,11 +88,13 @@ endif() + + # compile definitions + +-set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory") + if (KERNEL_HEADERS_DIR) + MESSAGE(STATUS "Using KERNEL_HEADERS_DIR=${KERNEL_HEADERS_DIR}") + target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}") + endif() ++if (NOT SYSTEM_INCLUDE_PATHS EQUAL "auto") ++ MESSAGE(STATUS "Using SYSTEM_INCLUDE_PATHS=${SYSTEM_INCLUDE_PATHS}") ++endif() + + execute_process( + COMMAND git describe --abbrev=4 --dirty --tags +diff --git a/src/clang_parser.cpp b/src/clang_parser.cpp +index 8b6689454267..9367e6692eb0 100644 +--- a/src/clang_parser.cpp ++++ b/src/clang_parser.cpp +@@ -882,11 +882,9 @@ std::string ClangParser::get_arch_include_path() + return "/usr/include/" + std::string(utsname.machine) + "-linux-gnu"; + } + +-std::vector ClangParser::system_include_paths() ++static void query_clang_include_dirs(std::vector &result) + { +- std::vector result; +- try +- { ++ try { + auto clang = "clang-" + std::to_string(LLVM_VERSION_MAJOR); + auto cmd = clang + " -Wp,-v -x c -fsyntax-only /dev/null 2>&1"; + auto check = exec_system(cmd.c_str()); +@@ -902,6 +900,19 @@ std::vector ClangParser::system_include_paths() + catch (std::runtime_error &) + { // If exec_system fails, just ignore it + } ++} ++ ++std::vector ClangParser::system_include_paths() ++{ ++ std::vector result; ++ std::istringstream lines(SYSTEM_INCLUDE_PATHS); ++ std::string line; ++ while (std::getline(lines, line, ':')) { ++ if (line == "auto") ++ query_clang_include_dirs(result); ++ else ++ result.push_back(trim(line)); ++ } + + if (result.empty()) + result = { "/usr/local/include", "/usr/include" }; +-- +2.45.2 + diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index bc5aab6a9406..8b1eb42d9a2a 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , llvmPackages, elfutils, bcc -, libbpf, libbfd, libopcodes +, libbpf, libbfd, libopcodes, glibc , cereal, asciidoctor , cmake, pkg-config, flex, bison , util-linux @@ -41,9 +41,17 @@ stdenv.mkDerivation rec { "-DBUILD_TESTING=FALSE" "-DLIBBCC_INCLUDE_DIRS=${bcc}/include" "-DINSTALL_TOOL_DOCS=OFF" - "-DUSE_SYSTEM_BPF_BCC=ON" + "-DSYSTEM_INCLUDE_PATHS=${glibc.dev}/include" ]; + patches = [ + # https://github.com/bpftrace/bpftrace/pull/3243 (merged) + ./override-system-headers.patch + # https://github.com/bpftrace/bpftrace/pull/3152 (merged) + ./tcp-bt-no-includes.patch + # https://github.com/bpftrace/bpftrace/pull/3262 (merged) + ./runqlat-bt-no-includes.patch + ]; # Pull BPF scripts into $PATH (next to their bcc program equivalents), but do # not move them to keep `${pkgs.bpftrace}/share/bpftrace/tools/...` working. diff --git a/pkgs/by-name/bp/bpftrace/runqlat-bt-no-includes.patch b/pkgs/by-name/bp/bpftrace/runqlat-bt-no-includes.patch new file mode 100644 index 000000000000..659e4bc4bbfd --- /dev/null +++ b/pkgs/by-name/bp/bpftrace/runqlat-bt-no-includes.patch @@ -0,0 +1,45 @@ +From 9b5f22854297aabb924969c25af66461d8d2fcb9 Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Fri, 21 Jun 2024 21:02:09 +0900 +Subject: [PATCH] tools/runqlat: provide TASK_RUNNING as a define + +runqlat requires kernel headers to run even with BTF, just because of a +define. +TASK_RUNNING isn't part of the stable API but it's never changed in all +of the linux git history so let's pretend it's stable and just define +it. + +If we find a way to handle kheaders again in the future we might want to +consider reverting this. + +Fixes: #3255 +(cherry picked from commit aa041d9d85f9ec11235c39fdcb5833412ec27083) +--- + tools/runqlat.bt | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/tools/runqlat.bt b/tools/runqlat.bt +index 3d71b76062eb..1298f399aee7 100755 +--- a/tools/runqlat.bt ++++ b/tools/runqlat.bt +@@ -11,7 +11,17 @@ + * 17-Sep-2018 Brendan Gregg Created this. + */ + ++#ifndef BPFTRACE_HAVE_BTF + #include ++#else ++/* ++ * With BTF providing types, full headers are not needed. ++ * We only need to supply the preprocessor defines used in this script. ++ * TASK_RUNNING is not arch-dependant and has not changed in the linux ++ * git history (it is not part of the stable API though) ++ */ ++#define TASK_RUNNING 0 ++#endif + + BEGIN + { +-- +2.45.2 + diff --git a/pkgs/by-name/bp/bpftrace/tcp-bt-no-includes.patch b/pkgs/by-name/bp/bpftrace/tcp-bt-no-includes.patch new file mode 100644 index 000000000000..fa2052358103 --- /dev/null +++ b/pkgs/by-name/bp/bpftrace/tcp-bt-no-includes.patch @@ -0,0 +1,114 @@ +From ebb12512f6ea0a1113ad8ddf30db26128f7a3426 Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Sun, 23 Jun 2024 20:41:01 +0900 +Subject: [PATCH] With BTF, users do not need libc headers installed for + AF_INET/AF_INET6 + +Signed-off-by: Bernhard Kaindl +(cherry picked from commit c0b9d252a43f99b9091245dedb178a6874803306) +--- + tools/tcpaccept.bt | 8 +++++++- + tools/tcpconnect.bt | 8 +++++++- + tools/tcpdrop.bt | 8 +++++++- + tools/tcplife.bt | 8 +++++++- + tools/tcpretrans.bt | 8 +++++++- + 5 files changed, 35 insertions(+), 5 deletions(-) + +diff --git a/tools/tcpaccept.bt b/tools/tcpaccept.bt +index 08e6af0158fc..cbffe36889ee 100755 +--- a/tools/tcpaccept.bt ++++ b/tools/tcpaccept.bt +@@ -20,7 +20,13 @@ + #include + #include + #else +-#include ++/* ++ * With BTF providing types, socket headers are not needed. ++ * We only need to supply the preprocessor defines in this script. ++ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI ++ */ ++#define AF_INET 2 ++#define AF_INET6 10 + #endif + + BEGIN +diff --git a/tools/tcpconnect.bt b/tools/tcpconnect.bt +index 1ac1eb99e9ad..636337275cd8 100755 +--- a/tools/tcpconnect.bt ++++ b/tools/tcpconnect.bt +@@ -22,7 +22,13 @@ + #include + #include + #else +-#include ++/* ++ * BTF provides the types, we just need to define AF_INET and AF_INET6. ++ * These are Linux ABI defines, and are not architecture-specific. ++ * With BTF, this allows tcpconnect.bt to work without glibc headers: ++ */ ++#define AF_INET 2 /* IPv4 */ ++#define AF_INET6 10 /* IPv6 */ + #endif + + BEGIN +diff --git a/tools/tcpdrop.bt b/tools/tcpdrop.bt +index fd3e55f490bf..a56bf69fcc6c 100755 +--- a/tools/tcpdrop.bt ++++ b/tools/tcpdrop.bt +@@ -24,7 +24,13 @@ + #include + #include + #else +-#include ++/* ++ * With BTF providing types, socket headers are not needed. ++ * We only need to supply the preprocessor defines in this script. ++ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI ++ */ ++#define AF_INET 2 ++#define AF_INET6 10 + #endif + + BEGIN +diff --git a/tools/tcplife.bt b/tools/tcplife.bt +index dd4c1d68284e..d5a09c4e5da9 100755 +--- a/tools/tcplife.bt ++++ b/tools/tcplife.bt +@@ -19,7 +19,13 @@ + #include + #include + #else +-#include ++/* ++ * With BTF providing types, socket headers are not needed. ++ * We only need to supply the preprocessor defines in this script. ++ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI ++ */ ++#define AF_INET 2 ++#define AF_INET6 10 + #endif + + BEGIN +diff --git a/tools/tcpretrans.bt b/tools/tcpretrans.bt +index ee2975d6e545..32a11bfa81b2 100755 +--- a/tools/tcpretrans.bt ++++ b/tools/tcpretrans.bt +@@ -21,7 +21,13 @@ + #include + #include + #else +-#include ++/* ++ * With BTF providing types, socket headers are not needed. ++ * We only need to supply the preprocessor defines in this script. ++ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI ++ */ ++#define AF_INET 2 ++#define AF_INET6 10 + #endif + + BEGIN +-- +2.45.2 + From 75316f49bbfc4a99c33f00a342e9931fbd22667a Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sun, 23 Jun 2024 21:09:52 +0900 Subject: [PATCH 07/45] bpftrace: only print kernel headers cannot be found warning on error need more time to figure how to deal with kheaders cleanly --- .../kheaders-not-found-message-fix.patch | 59 +++++ ...ders-not-found-message-only-on-error.patch | 220 ++++++++++++++++++ pkgs/by-name/bp/bpftrace/package.nix | 4 + 3 files changed, 283 insertions(+) create mode 100644 pkgs/by-name/bp/bpftrace/kheaders-not-found-message-fix.patch create mode 100644 pkgs/by-name/bp/bpftrace/kheaders-not-found-message-only-on-error.patch diff --git a/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-fix.patch b/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-fix.patch new file mode 100644 index 000000000000..31d99c420386 --- /dev/null +++ b/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-fix.patch @@ -0,0 +1,59 @@ +From 76950d08a3da13dd9e51b2fbef3532c3de79265b Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Fri, 14 Jun 2024 23:19:05 +0900 +Subject: [PATCH] utils: fix kernel headers not found warning (#3242) + +The code would make ksrc and kobj empty then try to print them, +this would always print empty strings. +Store is_dir() checks as bool instead and use these, the strings +cannot be empty if the check passed. + +(cherry picked from commit f937803c2ad156ab90b9194965dbfb62bef1ff80) +--- +(mostly to avoid conflicts with the next patch) + src/utils.cpp | 21 +++++++-------------- + 1 file changed, 7 insertions(+), 14 deletions(-) + +diff --git a/src/utils.cpp b/src/utils.cpp +index bda722136588..c358a401fc83 100644 +--- a/src/utils.cpp ++++ b/src/utils.cpp +@@ -738,15 +738,11 @@ std::tuple get_kernel_dirs( + auto ksrc = kdir + "/source"; + auto kobj = kdir + "/build"; + +- // if one of source/ or build/ is not present - try to use the other one for both. +- if (!is_dir(ksrc)) { +- ksrc = ""; +- } +- if (!is_dir(kobj)) { +- kobj = ""; +- } +- if (ksrc.empty() && kobj.empty()) +- { ++ // if one of source/ or build/ is not present - try to use the other one for ++ // both. ++ auto has_ksrc = is_dir(ksrc); ++ auto has_kobj = is_dir(kobj); ++ if (!has_ksrc && !has_kobj) { + LOG(WARNING) << "Could not find kernel headers in " << ksrc << " or " + << kobj + << ". To specify a particular path to kernel headers, set the " +@@ -757,12 +753,9 @@ std::tuple get_kernel_dirs( + "file at /sys/kernel/kheaders.tar.xz"; + return std::make_tuple("", ""); + } +- if (ksrc.empty()) +- { ++ if (!has_ksrc) { + ksrc = kobj; +- } +- else if (kobj.empty()) +- { ++ } else if (!has_kobj) { + kobj = ksrc; + } + +-- +2.45.2 + diff --git a/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-only-on-error.patch b/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-only-on-error.patch new file mode 100644 index 000000000000..38eb34be5b98 --- /dev/null +++ b/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-only-on-error.patch @@ -0,0 +1,220 @@ +From 5208c6275e65d94d0ed169ca2b253602c78c15a8 Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Fri, 14 Jun 2024 22:32:43 +0900 +Subject: [PATCH] kernel headers: only print kheaders not found warning if + parsing failed + +Current code would print kheaders not found as soon as the code has any +include, even if the include worked. + +This delays printing the warning until we know if parsing succeeded or +not, and only prints it if parsing failed. + +Also update the message to give clearer extraction instructions +--- + CHANGELOG.md | 2 ++ + src/CMakeLists.txt | 3 ++- + src/main.cpp | 40 ++++++++++++++++++++++++---------------- + src/utils.cpp | 45 +++++++++++++++++++++------------------------ + src/utils.h | 5 +++-- + 5 files changed, 52 insertions(+), 43 deletions(-) + +diff --git a/CHANGELOG.md b/CHANGELOG.md +index a4aca8b6c85d..181c1bffc9f3 100644 +--- a/CHANGELOG.md ++++ b/CHANGELOG.md +@@ -10,6 +10,8 @@ ## Unreleased + + #### Added + #### Changed ++- Only print kernel headers not found message if parsing fails ++ - [#3265](https://github.com/bpftrace/bpftrace/pull/3265) + #### Deprecated + #### Removed + #### Fixed +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eadb11207052..7b637835afd9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -90,11 +90,12 @@ endif() + + if (KERNEL_HEADERS_DIR) + MESSAGE(STATUS "Using KERNEL_HEADERS_DIR=${KERNEL_HEADERS_DIR}") +- target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}") + endif() ++target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}") + if (NOT SYSTEM_INCLUDE_PATHS EQUAL "auto") + MESSAGE(STATUS "Using SYSTEM_INCLUDE_PATHS=${SYSTEM_INCLUDE_PATHS}") + endif() ++target_compile_definitions(runtime PUBLIC SYSTEM_INCLUDE_PATHS="${SYSTEM_INCLUDE_PATHS}") + + execute_process( + COMMAND git describe --abbrev=4 --dirty --tags +diff --git a/src/main.cpp b/src/main.cpp +index 3c532b3aa767..7918f90b90ab 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -420,24 +420,20 @@ static std::optional get_delta_taitime() + + bool should_clang_parse = !(driver.root.get()->c_definitions.empty() && + bpftrace.btf_set_.empty()); +- +- if (should_clang_parse) +- { ++ if (should_clang_parse) { + ClangParser clang; ++ bool found_kernel_headers; ++ std::string ksrc, kobj; ++ struct utsname utsname; + std::vector extra_flags; +- { +- struct utsname utsname; +- uname(&utsname); +- std::string ksrc, kobj; +- auto kdirs = get_kernel_dirs(utsname); +- ksrc = std::get<0>(kdirs); +- kobj = std::get<1>(kdirs); ++ uname(&utsname); ++ found_kernel_headers = get_kernel_dirs(utsname, ksrc, kobj); + +- if (ksrc != "") +- { +- extra_flags = get_kernel_cflags( +- utsname.machine, ksrc, kobj, bpftrace.kconfig); +- } ++ if (found_kernel_headers) ++ { ++ extra_flags = get_kernel_cflags( ++ utsname.machine, ksrc, kobj, bpftrace.kconfig); ++ found_kernel_headers = true; + } + extra_flags.push_back("-include"); + extra_flags.push_back(CLANG_WORKAROUNDS_H); +@@ -453,8 +449,20 @@ static std::optional get_delta_taitime() + extra_flags.push_back(file); + } + +- if (!clang.parse(driver.root.get(), bpftrace, extra_flags)) ++ if (!clang.parse(driver.root.get(), bpftrace, extra_flags)) { ++ if (!found_kernel_headers) { ++ LOG(WARNING) ++ << "Could not find kernel headers in " << ksrc << " / " << kobj ++ << ". To specify a particular path to kernel headers, set the env " ++ << "variables BPFTRACE_KERNEL_SOURCE and, optionally, " ++ << "BPFTRACE_KERNEL_BUILD if the kernel was built in a different " ++ << "directory than its source. You can also point the variable to " ++ << "a directory with built-in headers extracted from the following " ++ << "snippet:\nmodprobe kheaders && tar -C -xf " ++ << "/sys/kernel/kheaders.tar.xz"; ++ } + return nullptr; ++ } + } + + err = driver.parse(); +diff --git a/src/utils.cpp b/src/utils.cpp +index c358a401fc83..06d7fa95ff6e 100644 +--- a/src/utils.cpp ++++ b/src/utils.cpp +@@ -700,8 +700,8 @@ bool is_dir(const std::string& path) + return std_filesystem::is_directory(buf, ec); + } + +-// get_kernel_dirs returns {ksrc, kobj} - directories for pristine and +-// generated kernel sources. ++// get_kernel_dirs fills {ksrc, kobj} - directories for pristine and ++// generated kernel sources - and returns if they were found. + // + // When the kernel was built in its source tree ksrc == kobj, however when + // the kernel was build in a different directory than its source, ksrc != kobj. +@@ -714,44 +714,41 @@ bool is_dir(const std::string& path) + // + // /lib/modules/`uname -r`/build/ + // +-// {"", ""} is returned if no trace of kernel headers was found at all. +-// Both ksrc and kobj are guaranteed to be != "", if at least some trace of kernel sources was found. +-std::tuple get_kernel_dirs( +- const struct utsname &utsname) ++// false is returned if no trace of kernel headers was found at all, with the guessed ++// location set anyway for later warning. ++// Both ksrc and kobj are guaranteed to be != "" ++bool get_kernel_dirs(const struct utsname &utsname, ++ std::string &ksrc, ++ std::string &kobj) + { +-#ifdef KERNEL_HEADERS_DIR +- return {KERNEL_HEADERS_DIR, KERNEL_HEADERS_DIR}; +-#endif ++ ksrc = kobj = std::string(KERNEL_HEADERS_DIR); ++ if (!ksrc.empty()) ++ return true; + + const char *kpath_env = ::getenv("BPFTRACE_KERNEL_SOURCE"); + if (kpath_env) + { ++ ksrc = std::string(kpath_env); + const char *kpath_build_env = ::getenv("BPFTRACE_KERNEL_BUILD"); +- if (!kpath_build_env) ++ if (kpath_build_env) + { +- kpath_build_env = kpath_env; ++ kobj = std::string(kpath_build_env); ++ } else { ++ kobj = ksrc; + } +- return std::make_tuple(kpath_env, kpath_build_env); ++ return true; + } + + std::string kdir = std::string("/lib/modules/") + utsname.release; +- auto ksrc = kdir + "/source"; +- auto kobj = kdir + "/build"; ++ ksrc = kdir + "/source"; ++ kobj = kdir + "/build"; + + // if one of source/ or build/ is not present - try to use the other one for + // both. + auto has_ksrc = is_dir(ksrc); + auto has_kobj = is_dir(kobj); + if (!has_ksrc && !has_kobj) { +- LOG(WARNING) << "Could not find kernel headers in " << ksrc << " or " +- << kobj +- << ". To specify a particular path to kernel headers, set the " +- "env variables BPFTRACE_KERNEL_SOURCE and, optionally, " +- "BPFTRACE_KERNEL_BUILD if the kernel was built in a " +- "different directory than its source. To create kernel " +- "headers run 'modprobe kheaders', which will create a tar " +- "file at /sys/kernel/kheaders.tar.xz"; +- return std::make_tuple("", ""); ++ return false; + } + if (!has_ksrc) { + ksrc = kobj; +@@ -759,7 +756,7 @@ std::tuple get_kernel_dirs( + kobj = ksrc; + } + +- return std::make_tuple(ksrc, kobj); ++ return true; + } + + const std::string &is_deprecated(const std::string &str) +diff --git a/src/utils.h b/src/utils.h +index bc78bd2176b5..9bd5395eab22 100644 +--- a/src/utils.h ++++ b/src/utils.h +@@ -186,8 +186,9 @@ std::vector get_online_cpus(); + std::vector get_possible_cpus(); + bool is_dir(const std::string &path); + bool file_exists_and_ownedby_root(const char *f); +-std::tuple get_kernel_dirs( +- const struct utsname &utsname); ++bool get_kernel_dirs(const struct utsname &utsname, ++ std::string &ksrc, ++ std::string &kobj); + std::vector get_kernel_cflags(const char *uname_machine, + const std::string &ksrc, + const std::string &kobj, +-- +2.45.2 + diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 8b1eb42d9a2a..654e379f2ec5 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -51,6 +51,10 @@ stdenv.mkDerivation rec { ./tcp-bt-no-includes.patch # https://github.com/bpftrace/bpftrace/pull/3262 (merged) ./runqlat-bt-no-includes.patch + # https://github.com/bpftrace/bpftrace/pull/3242 (merged) + ./kheaders-not-found-message-fix.patch + # https://github.com/bpftrace/bpftrace/pull/3265 + ./kheaders-not-found-message-only-on-error.patch ]; # Pull BPF scripts into $PATH (next to their bcc program equivalents), but do From ed8078b92dcefa7b8e499b877546ab21adddf9fa Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Sun, 30 Jun 2024 00:24:36 -0700 Subject: [PATCH 08/45] sanjuuni: move to pkgs/by-name --- .../sanjuuni/default.nix => by-name/sa/sanjuuni/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/graphics/sanjuuni/default.nix => by-name/sa/sanjuuni/package.nix} (100%) diff --git a/pkgs/tools/graphics/sanjuuni/default.nix b/pkgs/by-name/sa/sanjuuni/package.nix similarity index 100% rename from pkgs/tools/graphics/sanjuuni/default.nix rename to pkgs/by-name/sa/sanjuuni/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4227b56896a1..cfefbf58b46c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12615,8 +12615,6 @@ with pkgs; sanctity = callPackage ../tools/misc/sanctity { }; - sanjuuni = callPackage ../tools/graphics/sanjuuni { }; - sasquatch = callPackage ../tools/filesystems/sasquatch { }; sasview = libsForQt5.callPackage ../applications/science/misc/sasview { }; From 4e3a06726aa784543af54d86d88ef19ded01c378 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Sun, 30 Jun 2024 00:25:21 -0700 Subject: [PATCH 09/45] sanjuuni: format with nixfmt-rfc-style --- pkgs/by-name/sa/sanjuuni/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix index 023492cbf1cd..18dd1b11486f 100644 --- a/pkgs/by-name/sa/sanjuuni/package.nix +++ b/pkgs/by-name/sa/sanjuuni/package.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, pkg-config -, autoreconfHook -, ffmpeg -, poco -, ocl-icd -, opencl-clhpp +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + pkg-config, + autoreconfHook, + ffmpeg, + poco, + ocl-icd, + opencl-clhpp, }: stdenv.mkDerivation rec { From ff931a64add1e5b442cfa543336f1b6e60558125 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Sun, 30 Jun 2024 00:26:10 -0700 Subject: [PATCH 10/45] sanjuuni: 0.4 -> 0.5 Changelog: https://github.com/MCJack123/sanjuuni/releases/tag/0.5 --- pkgs/by-name/sa/sanjuuni/package.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix index 18dd1b11486f..e43efa771b57 100644 --- a/pkgs/by-name/sa/sanjuuni/package.nix +++ b/pkgs/by-name/sa/sanjuuni/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, fetchpatch, pkg-config, - autoreconfHook, ffmpeg, poco, ocl-icd, @@ -13,28 +12,16 @@ stdenv.mkDerivation rec { pname = "sanjuuni"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "MCJack123"; repo = "sanjuuni"; rev = version; - sha256 = "sha256-wgtyrik4Z5AXd8MHkiMuxMpGh/xcEtNqivyhvL68aac="; + sha256 = "sha256-wJRPD4OWOTPiyDr9dYseRA7BI942HPfHONVJGTc/+wU="; }; - patches = [ - (fetchpatch { - name = "build-with-cxx17.patch"; - url = "https://github.com/MCJack123/sanjuuni/commit/f2164bc18935bcf63ee5b0a82087bc91f7fd258d.patch"; - hash = "sha256-MjDeAiB3WkemCRYzgOHzHlbPUoI4DHEYe28xIIC+c7I="; - excludes = [ "configure" ]; # conflicts with release tarball; we manually regenerate this - }) - ]; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg From 7837dcbf6f61725936b8e15bc737f80f19bc9e6d Mon Sep 17 00:00:00 2001 From: Vasissualiyp Date: Mon, 1 Jul 2024 14:32:08 -0400 Subject: [PATCH 11/45] tmpi: init at 1.0.0 --- pkgs/by-name/tm/tmpi/package.nix | 48 ++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/tm/tmpi/package.nix diff --git a/pkgs/by-name/tm/tmpi/package.nix b/pkgs/by-name/tm/tmpi/package.nix new file mode 100644 index 000000000000..f61af72dc0f2 --- /dev/null +++ b/pkgs/by-name/tm/tmpi/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, mpi +, mpich +, tmux +, reptyr +, autoconf +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "tmpi"; + version = "0-unstable-2022-02-22"; + + src = fetchFromGitHub { + owner = "Azrael3000"; + repo = "tmpi"; + rev = "f5a0fd8848b5c87b301edc8a23de9bfcfbd41918"; + hash = "sha256-BaOaMpsF8ho8EIVuHfu4+CiVV3yLoC3tDkLq4R8BYBA="; + }; + + propagatedBuildInputs = [ mpi mpich reptyr tmux ]; + + buildInputs = [ autoconf makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + install -m755 tmpi $out/bin/tmpi + + wrapProgram $out/bin/tmpi \ + --prefix PATH : ${lib.makeBinPath [ mpi mpich tmux reptyr ]} + + runHook postInstall + ''; + + meta = { + description = "Run a parallel command inside a split tmux window"; + mainProgram = "tmpi"; + homepage = "https://github.com/Azrael3000/tmpi"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ vasissualiyp ]; + platforms = reptyr.meta.platforms; + }; +} From d2111b0cbb97e07d7f3f30b663d02448657dbe14 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Mon, 3 Jun 2024 23:10:37 -0700 Subject: [PATCH 12/45] dfhack: 50.13-r1.1 -> 50.13-r2.1 --- pkgs/games/dwarf-fortress/dfhack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 96a5dac52540..31cc277e770c 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -90,9 +90,9 @@ let xmlRev = "980b1af13acc31660dce632f913c968f52e2b275"; }; "50.13" = { - dfHackRelease = "50.13-r1.1"; - hash = "sha256-FiXanXflszTr4ogz+EoDAUxzE2U9ODeZIJJ1u6Xm4Mo="; - xmlRev = "3507715fd07340de5a6c47064220f6e17343e5d5"; + dfHackRelease = "50.13-r2.1"; + hash = "sha256-IcjDDZX9YSLzympNc++1Xl85cK/0ASVDvzeNaebYNTQ="; + xmlRev = "c5debb15f696c3d1cb3706e2eb201eccef64f61a"; }; }; From 880bea37bdba456116086eacb045cf914bda9008 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Mon, 3 Jun 2024 23:24:09 -0700 Subject: [PATCH 13/45] dwarf-fortress: fix eval on darwin --- pkgs/games/dwarf-fortress/default.nix | 6 ++++-- pkgs/games/dwarf-fortress/game.nix | 4 ++-- pkgs/games/dwarf-fortress/wrapper/default.nix | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index acf50d650c49..e5bbf60e1550 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -49,7 +49,9 @@ let # The latest Dwarf Fortress version. Maintainers: when a new version comes # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing # this. Note that unfuck and twbt are not required for 50. - latestVersion = "50.13"; + latestVersion = if stdenv.isLinux then "50.13" + else if stdenv.isDarwin then "0.47.05" + else throw "Unsupported system"; # Converts a version to a package name. versionToName = version: "dwarf-fortress_${replaceStrings ["."] ["_"] version}"; @@ -62,7 +64,7 @@ let let isAtLeast50 = versionAtLeast dfVersion "50.0"; - dwarf-fortress-unfuck = optionalAttrs (!isAtLeast50) (callPackage ./unfuck.nix { inherit dfVersion; }); + dwarf-fortress-unfuck = optionalAttrs (!isAtLeast50 && stdenv.isLinux) (callPackage ./unfuck.nix { inherit dfVersion; }); dwarf-fortress = callPackage ./game.nix { inherit dfVersion; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 6e8467e55df9..121091c5f216 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -53,7 +53,7 @@ let patchVersion = elemAt dfVersionTuple (dfVersionBaseIndex + 1); isAtLeast50 = baseVersion >= 50; - enableUnfuck = !isAtLeast50 && dwarf-fortress-unfuck != null; + enableUnfuck = !isAtLeast50 && dwarf-fortress-unfuck != null && (dwarf-fortress-unfuck.dfVersion or null) == dfVersion; game = if hasAttr dfVersion df-hashes @@ -95,7 +95,7 @@ stdenv.mkDerivation { fi ''; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = optional stdenv.isLinux autoPatchelfHook; buildInputs = optionals isAtLeast50 [ SDL2 SDL2_image SDL2_mixer ] ++ optional (!isAtLeast50) SDL ++ optional enableUnfuck dwarf-fortress-unfuck diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 2dd771ee922d..daa27ce5dc00 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -197,8 +197,8 @@ stdenv.mkDerivation rec { chmod 755 $out/bin/soundsense ''; - doInstallCheck = true; - nativeInstallCheckInputs = [ expect xvfb-run ]; + doInstallCheck = stdenv.isLinux; + nativeInstallCheckInputs = lib.optionals stdenv.isLinux [ expect xvfb-run ]; installCheckPhase = let commonExpectStatements = fmod: lib.optionalString isAtLeast50 '' From 3b7edb3eed3f4e38a3890bcae352bd02e988d03b Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Thu, 6 Jun 2024 13:07:21 -0700 Subject: [PATCH 14/45] dwarf-fortress: run postUnpack on darwin --- pkgs/games/dwarf-fortress/game.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 121091c5f216..80d3056aae95 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { sourceRoot = "."; - postUnpack = optionalString stdenv.isLinux '' + postUnpack = '' directory=${ if stdenv.isLinux then "df_linux" else if stdenv.isDarwin then "df_osx" @@ -108,6 +108,9 @@ stdenv.mkDerivation { mkdir -p $out cp -r * $out + # Clean up OS X detritus in the tarball. + find $out -type f -name '._*' -exec rm -rf {} \; + # Lots of files are +x in the newer releases... find $out -type d -exec chmod 0755 {} \; find $out -type f -exec chmod 0644 {} \; @@ -116,7 +119,7 @@ stdenv.mkDerivation { [ -f $out/run_df ] && chmod +x $out/run_df # We don't need any of these since they will just break autoPatchelf on $out/hash.md5.orig From b0cf365258c849cb8823db8bacff6d87ece898ab Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 7 Jun 2024 15:09:42 -0700 Subject: [PATCH 15/45] dwarf-fortress: wrapper: fix Darwin compatibility --- .../wrapper/dwarf-fortress-init.in | 49 +++++++++++++------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in index 61b1b4da6168..1c739a1afbbf 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in +++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in @@ -4,18 +4,6 @@ shopt -s extglob export NIXPKGS_DF_ENV="@env@" -if [[ -v DF_DIR ]] && [ -n "$DF_DIR" ] && { [[ ! -v NIXPKGS_DF_HOME ]] || [ -z "$NIXPKGS_DF_HOME" ]; }; then - # Compatibility for users that were using DF_DIR, since the dfhack script clobbers this variable. - export NIXPKGS_DF_HOME="$DF_DIR" -fi - -if [[ ! -v NIXPKGS_DF_HOME ]] || [ -z "$NIXPKGS_DF_HOME" ]; then - export NIXPKGS_DF_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/df_linux" -fi - -# Compatibility. -export DF_DIR="$NIXPKGS_DF_HOME" - ### BEGIN: Default DF options declare -A _NIXPKGS_DF_OPTS _NIXPKGS_DF_OPTS[fmod]=0 # Don't use fmod by default. @@ -131,6 +119,30 @@ go() { exit 1 } +os_name="$(@uname@)" +os_rev="$(@uname@ -r)" + +if [ "$os_name" == Linux ]; then + df_dir="df_linux" +elif [ "$os_name" == Darwin ]; then + df_dir="df_osx" +else + log "Unknown platform: $os_name" + exit 1 +fi + +if [[ -v DF_DIR ]] && [ -n "$DF_DIR" ] && { [[ ! -v NIXPKGS_DF_HOME ]] || [ -z "$NIXPKGS_DF_HOME" ]; }; then + # Compatibility for users that were using DF_DIR, since the dfhack script clobbers this variable. + export NIXPKGS_DF_HOME="$DF_DIR" +fi + +if [[ ! -v NIXPKGS_DF_HOME ]] || [ -z "$NIXPKGS_DF_HOME" ]; then + export NIXPKGS_DF_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/$df_dir" +fi + +# Compatibility. +export DF_DIR="$NIXPKGS_DF_HOME" + @mkdir@ -p "$NIXPKGS_DF_HOME" @cat@ <&2 @@ -156,7 +168,7 @@ EOF cd "$NIXPKGS_DF_ENV" # All potential important files in DF 50 and below. -for path in dwarfort *.so libs raw data/init/* data/!(init|index|announcement); do +for path in dwarfort dwarfort.exe df *.so libs raw data/init/* data/!(init|index|announcement); do force_delete=0 if [[ "$path" == libfmod*.so* ]] && [ "${_NIXPKGS_DF_OPTS[fmod]}" -eq 0 ]; then force_delete=1 @@ -175,7 +187,12 @@ for path in index announcement help dipscript; do done # Handle library paths on Darwin. -if [ "$(@uname@)" == Darwin ]; then - export DYLD_LIBRARY_PATH="$NIXPKGS_DF_ENV/libs" - export DYLD_FRAMEWORK_PATH="$NIXPKGS_DF_ENV/libs" +if [ "$os_name" == Darwin ]; then + if [ "${os_rev%%.*}" -ge 11 ]; then + export DYLD_LIBRARY_PATH="$NIXPKGS_DF_ENV/libs" + export DYLD_FRAMEWORK_PATH="$NIXPKGS_DF_ENV/libs" + else + export DYLD_FALLBACK_LIBRARY_PATH="$NIXPKGS_DF_ENV/libs" + export DYLD_FALLBACK_FRAMEWORK_PATH="$NIXPKGS_DF_ENV/libs" + fi fi From bcde7a9d681a44873272fa3edb1ccd598621ef88 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 15 Jun 2024 18:54:53 -0700 Subject: [PATCH 16/45] dwarf-fortress: darwin libs --- pkgs/games/dwarf-fortress/game.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 80d3056aae95..42b68356020f 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -2,6 +2,8 @@ , lib , fetchurl , SDL +, SDL_image +, SDL_ttf , SDL2 , SDL2_image , SDL2_mixer @@ -119,7 +121,7 @@ stdenv.mkDerivation { [ -f $out/run_df ] && chmod +x $out/run_df # We don't need any of these since they will just break autoPatchelf on $out/hash.md5.orig @@ -132,6 +134,7 @@ stdenv.mkDerivation { ln -s ${getLib ncurses}/lib/libncurses.dylib $out/libs ln -s ${getLib gcc.cc}/lib/libstdc++.6.dylib $out/libs + ln -s ${getLib gcc.cc}/lib/libgcc_s.1.dylib $out/libs ln -s ${getLib fmodex}/lib/libfmodex.dylib $out/libs install_name_tool \ From 37cd3a3f20ffba3666b3dba31a8efb01b1e24c54 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 15 Jun 2024 22:43:25 -0700 Subject: [PATCH 17/45] dwarf-fortress: remove unused dependencies --- pkgs/games/dwarf-fortress/game.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 42b68356020f..95a4ff06e570 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -2,8 +2,6 @@ , lib , fetchurl , SDL -, SDL_image -, SDL_ttf , SDL2 , SDL2_image , SDL2_mixer From 12789d65591dbb7d73fe6f07b55fbb64cb392baa Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 7 Jul 2024 15:44:21 -0700 Subject: [PATCH 18/45] dfhack: 50.13-r2.1 -> 50.13-r3 --- pkgs/games/dwarf-fortress/dfhack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 31cc277e770c..cb0e1e529637 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -90,9 +90,9 @@ let xmlRev = "980b1af13acc31660dce632f913c968f52e2b275"; }; "50.13" = { - dfHackRelease = "50.13-r2.1"; - hash = "sha256-IcjDDZX9YSLzympNc++1Xl85cK/0ASVDvzeNaebYNTQ="; - xmlRev = "c5debb15f696c3d1cb3706e2eb201eccef64f61a"; + dfHackRelease = "50.13-r3"; + hash = "sha256-WbkJ8HmLT5GdZgDmcuFh+1uzhloKM9um0b9YO//uR7Y="; + xmlRev = "f0530a22149606596e97e3e17d941df3aafe29b9"; }; }; From 0e806f5f143675671e4045e12393c9c934929166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Jul 2024 10:13:06 -0700 Subject: [PATCH 19/45] udiskie: use python3Packages python3.pkgs is not spliced --- pkgs/applications/misc/udiskie/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 0041d5153d54..58fa8054c67d 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -7,14 +7,14 @@ , libappindicator-gtk3 , libnotify , librsvg -, python3 +, python3Packages , udisks2 , wrapGAppsHook3 , testers , udiskie }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "udiskie"; version = "2.5.3"; @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook3 ]; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ setuptools ]; @@ -56,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { udisks2 ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ docopt keyutils pygobject3 @@ -79,7 +79,7 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; From c035424c74f744dfe36b652fcdb12ad4445ce9f0 Mon Sep 17 00:00:00 2001 From: wskeele Date: Mon, 8 Jul 2024 15:27:09 +0200 Subject: [PATCH 20/45] duplicity: Add paramiko optional dependency 'invoke' to pythonPath Fixes #325551 --- pkgs/tools/backup/duplicity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index fd5c7c60f0c9..169b143fbe81 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -84,7 +84,7 @@ let self = python3.pkgs.buildPythonApplication rec { pycrypto pydrive2 future - ]; + ] ++ paramiko.optional-dependencies.invoke; nativeCheckInputs = [ gnupg # Add 'gpg' to PATH. From 8f44b9286ac0816070b05c549a736b33a05e2e3b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:45:44 +0200 Subject: [PATCH 21/45] python312Packages.skorch: fix build --- pkgs/development/python-modules/skorch/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 19048dfc9ca8..413e0cfb563e 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -28,15 +28,6 @@ buildPythonPackage rec { hash = "sha256-JcplwaeYlGRAJXRNac1Ya/hgWoHE+NWjZhCU9eaSyRQ="; }; - # Remove at next skorch release: - patches = [ - (fetchpatch { - name = "unbreak-tests-with-sklearn-1.4"; - url = "https://github.com/skorch-dev/skorch/commit/1f7a779d0aa78589e17262c206f5775f2fcd75f8.diff"; - hash = "sha256-X3SgjgDeq3PlBI13cC56LIL1dV1e+Z3tsBj9sz5pizo="; - }) - ]; - disabled = pythonOlder "3.8"; propagatedBuildInputs = [ From 9581c3fad8dab5d1ae4a541a5823a5704042f180 Mon Sep 17 00:00:00 2001 From: Ryan Gibb Date: Wed, 10 Jul 2024 09:37:22 +0100 Subject: [PATCH 22/45] stig: 0.12.8a0 -> 0.12.10a0 --- pkgs/applications/networking/p2p/stig/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index b36ad59194d2..b5db5573ab87 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , python310Packages , testers @@ -10,13 +9,13 @@ python310Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig - version = "0.12.8a0"; + version = "0.12.10a0"; src = fetchFromGitHub { owner = "rndusr"; repo = "stig"; rev = "v${version}"; - sha256 = "sha256-vfmuA6DqWvAygcS6N+qX1h+Ag+P4eOwm41DhAFZR3r8="; + sha256 = "sha256-lSFI4/DxWl17KFgLXZ7c5nW/e5IUGN7s8Gm6wTM5ZWg="; }; propagatedBuildInputs = with python310Packages; [ @@ -58,12 +57,13 @@ python310Packages.buildPythonApplication rec { version = "stig version ${version}"; }; + # https://github.com/rndusr/stig/issues/214#issuecomment-1995651219 + dontUsePytestCheck = true; + meta = with lib; { description = "TUI and CLI for the BitTorrent client Transmission"; homepage = "https://github.com/rndusr/stig"; license = licenses.gpl3Plus; - # Too many broken tests, and it fails to launch - broken = true; maintainers = with maintainers; [ ]; }; } From 61c719e473a460597918be38a2fa7247495ae08f Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Mon, 17 Jun 2024 08:08:01 +0200 Subject: [PATCH 23/45] nixos-rebuild: add support for --file and --attr flags adds support of building system from nix file and attrPath directly these are --file and --attr flags in nix-build respectfully --- .../linux/nixos-rebuild/nixos-rebuild.8 | 42 +++++++++++-- .../linux/nixos-rebuild/nixos-rebuild.sh | 60 ++++++++++++++++--- 2 files changed, 90 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 index 8df05f9310f2..546818f5ce72 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 @@ -20,6 +20,8 @@ .Op Fl -rollback .Op Fl -builders Ar builder-spec .br +.Op Fl -file | f Ar path +.Op Fl -attr | A Ar attrPath .Op Fl -flake Ar flake-uri .Op Fl -no-flake .Op Fl -override-input Ar input-name flake-uri @@ -45,11 +47,15 @@ .Sh DESCRIPTION This command updates the system so that it corresponds to the configuration specified in -.Pa /etc/nixos/configuration.nix -or -.Pa /etc/nixos/flake.nix Ns -\&. Thus, every time you modify the configuration or any other NixOS module, you -must run +.Pa /etc/nixos/configuration.nix Ns +, +.Pa /etc/nixos/flake.nix +or the file and attribute specified by the +.Fl -file +and/or +.Fl -attr +options. Thus, every time you modify the configuration or any other NixOS +module, you must run .Nm to make the changes take effect. It builds the new system in .Pa /nix/store Ns @@ -369,6 +375,32 @@ system with .Ic sudo Ns \&. Setting this option allows deploying as a non-root user. . +.It Fl -file Ar path , Fl f Ar path +Enable and build the NixOS system from the specified file. The file must +evaluate to an attribute set, and it must contain a valid NixOS configuration +at attribute +.Va attrPath Ns +\&. This is useful for building a NixOS system from a nix file that is not +a flake or a NixOS configuration module. Attribute set a with valid NixOS +configuration can be made using +.Va nixos +function in nixpkgs or importing and calling +.Pa nixos/lib/eval-config.nix +from nixpkgs. If specified without +.Fl -attr +option, builds the configuration from the top-level +attribute of the file. +. +.It Fl -attr Ar attrPath , Fl A Ar attrPath +Enable and build the NixOS system from nix file and use the specified attribute +path from file specified by the +.Fl -file +option. If specified without +.Fl -file +option, uses +.Pa default.nix +in current directory. +. .It Fl -flake Va flake-uri Ns Op Va #name Build the NixOS system from the specified flake. It defaults to the directory containing the target of the symlink diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 364c3dc4c003..03b2dbfbeb66 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -34,6 +34,9 @@ targetHost= remoteSudo= verboseScript= noFlake= +attr= +buildFile=default.nix +buildingAttribute=1 installBootloader= json= @@ -58,6 +61,24 @@ while [ "$#" -gt 0 ]; do if [ -n "$action" ]; then showSyntax; fi action="$i" ;; + --file|-f) + if [ -z "$1" ]; then + log "$0: '$i' requires an argument" + exit 1 + fi + buildFile="$1" + buildingAttribute= + shift 1 + ;; + --attr|-A) + if [ -z "$1" ]; then + log "$0: '$i' requires an argument" + exit 1 + fi + attr="$1" + buildingAttribute= + shift 1 + ;; --install-grub) log "$0: --install-grub deprecated, use --install-bootloader instead" installBootloader=1 @@ -345,6 +366,12 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test ]]; then canRun=1 fi +# Verify that user is not trying to use attribute building and flake +# at the same time +if [[ -z $buildingAttribute && -n $flake ]]; then + log "error: '--flake' cannot be used with '--file' or '--attr'" + exit 1 +fi # If ‘--upgrade’ or `--upgrade-all` is given, # run ‘nix-channel --update nixos’. @@ -426,7 +453,10 @@ trap cleanup EXIT # Re-execute nixos-rebuild from the Nixpkgs tree. if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast ]]; then - if [[ -z $flake ]]; then + if [[ -z $buildingAttribute ]]; then + p=$(runCmd nix-build --no-out-link $buildFile -A "${attr:+$attr.}config.system.build.nixos-rebuild" "${extraBuildFlags[@]}") + SHOULD_REEXEC=1 + elif [[ -z $flake ]]; then if p=$(runCmd nix-build --no-out-link --expr 'with import {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then SHOULD_REEXEC=1 fi @@ -448,7 +478,10 @@ fi # Find configuration.nix and open editor instead of building. if [ "$action" = edit ]; then - if [[ -z $flake ]]; then + if [[ -n $attr || -n $buildFile ]]; then + log "error: '--file' and '--attr' are not supported with 'edit'" + exit 1 + elif [[ -z $flake ]]; then NIXOS_CONFIG=${NIXOS_CONFIG:-$(runCmd nix-instantiate --find-file nixos-config)} if [[ -d $NIXOS_CONFIG ]]; then NIXOS_CONFIG=$NIXOS_CONFIG/default.nix @@ -493,6 +526,9 @@ prebuiltNix() { getNixDrv() { nixDrv= + if [[ -z $buildingAttribute ]]; then + if nixDrv="$(runCmd nix-instantiate $buildFile --add-root "$tmpDir/nix.drv" --indirect -A ${attr:+$attr.}config.nix.package.out "${extraBuildFlags[@]}")"; then return; fi + fi if nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then return; fi if nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A nix "${extraBuildFlags[@]}")"; then return; fi @@ -553,7 +589,9 @@ if [ "$action" = repl ]; then # This is a very end user command, implemented using sub-optimal means. # You should feel free to improve its behavior, as well as resolve tech # debt in "breaking" ways. Humans adapt quite well. - if [[ -z $flake ]]; then + if [[ -z $buildingAttribute ]]; then + exec nix repl --file $buildFile $attr "${extraBuildFlags[@]}" + elif [[ -z $flake ]]; then exec nix repl '' "${extraBuildFlags[@]}" else if [[ -n "${lockFlags[0]}" ]]; then @@ -706,7 +744,9 @@ fi if [ -z "$rollback" ]; then log "building the system configuration..." if [[ "$action" = switch || "$action" = boot ]]; then - if [[ -z $flake ]]; then + if [[ -z $buildingAttribute ]]; then + pathToConfig="$(nixBuild $buildFile -A "${attr:+$attr.}config.system.build.toplevel" "${extraBuildFlags[@]}")" + elif [[ -z $flake ]]; then pathToConfig="$(nixBuild '' --no-out-link -A system "${extraBuildFlags[@]}")" else pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}")" @@ -714,19 +754,25 @@ if [ -z "$rollback" ]; then copyToTarget "$pathToConfig" targetHostSudoCmd nix-env -p "$profile" --set "$pathToConfig" elif [[ "$action" = test || "$action" = build || "$action" = dry-build || "$action" = dry-activate ]]; then - if [[ -z $flake ]]; then + if [[ -z $buildingAttribute ]]; then + pathToConfig="$(nixBuild $buildFile -A "${attr:+$attr.}config.system.build.toplevel" "${extraBuildFlags[@]}")" + elif [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")" else pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi elif [ "$action" = build-vm ]; then - if [[ -z $flake ]]; then + if [[ -z $buildingAttribute ]]; then + pathToConfig="$(nixBuild $buildFile -A "${attr:+$attr.}config.system.build.vm" "${extraBuildFlags[@]}")" + elif [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A vm -k "${extraBuildFlags[@]}")" else pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.vm" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi elif [ "$action" = build-vm-with-bootloader ]; then - if [[ -z $flake ]]; then + if [[ -z $buildingAttribute ]]; then + pathToConfig="$(nixBuild $buildFile -A "${attr:+$attr.}config.system.build.vmWithBootLoader" "${extraBuildFlags[@]}")" + elif [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A vmWithBootLoader -k "${extraBuildFlags[@]}")" else pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.vmWithBootLoader" "${extraBuildFlags[@]}" "${lockFlags[@]}")" From c7b66353bfa82536bc780ada22fef5f069319eef Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Wed, 10 Jul 2024 15:06:52 +0200 Subject: [PATCH 24/45] nixos/tests/installer: rename "flake" argument in makeConfig and reverse meaning to "withTestInstrumentation", which reflects what this argument does --- nixos/tests/installer.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 3f57a64333dd..1269463d8ef5 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -11,7 +11,7 @@ let # The configuration to install. makeConfig = { bootLoader, grubDevice, grubIdentifier, grubUseEfi - , extraConfig, forceGrubReinstallCount ? 0, flake ? false + , extraConfig, forceGrubReinstallCount ? 0, withTestInstrumentation ? true , clevisTest }: pkgs.writeText "configuration.nix" '' @@ -19,7 +19,7 @@ let { imports = [ ./hardware-configuration.nix - ${if flake + ${if !withTestInstrumentation then "" # Still included, but via installer/flake.nix else ""} ]; @@ -330,7 +330,7 @@ let "${makeConfig { inherit bootLoader grubDevice grubIdentifier grubUseEfi extraConfig clevisTest; forceGrubReinstallCount = 1; - flake = true; + withTestInstrumentation = false; }}", "/root/my-config/configuration.nix", ) From d77469c442478e13859ec9cf7ae009924701dc0e Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Wed, 10 Jul 2024 17:49:55 +0200 Subject: [PATCH 25/45] nixos/tests/installer: add testByAttrSwitch --- nixos/tests/installer.nix | 131 +++++++++++++++++++- nixos/tests/installer/byAttrNoChannel.nix | 18 +++ nixos/tests/installer/byAttrWithChannel.nix | 10 ++ 3 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 nixos/tests/installer/byAttrNoChannel.nix create mode 100644 nixos/tests/installer/byAttrWithChannel.nix diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 1269463d8ef5..ac333d2e9ea1 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -81,7 +81,7 @@ let # partitions and filesystems. testScriptFun = { bootLoader, createPartitions, grubDevice, grubUseEfi, grubIdentifier , postInstallCommands, postBootCommands, extraConfig - , testSpecialisationConfig, testFlakeSwitch, clevisTest, clevisFallbackTest + , testSpecialisationConfig, testFlakeSwitch, testByAttrSwitch, clevisTest, clevisFallbackTest , disableFileSystems }: let @@ -316,6 +316,119 @@ let target.shutdown() '' + + optionalString testByAttrSwitch '' + with subtest("Configure system with attribute set"): + target.succeed(""" + mkdir /root/my-config + mv /etc/nixos/hardware-configuration.nix /root/my-config/ + rm /etc/nixos/configuration.nix + """) + target.copy_from_host_via_shell( + "${makeConfig { + inherit bootLoader grubDevice grubIdentifier grubUseEfi extraConfig clevisTest; + forceGrubReinstallCount = 1; + withTestInstrumentation = false; + }}", + "/root/my-config/configuration.nix", + ) + target.copy_from_host_via_shell( + "${./installer/byAttrWithChannel.nix}", + "/root/my-config/default.nix", + ) + with subtest("Switch to attribute set based config with channels"): + target.succeed("nixos-rebuild switch --file /root/my-config/default.nix") + + target.shutdown() + + ${startTarget} + + target.succeed(""" + rm /root/my-config/default.nix + """) + target.copy_from_host_via_shell( + "${./installer/byAttrNoChannel.nix}", + "/root/my-config/default.nix", + ) + + target.succeed(""" + pkgs=$(readlink -f /nix/var/nix/profiles/per-user/root/channels)/nixos + if ! [[ -e $pkgs/pkgs/top-level/default.nix ]]; then + echo 1>&2 "$pkgs does not seem to be a nixpkgs source. Please fix the test so that pkgs points to a nixpkgs source."; + exit 1; + fi + sed -e s^@nixpkgs@^$pkgs^ -i /root/my-config/default.nix + + """) + + with subtest("Switch to attribute set based config without channels"): + target.succeed("nixos-rebuild switch --file /root/my-config/default.nix") + + target.shutdown() + + ${startTarget} + + with subtest("nix-channel command is not available anymore"): + target.succeed("! which nix-channel") + + with subtest("builtins.nixPath is now empty"): + target.succeed(""" + [[ "[ ]" == "$(nix-instantiate builtins.nixPath --eval --expr)" ]] + """) + + with subtest(" does not resolve"): + target.succeed(""" + ! nix-instantiate '' --eval --expr + """) + + with subtest("Evaluate attribute set based config in fresh env without nix-channel"): + target.succeed("nixos-rebuild switch --file /root/my-config/default.nix") + + with subtest("Evaluate attribute set based config in fresh env without channel profiles"): + target.succeed(""" + ( + exec 1>&2 + mkdir -p /root/restore + mv -v /root/.nix-channels /root/restore/ + mv -v ~/.nix-defexpr /root/restore/ + mkdir -p /root/restore/channels + mv -v /nix/var/nix/profiles/per-user/root/channels* /root/restore/channels/ + ) + """) + target.succeed("nixos-rebuild switch --file /root/my-config/default.nix") + '' + + optionalString (testByAttrSwitch && testFlakeSwitch) '' + with subtest("Restore channel profiles"): + target.succeed(""" + ( + exec 1>&2 + mv -v /root/restore/.nix-channels /root/ + mv -v /root/restore/.nix-defexpr ~/.nix-defexpr + mv -v /root/restore/channels/* /nix/var/nix/profiles/per-user/root/ + rm -vrf /root/restore + ) + """) + + with subtest("Restore /etc/nixos"): + target.succeed(""" + mv -v /root/my-config/hardware-configuration.nix /etc/nixos/ + """) + target.copy_from_host_via_shell( + "${makeConfig { + inherit bootLoader grubDevice grubIdentifier grubUseEfi extraConfig clevisTest; + forceGrubReinstallCount = 1; + }}", + "/etc/nixos/configuration.nix", + ) + + with subtest("Restore /root/my-config"): + target.succeed(""" + rm -vrf /root/my-config + """) + + '' + + optionalString (testByAttrSwitch && !testFlakeSwitch) '' + target.shutdown() + '' + optionalString testFlakeSwitch '' ${startTarget} @@ -399,6 +512,7 @@ let , enableOCR ? false, meta ? {} , testSpecialisationConfig ? false , testFlakeSwitch ? false + , testByAttrSwitch ? false , clevisTest ? false , clevisFallbackTest ? false , disableFileSystems ? false @@ -533,7 +647,7 @@ let testScript = testScriptFun { inherit bootLoader createPartitions postInstallCommands postBootCommands grubDevice grubIdentifier grubUseEfi extraConfig - testSpecialisationConfig testFlakeSwitch clevisTest clevisFallbackTest + testSpecialisationConfig testFlakeSwitch testByAttrSwitch clevisTest clevisFallbackTest disableFileSystems; }; }; @@ -589,6 +703,15 @@ let testFlakeSwitch = true; }; + simple-test-config-by-attr = simple-test-config // { + testByAttrSwitch = true; + }; + + simple-test-config-from-by-attr-to-flake = simple-test-config // { + testByAttrSwitch = true; + testFlakeSwitch = true; + }; + simple-uefi-grub-config = { createPartitions = '' installer.succeed( @@ -772,6 +895,10 @@ in { switchToFlake = makeInstallerTest "switch-to-flake" simple-test-config-flake; + switchToByAttr = makeInstallerTest "switch-to-by-attr" simple-test-config-by-attr; + + switchFromByAttrToFlake = makeInstallerTest "switch-from-by-attr-to-flake" simple-test-config-from-by-attr-to-flake; + # Test cloned configurations with the simple grub configuration simpleSpecialised = makeInstallerTest "simpleSpecialised" (simple-test-config // specialisation-test-extraconfig); diff --git a/nixos/tests/installer/byAttrNoChannel.nix b/nixos/tests/installer/byAttrNoChannel.nix new file mode 100644 index 000000000000..03293cd4a0e3 --- /dev/null +++ b/nixos/tests/installer/byAttrNoChannel.nix @@ -0,0 +1,18 @@ +# This file gets copied into the installation + +let + nixpkgs = "@nixpkgs@"; +in + +{ evalConfig ? import "${nixpkgs}/nixos/lib/eval-config.nix" }: + +evalConfig { + modules = [ + ./configuration.nix + ( import "${nixpkgs}/nixos/modules/testing/test-instrumentation.nix" ) + { + # Disable nix channels + nix.channel.enable = false; + } + ]; +} diff --git a/nixos/tests/installer/byAttrWithChannel.nix b/nixos/tests/installer/byAttrWithChannel.nix new file mode 100644 index 000000000000..951231dcba3e --- /dev/null +++ b/nixos/tests/installer/byAttrWithChannel.nix @@ -0,0 +1,10 @@ +# This file gets copied into the installation + +{ evalConfig ? import }: + +evalConfig { + modules = [ + ./configuration.nix + ( import ) + ]; +} From eeb1dffd02a19b35e0f3877166c3b05a23aa823e Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Tue, 9 Jul 2024 13:21:49 +0200 Subject: [PATCH 26/45] nixos/nixos-install: add support for --file and --attr flags --- .../installer/tools/manpages/nixos-install.8 | 28 ++++++++ .../modules/installer/tools/nixos-install.sh | 68 ++++++++++++++++--- 2 files changed, 86 insertions(+), 10 deletions(-) diff --git a/nixos/modules/installer/tools/manpages/nixos-install.8 b/nixos/modules/installer/tools/manpages/nixos-install.8 index c6c8ed15224d..e1af90a37d76 100644 --- a/nixos/modules/installer/tools/manpages/nixos-install.8 +++ b/nixos/modules/installer/tools/manpages/nixos-install.8 @@ -14,6 +14,8 @@ .Op Fl -root Ar root .Op Fl -system Ar path .Op Fl -flake Ar flake-uri +.Op Fl -file | f Ar path +.Op Fl -attr | A Ar attrPath .Op Fl -impure .Op Fl -channel Ar channel .Op Fl -no-channel-copy @@ -111,6 +113,32 @@ output named .Ql nixosConfigurations. Ns Ar name Ns \&. . +.It Fl -file Ar path , Fl f Ar path +Enable and build the NixOS system from the specified file. The file must +evaluate to an attribute set, and it must contain a valid NixOS configuration +at attribute +.Va attrPath Ns +\&. This is useful for building a NixOS system from a nix file that is not +a flake or a NixOS configuration module. Attribute set a with valid NixOS +configuration can be made using +.Va nixos +function in nixpkgs or importing and calling +.Pa nixos/lib/eval-config.nix +from nixpkgs. If specified without +.Fl -attr +option, builds the configuration from the top-level +attribute of the file. +. +.It Fl -attr Ar attrPath , Fl A Ar attrPath +Enable and build the NixOS system from nix file and use the specified attribute +path from file specified by the +.Fl -file +option. If specified without +.Fl -file +option, uses +.Va [root] Ns Pa /etc/nixos/default.nix Ns +\&. +. .It Fl -channel Ar channel If this option is provided, do not copy the current .Dq nixos diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 4e42875c0365..a76b4ffb4444 100755 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -17,6 +17,9 @@ mountPoint=/mnt channelPath= system= verbosity=() +attr= +buildFile= +buildingAttribute=1 while [ "$#" -gt 0 ]; do i="$1"; shift 1 @@ -41,6 +44,24 @@ while [ "$#" -gt 0 ]; do flakeFlags=(--experimental-features 'nix-command flakes') shift 1 ;; + --file|-f) + if [ -z "$1" ]; then + log "$0: '$i' requires an argument" + exit 1 + fi + buildFile="$1" + buildingAttribute= + shift 1 + ;; + --attr|-A) + if [ -z "$1" ]; then + log "$0: '$i' requires an argument" + exit 1 + fi + attr="$1" + buildingAttribute= + shift 1 + ;; --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file) lockFlags+=("$i") ;; @@ -101,17 +122,30 @@ while [[ "$checkPath" != "/" ]]; do checkPath="$(dirname "$checkPath")" done -# Get the path of the NixOS configuration file. -if [[ -z $NIXOS_CONFIG ]]; then - NIXOS_CONFIG=$mountPoint/etc/nixos/configuration.nix -fi - -if [[ ${NIXOS_CONFIG:0:1} != / ]]; then - echo "$0: \$NIXOS_CONFIG is not an absolute path" +# Verify that user is not trying to use attribute building and flake +# at the same time +if [[ -z $buildingAttribute && -n $flake ]]; then + echo "$0: '--flake' cannot be used with '--file' or '--attr'" exit 1 fi -if [[ -n $flake ]]; then +# Get the path of the NixOS configuration file. +if [[ -z $flake && -n $buildingAttribute ]]; then + if [[ -z $NIXOS_CONFIG ]]; then + NIXOS_CONFIG=$mountPoint/etc/nixos/configuration.nix + fi + + if [[ ${NIXOS_CONFIG:0:1} != / ]]; then + echo "$0: \$NIXOS_CONFIG is not an absolute path" + exit 1 + fi +elif [[ -z $buildingAttribute ]]; then + if [[ -z $buildFile ]]; then + buildFile="$mountPoint/etc/nixos/default.nix" + elif [[ -d $buildFile ]]; then + buildFile="$buildFile/default.nix" + fi +elif [[ -n $flake ]]; then if [[ $flake =~ ^(.*)\#([^\#\"]*)$ ]]; then flake="${BASH_REMATCH[1]}" flakeAttr="${BASH_REMATCH[2]}" @@ -129,11 +163,16 @@ if [[ -n $flake ]]; then flake=$(nix "${flakeFlags[@]}" flake metadata --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url) fi -if [[ ! -e $NIXOS_CONFIG && -z $system && -z $flake ]]; then +if [[ ! -e $NIXOS_CONFIG && -z $system && -z $flake && -n $buildingAttribute ]]; then echo "configuration file $NIXOS_CONFIG doesn't exist" exit 1 fi +if [[ ! -z $buildingAttribute && -e $buildFile && -z $system ]]; then + echo "configuration file $buildFile doesn't exist" + exit 1 +fi + # A place to drop temporary stuff. tmpdir="$(mktemp -d -p "$mountPoint")" trap 'rm -rf $tmpdir' EXIT @@ -163,11 +202,20 @@ fi # Build the system configuration in the target filesystem. if [[ -z $system ]]; then outLink="$tmpdir/system" - if [[ -z $flake ]]; then + if [[ -z $flake && -n $buildingAttribute ]]; then echo "building the configuration in $NIXOS_CONFIG..." nix-build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ --extra-substituters "$sub" \ '' -A system -I "nixos-config=$NIXOS_CONFIG" "${verbosity[@]}" + elif [[ -z $buildingAttribute ]]; then + if [[ -n $attr ]]; then + echo "building the configuration in $buildFile and attribute $attr..." + else + echo "building the configuration in $buildFile..." + fi + nix-build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ + --extra-substituters "$sub" \ + "$buildFile" -A "${attr:+$attr.}config.system.build.toplevel" "${verbosity[@]}" else echo "building the flake in $flake..." nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" \ From 45037a9d735a87619e7751de2fff0b60dcc34444 Mon Sep 17 00:00:00 2001 From: Smaug123 <3138005+Smaug123@users.noreply.github.com> Date: Thu, 11 Jul 2024 18:32:27 +0100 Subject: [PATCH 27/45] buildDotnetModule: split fetch-deps script to new file This makes the minimal change to put the script in a new file. It does not fix the resulting ShellCheck warnings (which would have been present in the previous version; I've just exposed them). --- .../dotnet/build-dotnet-module/default.nix | 169 +++++------------- .../dotnet/build-dotnet-module/fetch-deps.sh | 111 ++++++++++++ 2 files changed, 155 insertions(+), 125 deletions(-) create mode 100644 pkgs/build-support/dotnet/build-dotnet-module/fetch-deps.sh diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 7b88b16064bc..9dd36b03fc48 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -1,6 +1,8 @@ { lib +, runtimeShell , stdenvNoCC , callPackage +, substituteAll , writeShellScript , srcOnly , linkFarmFromDrvs @@ -202,131 +204,48 @@ stdenvNoCC.mkDerivation (args // { passthru = { inherit nuget-source; } // lib.optionalAttrs (!lib.isDerivation nugetDeps) { - fetch-deps = - let - flags = dotnetFlags ++ dotnetRestoreFlags; - runtimeIds = - if runtimeId != null - then [ runtimeId ] - else map (system: dotnetCorePackages.systemToDotnetRid system) platforms; - defaultDepsFile = - # Wire in the nugetDeps file such that running the script with no args - # runs it agains the correct deps file by default. - # Note that toString is necessary here as it results in the path at - # eval time (i.e. to the file in your local Nixpkgs checkout) rather - # than the Nix store path of the path after it's been imported. - if lib.isPath nugetDepsFile && !lib.hasPrefix "${builtins.storeDir}/" (toString nugetDepsFile) - then toString nugetDepsFile - else ''$(mktemp -t "${pname}-deps-XXXXXX.nix")''; - in - writeShellScript "fetch-${pname}-deps" '' - set -euo pipefail - - export PATH="${lib.makeBinPath [ coreutils runtimeShellPackage dotnet-sdk (nuget-to-nix.override { inherit dotnet-sdk; }) ]}" - - for arg in "$@"; do - case "$arg" in - --keep-sources|-k) - keepSources=1 - shift - ;; - --help|-h) - echo "usage: $0 [--keep-sources] [--help] " - echo " The path to write the lockfile to. A temporary file is used if this is not set" - echo " --keep-sources Dont remove temporary directories upon exit, useful for debugging" - echo " --help Show this help message" - exit - ;; - esac - done - - if [[ ''${TMPDIR:-} == /run/user/* ]]; then - # /run/user is usually a tmpfs in RAM, which may be too small - # to store all downloaded dotnet packages - unset TMPDIR - fi - - export tmp=$(mktemp -td "deps-${pname}-XXXXXX") - HOME=$tmp/home - - exitTrap() { - test -n "''${ranTrap-}" && return - ranTrap=1 - - if test -n "''${keepSources-}"; then - echo -e "Path to the source: $tmp/src\nPath to the fake home: $tmp/home" - else - rm -rf "$tmp" - fi - - # Since mktemp is used this will be empty if the script didnt succesfully complete - if ! test -s "$depsFile"; then - rm -rf "$depsFile" - fi - } - - trap exitTrap EXIT INT TERM - - dotnetRestore() { - local -r project="''${1-}" - local -r rid="$2" - - dotnet restore ''${project-} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --packages "$tmp/nuget_pkgs" \ - --runtime "$rid" \ - --no-cache \ - --force \ - ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ - ${lib.escapeShellArgs flags} - } - - declare -a projectFiles=( ${lib.escapeShellArgs projectFiles} ) - declare -a testProjectFiles=( ${lib.escapeShellArgs testProjectFiles} ) - - export DOTNET_NOLOGO=1 - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - - depsFile=$(realpath "''${1:-${defaultDepsFile}}") - echo Will write lockfile to "$depsFile" - mkdir -p "$tmp/nuget_pkgs" - - storeSrc="${srcOnly args}" - src=$tmp/src - cp -rT "$storeSrc" "$src" - chmod -R +w "$src" - - cd "$src" - echo "Restoring project..." - - ${dotnet-sdk}/bin/dotnet tool restore - cp -r $HOME/.nuget/packages/* $tmp/nuget_pkgs || true - - for rid in "${lib.concatStringsSep "\" \"" runtimeIds}"; do - (( ''${#projectFiles[@]} == 0 )) && dotnetRestore "" "$rid" - - for project in ''${projectFiles[@]-} ''${testProjectFiles[@]-}; do - dotnetRestore "$project" "$rid" - done - done - # Second copy, makes sure packages restored by ie. paket are included - cp -r $HOME/.nuget/packages/* $tmp/nuget_pkgs || true - - echo "Succesfully restored project" - - echo "Writing lockfile..." - - excluded_sources="${lib.concatStringsSep " " sdkDeps}" - for excluded_source in ''${excluded_sources[@]}; do - ls "$excluded_source" >> "$tmp/excluded_list" - done - tmpFile="$tmp"/deps.nix - echo -e "# This file was automatically generated by passthru.fetch-deps.\n# Please dont edit it manually, your changes might get overwritten!\n" > "$tmpFile" - nuget-to-nix "$tmp/nuget_pkgs" "$tmp/excluded_list" >> "$tmpFile" - mv "$tmpFile" "$depsFile" - echo "Succesfully wrote lockfile to $depsFile" - ''; + fetch-deps = let + flagsList = dotnetFlags ++ dotnetRestoreFlags; + flags = lib.concatStringsSep " " (map lib.escapeShellArg flagsList); + disableParallel = + lib.optionalString (!enableParallelBuilding) "--disable-parallel"; + runtimeIdsList = if runtimeId != null then + [ runtimeId ] + else + map (system: dotnetCorePackages.systemToDotnetRid system) platforms; + runtimeIds = + lib.concatStringsSep " " (map lib.escapeShellArg runtimeIdsList); + defaultDepsFile = + # Wire in the nugetDeps file such that running the script with no args + # runs it agains the correct deps file by default. + # Note that toString is necessary here as it results in the path at + # eval time (i.e. to the file in your local Nixpkgs checkout) rather + # than the Nix store path of the path after it's been imported. + if lib.isPath nugetDepsFile + && !lib.hasPrefix "${builtins.storeDir}/" (toString nugetDepsFile) then + toString nugetDepsFile + else + ''$(mktemp -t "${pname}-deps-XXXXXX.nix")''; + storeSrc = srcOnly args; + projectFileStr = lib.escapeShellArg projectFiles; + testProjectFileStr = lib.escapeShellArg testProjectFiles; + path = lib.makeBinPath [ + coreutils + runtimeShellPackage + dotnet-sdk + (nuget-to-nix.override { inherit dotnet-sdk; }) + ]; + dotnetSdkPath = toString dotnet-sdk; + excludedSources = + lib.concatStringsSep " " (map lib.escapeShellArg sdkDeps); + in substituteAll { + name = "fetch-deps"; + src = ./fetch-deps.sh; + isExecutable = true; + inherit pname defaultDepsFile runtimeIds storeSrc flags disableParallel + projectFileStr testProjectFileStr path dotnetSdkPath excludedSources + runtimeShell; + }; } // args.passthru or { }; meta = (args.meta or { }) // { inherit platforms; }; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/fetch-deps.sh b/pkgs/build-support/dotnet/build-dotnet-module/fetch-deps.sh new file mode 100644 index 000000000000..de134162dc84 --- /dev/null +++ b/pkgs/build-support/dotnet/build-dotnet-module/fetch-deps.sh @@ -0,0 +1,111 @@ +#! @runtimeShell@ +# shellcheck shell=bash +set -euo pipefail + +export PATH="@path@" + +for arg in "$@"; do + case "$arg" in + --keep-sources|-k) + keepSources=1 + shift + ;; + --help|-h) + echo "usage: $0 [--keep-sources] [--help] " + echo " The path to write the lockfile to. A temporary file is used if this is not set" + echo " --keep-sources Dont remove temporary directories upon exit, useful for debugging" + echo " --help Show this help message" + exit + ;; + esac +done + +if [[ ${TMPDIR:-} == /run/user/* ]]; then + # /run/user is usually a tmpfs in RAM, which may be too small + # to store all downloaded dotnet packages + unset TMPDIR +fi + +export tmp=$(mktemp -td "deps-@pname@-XXXXXX") +HOME=$tmp/home + +exitTrap() { + test -n "${ranTrap-}" && return + ranTrap=1 + + if test -n "${keepSources-}"; then + echo -e "Path to the source: $tmp/src\nPath to the fake home: $tmp/home" + else + rm -rf "$tmp" + fi + + # Since mktemp is used this will be empty if the script didnt succesfully complete + if ! test -s "$depsFile"; then + rm -rf "$depsFile" + fi +} + +trap exitTrap EXIT INT TERM + +dotnetRestore() { + local -r project="${1-}" + local -r rid="$2" + + dotnet restore ${project-} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --packages "$tmp/nuget_pkgs" \ + --runtime "$rid" \ + --no-cache \ + --force \ + @disableParallel@ \ + @flags@ +} + +declare -a projectFiles=( @projectFileStr@ ) +declare -a testProjectFiles=( @testProjectFileStr@ ) + +export DOTNET_NOLOGO=1 +export DOTNET_CLI_TELEMETRY_OPTOUT=1 + +depsFile=$(realpath "${1:-@defaultDepsFile@}") +echo Will write lockfile to "$depsFile" +mkdir -p "$tmp/nuget_pkgs" + +storeSrc="@storeSrc@" +src=$tmp/src +cp -rT "$storeSrc" "$src" +chmod -R +w "$src" + +cd "$src" +echo "Restoring project..." + +"@dotnetSdkPath@/bin/dotnet" tool restore +cp -r $HOME/.nuget/packages/* $tmp/nuget_pkgs || true + +runtimeIds=(@runtimeIds@) + +for rid in "${runtimeIds[@]}"; do + (( ${#projectFiles[@]} == 0 )) && dotnetRestore "" "$rid" + + for project in ${projectFiles[@]-} ${testProjectFiles[@]-}; do + dotnetRestore "$project" "$rid" + done +done +# Second copy, makes sure packages restored by ie. paket are included +cp -r $HOME/.nuget/packages/* $tmp/nuget_pkgs || true + +echo "Succesfully restored project" + +echo "Writing lockfile..." + +excluded_sources=( @excludedSources@ ) +for excluded_source in ${excluded_sources[@]}; do + ls "$excluded_source" >> "$tmp/excluded_list" +done +tmpFile="$tmp"/deps.nix +echo -e "# This file was automatically generated by passthru.fetch-deps.\n# Please dont edit it manually, your changes might get overwritten!\n" > "$tmpFile" +nuget-to-nix "$tmp/nuget_pkgs" "$tmp/excluded_list" >> "$tmpFile" +mv "$tmpFile" "$depsFile" +echo "Succesfully wrote lockfile to $depsFile" + From 3dc454582201c2f605eefa7e0711347aba54498e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 21:47:24 +0000 Subject: [PATCH 28/45] haproxy: 3.0.2 -> 3.0.3 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 4cef8e04ea2d..6a01f2f8ba88 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -28,11 +28,11 @@ let sslPkg = sslPkgs.${sslLibrary}; in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-lnLuQ7EJ8ZNWw11yaHsiLc+CuHk2DG6CZ3OXN2z13DY="; + hash = "sha256-Oac8GHoLANJgLLP/ylLRtZ2Q8JAyc0/owD6y4pp9Gd8="; }; buildInputs = [ sslPkg zlib libxcrypt ] From 5ebd80d6d25536f167bc0cbab53b6f35f3cb63c9 Mon Sep 17 00:00:00 2001 From: isabel Date: Sat, 13 Jul 2024 08:35:34 +0100 Subject: [PATCH 29/45] lazygit: move to by-name --- .../lazygit/default.nix => by-name/la/lazygit/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/lazygit/default.nix => by-name/la/lazygit/package.nix} (100%) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/by-name/la/lazygit/package.nix similarity index 100% rename from pkgs/development/tools/lazygit/default.nix rename to pkgs/by-name/la/lazygit/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f90e707a504..7d86e2079f43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18778,8 +18778,6 @@ with pkgs; kythe = callPackage ../development/tools/kythe { }; - lazygit = callPackage ../development/tools/lazygit { }; - laminar = callPackage ../development/tools/continuous-integration/laminar { }; lcov = callPackage ../development/tools/analysis/lcov { }; From 606f9e487833b0fafdd867aaffa9229f96e75741 Mon Sep 17 00:00:00 2001 From: isabel Date: Sat, 13 Jul 2024 08:37:02 +0100 Subject: [PATCH 30/45] lazygit: format with nixfmt-rfc-style --- pkgs/by-name/la/lazygit/package.nix | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index b5f1d5d4a64e..98bb863350f5 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -1,5 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, lazygit, testers }: - +{ + lib, + buildGoModule, + fetchFromGitHub, + lazygit, + testers, +}: buildGoModule rec { pname = "lazygit"; version = "0.42.0"; @@ -14,18 +19,24 @@ buildGoModule rec { vendorHash = null; subPackages = [ "." ]; - ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; + ldflags = [ + "-X main.version=${version}" + "-X main.buildSource=nix" + ]; - passthru.tests.version = testers.testVersion { - package = lazygit; - }; + passthru.tests.version = testers.testVersion { package = lazygit; }; meta = with lib; { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne equirosa paveloom starsep ]; + maintainers = with maintainers; [ + Br1ght0ne + equirosa + paveloom + starsep + ]; mainProgram = "lazygit"; }; } From 4c01c9d8a59e37140913dae78d6d49b8a85b21b7 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 13 Jul 2024 12:00:00 +0000 Subject: [PATCH 31/45] sved: fix the wrapper to be a python script --- pkgs/applications/editors/vim/plugins/overrides.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 44c60783f1a8..948de487fb3f 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -87,6 +87,7 @@ glib , gobject-introspection , wrapGAppsHook3 +, writeText , # sniprun dependencies bashInteractive , coreutils @@ -1482,12 +1483,19 @@ install -Dt $out/bin ftplugin/evinceSync.py ''; }; + # the vim plugin expects evinceSync.py to be a python file, but it is a C wrapper + pythonWrapper = writeText "evinceSync-wrapper.py" /* python */ '' + #!${python3}/bin/python3 + import os + import sys + os.execv("${svedbackend}/bin/evinceSync.py", sys.argv) + ''; in super.sved.overrideAttrs { preferLocalBuild = true; postPatch = '' rm ftplugin/evinceSync.py - ln -s ${svedbackend}/bin/evinceSync.py ftplugin/evinceSync.py + install -m 544 ${pythonWrapper} ftplugin/evinceSync.py ''; meta = { description = "synctex support between vim/neovim and evince"; From 5d27ab8df13638ce24ea29076c70d4c3be9ab165 Mon Sep 17 00:00:00 2001 From: isabel Date: Sat, 13 Jul 2024 08:40:07 +0100 Subject: [PATCH 32/45] lazygit: 0.42.0 -> 0.43.1 --- pkgs/by-name/la/lazygit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 98bb863350f5..4f7134692ba5 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "lazygit"; - version = "0.42.0"; + version = "0.43.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - hash = "sha256-w5QL+CuMYyTTnNAfWF8jQuQWfjxaw7bANK69Dc+onGk="; + hash = "sha256-iFx/ffaijhOqEDRW1QVzhQMvSgnS4lKFOzq1YdlkUzc="; }; vendorHash = null; From 3eae220883d4c134f924a338a9fd963b6bb5d21f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 15:33:54 +0000 Subject: [PATCH 33/45] asm-lsp: 0.6.0 -> 0.7.1 --- pkgs/by-name/as/asm-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 9a44f68ca64f..a314e16db7fd 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -6,7 +6,7 @@ }: let pname = "asm-lsp"; - version = "0.6.0"; + version = "0.7.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage { owner = "bergercookie"; repo = "asm-lsp"; rev = "v${version}"; - hash = "sha256-vOkuTJFP2zme8S+u5j1TXt6BXnwtASRVH4Dre9g1dtk="; + hash = "sha256-nHLM4cwVo6esrrpr4s+DfJIUWWKSrYwWLOPC84tb68o="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { openssl ]; - cargoHash = "sha256-lmOnBcLWfTCuQcPiRmPoFD/QvagfkApFP6/h1ot7atU="; + cargoHash = "sha256-CiHXfy8Xqrg8SAWA4nTHSGZKS0pGcoQem9kLRtTLpRs="; # tests expect ~/.cache/asm-lsp to be writable preCheck = '' From fccf7e0219234c2f40056a52ead4632c67369258 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 16:04:45 +0000 Subject: [PATCH 34/45] python312Packages.optimum: 1.20.0 -> 1.21.2 --- pkgs/development/python-modules/optimum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 07c80298754a..279db6eded5f 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.20.0"; + version = "1.21.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-aQNDVNWTgY2LEtug229SEZRMvKHpsQfiTPWW4Lh3hs4="; + hash = "sha256-OhquE+QhNOXFkKy/TvKlLn65CMchvKjcbR/S4Rl2MT4="; }; build-system = [ setuptools ]; From 05f5dbd470d5f9c9c6f53fca395ceb1bf20f404e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 13 Jul 2024 18:56:35 +0200 Subject: [PATCH 35/45] doc/php: Fix mkComposerRepository example `mkComposerRepository` required `pname` and `version` since the beginning (b36ad2f51797d82ddd4479835c0edd71b3386865), with the boolean attribute becoming required later (3eb168da9243989a63dfd4e2c17c52f8c133247b). --- doc/languages-frameworks/php.section.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index c1493588a606..1bcb4ee727a5 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -283,7 +283,10 @@ in { ]; composerRepository = php.mkComposerRepository { - inherit (finalAttrs) src; + inherit (finalAttrs) pname version src; + composerNoDev = true; + composerNoPlugins = true; + composerNoScripts = true; # Specifying a custom composer.lock since it is not present in the sources. composerLock = ./composer.lock; # The composer vendor hash From 07c1bc203404a2c34188131b4e454185eba23b11 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 14 Jul 2024 00:25:56 +0800 Subject: [PATCH 36/45] treewide: sha256 -> hash attribute for pypi fetchers --- pkgs/applications/audio/mopidy/bandcamp.nix | 2 +- pkgs/applications/audio/mopidy/iris.nix | 2 +- pkgs/applications/audio/mopidy/jellyfin.nix | 2 +- pkgs/applications/audio/mopidy/mopify.nix | 2 +- pkgs/applications/audio/mopidy/mpd.nix | 2 +- pkgs/applications/audio/mopidy/mpris.nix | 2 +- pkgs/applications/audio/mopidy/muse.nix | 2 +- pkgs/applications/audio/mopidy/notify.nix | 2 +- pkgs/applications/audio/mopidy/podcast.nix | 2 +- pkgs/applications/audio/spotify-cli-linux/default.nix | 2 +- pkgs/applications/misc/bikeshed/default.nix | 2 +- pkgs/applications/misc/chatblade/default.nix | 2 +- pkgs/applications/misc/khard/default.nix | 2 +- pkgs/applications/misc/raiseorlaunch/default.nix | 2 +- pkgs/applications/misc/remarkable/remarkable-mouse/default.nix | 2 +- pkgs/applications/misc/seashells/default.nix | 2 +- pkgs/applications/misc/vit/default.nix | 2 +- pkgs/applications/networking/cluster/luigi/default.nix | 2 +- pkgs/applications/networking/flent/default.nix | 2 +- pkgs/applications/office/tryton/default.nix | 2 +- pkgs/applications/radio/quisk/default.nix | 2 +- pkgs/applications/version-management/git-aggregator/default.nix | 2 +- pkgs/applications/version-management/legit/default.nix | 2 +- pkgs/applications/video/ffmpeg-normalize/default.nix | 2 +- pkgs/applications/video/jellyfin-mpv-shim/default.nix | 2 +- pkgs/applications/window-managers/i3/balance-workspace.nix | 2 +- pkgs/applications/window-managers/i3/i3-resurrect.nix | 2 +- pkgs/by-name/si/signal-export/package.nix | 2 +- pkgs/development/compilers/lesscpy/default.nix | 2 +- pkgs/development/embedded/rshell/default.nix | 2 +- pkgs/development/python-modules/agate-dbf/default.nix | 2 +- pkgs/development/python-modules/aigpy/default.nix | 2 +- .../development/python-modules/aiohttp-client-cache/default.nix | 2 +- pkgs/development/python-modules/aiorpcx/default.nix | 2 +- pkgs/development/python-modules/altgraph/default.nix | 2 +- .../python-modules/argos-translate-files/default.nix | 2 +- pkgs/development/python-modules/argostranslate/default.nix | 2 +- pkgs/development/python-modules/arrayqueues/default.nix | 2 +- .../development/python-modules/azure-datalake-store/default.nix | 2 +- .../python-modules/azure-mgmt-apimanagement/default.nix | 2 +- pkgs/development/python-modules/azure-mgmt-dns/default.nix | 2 +- pkgs/development/python-modules/betamax/default.nix | 2 +- pkgs/development/python-modules/calmjs-types/default.nix | 2 +- pkgs/development/python-modules/calmjs/default.nix | 2 +- pkgs/development/python-modules/cogapp/default.nix | 2 +- pkgs/development/python-modules/commandparse/default.nix | 2 +- pkgs/development/python-modules/ctap-keyring-device/default.nix | 2 +- pkgs/development/python-modules/cypari2/default.nix | 2 +- pkgs/development/python-modules/daff/default.nix | 2 +- pkgs/development/python-modules/dazl/default.nix | 2 +- pkgs/development/python-modules/django-sekizai/default.nix | 2 +- pkgs/development/python-modules/dogtag-pki/default.nix | 2 +- pkgs/development/python-modules/durus/default.nix | 2 +- pkgs/development/python-modules/elasticsearch-dsl/default.nix | 2 +- pkgs/development/python-modules/elasticsearch/default.nix | 2 +- pkgs/development/python-modules/empy/default.nix | 2 +- pkgs/development/python-modules/ete3/default.nix | 2 +- pkgs/development/python-modules/f5-sdk/default.nix | 2 +- pkgs/development/python-modules/fastdownload/default.nix | 2 +- pkgs/development/python-modules/feedgen/default.nix | 2 +- pkgs/development/python-modules/feedgenerator/default.nix | 2 +- pkgs/development/python-modules/flower/default.nix | 2 +- pkgs/development/python-modules/formencode/default.nix | 2 +- pkgs/development/python-modules/freertos-gdb/default.nix | 2 +- pkgs/development/python-modules/grequests/default.nix | 2 +- .../python-modules/gtfs-realtime-bindings/default.nix | 2 +- pkgs/development/python-modules/http-ece/default.nix | 2 +- pkgs/development/python-modules/httpauth/default.nix | 2 +- pkgs/development/python-modules/isosurfaces/default.nix | 2 +- pkgs/development/python-modules/javaobj-py3/default.nix | 2 +- pkgs/development/python-modules/kaggle/default.nix | 2 +- pkgs/development/python-modules/l18n/default.nix | 2 +- pkgs/development/python-modules/langcodes/default.nix | 2 +- pkgs/development/python-modules/latexcodec/default.nix | 2 +- pkgs/development/python-modules/leather/default.nix | 2 +- pkgs/development/python-modules/m2r/default.nix | 2 +- pkgs/development/python-modules/macfsevents/default.nix | 2 +- .../python-modules/material-color-utilities/default.nix | 2 +- pkgs/development/python-modules/memory-profiler/default.nix | 2 +- pkgs/development/python-modules/merge3/default.nix | 2 +- pkgs/development/python-modules/micawber/default.nix | 2 +- pkgs/development/python-modules/miniupnpc/default.nix | 2 +- pkgs/development/python-modules/mixins/default.nix | 2 +- pkgs/development/python-modules/mkdocs-macros/default.nix | 2 +- pkgs/development/python-modules/mock/default.nix | 2 +- pkgs/development/python-modules/multipledispatch/default.nix | 2 +- pkgs/development/python-modules/netaddr/default.nix | 2 +- pkgs/development/python-modules/netapp-lib/default.nix | 2 +- pkgs/development/python-modules/olefile/default.nix | 2 +- pkgs/development/python-modules/omrdatasettools/default.nix | 2 +- pkgs/development/python-modules/oslotest/default.nix | 2 +- pkgs/development/python-modules/palettable/default.nix | 2 +- pkgs/development/python-modules/pamela/default.nix | 2 +- pkgs/development/python-modules/pandocfilters/default.nix | 2 +- pkgs/development/python-modules/persist-queue/default.nix | 2 +- pkgs/development/python-modules/plone-testing/default.nix | 2 +- pkgs/development/python-modules/poppler-qt5/default.nix | 2 +- pkgs/development/python-modules/portend/default.nix | 2 +- pkgs/development/python-modules/pplpy/default.nix | 2 +- pkgs/development/python-modules/pq/default.nix | 2 +- pkgs/development/python-modules/prov/default.nix | 2 +- pkgs/development/python-modules/pubnubsub-handler/default.nix | 2 +- pkgs/development/python-modules/py-slvs/default.nix | 2 +- pkgs/development/python-modules/pyacoustid/default.nix | 2 +- pkgs/development/python-modules/pycollada/default.nix | 2 +- pkgs/development/python-modules/pycparser/default.nix | 2 +- pkgs/development/python-modules/pydelijn/default.nix | 2 +- pkgs/development/python-modules/pydot/default.nix | 2 +- pkgs/development/python-modules/pyephember/default.nix | 2 +- pkgs/development/python-modules/pyfiglet/default.nix | 2 +- .../development/python-modules/pygments-better-html/default.nix | 2 +- pkgs/development/python-modules/pyhomematic/default.nix | 2 +- pkgs/development/python-modules/pylibacl/default.nix | 2 +- pkgs/development/python-modules/pymaven-patch/default.nix | 2 +- pkgs/development/python-modules/pypresence/default.nix | 2 +- pkgs/development/python-modules/pyqt6-charts/default.nix | 2 +- pkgs/development/python-modules/pyqtwebengine/default.nix | 2 +- pkgs/development/python-modules/pyramid-beaker/default.nix | 2 +- pkgs/development/python-modules/pyscreenshot/default.nix | 2 +- pkgs/development/python-modules/pytest-arraydiff/default.nix | 2 +- pkgs/development/python-modules/pytest-instafail/default.nix | 2 +- pkgs/development/python-modules/pytest-twisted/default.nix | 2 +- pkgs/development/python-modules/python-daemon/default.nix | 2 +- pkgs/development/python-modules/python-musicpd/default.nix | 2 +- pkgs/development/python-modules/python-periphery/default.nix | 2 +- pkgs/development/python-modules/python-uinput/default.nix | 2 +- pkgs/development/python-modules/pytubefix/default.nix | 2 +- pkgs/development/python-modules/pyvcd/default.nix | 2 +- pkgs/development/python-modules/pyvizio/default.nix | 2 +- pkgs/development/python-modules/pywatchman/default.nix | 2 +- pkgs/development/python-modules/qgrid/default.nix | 2 +- pkgs/development/python-modules/queuelib/default.nix | 2 +- pkgs/development/python-modules/ramlfications/default.nix | 2 +- pkgs/development/python-modules/relatorio/default.nix | 2 +- pkgs/development/python-modules/requests-futures/default.nix | 2 +- pkgs/development/python-modules/requests-hawk/default.nix | 2 +- pkgs/development/python-modules/riprova/default.nix | 2 +- pkgs/development/python-modules/rnc2rng/default.nix | 2 +- pkgs/development/python-modules/rpmfile/default.nix | 2 +- pkgs/development/python-modules/smpplib/default.nix | 2 +- pkgs/development/python-modules/sockjs/default.nix | 2 +- pkgs/development/python-modules/soundcloud-v2/default.nix | 2 +- pkgs/development/python-modules/sphinx-external-toc/default.nix | 2 +- pkgs/development/python-modules/srt/default.nix | 2 +- pkgs/development/python-modules/sure/default.nix | 2 +- pkgs/development/python-modules/tadasets/default.nix | 2 +- pkgs/development/python-modules/takethetime/default.nix | 2 +- pkgs/development/python-modules/tesserocr/default.nix | 2 +- pkgs/development/python-modules/testrepository/default.nix | 2 +- pkgs/development/python-modules/testtools/default.nix | 2 +- pkgs/development/python-modules/textacy/default.nix | 2 +- pkgs/development/python-modules/tubeup/default.nix | 2 +- pkgs/development/python-modules/types-appdirs/default.nix | 2 +- pkgs/development/python-modules/uhi/default.nix | 2 +- pkgs/development/python-modules/unrardll/default.nix | 2 +- pkgs/development/python-modules/validobj/default.nix | 2 +- pkgs/development/python-modules/verspec/default.nix | 2 +- pkgs/development/python-modules/virtualenvwrapper/default.nix | 2 +- pkgs/development/python-modules/vobject/default.nix | 2 +- pkgs/development/python-modules/waitress/default.nix | 2 +- pkgs/development/python-modules/waqiasync/default.nix | 2 +- .../python-modules/xstatic-asciinema-player/default.nix | 2 +- .../development/python-modules/xstatic-font-awesome/default.nix | 2 +- pkgs/development/python-modules/xstatic/default.nix | 2 +- .../python-modules/yamlordereddictloader/default.nix | 2 +- pkgs/development/python-modules/ydiff/default.nix | 2 +- pkgs/development/python-modules/yubico/default.nix | 2 +- pkgs/development/python-modules/zope-deferredimport/default.nix | 2 +- pkgs/development/python-modules/zopfli/default.nix | 2 +- pkgs/development/tools/bashate/default.nix | 2 +- pkgs/development/tools/database/litecli/default.nix | 2 +- pkgs/development/tools/database/sqlite-web/default.nix | 2 +- pkgs/development/tools/dazel/default.nix | 2 +- pkgs/development/tools/distgen/default.nix | 2 +- pkgs/development/tools/eliot-tree/default.nix | 2 +- pkgs/development/tools/mbed-cli/default.nix | 2 +- pkgs/development/tools/misc/gdbgui/default.nix | 2 +- pkgs/development/tools/misc/usbsdmux/default.nix | 2 +- pkgs/development/tools/patatt/default.nix | 2 +- pkgs/development/tools/pifpaf/default.nix | 2 +- pkgs/development/tools/wllvm/default.nix | 2 +- pkgs/misc/flashfocus/default.nix | 2 +- pkgs/misc/present/default.nix | 2 +- pkgs/servers/dcnnt/default.nix | 2 +- pkgs/servers/geospatial/mapproxy/default.nix | 2 +- pkgs/servers/mail/mailman/mailman-hyperkitty.nix | 2 +- pkgs/servers/matrix-synapse/plugins/ldap3.nix | 2 +- pkgs/servers/monitoring/alerta/client.nix | 2 +- pkgs/servers/monitoring/alerta/default.nix | 2 +- pkgs/servers/monitoring/prometheus/pve-exporter.nix | 2 +- pkgs/tools/admin/mycli/default.nix | 2 +- pkgs/tools/audio/patray/default.nix | 2 +- pkgs/tools/audio/tidal-dl/default.nix | 2 +- pkgs/tools/backup/borgmatic/default.nix | 2 +- pkgs/tools/backup/gh2md/default.nix | 2 +- pkgs/tools/backup/rdiff-backup/default.nix | 2 +- pkgs/tools/backup/zfs-autobackup/default.nix | 2 +- pkgs/tools/misc/bepasty/default.nix | 2 +- pkgs/tools/misc/edir/default.nix | 2 +- pkgs/tools/misc/gaphor/default.nix | 2 +- pkgs/tools/misc/mloader/default.nix | 2 +- pkgs/tools/misc/pandoc-acro/default.nix | 2 +- pkgs/tools/misc/sacad/default.nix | 2 +- pkgs/tools/misc/semiphemeral/default.nix | 2 +- pkgs/tools/misc/twspace-dl/default.nix | 2 +- pkgs/tools/misc/vimwiki-markdown/default.nix | 2 +- pkgs/tools/misc/wlc/default.nix | 2 +- pkgs/tools/misc/you-get/default.nix | 2 +- pkgs/tools/misc/ytmdl/default.nix | 2 +- pkgs/tools/networking/pirate-get/default.nix | 2 +- pkgs/tools/security/ghdorker/default.nix | 2 +- pkgs/tools/security/kerbrute/default.nix | 2 +- pkgs/tools/security/onlykey-agent/default.nix | 2 +- pkgs/tools/security/onlykey-cli/default.nix | 2 +- pkgs/tools/system/s-tui/default.nix | 2 +- pkgs/tools/virtualization/ec2instanceconnectcli/default.nix | 2 +- 216 files changed, 216 insertions(+), 216 deletions(-) diff --git a/pkgs/applications/audio/mopidy/bandcamp.nix b/pkgs/applications/audio/mopidy/bandcamp.nix index 01a5f9f6bd9f..35491813f1a2 100644 --- a/pkgs/applications/audio/mopidy/bandcamp.nix +++ b/pkgs/applications/audio/mopidy/bandcamp.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { version = "1.1.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ="; + hash = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ="; }; propagatedBuildInputs = with python3Packages; [ mopidy pykka ]; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 66af8c658687..bebb4082a40f 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PEAXnapiyxozijR053I7zQYRYLeDOV719L0QbO2r4r4="; + hash = "sha256-PEAXnapiyxozijR053I7zQYRYLeDOV719L0QbO2r4r4="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/jellyfin.nix b/pkgs/applications/audio/mopidy/jellyfin.nix index 932983aa4dda..819336166610 100644 --- a/pkgs/applications/audio/mopidy/jellyfin.nix +++ b/pkgs/applications/audio/mopidy/jellyfin.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "Mopidy-Jellyfin"; - sha256 = "sha256-cZliraTxTAJ2dXaxttWI3x4wCkmEhEo33GTNtAYwgTc="; + hash = "sha256-cZliraTxTAJ2dXaxttWI3x4wCkmEhEo33GTNtAYwgTc="; }; propagatedBuildInputs = [ mopidy python3Packages.unidecode python3Packages.websocket-client ]; diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix index b5f89f4f4511..21ebc32b9d15 100644 --- a/pkgs/applications/audio/mopidy/mopify.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RlCC+39zC+LeA/QDWPHYx5TrEwOgVrnvcH1Xg12qSLE="; + hash = "sha256-RlCC+39zC+LeA/QDWPHYx5TrEwOgVrnvcH1Xg12qSLE="; }; propagatedBuildInputs = with pythonPackages; [ mopidy configobj ]; diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index 281efc028951..303a4c733e8a 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM="; + hash = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM="; }; propagatedBuildInputs = [ mopidy ]; diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix index 86f85749573e..c4f205cd359b 100644 --- a/pkgs/applications/audio/mopidy/mpris.nix +++ b/pkgs/applications/audio/mopidy/mpris.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "Mopidy-MPRIS"; - sha256 = "sha256-rHQgNIyludTEL7RDC8dIpyGTMOt1Tazn6i/orKlSP4U="; + hash = "sha256-rHQgNIyludTEL7RDC8dIpyGTMOt1Tazn6i/orKlSP4U="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/muse.nix b/pkgs/applications/audio/mopidy/muse.nix index 9721c5bcc1cc..5b33771ff3f1 100644 --- a/pkgs/applications/audio/mopidy/muse.nix +++ b/pkgs/applications/audio/mopidy/muse.nix @@ -7,7 +7,7 @@ pythonPackages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "Mopidy-Muse"; - sha256 = "sha256-CEPAPWtMrD+HljyqBB6EAyGVeOjzkvVoEywlE4XEJGs="; + hash = "sha256-CEPAPWtMrD+HljyqBB6EAyGVeOjzkvVoEywlE4XEJGs="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/notify.nix b/pkgs/applications/audio/mopidy/notify.nix index ca6ab3d2bee6..aeeedb23a03a 100644 --- a/pkgs/applications/audio/mopidy/notify.nix +++ b/pkgs/applications/audio/mopidy/notify.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-8FT4O4k0wEsdHA1vJaOW9UamJ3QLyO47HwL5XcSU3Pc="; + hash = "sha256-8FT4O4k0wEsdHA1vJaOW9UamJ3QLyO47HwL5XcSU3Pc="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/podcast.nix b/pkgs/applications/audio/mopidy/podcast.nix index 8d75b888826c..8af6dff62548 100644 --- a/pkgs/applications/audio/mopidy/podcast.nix +++ b/pkgs/applications/audio/mopidy/podcast.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "Mopidy-Podcast"; - sha256 = "sha256-grNPVEVM2PlpYhBXe6sabFjWVB9+q+apIRjcHUxH52A="; + hash = "sha256-grNPVEVM2PlpYhBXe6sabFjWVB9+q+apIRjcHUxH52A="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/spotify-cli-linux/default.nix b/pkgs/applications/audio/spotify-cli-linux/default.nix index 38aec6ea6f08..944fa4dd3ee0 100644 --- a/pkgs/applications/audio/spotify-cli-linux/default.nix +++ b/pkgs/applications/audio/spotify-cli-linux/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XJMkiQR1FoeIPfAuJT22kfYJdc/ABuxExELh0EEev8k="; + hash = "sha256-XJMkiQR1FoeIPfAuJT22kfYJdc/ABuxExELh0EEev8k="; }; preBuild = '' diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/applications/misc/bikeshed/default.nix index 21c6ac8c523d..5b51a8324e3f 100644 --- a/pkgs/applications/misc/bikeshed/default.nix +++ b/pkgs/applications/misc/bikeshed/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3fVo+B71SsJs+XF4+FWH2nz0ouTnpC/02fXYr1C9Jrk="; + hash = "sha256-3fVo+B71SsJs+XF4+FWH2nz0ouTnpC/02fXYr1C9Jrk="; }; # Relax requirements from "==" to ">=" diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/applications/misc/chatblade/default.nix index 7310b1c7f19d..a8d252adfb7d 100644 --- a/pkgs/applications/misc/chatblade/default.nix +++ b/pkgs/applications/misc/chatblade/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AjE+1MkSkZOtEUPKEPBKQ3n+aOB8cwsorBpL5skNskU="; + hash = "sha256-AjE+1MkSkZOtEUPKEPBKQ3n+aOB8cwsorBpL5skNskU="; }; doCheck = false; # there are no tests diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 6bd9b2089f18..bcb00ebdbb2e 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WfMKDaPD2j6wT02+GO5HY5E7aF2Z7IQY/VdKiMSRxJA="; + hash = "sha256-WfMKDaPD2j6wT02+GO5HY5E7aF2Z7IQY/VdKiMSRxJA="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix index 925bc9bdcb3f..22eddd71bd11 100644 --- a/pkgs/applications/misc/raiseorlaunch/default.nix +++ b/pkgs/applications/misc/raiseorlaunch/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-L/hu0mYCAxHkp5me96a6HlEY6QsuJDESpTNhlzVRHWs="; + hash = "sha256-L/hu0mYCAxHkp5me96a6HlEY6QsuJDESpTNhlzVRHWs="; }; nativeBuildInputs = [ python3Packages.setuptools-scm ]; diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index c953d5e6299a..8d59f0ae99f6 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-82P9tE3jiUlKBGZCiWDoL+9VJ06Bc+If+aMfcEEU90U="; + hash = "sha256-82P9tE3jiUlKBGZCiWDoL+9VJ06Bc+If+aMfcEEU90U="; }; propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; diff --git a/pkgs/applications/misc/seashells/default.nix b/pkgs/applications/misc/seashells/default.nix index 37a90478710c..c928bca8cefb 100644 --- a/pkgs/applications/misc/seashells/default.nix +++ b/pkgs/applications/misc/seashells/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM="; + hash = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM="; }; doCheck = false; # there are no tests diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 7bd7501f2296..59e0345fc402 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qDfY6GWnDQ44Sh540xQzDwANEI+mLjpy2a7G3sfKIzw="; + hash = "sha256-qDfY6GWnDQ44Sh540xQzDwANEI+mLjpy2a7G3sfKIzw="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index bb57bae66021..6a01cb5134cd 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/HkLJ0dRXdGcZz77uOTJrOX0xc3DH45/k9xmfesuxsg="; + hash = "sha256-/HkLJ0dRXdGcZz77uOTJrOX0xc3DH45/k9xmfesuxsg="; }; propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 tenacity ]; diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 8aa1f9809c26..f2d796b21384 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M="; + hash = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M="; }; buildInputs = [python.pkgs.sphinx]; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index d2db214a4ef8..ddb0138e6897 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XIPzpVIttTgP34rbA705vFoRZE9dj8Of3BR23DbpQPk="; + hash = "sha256-XIPzpVIttTgP34rbA705vFoRZE9dj8Of3BR23DbpQPk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index d9b03d057369..e31c5ea369b0 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2QCFUV7FpNiqGPHLXAMHJcnCn9FOk1mx12P9ZDtvVvg="; + hash = "sha256-2QCFUV7FpNiqGPHLXAMHJcnCn9FOk1mx12P9ZDtvVvg="; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-aggregator/default.nix b/pkgs/applications/version-management/git-aggregator/default.nix index 34365cb5d90d..740f805d12c5 100644 --- a/pkgs/applications/version-management/git-aggregator/default.nix +++ b/pkgs/applications/version-management/git-aggregator/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw="; + hash = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/version-management/legit/default.nix b/pkgs/applications/version-management/legit/default.nix index 93d274ecaf2f..d03bc426243b 100644 --- a/pkgs/applications/version-management/legit/default.nix +++ b/pkgs/applications/version-management/legit/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-lJOWtoApqK9AWrIMkBkCNB72vVXH/sbatxFB1j1AaxE="; + hash = "sha256-lJOWtoApqK9AWrIMkBkCNB72vVXH/sbatxFB1j1AaxE="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index a3b40daacf79..9a5e4f64d497 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-OwREpfWaP0tdAjMGjGpVIAQn8rlTTjSfT+0t5g/2yjQ="; + hash = "sha256-OwREpfWaP0tdAjMGjGpVIAQn8rlTTjSfT+0t5g/2yjQ="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index fe32c894c741..f810b5403f1b 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-EANaNmvD8hcdGB2aoGemKvA9syS1VvIqGsP1jk0b+lE="; + hash = "sha256-EANaNmvD8hcdGB2aoGemKvA9syS1VvIqGsP1jk0b+lE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix index bb0ea94e77c3..de68a06d896e 100644 --- a/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0="; + hash = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0="; }; propagatedBuildInputs = [ i3ipc ]; diff --git a/pkgs/applications/window-managers/i3/i3-resurrect.nix b/pkgs/applications/window-managers/i3/i3-resurrect.nix index 015bbee6013f..2040cdba806a 100644 --- a/pkgs/applications/window-managers/i3/i3-resurrect.nix +++ b/pkgs/applications/window-managers/i3/i3-resurrect.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-13FKRvEE4vHq5G51G1UyBnfNiWeS9Q/SYCG16E1Sn4c="; + hash = "sha256-13FKRvEE4vHq5G51G1UyBnfNiWeS9Q/SYCG16E1Sn4c="; }; propagatedBuildInputs = [ click psutil xprop natsort i3ipc xdotool importlib-metadata ]; diff --git a/pkgs/by-name/si/signal-export/package.nix b/pkgs/by-name/si/signal-export/package.nix index 40c925e5f4d2..93e82dbaf27d 100644 --- a/pkgs/by-name/si/signal-export/package.nix +++ b/pkgs/by-name/si/signal-export/package.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Hm0BVF2RUsxDacsAB3MJtk1t9FYmBPjeb5JzwaLkZ14="; + hash = "sha256-Hm0BVF2RUsxDacsAB3MJtk1t9FYmBPjeb5JzwaLkZ14="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/compilers/lesscpy/default.nix b/pkgs/development/compilers/lesscpy/default.nix index 52372bb1edce..493fdc08f812 100644 --- a/pkgs/development/compilers/lesscpy/default.nix +++ b/pkgs/development/compilers/lesscpy/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-EEXRepj2iGRsp1jf8lTm6cA3RWSOBRoIGwOVw7d8gkw="; + hash = "sha256-EEXRepj2iGRsp1jf8lTm6cA3RWSOBRoIGwOVw7d8gkw="; }; checkInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/development/embedded/rshell/default.nix b/pkgs/development/embedded/rshell/default.nix index b42651aa1404..7791ba72e907 100644 --- a/pkgs/development/embedded/rshell/default.nix +++ b/pkgs/development/embedded/rshell/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-frIwZ21JzVgxRS+KouBjDShHCP1lCoUwwySy2oFGcJ8="; + hash = "sha256-frIwZ21JzVgxRS+KouBjDShHCP1lCoUwwySy2oFGcJ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index 0f3008f16f23..1d122ce63f4b 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mKK1N1cTbMdNwpflniEB009tSPQfdBVrtsDeJruiqj8="; + hash = "sha256-mKK1N1cTbMdNwpflniEB009tSPQfdBVrtsDeJruiqj8="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/aigpy/default.nix b/pkgs/development/python-modules/aigpy/default.nix index d8cadb97e1cc..fb331e1633f4 100644 --- a/pkgs/development/python-modules/aigpy/default.nix +++ b/pkgs/development/python-modules/aigpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1kQced6YdC/wvegqFVhZfej4+4aemGXvKysKjejP13w="; + hash = "sha256-1kQced6YdC/wvegqFVhZfej4+4aemGXvKysKjejP13w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix index 540a96a824dd..72ae35816ecb 100644 --- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix +++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-B2b/9O2gVJjHUlN0pYeBDcwsy3slaAnd5SroeQqEU+s="; + hash = "sha256-B2b/9O2gVJjHUlN0pYeBDcwsy3slaAnd5SroeQqEU+s="; }; nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix index a770b6e5f3ab..7df3f61027a8 100644 --- a/pkgs/development/python-modules/aiorpcx/default.nix +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "aiorpcX"; - sha256 = "sha256-WyMALxpNXTCF4xVVoHUZxe+NTEAHHrSZVW/9qBFIYKI="; + hash = "sha256-WyMALxpNXTCF4xVVoHUZxe+NTEAHHrSZVW/9qBFIYKI="; }; propagatedBuildInputs = [ attrs ]; diff --git a/pkgs/development/python-modules/altgraph/default.nix b/pkgs/development/python-modules/altgraph/default.nix index e45be70d4a08..5e638c4aa9b0 100644 --- a/pkgs/development/python-modules/altgraph/default.nix +++ b/pkgs/development/python-modules/altgraph/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-G1r7uY9sTcrbLirmq5+plLu4wddfT6ltNA+UN65FRAY="; + hash = "sha256-G1r7uY9sTcrbLirmq5+plLu4wddfT6ltNA+UN65FRAY="; }; pythonImportsCheck = [ "altgraph" ]; diff --git a/pkgs/development/python-modules/argos-translate-files/default.nix b/pkgs/development/python-modules/argos-translate-files/default.nix index 308f8bb7c0a1..86d269ce76a2 100644 --- a/pkgs/development/python-modules/argos-translate-files/default.nix +++ b/pkgs/development/python-modules/argos-translate-files/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YSTqqd+Kv2QVlAjA0lf4IRx7rJ1DmvB0JIReBv3yZcM="; + hash = "sha256-YSTqqd+Kv2QVlAjA0lf4IRx7rJ1DmvB0JIReBv3yZcM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/argostranslate/default.nix b/pkgs/development/python-modules/argostranslate/default.nix index 5d4db901771d..69e3bf1cc0f8 100644 --- a/pkgs/development/python-modules/argostranslate/default.nix +++ b/pkgs/development/python-modules/argostranslate/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3YzBMnqmcTIpn5UOFg3SDTFLjPSE9UDw0i8fB8LYh2s="; + hash = "sha256-3YzBMnqmcTIpn5UOFg3SDTFLjPSE9UDw0i8fB8LYh2s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix index a363318453ba..a2bd69bf3a19 100644 --- a/pkgs/development/python-modules/arrayqueues/default.nix +++ b/pkgs/development/python-modules/arrayqueues/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7I+5BQO/gsvTREDkBfxrMblw3JPfY48S4KI4PCGPtFY="; + hash = "sha256-7I+5BQO/gsvTREDkBfxrMblw3JPfY48S4KI4PCGPtFY="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix index 2a5ad27ee8c1..1552f1c4b75d 100644 --- a/pkgs/development/python-modules/azure-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BbbeYu4/KgpuaUHmkzt5K4AMPn9v/OL8MkvBmHV1c5M="; + hash = "sha256-BbbeYu4/KgpuaUHmkzt5K4AMPn9v/OL8MkvBmHV1c5M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 81d30a68fd60..de7c2fa6bb3d 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XPUJzALti7QXTmgtuwVDhCA2luWz7zfykWEsJmpHzA4="; + hash = "sha256-XPUJzALti7QXTmgtuwVDhCA2luWz7zfykWEsJmpHzA4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index 3c117d02f6b3..b166ab5ea0f7 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-2DedS7kZS4G3nlKE2HX6bfgHBzRvLLtcVJGiDzUmb9A="; + hash = "sha256-2DedS7kZS4G3nlKE2HX6bfgHBzRvLLtcVJGiDzUmb9A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix index 9c96a59cabc3..dab6fcd1d4f2 100644 --- a/pkgs/development/python-modules/betamax/default.nix +++ b/pkgs/development/python-modules/betamax/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-gjFuFnm8aHnjyDMY0Ba1S3ySJf8IxEYt5IE+IgONX5Q="; + hash = "sha256-gjFuFnm8aHnjyDMY0Ba1S3ySJf8IxEYt5IE+IgONX5Q="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/calmjs-types/default.nix b/pkgs/development/python-modules/calmjs-types/default.nix index 4d98b29c5800..906b372572c8 100644 --- a/pkgs/development/python-modules/calmjs-types/default.nix +++ b/pkgs/development/python-modules/calmjs-types/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "calmjs.types"; inherit version; - sha256 = "sha256-EGWYv9mx3RPqs9dnB5t3Bu3hiujL2y/XxyMP7JkjjAQ="; + hash = "sha256-EGWYv9mx3RPqs9dnB5t3Bu3hiujL2y/XxyMP7JkjjAQ="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/calmjs/default.nix b/pkgs/development/python-modules/calmjs/default.nix index 442528807dac..ee3affa9c1bd 100644 --- a/pkgs/development/python-modules/calmjs/default.nix +++ b/pkgs/development/python-modules/calmjs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-73NQiY1RMdBrMIlm/VTvHY4dCHL1pQoj6a48CWRos3o="; + hash = "sha256-73NQiY1RMdBrMIlm/VTvHY4dCHL1pQoj6a48CWRos3o="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 84139b83f253..c6f669c8ad56 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qAbV254xihotP86YgAgXkWjn2xPl5VsZt5dj+budKYI="; + hash = "sha256-qAbV254xihotP86YgAgXkWjn2xPl5VsZt5dj+budKYI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/commandparse/default.nix b/pkgs/development/python-modules/commandparse/default.nix index a7f28dab1563..88002d022c71 100644 --- a/pkgs/development/python-modules/commandparse/default.nix +++ b/pkgs/development/python-modules/commandparse/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-S9e90BtS6qMjFtYUmgC0w4IKQP8q1iR2tGqq5l2+n6o="; + hash = "sha256-S9e90BtS6qMjFtYUmgC0w4IKQP8q1iR2tGqq5l2+n6o="; }; # tests only distributed upstream source, not PyPi diff --git a/pkgs/development/python-modules/ctap-keyring-device/default.nix b/pkgs/development/python-modules/ctap-keyring-device/default.nix index a18241658b01..07cf1b616027 100644 --- a/pkgs/development/python-modules/ctap-keyring-device/default.nix +++ b/pkgs/development/python-modules/ctap-keyring-device/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version pname; - sha256 = "sha256-pEJkuz0wxKt2PkowmLE2YC+HPYa2ZiENK7FAW14Ec/Y="; + hash = "sha256-pEJkuz0wxKt2PkowmLE2YC+HPYa2ZiENK7FAW14Ec/Y="; }; # removing optional dependency needing pyobjc diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 3910cdd34f25..f987ee07a64e 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-GiWGXDTyCx3JWDB5jjSrZDbieLjgyA3HvwqzTF2wOrg="; + hash = "sha256-GiWGXDTyCx3JWDB5jjSrZDbieLjgyA3HvwqzTF2wOrg="; }; patches = [ diff --git a/pkgs/development/python-modules/daff/default.nix b/pkgs/development/python-modules/daff/default.nix index 2e4841e70c17..d12b3245879b 100644 --- a/pkgs/development/python-modules/daff/default.nix +++ b/pkgs/development/python-modules/daff/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ItDan9ajJ1tUySapyXsYD5JYqtZRE+oY8/7FLLrc2Bg="; + hash = "sha256-ItDan9ajJ1tUySapyXsYD5JYqtZRE+oY8/7FLLrc2Bg="; }; # there are no tests diff --git a/pkgs/development/python-modules/dazl/default.nix b/pkgs/development/python-modules/dazl/default.nix index 7613795fabe9..e73892f1f998 100644 --- a/pkgs/development/python-modules/dazl/default.nix +++ b/pkgs/development/python-modules/dazl/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IErym/Fd8G75NOa+xOyV87UNmEaB31XPvg8GWCSP7k8="; + hash = "sha256-IErym/Fd8G75NOa+xOyV87UNmEaB31XPvg8GWCSP7k8="; }; patches = [ diff --git a/pkgs/development/python-modules/django-sekizai/default.nix b/pkgs/development/python-modules/django-sekizai/default.nix index 0cfe0fae0222..5727b5ac9990 100644 --- a/pkgs/development/python-modules/django-sekizai/default.nix +++ b/pkgs/development/python-modules/django-sekizai/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Kso2y64LXAzv7ZVlQW7EQjNXZ/sxRb/xHlhiL8ZTza0="; + hash = "sha256-Kso2y64LXAzv7ZVlQW7EQjNXZ/sxRb/xHlhiL8ZTza0="; }; propagatedBuildInputs = [ django-classy-tags ]; diff --git a/pkgs/development/python-modules/dogtag-pki/default.nix b/pkgs/development/python-modules/dogtag-pki/default.nix index f2077050314f..ae26a543de05 100644 --- a/pkgs/development/python-modules/dogtag-pki/default.nix +++ b/pkgs/development/python-modules/dogtag-pki/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rQSnQPNYr5SyeNbKoFAbnGb2X/8utrfWLa8gu93hy2w="; + hash = "sha256-rQSnQPNYr5SyeNbKoFAbnGb2X/8utrfWLa8gu93hy2w="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/durus/default.nix b/pkgs/development/python-modules/durus/default.nix index 3c7fd696fa99..d2afcd4b3ff4 100644 --- a/pkgs/development/python-modules/durus/default.nix +++ b/pkgs/development/python-modules/durus/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Durus"; inherit version; - sha256 = "sha256:1gzxg43zawwgqjrfixvcrilwpikb1ix9b7710rsl5ffk7q50yi3c"; + hash = "sha256:1gzxg43zawwgqjrfixvcrilwpikb1ix9b7710rsl5ffk7q50yi3c"; }; # Checks disabled due to missing python unittest framework 'sancho' in nixpkgs diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 45476eaf0418..bd9b460356cb 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-MmxtzPMvH/PUyEiJOIWQd4REuhj3cK3uUvJHIcuXxMc="; + hash = "sha256-MmxtzPMvH/PUyEiJOIWQd4REuhj3cK3uUvJHIcuXxMc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index e33c98782bb4..562d66e9bc2a 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qiSQAp3Zb0AVszPBgnqiH9bApNIjsA37D+kzuNCaURs="; + hash = "sha256-qiSQAp3Zb0AVszPBgnqiH9bApNIjsA37D+kzuNCaURs="; }; nativeBuildInputs = [ elastic-transport ]; diff --git a/pkgs/development/python-modules/empy/default.nix b/pkgs/development/python-modules/empy/default.nix index ea8051381643..018e0240ca65 100644 --- a/pkgs/development/python-modules/empy/default.nix +++ b/pkgs/development/python-modules/empy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nXEul8E5WFm+E9K0V4jJGGzZfxwE2sUQOZEw8yhkM2c="; + hash = "sha256-nXEul8E5WFm+E9K0V4jJGGzZfxwE2sUQOZEw8yhkM2c="; }; pythonImportsCheck = [ "em" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ete3/default.nix b/pkgs/development/python-modules/ete3/default.nix index 54864226c75e..2aa4e65dce0b 100644 --- a/pkgs/development/python-modules/ete3/default.nix +++ b/pkgs/development/python-modules/ete3/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BqO3+o7ZAYewdqjbvlsbYqzulCAdPG6CL1X0SWAe9vI="; + hash = "sha256-BqO3+o7ZAYewdqjbvlsbYqzulCAdPG6CL1X0SWAe9vI="; }; doCheck = false; # Tests are (i) not 3.x compatible, (ii) broken under 2.7 diff --git a/pkgs/development/python-modules/f5-sdk/default.nix b/pkgs/development/python-modules/f5-sdk/default.nix index 09aded01c5ae..304f1daabbfb 100644 --- a/pkgs/development/python-modules/f5-sdk/default.nix +++ b/pkgs/development/python-modules/f5-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IokMj9mCMsFMVFYO4CpZUB2i32cOamhS5u2mNkNjljo="; + hash = "sha256-IokMj9mCMsFMVFYO4CpZUB2i32cOamhS5u2mNkNjljo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastdownload/default.nix b/pkgs/development/python-modules/fastdownload/default.nix index 82e9281dbf43..363230edcf81 100644 --- a/pkgs/development/python-modules/fastdownload/default.nix +++ b/pkgs/development/python-modules/fastdownload/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IFB+246JQGofvXd15uKj2BpN1jPdUGsOnPDhYT6DHWo="; + hash = "sha256-IFB+246JQGofvXd15uKj2BpN1jPdUGsOnPDhYT6DHWo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 5dba169171d6..e6b7866b0cd0 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2b1Rw7XpVqKlKZjDcIxNLHKfL8wxEYjh5dO5cmOTVGo="; + hash = "sha256-2b1Rw7XpVqKlKZjDcIxNLHKfL8wxEYjh5dO5cmOTVGo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index 5b76a3ca7444..d561911cd4d1 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-8HXyPyj9In8JfDayEhYcbPAS4cbKr3/1PV1rsCzUK50="; + hash = "sha256-8HXyPyj9In8JfDayEhYcbPAS4cbKr3/1PV1rsCzUK50="; }; postPatch = '' diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix index b6af9c7564f8..6999a333f284 100644 --- a/pkgs/development/python-modules/flower/default.nix +++ b/pkgs/development/python-modules/flower/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WrcXuXlTB3DBavtItQ0qmNI8Pp/jmFHc9rxNAYRaAqA="; + hash = "sha256-WrcXuXlTB3DBavtItQ0qmNI8Pp/jmFHc9rxNAYRaAqA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/formencode/default.nix b/pkgs/development/python-modules/formencode/default.nix index b6be8e6158f6..58a2fe4d772e 100644 --- a/pkgs/development/python-modules/formencode/default.nix +++ b/pkgs/development/python-modules/formencode/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "FormEncode"; inherit version; - sha256 = "sha256-63TSIweKKM8BX6iJZsbjTy0Y11EnMY1lwUS+2a/EJj8="; + hash = "sha256-63TSIweKKM8BX6iJZsbjTy0Y11EnMY1lwUS+2a/EJj8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/freertos-gdb/default.nix b/pkgs/development/python-modules/freertos-gdb/default.nix index 7535ba80d35c..70a7c8efa31a 100644 --- a/pkgs/development/python-modules/freertos-gdb/default.nix +++ b/pkgs/development/python-modules/freertos-gdb/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5rkB01OdbD5Z4vA6dbqhWp5pGwqI1IlE4IE1dSdT1QE="; + hash = "sha256-5rkB01OdbD5Z4vA6dbqhWp5pGwqI1IlE4IE1dSdT1QE="; }; # Project has no tests diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index 41632258f64f..a442a6e5d727 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XDPxQmjfW4+hEH2FN4Fb5v67rW7FYFJNakBLd3jPa6Y="; + hash = "sha256-XDPxQmjfW4+hEH2FN4Fb5v67rW7FYFJNakBLd3jPa6Y="; }; # No tests in archive diff --git a/pkgs/development/python-modules/gtfs-realtime-bindings/default.nix b/pkgs/development/python-modules/gtfs-realtime-bindings/default.nix index 3ea28e1b8112..50979a36d10a 100644 --- a/pkgs/development/python-modules/gtfs-realtime-bindings/default.nix +++ b/pkgs/development/python-modules/gtfs-realtime-bindings/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-LoztiQRADMk6t+hSCttpNM+mAe2sxvWT/Cy0RIZiu0c="; + hash = "sha256-LoztiQRADMk6t+hSCttpNM+mAe2sxvWT/Cy0RIZiu0c="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix index 50de4ff088d4..66dd40712ded 100644 --- a/pkgs/development/python-modules/http-ece/default.nix +++ b/pkgs/development/python-modules/http-ece/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "http_ece"; inherit version; - sha256 = "sha256-tZIPjvuOG1+wJXE+Ozb9pUM2JiAQY0sm3B+Y+F0es94="; + hash = "sha256-tZIPjvuOG1+wJXE+Ozb9pUM2JiAQY0sm3B+Y+F0es94="; }; postPatch = '' diff --git a/pkgs/development/python-modules/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix index e99a7eaea0f5..2fb598918a14 100644 --- a/pkgs/development/python-modules/httpauth/default.nix +++ b/pkgs/development/python-modules/httpauth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-C6rnFroAd5vOULBMwsLSyeSK5zPXOEgGHDSYt+Pm2dQ="; + hash = "sha256-C6rnFroAd5vOULBMwsLSyeSK5zPXOEgGHDSYt+Pm2dQ="; }; doCheck = false; diff --git a/pkgs/development/python-modules/isosurfaces/default.nix b/pkgs/development/python-modules/isosurfaces/default.nix index 7356db3a2744..b72476e7743b 100644 --- a/pkgs/development/python-modules/isosurfaces/default.nix +++ b/pkgs/development/python-modules/isosurfaces/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+lHr6GTqk1WyaDDif91qQdWli0GfqNS0fjuLgHGNbiE="; + hash = "sha256-+lHr6GTqk1WyaDDif91qQdWli0GfqNS0fjuLgHGNbiE="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/pkgs/development/python-modules/javaobj-py3/default.nix index 2bc51a204125..fecd77a50300 100644 --- a/pkgs/development/python-modules/javaobj-py3/default.nix +++ b/pkgs/development/python-modules/javaobj-py3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5OMlfvLPgaMzl4ek1c+STlTJHwlacj9tJYTa5h1Dlu0="; + hash = "sha256-5OMlfvLPgaMzl4ek1c+STlTJHwlacj9tJYTa5h1Dlu0="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index 5d38eeaf6480..f20a03e6df3c 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WDUyveyjyeDK/EkxESxnN7Xmjxh6tZ7nff/fCf3529k="; + hash = "sha256-WDUyveyjyeDK/EkxESxnN7Xmjxh6tZ7nff/fCf3529k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/l18n/default.nix b/pkgs/development/python-modules/l18n/default.nix index 3270550e87e3..76491a4699ca 100644 --- a/pkgs/development/python-modules/l18n/default.nix +++ b/pkgs/development/python-modules/l18n/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-GVbokNZz0XE1zCCRMlPBVPa8HAAmbCK31QPMGlpC2Eg="; + hash = "sha256-GVbokNZz0XE1zCCRMlPBVPa8HAAmbCK31QPMGlpC2Eg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 52f4c384f806..981b90bbc5ec 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rlp30aAdDR6RhUpnGJCJK3zpq7YBq3Mn/FyHT4meGXk="; + hash = "sha256-rlp30aAdDR6RhUpnGJCJK3zpq7YBq3Mn/FyHT4meGXk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index 822b51053c17..c2890bf591ec 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kX3F/iQnYswZ2WPmVItC1joRgCjN0zYdYjl+O2OLa8U="; + hash = "sha256-kX3F/iQnYswZ2WPmVItC1joRgCjN0zYdYjl+O2OLa8U="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index bd844d647a62..3af76888e420 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+WS+wghvMVOmwW5wfyDLcY+BH1evEWB19MD0gFxgi5U="; + hash = "sha256-+WS+wghvMVOmwW5wfyDLcY+BH1evEWB19MD0gFxgi5U="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 28131581936f..9fc1cf12fb4a 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qvtn/EnPsdieRqNEOsdH4V9LtC3yDtBPBnrZ777iVqs="; + hash = "sha256-qvtn/EnPsdieRqNEOsdH4V9LtC3yDtBPBnrZ777iVqs="; }; patches = [ diff --git a/pkgs/development/python-modules/macfsevents/default.nix b/pkgs/development/python-modules/macfsevents/default.nix index 065713f2f05d..77e82746e77d 100644 --- a/pkgs/development/python-modules/macfsevents/default.nix +++ b/pkgs/development/python-modules/macfsevents/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "MacFSEvents"; inherit version; - sha256 = "sha256-v3KD8dUXdkzNyBlbIWMdu6wcUGuSC/mo6ilWsxJ2Ucs="; + hash = "sha256-v3KD8dUXdkzNyBlbIWMdu6wcUGuSC/mo6ilWsxJ2Ucs="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/material-color-utilities/default.nix b/pkgs/development/python-modules/material-color-utilities/default.nix index 527726401f82..1eaec0a4069f 100644 --- a/pkgs/development/python-modules/material-color-utilities/default.nix +++ b/pkgs/development/python-modules/material-color-utilities/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PG8C585wWViFRHve83z3b9NijHyV+iGY2BdMJpyVH64="; + hash = "sha256-PG8C585wWViFRHve83z3b9NijHyV+iGY2BdMJpyVH64="; }; pythonRelaxDeps = [ "Pillow" ]; diff --git a/pkgs/development/python-modules/memory-profiler/default.nix b/pkgs/development/python-modules/memory-profiler/default.nix index 8e0736e99271..a23929a52be2 100644 --- a/pkgs/development/python-modules/memory-profiler/default.nix +++ b/pkgs/development/python-modules/memory-profiler/default.nix @@ -12,7 +12,7 @@ python.pkgs.buildPythonPackage rec { src = fetchPypi { pname = "memory_profiler"; inherit version; - sha256 = "sha256-Tltz14ZKHRKS+3agPoKj5475NNBoKKaY2dradtogZ7A="; + hash = "sha256-Tltz14ZKHRKS+3agPoKj5475NNBoKKaY2dradtogZ7A="; }; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/development/python-modules/merge3/default.nix b/pkgs/development/python-modules/merge3/default.nix index 3d96e2e1108f..22d02db447b2 100644 --- a/pkgs/development/python-modules/merge3/default.nix +++ b/pkgs/development/python-modules/merge3/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0+rCE9hNVt/J45VSrIJGx4YKlAlk6+7YqL5EIvZJK68="; + hash = "sha256-0+rCE9hNVt/J45VSrIJGx4YKlAlk6+7YqL5EIvZJK68="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index ecd06217faf7..6593253d647b 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CsWBS2X/KngfsTlLkaI6ipX3NJK2u49wW67q2C6t1UM="; + hash = "sha256-CsWBS2X/KngfsTlLkaI6ipX3NJK2u49wW67q2C6t1UM="; }; propagatedBuildInputs = [ beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index c4ec910b6425..a23ef91c8a81 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KwpNVl+tZTZHHZKW9p3a/S0nZJW6lZftjBK9ECkRUMo="; + hash = "sha256-KwpNVl+tZTZHHZKW9p3a/S0nZJW6lZftjBK9ECkRUMo="; }; nativeBuildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/mixins/default.nix b/pkgs/development/python-modules/mixins/default.nix index c6632f3b6a78..655f129b8ab6 100644 --- a/pkgs/development/python-modules/mixins/default.nix +++ b/pkgs/development/python-modules/mixins/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SmYYRzo6wClQBMc2oRgO0CQEHOxWe8GFL24TPa6A4NQ="; + hash = "sha256-SmYYRzo6wClQBMc2oRgO0CQEHOxWe8GFL24TPa6A4NQ="; }; pythonImportsCheck = [ "mixins" ]; diff --git a/pkgs/development/python-modules/mkdocs-macros/default.nix b/pkgs/development/python-modules/mkdocs-macros/default.nix index a8940953123b..1be602360f9f 100644 --- a/pkgs/development/python-modules/mkdocs-macros/default.nix +++ b/pkgs/development/python-modules/mkdocs-macros/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/jSNdfAckR82K22ZjFez2FtQWHbd5p25JPLFEsOVwyg="; + hash = "sha256-/jSNdfAckR82K22ZjFez2FtQWHbd5p25JPLFEsOVwyg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index c5b32f6397c4..20c78bf4f18e 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Xpaq1czaRxjgointlLICTfdcwtVVdbpXYtMfV2e4dn0="; + hash = "sha256-Xpaq1czaRxjgointlLICTfdcwtVVdbpXYtMfV2e4dn0="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index 15ff5d914afd..e3f20311123c 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XIOZFUZcaCBsPpxHM1eQghbCg4O0JTYeXRRFlL+Fp+A="; + hash = "sha256-XIOZFUZcaCBsPpxHM1eQghbCg4O0JTYeXRRFlL+Fp+A="; }; # No tests in archive diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index aaf776d9aaba..8d04bc106b07 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XDw9mJW1Ubdjd5un23oDSH3B+OOzha+BmvNBrp725Io="; + hash = "sha256-XDw9mJW1Ubdjd5un23oDSH3B+OOzha+BmvNBrp725Io="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/netapp-lib/default.nix b/pkgs/development/python-modules/netapp-lib/default.nix index 4155d3bff0c9..478831a9112e 100644 --- a/pkgs/development/python-modules/netapp-lib/default.nix +++ b/pkgs/development/python-modules/netapp-lib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1g4FCSMyS8T6F/T8BOqak4h1nJis8g9jaOluA4FTNpA="; + hash = "sha256-1g4FCSMyS8T6F/T8BOqak4h1nJis8g9jaOluA4FTNpA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index d69d11a331e6..adf8784a501e 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-WZODOBoL89+9kyygymUVrNF07UiHDL9/7hI9aYwZLBw="; + hash = "sha256-WZODOBoL89+9kyygymUVrNF07UiHDL9/7hI9aYwZLBw="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/omrdatasettools/default.nix b/pkgs/development/python-modules/omrdatasettools/default.nix index a61bc96dc78f..b20189e3e972 100644 --- a/pkgs/development/python-modules/omrdatasettools/default.nix +++ b/pkgs/development/python-modules/omrdatasettools/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kUUcbti29uDnSEvCubMAUnptlaZGpEsW2IBGSAGnGyQ="; + hash = "sha256-kUUcbti29uDnSEvCubMAUnptlaZGpEsW2IBGSAGnGyQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oslotest/default.nix b/pkgs/development/python-modules/oslotest/default.nix index 55553b98e1e3..9aebaf81d38c 100644 --- a/pkgs/development/python-modules/oslotest/default.nix +++ b/pkgs/development/python-modules/oslotest/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-97skDGy+8voLq7lRP/PafQ8ozDja+Y70Oy6ISDZ/vSA="; + hash = "sha256-97skDGy+8voLq7lRP/PafQ8ozDja+Y70Oy6ISDZ/vSA="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index acdf8eaf3a82..aa7876f4644a 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CU3X2aX8HMpIVHc+XB/GoxWzO9WzqPRwZJKPrK8EkKg="; + hash = "sha256-CU3X2aX8HMpIVHc+XB/GoxWzO9WzqPRwZJKPrK8EkKg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix index ad16f250130f..5f02936d9252 100644 --- a/pkgs/development/python-modules/pamela/default.nix +++ b/pkgs/development/python-modules/pamela/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1LE5/mAOGS4Xaio2gFkgemv/oOeHmHmxP0/LoBY0gb4="; + hash = "sha256-1LE5/mAOGS4Xaio2gFkgemv/oOeHmHmxP0/LoBY0gb4="; }; postUnpack = '' diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix index 37ce5a14d7d0..876637cdfe51 100644 --- a/pkgs/development/python-modules/pandocfilters/default.nix +++ b/pkgs/development/python-modules/pandocfilters/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ACtKVV7k68A/i2Ywfih/pJLkp3tOoU0/k0MoKXu0k54="; + hash = "sha256-ACtKVV7k68A/i2Ywfih/pJLkp3tOoU0/k0MoKXu0k54="; }; # No tests available diff --git a/pkgs/development/python-modules/persist-queue/default.nix b/pkgs/development/python-modules/persist-queue/default.nix index ac91a7fa4ef0..bbadd55d3afe 100644 --- a/pkgs/development/python-modules/persist-queue/default.nix +++ b/pkgs/development/python-modules/persist-queue/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-P/t0aQLTAj/QnrRol2Cf3ubHexZB8Z4vyNmNdEvfyEU="; + hash = "sha256-P/t0aQLTAj/QnrRol2Cf3ubHexZB8Z4vyNmNdEvfyEU="; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index 044bf148a336..daa68e31afa1 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xdzm4LG/W5ziYXaXbCOfQbZYZvaUUih3lWhkLzWqeUc="; + hash = "sha256-xdzm4LG/W5ziYXaXbCOfQbZYZvaUUih3lWhkLzWqeUc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index dd5434422144..dc3dc7089d22 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-tHfohB8OoOCf2rby8wXPON+XfZ4ULlaTo3RgXXXdb+A="; + hash = "sha256-tHfohB8OoOCf2rby8wXPON+XfZ4ULlaTo3RgXXXdb+A="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 2b89a74928db..35bf5d1a8be5 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UlCjUsGclZ12fKyHi4Kdk+XcdiWlFDOZoqANxmKP+3I="; + hash = "sha256-UlCjUsGclZ12fKyHi4Kdk+XcdiWlFDOZoqANxmKP+3I="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix index 98f97f9466ae..d9684090774a 100644 --- a/pkgs/development/python-modules/pplpy/default.nix +++ b/pkgs/development/python-modules/pplpy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1CohbIKRTc9NfAAN68mLsza4+D4Ca6XZUszNn4B07/0="; + hash = "sha256-1CohbIKRTc9NfAAN68mLsza4+D4Ca6XZUszNn4B07/0="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pq/default.nix b/pkgs/development/python-modules/pq/default.nix index 5c6a85b29c83..533382cdca26 100644 --- a/pkgs/development/python-modules/pq/default.nix +++ b/pkgs/development/python-modules/pq/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1krw77ij69EbLg5mKmQmxeHpn38uRG9EOboGmRk+StY="; + hash = "sha256-1krw77ij69EbLg5mKmQmxeHpn38uRG9EOboGmRk+StY="; }; # tests require running postgresql cluster diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index 233f71b0a3d9..f4606cda7f48 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DiOMFAXRpVxyvTmzttc9b3q/2dCn+rLsBpOhmimlYX8="; + hash = "sha256-DiOMFAXRpVxyvTmzttc9b3q/2dCn+rLsBpOhmimlYX8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pubnubsub-handler/default.nix b/pkgs/development/python-modules/pubnubsub-handler/default.nix index 2bb9a0e75f73..8938d9df1ce4 100644 --- a/pkgs/development/python-modules/pubnubsub-handler/default.nix +++ b/pkgs/development/python-modules/pubnubsub-handler/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256:1c44x19zi709sazgl060nkqa7vbaf3iyhwcnwdykhsbipvp6bscy"; + hash = "sha256:1c44x19zi709sazgl060nkqa7vbaf3iyhwcnwdykhsbipvp6bscy"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py-slvs/default.nix b/pkgs/development/python-modules/py-slvs/default.nix index 775de5a238bd..1f434fe66970 100644 --- a/pkgs/development/python-modules/py-slvs/default.nix +++ b/pkgs/development/python-modules/py-slvs/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "py_slvs"; inherit version; - sha256 = "sha256-U6T/aXy0JTC1ptL5oBmch0ytSPmIkRA8XOi31NpArnI="; + hash = "sha256-U6T/aXy0JTC1ptL5oBmch0ytSPmIkRA8XOi31NpArnI="; }; pyproject = true; diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix index 3f8721e61e04..24dc34c47f53 100644 --- a/pkgs/development/python-modules/pyacoustid/default.nix +++ b/pkgs/development/python-modules/pyacoustid/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-X09IcZHBnruQgnCxt7UpfxMtozKxVouWqRRXTAee0Xc="; + hash = "sha256-X09IcZHBnruQgnCxt7UpfxMtozKxVouWqRRXTAee0Xc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 8a27f29682b0..b2b4ef94b8d3 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-86N1nMTOwdWekyqtdDmdvPVB0YhiqtkDx3AEDaQq8g4="; + hash = "sha256-86N1nMTOwdWekyqtdDmdvPVB0YhiqtkDx3AEDaQq8g4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index fbdb230e3a87..67bbfa1c3d97 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SRyL6cBA9TkPW/RKWwd1K9B/Vu35kjgbBccBQ57sEPY="; + hash = "sha256-SRyL6cBA9TkPW/RKWwd1K9B/Vu35kjgbBccBQ57sEPY="; }; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/pydelijn/default.nix b/pkgs/development/python-modules/pydelijn/default.nix index be679c748b31..c64eef1c9a63 100644 --- a/pkgs/development/python-modules/pydelijn/default.nix +++ b/pkgs/development/python-modules/pydelijn/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xyBq2h3ipUarkjCXq9GIbY7bhsf9729aQwHde3o5K6g="; + hash = "sha256-xyBq2h3ipUarkjCXq9GIbY7bhsf9729aQwHde3o5K6g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 524010a89a49..3a5fcb066ccc 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU="; + hash = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU="; }; propagatedBuildInputs = [ pyparsing ]; diff --git a/pkgs/development/python-modules/pyephember/default.nix b/pkgs/development/python-modules/pyephember/default.nix index 45d9227d7b9d..7efe8561c883 100644 --- a/pkgs/development/python-modules/pyephember/default.nix +++ b/pkgs/development/python-modules/pyephember/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-j3SftxXKs9EZwdio26W5U0y5owH4yTteS4RUmzkZkoE="; + hash = "sha256-j3SftxXKs9EZwdio26W5U0y5owH4yTteS4RUmzkZkoE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index 20c448b36c64..a236951c493c 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-dYeIAYq4+q3cCYTh6gX/Mw08ZL5mPFE8wfEF9qMGbas="; + hash = "sha256-dYeIAYq4+q3cCYTh6gX/Mw08ZL5mPFE8wfEF9qMGbas="; }; doCheck = false; diff --git a/pkgs/development/python-modules/pygments-better-html/default.nix b/pkgs/development/python-modules/pygments-better-html/default.nix index 2f880a0ea867..488126dbe18d 100644 --- a/pkgs/development/python-modules/pygments-better-html/default.nix +++ b/pkgs/development/python-modules/pygments-better-html/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SLAe5ubIGEchUNoHCct6CWisBja3WNEfpE48v9CTzPQ="; + hash = "sha256-SLAe5ubIGEchUNoHCct6CWisBja3WNEfpE48v9CTzPQ="; }; propagatedBuildInputs = [ pygments ]; diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index b79cbc812bda..8b6b6e68627c 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-uB9aDa1urIwL2DBdBwPi0sHWPW7SUZ3EaAjuMLSOudc="; + hash = "sha256-uB9aDa1urIwL2DBdBwPi0sHWPW7SUZ3EaAjuMLSOudc="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix index e2f2efdef7a2..9438cb9102b9 100644 --- a/pkgs/development/python-modules/pylibacl/default.nix +++ b/pkgs/development/python-modules/pylibacl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7UludMpUUtXUzr4j3yKepGJzWpZSi5+ijjzh96K+0xo="; + hash = "sha256-7UludMpUUtXUzr4j3yKepGJzWpZSi5+ijjzh96K+0xo="; }; # ERROR: testExtended (tests.test_acls.AclExtensions) diff --git a/pkgs/development/python-modules/pymaven-patch/default.nix b/pkgs/development/python-modules/pymaven-patch/default.nix index 357c1f96f318..c390123e4c5a 100644 --- a/pkgs/development/python-modules/pymaven-patch/default.nix +++ b/pkgs/development/python-modules/pymaven-patch/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DPfJPonwHwQI62Vu7FjLSiKMleA7PUfLc9MfiZBVzVA="; + hash = "sha256-DPfJPonwHwQI62Vu7FjLSiKMleA7PUfLc9MfiZBVzVA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pypresence/default.nix b/pkgs/development/python-modules/pypresence/default.nix index 96aec1c90dc7..cf792a4226d9 100644 --- a/pkgs/development/python-modules/pypresence/default.nix +++ b/pkgs/development/python-modules/pypresence/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-phkaOvM6lmfypO8BhVd8hrli7nCqgmQ8Rydopv7R+/M="; + hash = "sha256-phkaOvM6lmfypO8BhVd8hrli7nCqgmQ8Rydopv7R+/M="; }; doCheck = false; # tests require internet connection diff --git a/pkgs/development/python-modules/pyqt6-charts/default.nix b/pkgs/development/python-modules/pyqt6-charts/default.nix index 60bc08b315d7..f802db34771c 100644 --- a/pkgs/development/python-modules/pyqt6-charts/default.nix +++ b/pkgs/development/python-modules/pyqt6-charts/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyQt6_Charts"; inherit version; - sha256 = "sha256-xPfPNpko978DLk4z9xjTuP5m2hdtSVn+MHNalw2G81w="; + hash = "sha256-xPfPNpko978DLk4z9xjTuP5m2hdtSVn+MHNalw2G81w="; }; # fix include path and increase verbosity diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index b72fde6277f7..e8b1da7fdc87 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -37,7 +37,7 @@ buildPythonPackage ( src = fetchPypi { pname = "PyQtWebEngine"; inherit version; - sha256 = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE="; + hash = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyramid-beaker/default.nix b/pkgs/development/python-modules/pyramid-beaker/default.nix index 8faae270960d..87e9a30932cb 100644 --- a/pkgs/development/python-modules/pyramid-beaker/default.nix +++ b/pkgs/development/python-modules/pyramid-beaker/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyramid_beaker"; inherit version; - sha256 = "sha256-zMUT60z7W0Flfym25rKMor17O/n9qRMGoQKa7pLRz6U="; + hash = "sha256-zMUT60z7W0Flfym25rKMor17O/n9qRMGoQKa7pLRz6U="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix index 4cf66570a74f..768cd3170418 100644 --- a/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/pkgs/development/python-modules/pyscreenshot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-jA6T8K72amv+Vahqv87WvTlq5LT2zB428EoorSYlWU0="; + hash = "sha256-jA6T8K72amv+Vahqv87WvTlq5LT2zB428EoorSYlWU0="; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix index 9f98f85052f3..6de1445b7da7 100644 --- a/pkgs/development/python-modules/pytest-arraydiff/default.nix +++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KTexRQ/JNWIPJHCdh9QMZ+BVoEPXuFQaJf36mU3aZ94="; + hash = "sha256-KTexRQ/JNWIPJHCdh9QMZ+BVoEPXuFQaJf36mU3aZ94="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-instafail/default.nix b/pkgs/development/python-modules/pytest-instafail/default.nix index 63357c1b48d7..9afcd14deb17 100644 --- a/pkgs/development/python-modules/pytest-instafail/default.nix +++ b/pkgs/development/python-modules/pytest-instafail/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-M6YG9+DI5kbcO/7g1eOkt7eO98NhaM+h89k698pwbJ4="; + hash = "sha256-M6YG9+DI5kbcO/7g1eOkt7eO98NhaM+h89k698pwbJ4="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix index fa80566a1336..29ae8e462498 100644 --- a/pkgs/development/python-modules/pytest-twisted/default.nix +++ b/pkgs/development/python-modules/pytest-twisted/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qbGLyfykfSiG+O/j/SeHmoHxwLtJ8cVgZmyedkSRtjI="; + hash = "sha256-qbGLyfykfSiG+O/j/SeHmoHxwLtJ8cVgZmyedkSRtjI="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index bb6cf5d94ea1..63f8575ff2d0 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bFdFI3L36v9Ak0ocA60YJr9eeTVY6H/vSRMeZGS02uU="; + hash = "sha256-bFdFI3L36v9Ak0ocA60YJr9eeTVY6H/vSRMeZGS02uU="; }; nativeBuildInputs = [ twine ]; diff --git a/pkgs/development/python-modules/python-musicpd/default.nix b/pkgs/development/python-modules/python-musicpd/default.nix index 673a9723397d..72ba24cc0aeb 100644 --- a/pkgs/development/python-modules/python-musicpd/default.nix +++ b/pkgs/development/python-modules/python-musicpd/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname; inherit version; - sha256 = "sha256-/FdM0UolVqhJNpS60Q/nra1hSHKL/LiSMX7/Hcipwco="; + hash = "sha256-/FdM0UolVqhJNpS60Q/nra1hSHKL/LiSMX7/Hcipwco="; }; pyproject = true; diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index ed97aef27a39..95751831d2cc 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YdRh1zaYKm92boeHIKsQpoFR4ujBCGYA2TiaxH5A6Io="; + hash = "sha256-YdRh1zaYKm92boeHIKsQpoFR4ujBCGYA2TiaxH5A6Io="; }; # Some tests require physical probing and additional physical setup diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index ef5ecb4105bc..01f1f2483282 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hTaXNEtk31U31K4yum+88FFdUakBCRD11QGZWQOLbro="; + hash = "sha256-hTaXNEtk31U31K4yum+88FFdUakBCRD11QGZWQOLbro="; }; buildInputs = [ udev ]; diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index 2050953b6663..146eca77fbb9 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5VnJXQo/VjeGB9Kpazg/MHU8m4Kh/JVd43HXitpk0Mk="; + hash = "sha256-5VnJXQo/VjeGB9Kpazg/MHU8m4Kh/JVd43HXitpk0Mk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 3b4c2db06636..3904923d53b4 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Mb4/UBRBqbjF3HJmD/e5z++bQ7ISGiPZb1htKGMnApA="; + hash = "sha256-Mb4/UBRBqbjF3HJmD/e5z++bQ7ISGiPZb1htKGMnApA="; }; buildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pyvizio/default.nix b/pkgs/development/python-modules/pyvizio/default.nix index 72793ca72b92..d981f8b142e4 100644 --- a/pkgs/development/python-modules/pyvizio/default.nix +++ b/pkgs/development/python-modules/pyvizio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AtqMWe2zgRqOp5S9oKq7keHNHM8pnTmV1mfGiVzygTc="; + hash = "sha256-AtqMWe2zgRqOp5S9oKq7keHNHM8pnTmV1mfGiVzygTc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix index d0311c4fdb39..f51d3c2dbce5 100644 --- a/pkgs/development/python-modules/pywatchman/default.nix +++ b/pkgs/development/python-modules/pywatchman/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JTVNnjZH+UQRpME+UQyDoc7swXl3sFJbpBsW5wGceww="; + hash = "sha256-JTVNnjZH+UQRpME+UQyDoc7swXl3sFJbpBsW5wGceww="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qgrid/default.nix b/pkgs/development/python-modules/qgrid/default.nix index e409345bcd7a..a508d6351688 100644 --- a/pkgs/development/python-modules/qgrid/default.nix +++ b/pkgs/development/python-modules/qgrid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/or1tQgzCE3AtqJlzRrHuDfAPA+FIRUBY1YNzneNcRw="; + hash = "sha256-/or1tQgzCE3AtqJlzRrHuDfAPA+FIRUBY1YNzneNcRw="; }; patches = [ diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix index 9274a8157d97..eee800736a6c 100644 --- a/pkgs/development/python-modules/queuelib/default.nix +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KFUWIJbPAjBRCJCzVDeeocD/GdEF0xR9NJ0kM7siKwg="; + hash = "sha256-KFUWIJbPAjBRCJCzVDeeocD/GdEF0xR9NJ0kM7siKwg="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix index 108ad1470c70..4efb631ad7f3 100644 --- a/pkgs/development/python-modules/ramlfications/default.nix +++ b/pkgs/development/python-modules/ramlfications/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wcQd5j74y7d0xFeWlwlhceZj95ixUmv5upnv/6Rl1ew="; + hash = "sha256-wcQd5j74y7d0xFeWlwlhceZj95ixUmv5upnv/6Rl1ew="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 9595e8e17687..458633c1a36a 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zgCOmcR9FWj0lpi78U0G1CKR5kyNyr541HusIrBpF/Q="; + hash = "sha256-zgCOmcR9FWj0lpi78U0G1CKR5kyNyr541HusIrBpF/Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-futures/default.nix b/pkgs/development/python-modules/requests-futures/default.nix index d166a0fe0fde..e370ec6f846f 100644 --- a/pkgs/development/python-modules/requests-futures/default.nix +++ b/pkgs/development/python-modules/requests-futures/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9VpO+ABw4oWOfR5zEj0r+uryW5P9NDhNjd8UjitnY3M="; + hash = "sha256-9VpO+ABw4oWOfR5zEj0r+uryW5P9NDhNjd8UjitnY3M="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/requests-hawk/default.nix b/pkgs/development/python-modules/requests-hawk/default.nix index 9f3fbb94670d..5e96bd5f2dba 100644 --- a/pkgs/development/python-modules/requests-hawk/default.nix +++ b/pkgs/development/python-modules/requests-hawk/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rZIFBCyUvbFa+qGbB4DhEHeyTZ5c/6wfs9JssIqkNbc="; + hash = "sha256-rZIFBCyUvbFa+qGbB4DhEHeyTZ5c/6wfs9JssIqkNbc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/riprova/default.nix b/pkgs/development/python-modules/riprova/default.nix index 98d70bcd939a..737f941f8dbb 100644 --- a/pkgs/development/python-modules/riprova/default.nix +++ b/pkgs/development/python-modules/riprova/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-FgFySbvBjcZU2bjo40/1O7glc6oFWW05jinEOfMWMVI="; + hash = "sha256-FgFySbvBjcZU2bjo40/1O7glc6oFWW05jinEOfMWMVI="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/rnc2rng/default.nix b/pkgs/development/python-modules/rnc2rng/default.nix index bc4147153356..7b691f638b44 100644 --- a/pkgs/development/python-modules/rnc2rng/default.nix +++ b/pkgs/development/python-modules/rnc2rng/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3Z/7vWnQnLB+bnqM+A/ShwP9xtO5Am+HVrScvjMUZ2s="; + hash = "sha256-3Z/7vWnQnLB+bnqM+A/ShwP9xtO5Am+HVrScvjMUZ2s="; }; propagatedBuildInputs = [ rply ]; diff --git a/pkgs/development/python-modules/rpmfile/default.nix b/pkgs/development/python-modules/rpmfile/default.nix index bec7009ae86f..3f49d153a1bb 100644 --- a/pkgs/development/python-modules/rpmfile/default.nix +++ b/pkgs/development/python-modules/rpmfile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-tLDdVTrZlxGk+oYmeCm/4XLAPx6hzkztJP+lXtiDhb4="; + hash = "sha256-tLDdVTrZlxGk+oYmeCm/4XLAPx6hzkztJP+lXtiDhb4="; }; # Tests access the internet diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index 16c96ce311d4..e81479419aa0 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UhWpWwU40m8YlgDgmCsx2oKB90U81uKGLFsh4+EAIzE="; + hash = "sha256-UhWpWwU40m8YlgDgmCsx2oKB90U81uKGLFsh4+EAIzE="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/sockjs/default.nix b/pkgs/development/python-modules/sockjs/default.nix index da423a473052..c41bef8e1c7f 100644 --- a/pkgs/development/python-modules/sockjs/default.nix +++ b/pkgs/development/python-modules/sockjs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-V+lZoj8gqNVRSdHl2ws7hwcm8rStgWbUG9z0EbNs33Y="; + hash = "sha256-V+lZoj8gqNVRSdHl2ws7hwcm8rStgWbUG9z0EbNs33Y="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix index 7b46166ec2f4..bd9d11105e1b 100644 --- a/pkgs/development/python-modules/soundcloud-v2/default.nix +++ b/pkgs/development/python-modules/soundcloud-v2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wcRjzLnPvpz4zWhV7LxAJ6+BDvkI1MexdgL4nBjJwbg="; + hash = "sha256-wcRjzLnPvpz4zWhV7LxAJ6+BDvkI1MexdgL4nBjJwbg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index 051da27792f8..fcb02b334a2b 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_external_toc"; - sha256 = "sha256-p9LGPMR+xohUZEOyi8TvRmEhgn7z3Hu1Cd41S61OouA="; + hash = "sha256-p9LGPMR+xohUZEOyi8TvRmEhgn7z3Hu1Cd41S61OouA="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/srt/default.nix b/pkgs/development/python-modules/srt/default.nix index d4ae26479ca6..6a8646be1a5b 100644 --- a/pkgs/development/python-modules/srt/default.nix +++ b/pkgs/development/python-modules/srt/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SIQxUEOk8HQP0fh47WyqN2rAbXDhNfMGptxEYy7tDMA="; + hash = "sha256-SIQxUEOk8HQP0fh47WyqN2rAbXDhNfMGptxEYy7tDMA="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index 493f761c8511..a0aff938ab03 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-yPxvq8Dn9phO6ruUJUDkVkblvvC7mf5Z4C2mNOTUuco="; + hash = "sha256-yPxvq8Dn9phO6ruUJUDkVkblvvC7mf5Z4C2mNOTUuco="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tadasets/default.nix b/pkgs/development/python-modules/tadasets/default.nix index 2cf02af4efb2..ad437fd3497b 100644 --- a/pkgs/development/python-modules/tadasets/default.nix +++ b/pkgs/development/python-modules/tadasets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PWbq+dCQ8mGR81lolBDSArxjkTdis1ZpLY0MqZfZ66I="; + hash = "sha256-PWbq+dCQ8mGR81lolBDSArxjkTdis1ZpLY0MqZfZ66I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/takethetime/default.nix b/pkgs/development/python-modules/takethetime/default.nix index 6c397f7535c8..e5671d5c08e8 100644 --- a/pkgs/development/python-modules/takethetime/default.nix +++ b/pkgs/development/python-modules/takethetime/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "TakeTheTime"; inherit version; - sha256 = "sha256-2+MEU6G1lqOPni4/qOGtxa8tv2RsoIN61cIFmhb+L/k="; + hash = "sha256-2+MEU6G1lqOPni4/qOGtxa8tv2RsoIN61cIFmhb+L/k="; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index b7322f07b473..cfc4922eccf7 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RcCTYwM30Bpqj5d6JGrW1zLrEfLgcrsibVmtPSR4HJk="; + hash = "sha256-RcCTYwM30Bpqj5d6JGrW1zLrEfLgcrsibVmtPSR4HJk="; }; # https://github.com/sirfz/tesserocr/issues/314 diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index 9217aff5a8ff..ec6a5d662425 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Nor89+CQs8aIvddUol9kvDFOUSuBb4xxufn8F9w3o9k="; + hash = "sha256-Nor89+CQs8aIvddUol9kvDFOUSuBb4xxufn8F9w3o9k="; }; nativeCheckInputs = [ testresources ]; diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index 6e98a9f3461e..df074958d1cd 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-W+W7wfD6D4tgrKbO7AeEXUHQxHXPRFv6200sRew5fqM="; + hash = "sha256-W+W7wfD6D4tgrKbO7AeEXUHQxHXPRFv6200sRew5fqM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 8a95ecf22fea..31e94229e771 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-a+AkSMCPx9fE7fhSiQBuOaSlPvdHIB/yS2dcZS9AxoY="; + hash = "sha256-a+AkSMCPx9fE7fhSiQBuOaSlPvdHIB/yS2dcZS9AxoY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 3b351c3a608f..1d58d87eeb77 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Pp4h0MBoYhczmxPq21cLiYpLUeFP+2JoACcFpBl3b0E="; + hash = "sha256-Pp4h0MBoYhczmxPq21cLiYpLUeFP+2JoACcFpBl3b0E="; }; diff --git a/pkgs/development/python-modules/types-appdirs/default.nix b/pkgs/development/python-modules/types-appdirs/default.nix index ec18f6cbcedb..9c48d6996f8d 100644 --- a/pkgs/development/python-modules/types-appdirs/default.nix +++ b/pkgs/development/python-modules/types-appdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-gyaNpkWFNhv6KR+PUGogknYhKgSXvTfwUSqTmz1p/xQ="; + hash = "sha256-gyaNpkWFNhv6KR+PUGogknYhKgSXvTfwUSqTmz1p/xQ="; }; meta = { diff --git a/pkgs/development/python-modules/uhi/default.nix b/pkgs/development/python-modules/uhi/default.nix index 4fab1494d88b..c84408b339ed 100644 --- a/pkgs/development/python-modules/uhi/default.nix +++ b/pkgs/development/python-modules/uhi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DctrGXdQh9OKMe44jLLHDy7P4ExP/iymMiNBDK5b7vo="; + hash = "sha256-DctrGXdQh9OKMe44jLLHDy7P4ExP/iymMiNBDK5b7vo="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/unrardll/default.nix b/pkgs/development/python-modules/unrardll/default.nix index ef69a9bbe94e..14a32c0ba862 100644 --- a/pkgs/development/python-modules/unrardll/default.nix +++ b/pkgs/development/python-modules/unrardll/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4QZ/4nu03iBO+PNpLyPZPF07QpL3iyksb8fcT3V0n3Y="; + hash = "sha256-4QZ/4nu03iBO+PNpLyPZPF07QpL3iyksb8fcT3V0n3Y="; }; buildInputs = [ unrar ]; diff --git a/pkgs/development/python-modules/validobj/default.nix b/pkgs/development/python-modules/validobj/default.nix index 5ee2b0d6d0c8..65076a08843d 100644 --- a/pkgs/development/python-modules/validobj/default.nix +++ b/pkgs/development/python-modules/validobj/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-uwP2Mu10AiDWzlPMRH2+0CMSnibTB8KBY8QZNf+icNA="; + hash = "sha256-uwP2Mu10AiDWzlPMRH2+0CMSnibTB8KBY8QZNf+icNA="; }; nativeBuildInputs = [ flit ]; diff --git a/pkgs/development/python-modules/verspec/default.nix b/pkgs/development/python-modules/verspec/default.nix index 4064f1a18cae..fe30ab8bebf9 100644 --- a/pkgs/development/python-modules/verspec/default.nix +++ b/pkgs/development/python-modules/verspec/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xFBMppeyBWzbS/pxIUYfWg6BgJJVtBwD3aS6gjY3wB4="; + hash = "sha256-xFBMppeyBWzbS/pxIUYfWg6BgJJVtBwD3aS6gjY3wB4="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 62f6315880fa..37662921905a 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1Ge+rFpEvgD7XNG88zI5jD2rX7O9OveBXqhrTWuz06Q="; + hash = "sha256-1Ge+rFpEvgD7XNG88zI5jD2rX7O9OveBXqhrTWuz06Q="; }; # pip depend on $HOME setting diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 5653e5629d40..81f6553a9646 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-q3J7+B3oiYStpcEfBm8eFkmQPT49fskfHOloFyr9UlY="; + hash = "sha256-q3J7+B3oiYStpcEfBm8eFkmQPT49fskfHOloFyr9UlY="; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 94b004862d59..933823a748c5 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AF2kebBBNM3Z3WAtHufEnXneBTdhDWU2dMxsveIiuKE="; + hash = "sha256-AF2kebBBNM3Z3WAtHufEnXneBTdhDWU2dMxsveIiuKE="; }; doCheck = false; diff --git a/pkgs/development/python-modules/waqiasync/default.nix b/pkgs/development/python-modules/waqiasync/default.nix index 91d58d85347c..c627c24290ff 100644 --- a/pkgs/development/python-modules/waqiasync/default.nix +++ b/pkgs/development/python-modules/waqiasync/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SOs998BQV4UlLnRB3Yf7zze51u43g2Npwgk6y80S+m8="; + hash = "sha256-SOs998BQV4UlLnRB3Yf7zze51u43g2Npwgk6y80S+m8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix index 187a9c7baf93..4427858a8157 100644 --- a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix +++ b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "XStatic-asciinema-player"; inherit version; - sha256 = "sha256-yA6WC067St82Dm6StaCKdWrRBhmNemswetIO8iodfcw="; + hash = "sha256-yA6WC067St82Dm6StaCKdWrRBhmNemswetIO8iodfcw="; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic-font-awesome/default.nix b/pkgs/development/python-modules/xstatic-font-awesome/default.nix index 1a8868a84685..7f8d70372a3d 100644 --- a/pkgs/development/python-modules/xstatic-font-awesome/default.nix +++ b/pkgs/development/python-modules/xstatic-font-awesome/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "XStatic-Font-Awesome"; inherit version; - sha256 = "sha256-8HWHEJYShjjy4VOQINgid1TD2IXdaOfubemgEjUHaCg="; + hash = "sha256-8HWHEJYShjjy4VOQINgid1TD2IXdaOfubemgEjUHaCg="; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix index 4d6fd00d221c..fb7b2b1e9001 100644 --- a/pkgs/development/python-modules/xstatic/default.nix +++ b/pkgs/development/python-modules/xstatic/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "XStatic"; inherit version; - sha256 = "sha256-QCVEzJ4XlIlEEFTwnIB4BOEV6iRpB96HwDVftPWjEmg="; + hash = "sha256-QCVEzJ4XlIlEEFTwnIB4BOEV6iRpB96HwDVftPWjEmg="; }; # no tests implemented diff --git a/pkgs/development/python-modules/yamlordereddictloader/default.nix b/pkgs/development/python-modules/yamlordereddictloader/default.nix index 89f871e50be2..33a4732fdebf 100644 --- a/pkgs/development/python-modules/yamlordereddictloader/default.nix +++ b/pkgs/development/python-modules/yamlordereddictloader/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Nq8vYhD8/12k/EwS4dgV+XPc60EETnleHwYRXWNLyhM="; + hash = "sha256-Nq8vYhD8/12k/EwS4dgV+XPc60EETnleHwYRXWNLyhM="; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index db3bfceea9e4..e656721e855c 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ii6EWI7zHT5SVwD6lksfmqth8MnEYoHgU0GlbgHc17g="; + hash = "sha256-ii6EWI7zHT5SVwD6lksfmqth8MnEYoHgU0GlbgHc17g="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/yubico/default.nix b/pkgs/development/python-modules/yubico/default.nix index 43f3a8994b66..8a4bfb769e13 100644 --- a/pkgs/development/python-modules/yubico/default.nix +++ b/pkgs/development/python-modules/yubico/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2EZkJ6pZIqxdS36cZbaTEIQnz1N9ZT1oyyEsBxPo5vU="; + hash = "sha256-2EZkJ6pZIqxdS36cZbaTEIQnz1N9ZT1oyyEsBxPo5vU="; }; propagatedBuildInputs = [ pyusb ]; diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 352fefbcd373..7cc6f18d5e3d 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zope.deferredimport"; inherit version; - sha256 = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM="; + hash = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM="; }; propagatedBuildInputs = [ zope-proxy ]; diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index f26eb8385a6e..93941dd57955 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-28mEG+3XNgQeteaYLNktqTvuFFdF9UIvN5X28ljNxu8="; + hash = "sha256-28mEG+3XNgQeteaYLNktqTvuFFdF9UIvN5X28ljNxu8="; extension = "zip"; }; diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/development/tools/bashate/default.nix index 69538a923d14..fd4161499c72 100644 --- a/pkgs/development/tools/bashate/default.nix +++ b/pkgs/development/tools/bashate/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-S6tul3+DBacgU1+Pk/H7QsUh/LxKbCs9PXZx9C8iH0w="; + hash = "sha256-S6tul3+DBacgU1+Pk/H7QsUh/LxKbCs9PXZx9C8iH0w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index 69004289f528..9a20f12c0f60 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YW3mjYfSuxi/XmaetrWmjVuTfqgaitQ5wfUaJdHIH1Y="; + hash = "sha256-YW3mjYfSuxi/XmaetrWmjVuTfqgaitQ5wfUaJdHIH1Y="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/pkgs/development/tools/database/sqlite-web/default.nix index dc5960fd9ee2..8adaabd5e094 100644 --- a/pkgs/development/tools/database/sqlite-web/default.nix +++ b/pkgs/development/tools/database/sqlite-web/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-cDSlSh0vnwvbJZFDPqvJ5oXz68gN9yzodcQYkXUAytE="; + hash = "sha256-cDSlSh0vnwvbJZFDPqvJ5oXz68gN9yzodcQYkXUAytE="; }; propagatedBuildInputs = with python3Packages; [ flask peewee pygments ]; diff --git a/pkgs/development/tools/dazel/default.nix b/pkgs/development/tools/dazel/default.nix index f19d46969783..119cbaca9c70 100644 --- a/pkgs/development/tools/dazel/default.nix +++ b/pkgs/development/tools/dazel/default.nix @@ -8,7 +8,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JE7+GS7DpuFoC2LK3dvYvjtOdzRxFMHzgZRfvrGBDtQ="; + hash = "sha256-JE7+GS7DpuFoC2LK3dvYvjtOdzRxFMHzgZRfvrGBDtQ="; }; meta = { diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/development/tools/distgen/default.nix index c405aa3fd354..a9d13d973000 100644 --- a/pkgs/development/tools/distgen/default.nix +++ b/pkgs/development/tools/distgen/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Md6R1thUtPQ7BFZsWmTDuNdD7UHMMFlEVksIJZAyjk4="; + hash = "sha256-Md6R1thUtPQ7BFZsWmTDuNdD7UHMMFlEVksIJZAyjk4="; }; nativeCheckInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix index 9a1a8978598b..04eac7726f71 100644 --- a/pkgs/development/tools/eliot-tree/default.nix +++ b/pkgs/development/tools/eliot-tree/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hTl+r+QJPPQ7ss73lty3Wm7DLy2SKGmmgIuJx38ilO8="; + hash = "sha256-hTl+r+QJPPQ7ss73lty3Wm7DLy2SKGmmgIuJx38ilO8="; }; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix index f5d55ce10dfb..393f2512e875 100644 --- a/pkgs/development/tools/mbed-cli/default.nix +++ b/pkgs/development/tools/mbed-cli/default.nix @@ -8,7 +8,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-X+hNVM8fsy0VFTqFr1pPKWRimacBenTcY4y+PBJpvlI="; + hash = "sha256-X+hNVM8fsy0VFTqFr1pPKWRimacBenTcY4y+PBJpvlI="; }; nativeCheckInputs = [ diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index cc5b0fde7219..33d9da9f636e 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-vmMlRmjFqhs3Vf+IU9IDtJzt4dZ0yIOmXIVOx5chZPA="; + hash = "sha256-vmMlRmjFqhs3Vf+IU9IDtJzt4dZ0yIOmXIVOx5chZPA="; }; postPatch = '' diff --git a/pkgs/development/tools/misc/usbsdmux/default.nix b/pkgs/development/tools/misc/usbsdmux/default.nix index 86ed8b11acf9..7794cf06d77d 100644 --- a/pkgs/development/tools/misc/usbsdmux/default.nix +++ b/pkgs/development/tools/misc/usbsdmux/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-OtGgToDGUr6pBu9+LS/DxaYw/9+Pd6jPhxVDAM22HB4="; + hash = "sha256-OtGgToDGUr6pBu9+LS/DxaYw/9+Pd6jPhxVDAM22HB4="; }; # Remove the wrong GROUP=plugdev. diff --git a/pkgs/development/tools/patatt/default.nix b/pkgs/development/tools/patatt/default.nix index b50fae18ae49..49477035a110 100644 --- a/pkgs/development/tools/patatt/default.nix +++ b/pkgs/development/tools/patatt/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mAgm9lKdJXbCZ8ofVk1b7wRstH5UIVu1mO1sS5stCig="; + hash = "sha256-mAgm9lKdJXbCZ8ofVk1b7wRstH5UIVu1mO1sS5stCig="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/pifpaf/default.nix b/pkgs/development/tools/pifpaf/default.nix index 80d9c26f506c..6ae32206c6d0 100644 --- a/pkgs/development/tools/pifpaf/default.nix +++ b/pkgs/development/tools/pifpaf/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-lmixfUP+pq0RdyXeY6MmUQOx1sMLHqojOKUK1mivbaU="; + hash = "sha256-lmixfUP+pq0RdyXeY6MmUQOx1sMLHqojOKUK1mivbaU="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index 32c09f4c5388..5a2ef3b16dcf 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; + hash = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; }; meta = with lib; { diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 20f6846274b7..8c7fb067f1ab 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-O6jRQ6e96b8CuumTD6TGELaz26No7WFZgGSnNSlqzuE="; + hash = "sha256-O6jRQ6e96b8CuumTD6TGELaz26No7WFZgGSnNSlqzuE="; }; postPatch = '' diff --git a/pkgs/misc/present/default.nix b/pkgs/misc/present/default.nix index a27b6abe4359..77ca05b0faae 100644 --- a/pkgs/misc/present/default.nix +++ b/pkgs/misc/present/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-l9W5L4LD9qRo3rLBkgd2I/aDaj+ucib5UYg+X4RYg6c="; + hash = "sha256-l9W5L4LD9qRo3rLBkgd2I/aDaj+ucib5UYg+X4RYg6c="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/servers/dcnnt/default.nix b/pkgs/servers/dcnnt/default.nix index 2279c9f116b1..505ee26ab95d 100644 --- a/pkgs/servers/dcnnt/default.nix +++ b/pkgs/servers/dcnnt/default.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-73ZLgb5YcXlAOjbKLVv8oqgS6pstBdJxa7LFUgIHpUE="; + hash = "sha256-73ZLgb5YcXlAOjbKLVv8oqgS6pstBdJxa7LFUgIHpUE="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/geospatial/mapproxy/default.nix b/pkgs/servers/geospatial/mapproxy/default.nix index ce3bcd5560de..773c12f24185 100644 --- a/pkgs/servers/geospatial/mapproxy/default.nix +++ b/pkgs/servers/geospatial/mapproxy/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HwO5gvrsW9pArz4RLtxNfCmiFqa85AAi6wBJI+F9GE8="; + hash = "sha256-HwO5gvrsW9pArz4RLtxNfCmiFqa85AAi6wBJI+F9GE8="; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" diff --git a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix index dfec900b0214..2aac1665f81b 100644 --- a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix +++ b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+Nad+8bMtYKJbUCpppRXqhB1zdbvvFXTTHlwJLQLzDg="; + hash = "sha256-+Nad+8bMtYKJbUCpppRXqhB1zdbvvFXTTHlwJLQLzDg="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/matrix-synapse/plugins/ldap3.nix b/pkgs/servers/matrix-synapse/plugins/ldap3.nix index feac6f084726..6a631f4f262f 100644 --- a/pkgs/servers/matrix-synapse/plugins/ldap3.nix +++ b/pkgs/servers/matrix-synapse/plugins/ldap3.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-s4jZVpNIbu9pra79D9noRGPVL+F7AhSgDvyqZptzy3Q="; + hash = "sha256-s4jZVpNIbu9pra79D9noRGPVL+F7AhSgDvyqZptzy3Q="; }; patches = [ diff --git a/pkgs/servers/monitoring/alerta/client.nix b/pkgs/servers/monitoring/alerta/client.nix index e95c114ee2a6..ea1e589ad4f2 100644 --- a/pkgs/servers/monitoring/alerta/client.nix +++ b/pkgs/servers/monitoring/alerta/client.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ePvT2icsgv+io5aDDUr1Zhfodm4wlqh/iqXtNkFhS10="; + hash = "sha256-ePvT2icsgv+io5aDDUr1Zhfodm4wlqh/iqXtNkFhS10="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/monitoring/alerta/default.nix b/pkgs/servers/monitoring/alerta/default.nix index f84bb3302eca..3a360ca0f89c 100644 --- a/pkgs/servers/monitoring/alerta/default.nix +++ b/pkgs/servers/monitoring/alerta/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-v4+0l5Sx9RTxmNFnKCoKrWFl1xu1JIRZ/kiI6zi/y0I="; + hash = "sha256-v4+0l5Sx9RTxmNFnKCoKrWFl1xu1JIRZ/kiI6zi/y0I="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix index a9d287a41a7e..aaf5f46b075e 100644 --- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-C7agnOUdtd4YncAiaPQaZqBJ8DKZoM1Fa+dr1F4xYgI="; + hash = "sha256-C7agnOUdtd4YncAiaPQaZqBJ8DKZoM1Fa+dr1F4xYgI="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 15600c325561..4d3e320bee0a 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0R2k5hRkAJbqgGZEPXWUb48oFxTKMKiQZckf3F+VC3I="; + hash = "sha256-0R2k5hRkAJbqgGZEPXWUb48oFxTKMKiQZckf3F+VC3I="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/audio/patray/default.nix b/pkgs/tools/audio/patray/default.nix index 90c8719b48b3..b281da1b144e 100644 --- a/pkgs/tools/audio/patray/default.nix +++ b/pkgs/tools/audio/patray/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit version pname; - sha256 = "sha256-O8CBUexL2V1qI7bB/Lns3yjUvFOpC6spd/6asXa5+pw="; + hash = "sha256-O8CBUexL2V1qI7bB/Lns3yjUvFOpC6spd/6asXa5+pw="; }; patchPhase = '' diff --git a/pkgs/tools/audio/tidal-dl/default.nix b/pkgs/tools/audio/tidal-dl/default.nix index c45d78aec4dc..eb7c597d2d75 100644 --- a/pkgs/tools/audio/tidal-dl/default.nix +++ b/pkgs/tools/audio/tidal-dl/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-b2AAsiI3n2/v6HC37fMI/d8UcxZxsWM+fnWvdajHrOg="; + hash = "sha256-b2AAsiI3n2/v6HC37fMI/d8UcxZxsWM+fnWvdajHrOg="; }; propagatedBuildInputs = [ aigpy ]; diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 7a0793c2763b..f6f9bcd3c0d3 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4Z5imxNjfvd4fkpFsggSO9XueN5Yzcz4RCl+BqmddCM="; + hash = "sha256-4Z5imxNjfvd4fkpFsggSO9XueN5Yzcz4RCl+BqmddCM="; }; nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ passthru.optional-dependencies.apprise; diff --git a/pkgs/tools/backup/gh2md/default.nix b/pkgs/tools/backup/gh2md/default.nix index 035139b58022..a56bd53c6f4a 100644 --- a/pkgs/tools/backup/gh2md/default.nix +++ b/pkgs/tools/backup/gh2md/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-B7IB1TWfZ0StH2zo/tXfDAaPlgLvr4ciIv7B8EQyp8w="; + hash = "sha256-B7IB1TWfZ0StH2zo/tXfDAaPlgLvr4ciIv7B8EQyp8w="; }; propagatedBuildInputs = with python3Packages; [ six requests python-dateutil ]; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 58605362f065..bf797a16cbfd 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -10,7 +10,7 @@ pypkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0HeDVyZrxlE7t/daRXCymySydgNIu/YHur/DpvCUWM8"; + hash = "sha256-0HeDVyZrxlE7t/daRXCymySydgNIu/YHur/DpvCUWM8"; }; nativeBuildInputs = with pypkgs; [ setuptools-scm ]; diff --git a/pkgs/tools/backup/zfs-autobackup/default.nix b/pkgs/tools/backup/zfs-autobackup/default.nix index e29813caab27..79d0fcd01dea 100644 --- a/pkgs/tools/backup/zfs-autobackup/default.nix +++ b/pkgs/tools/backup/zfs-autobackup/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "zfs_autobackup"; - sha256 = "sha256-rvtY7fsn2K2hueAsQkaPXcwxUAgE8j+GsQFF3eJKG2o="; + hash = "sha256-rvtY7fsn2K2hueAsQkaPXcwxUAgE8j+GsQFF3eJKG2o="; }; diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index 1e3f22642321..907fcd6b3541 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -49,7 +49,7 @@ bepastyPython.pkgs.buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-08cyr2AruGAfHAwHHS8WMfJh7DBKymaYyz4AxI/ubkE="; + hash = "sha256-08cyr2AruGAfHAwHHS8WMfJh7DBKymaYyz4AxI/ubkE="; }; nativeCheckInputs = with bepastyPython.pkgs; [ diff --git a/pkgs/tools/misc/edir/default.nix b/pkgs/tools/misc/edir/default.nix index 13cd4ed1c737..85fc426fc57c 100644 --- a/pkgs/tools/misc/edir/default.nix +++ b/pkgs/tools/misc/edir/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5b86/M8xqzwWMCRtsH1qwmooyfOhORgXgctRjzQEmlU="; + hash = "sha256-5b86/M8xqzwWMCRtsH1qwmooyfOhORgXgctRjzQEmlU="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/tools/misc/gaphor/default.nix index 68f922d4abd8..3079a620df45 100644 --- a/pkgs/tools/misc/gaphor/default.nix +++ b/pkgs/tools/misc/gaphor/default.nix @@ -27,7 +27,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+qqsSLjdY2I19fxdfkOEQ9DhTTHccUDll4O5yqtLiz0="; + hash = "sha256-+qqsSLjdY2I19fxdfkOEQ9DhTTHccUDll4O5yqtLiz0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/tools/misc/mloader/default.nix index 1a39727e9973..3a06da1e8585 100644 --- a/pkgs/tools/misc/mloader/default.nix +++ b/pkgs/tools/misc/mloader/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0o4FvhuFudNSEL6fwBVqxldaNePbbidY9utDqXiLRNc="; + hash = "sha256-0o4FvhuFudNSEL6fwBVqxldaNePbbidY9utDqXiLRNc="; }; postPatch = '' diff --git a/pkgs/tools/misc/pandoc-acro/default.nix b/pkgs/tools/misc/pandoc-acro/default.nix index 36bd518f5b2b..824418dd3f7f 100644 --- a/pkgs/tools/misc/pandoc-acro/default.nix +++ b/pkgs/tools/misc/pandoc-acro/default.nix @@ -15,7 +15,7 @@ let src = fetchPypi { inherit pname version; - sha256 = "sha256-JMfSQXX+BCGdFQYPFB+r08WRnhT3aXfnBNINROxCUA0="; + hash = "sha256-JMfSQXX+BCGdFQYPFB+r08WRnhT3aXfnBNINROxCUA0="; }; in buildPythonApplication { diff --git a/pkgs/tools/misc/sacad/default.nix b/pkgs/tools/misc/sacad/default.nix index cd948505301e..d8666ebd495f 100644 --- a/pkgs/tools/misc/sacad/default.nix +++ b/pkgs/tools/misc/sacad/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ZJPcxKc0G8V7x9nyzKXaXpfNpMB3/qRoX0d4lfBZTFY="; + hash = "sha256-ZJPcxKc0G8V7x9nyzKXaXpfNpMB3/qRoX0d4lfBZTFY="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/semiphemeral/default.nix b/pkgs/tools/misc/semiphemeral/default.nix index 7208dca81176..173431e526f7 100644 --- a/pkgs/tools/misc/semiphemeral/default.nix +++ b/pkgs/tools/misc/semiphemeral/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KRi3zfRWGRZJjQ6KPqBI9wQ6yU8Ohx0TDtA5qoak35U="; + hash = "sha256-KRi3zfRWGRZJjQ6KPqBI9wQ6yU8Ohx0TDtA5qoak35U="; }; doCheck = false; # upstream has no tests diff --git a/pkgs/tools/misc/twspace-dl/default.nix b/pkgs/tools/misc/twspace-dl/default.nix index e0f2e8b5f581..1345a25eb1bb 100644 --- a/pkgs/tools/misc/twspace-dl/default.nix +++ b/pkgs/tools/misc/twspace-dl/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "twspace_dl"; - sha256 = "sha256-GLs+UGEOsdGcp/mEh+12Vs+XlY1goEql7UOAvVVi1pg="; + hash = "sha256-GLs+UGEOsdGcp/mEh+12Vs+XlY1goEql7UOAvVVi1pg="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix index b285d18a90ed..9db7c9d2443e 100644 --- a/pkgs/tools/misc/vimwiki-markdown/default.nix +++ b/pkgs/tools/misc/vimwiki-markdown/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit version pname; - sha256 = "sha256-hJl0OTE6kHucVGOxgOZBG0noYRfxma3yZSrUWEssLN4="; + hash = "sha256-hJl0OTE6kHucVGOxgOZBG0noYRfxma3yZSrUWEssLN4="; }; propagatedBuildInputs= [ diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/tools/misc/wlc/default.nix index 211bde7c240d..46683480de3c 100644 --- a/pkgs/tools/misc/wlc/default.nix +++ b/pkgs/tools/misc/wlc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-QMF41B6a2jMSdhjeFoRQq+K1YJAEz96msHLzX6wVqSc="; + hash = "sha256-QMF41B6a2jMSdhjeFoRQq+K1YJAEz96msHLzX6wVqSc="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 785c66db62f8..6f11442c496c 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XNIUkgEqRGrBtSxvfkSUSqxltZ6ZdkWoTc9kz4BD6Zw="; + hash = "sha256-XNIUkgEqRGrBtSxvfkSUSqxltZ6ZdkWoTc9kz4BD6Zw="; }; patches = [ diff --git a/pkgs/tools/misc/ytmdl/default.nix b/pkgs/tools/misc/ytmdl/default.nix index 9baf2888d78b..3acaac1b3519 100644 --- a/pkgs/tools/misc/ytmdl/default.nix +++ b/pkgs/tools/misc/ytmdl/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-Im3rQAs/TYookv6FeGpU6tJxUGBMb6/UW1ZMDg9FW4s="; + hash = "sha256-Im3rQAs/TYookv6FeGpU6tJxUGBMb6/UW1ZMDg9FW4s="; }; postPatch = '' diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 743ee82c2bd9..06d322b83869 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -8,7 +8,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-VtnVyJqrdGXTqcyzpHCOMUI9G7/BkXzihDrBrsxl7Eg="; + hash = "sha256-VtnVyJqrdGXTqcyzpHCOMUI9G7/BkXzihDrBrsxl7Eg="; }; propagatedBuildInputs = [ colorama veryprettytable pyperclip ]; diff --git a/pkgs/tools/security/ghdorker/default.nix b/pkgs/tools/security/ghdorker/default.nix index f00e9a60df81..61ac1f2cc852 100644 --- a/pkgs/tools/security/ghdorker/default.nix +++ b/pkgs/tools/security/ghdorker/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wF4QoXxH55SpdYgKLHf4sCwUk1rkCpSdnIX5FvFi/BU="; + hash = "sha256-wF4QoXxH55SpdYgKLHf4sCwUk1rkCpSdnIX5FvFi/BU="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/kerbrute/default.nix b/pkgs/tools/security/kerbrute/default.nix index c020e0e5c4bc..626fe91a60c4 100644 --- a/pkgs/tools/security/kerbrute/default.nix +++ b/pkgs/tools/security/kerbrute/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ok/yttRSkCaEdV4aM2670qERjgDBll6Oi3L5TV5YEEA="; + hash = "sha256-ok/yttRSkCaEdV4aM2670qERjgDBll6Oi3L5TV5YEEA="; }; # This package does not have any tests diff --git a/pkgs/tools/security/onlykey-agent/default.nix b/pkgs/tools/security/onlykey-agent/default.nix index f37073d602da..d78c1b89b4f6 100644 --- a/pkgs/tools/security/onlykey-agent/default.nix +++ b/pkgs/tools/security/onlykey-agent/default.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SbGb7CjcD7cFPvASZtip56B4uxRiFKZBvbsf6sb8fds="; + hash = "sha256-SbGb7CjcD7cFPvASZtip56B4uxRiFKZBvbsf6sb8fds="; }; propagatedBuildInputs = with python3Packages; [ lib-agent onlykey-cli setuptools ]; diff --git a/pkgs/tools/security/onlykey-cli/default.nix b/pkgs/tools/security/onlykey-cli/default.nix index 6d43a4df4aff..be95675dd66e 100644 --- a/pkgs/tools/security/onlykey-cli/default.nix +++ b/pkgs/tools/security/onlykey-cli/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "onlykey"; - sha256 = "sha256-ZmQnyZx9YlIIxMMdZ0U2zb+QANfcwrtG7iR1LpgzmBQ="; + hash = "sha256-ZmQnyZx9YlIIxMMdZ0U2zb+QANfcwrtG7iR1LpgzmBQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 6a8e5ec0be19..15bedadccef0 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-nSdpnM8ubodlPwmvdmNFTn9TsS8i7lWBZ2CifMHDe1c="; + hash = "sha256-nSdpnM8ubodlPwmvdmNFTn9TsS8i7lWBZ2CifMHDe1c="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix b/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix index 27830f9645ca..b0327b2b6052 100644 --- a/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix +++ b/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/U59a6od0JI27VHX+Bvue/7tQy+iwU+g8yt9/GgdoH4="; + hash = "sha256-/U59a6od0JI27VHX+Bvue/7tQy+iwU+g8yt9/GgdoH4="; }; propagatedBuildInputs = [ boto3 cryptography ]; From 6fd80c0cce0d431ddeec708b72c41839417e447e Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 14 Jul 2024 01:27:55 +0800 Subject: [PATCH 37/45] bepasty: fix overriding hash --- pkgs/tools/misc/bepasty/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index 907fcd6b3541..8e9b0ce6e094 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -13,7 +13,7 @@ let version = "4.7.0.0"; src = oldAttrs.src.override { inherit version; - sha256 = "sha256-4B+0gMqqfHlj3LMyikcA5jG+9gcNsOi2hYFtIg5oX2w="; + hash = "sha256-4B+0gMqqfHlj3LMyikcA5jG+9gcNsOi2hYFtIg5oX2w="; }; }); }; From c84b739d75879132106d342c68496a7e2d9b8e82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 20:22:47 +0000 Subject: [PATCH 38/45] mousam: 1.3.1 -> 1.3.2 --- pkgs/by-name/mo/mousam/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mousam/package.nix b/pkgs/by-name/mo/mousam/package.nix index bb57866d46cc..4cf91beffe49 100644 --- a/pkgs/by-name/mo/mousam/package.nix +++ b/pkgs/by-name/mo/mousam/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { pname = "mousam"; - version = "1.3.1"; + version = "1.3.2"; # built with meson, not a python format pyproject = false; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { owner = "amit9838"; repo = "mousam"; rev = "refs/tags/v${version}"; - hash = "sha256-QFEn7o3DRJyRLbEfb86AsS/ifYqzs3b5n2fZa/9Mm1A="; + hash = "sha256-1gFuMh5Poypmgyk2bpi9v6iK7WkO5KHLs+WsoDpJPeg="; }; nativeBuildInputs = [ From 6985c126266e360608f5dd0c5aade5a439e0013e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 22:11:21 +0000 Subject: [PATCH 39/45] syncthingtray: 1.5.4 -> 1.5.5 --- pkgs/applications/misc/syncthingtray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index b66c4f74d724..4d5252e455c8 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -35,14 +35,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.4"; + version = "1.5.5"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-3Z9heiQiuYzWtReKs/XeA+ENRKgxHR74ANzrDcdyjh4="; + hash = "sha256-NfFB+4cqe1rHqc+w0Enl9h33gPjJ3CfrFpyOhysmz0Q="; }; buildInputs = [ From ccbdc8d4093fbec72149f1d84ddb4f94bbe16d70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 22:46:03 +0000 Subject: [PATCH 40/45] flyctl: 0.2.79 -> 0.2.88 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index cde017c71e5d..58e17cd8a838 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.79"; + version = "0.2.88"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-mnLBSTzeDcxmKNile4Kfe0AABoLgK3EL9HU8r8OPsuc="; + hash = "sha256-eGeYCMwl4m9I+KYfLdh/zYb6xnJxYAI4bbJrtfv2ioA="; }; - vendorHash = "sha256-RSLwEOtZsYfTgBdkZIxccxehz8lbozWJV5UdKiMeoLU="; + vendorHash = "sha256-c4hTDqJ7ss8iCf3FVuQHTe1Nsbzb7R6f2+evhzey1PE="; subPackages = [ "." ]; From 62cac25eeef6d6ec97d48e8d6c581f32c6016c5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 23:54:26 +0000 Subject: [PATCH 41/45] python312Packages.unstructured: 0.14.8 -> 0.14.10 --- pkgs/development/python-modules/unstructured/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 98a2531fa4db..1201850f54b9 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -57,7 +57,7 @@ grpcio, }: let - version = "0.14.8"; + version = "0.14.10"; optional-dependencies = { huggingflace = [ langdetect @@ -100,7 +100,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-cZBoGKjIWHJxbG6sDbkjJJt3nSYjrha+Lz9RFdq6d0c="; + hash = "sha256-h+sTqI0wLK+ZZR6bdQxKSVtXRvR2ovJ4YbvsXLTZ8Aw="; }; propagatedBuildInputs = [ From 13144909978b8f2186bccd89470d519697830c5a Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sat, 13 Jul 2024 20:41:27 -0400 Subject: [PATCH 42/45] icoextract: add missing -t to install command --- pkgs/by-name/ic/icoextract/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ic/icoextract/package.nix b/pkgs/by-name/ic/icoextract/package.nix index 2cb81016e56e..8565bff672fd 100644 --- a/pkgs/by-name/ic/icoextract/package.nix +++ b/pkgs/by-name/ic/icoextract/package.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace exe-thumbnailer.thumbnailer \ --replace Exec=exe-thumbnailer Exec=$out/bin/exe-thumbnailer - install -Dm644 exe-thumbnailer.thumbnailer $out/share/thumbnailers + install -Dm644 exe-thumbnailer.thumbnailer -t $out/share/thumbnailers ''; meta = with lib; { From e03e7e1826e236be0f0bea0f6a7555aba6d2d886 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 00:59:23 +0000 Subject: [PATCH 43/45] wavemon: 0.9.5 -> 0.9.6 --- pkgs/tools/networking/wavemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index 259996d93540..6d05569de8ad 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "wavemon"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "uoaerg"; repo = "wavemon"; rev = "v${version}"; - sha256 = "sha256-MvIFuPATI0Y7aIYZkb2Yr+iCco4gILHhDU5FWeMCk5Q="; + sha256 = "sha256-OnELXlnzXamQflCAWuc4fxwvqHZtl+nrlTpkKK4IGKw="; }; nativeBuildInputs = [ From 88d05be4a28ccad961faef5f85859882cbf7e5a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 01:03:31 +0000 Subject: [PATCH 44/45] shpool: 0.6.2 -> 0.6.3 --- pkgs/by-name/sh/shpool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix index 0b8be24fd452..34c59c05c563 100644 --- a/pkgs/by-name/sh/shpool/package.nix +++ b/pkgs/by-name/sh/shpool/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "shpool"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "shell-pool"; repo = "shpool"; rev = "v${version}"; - hash = "sha256-6gfK71uM6IOP571Jzv3QPPKITaRteXyySZAstH0e+/M="; + hash = "sha256-RzXlwzCMZ5nDnNfQHzqY9Wu7gvG8y39yR2W3cfl208w="; }; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/bin/shpool' "$out/bin/shpool" ''; - cargoHash = "sha256-rJ+Avq/6y68xEcJ+EeFVhFaSWJyC+x0a46cclVsTE4Q="; + cargoHash = "sha256-Xb/ohGzgXR8B6Zfd2pUqgpxK6WQnk2xF4bbCyz1g2os="; buildInputs = [ linux-pam From 0a1370d338361d35253dcc28cfe7b8f6112e405b Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Sun, 14 Jul 2024 04:12:56 +0200 Subject: [PATCH 45/45] vscode: 1.91.0 -> 1.91.1 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index c2e41573c1ef..a57db1275abc 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0bzf0mx1rgndpdd4a97kr01xsgsgp86gyscg8js2cvaad4265bmv"; - x86_64-darwin = "1m7f91cqbbv00difvfqld8fqkj9kvyddihmzi3zyzn4gfkv8gvf0"; - aarch64-linux = "09mxsk4qkq34yg1sd67cdasfxwdhdzcfij50fv1nl3kdjzp2i0iz"; - aarch64-darwin = "1jxjzfz6gr0pcp2anwjqwm38ma2i8fnzf5zpscfdklrlbhf438k2"; - armv7l-linux = "1yp4npgw4dkx8halsr1vm5ll1w4phx67dwd4krz1914mddx7x2kr"; + x86_64-linux = "0ighhwwmc8cxdabq2wkzzr21sv6zaj90pnqi2cy8krfwm88w6jc0"; + x86_64-darwin = "1fbpw0xib9vm47ab028frg789vgmkpwcdxs8m2in7ywrckl6xycy"; + aarch64-linux = "0n0f518xl1fh17llsd159ldi50z2vihkghfq7plfnbnngpf0swy9"; + aarch64-darwin = "03v3869yblx03j0c3njlvg7qgdmqrg8jvj9s1iyhqw1xpb2lc41c"; + armv7l-linux = "12dv0vqqzriqr8ysjjx62hy2b41dky2p0rcr11wznqi259bryckr"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.91.0"; + version = "1.91.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "ea1445cc7016315d0f5728f8e8b12a45dc0a7286"; + rev = "f1e16e1e6214d7c44d078b1f0607b2388f29d729"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "08mgfrwiji16q8x8kwmw3pdmb0325hfr9pd2fa5g5kmy9gnfw38v"; + sha256 = "0k38pkfz9kpbpx0n50iq531mrm7qxqggks092cs4zicv815jk8wg"; }; };