summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK900 <me@0upti.me>2025-08-11 07:51:20 +0300
committerK900 <me@0upti.me>2025-08-11 07:51:20 +0300
commitf2f57f5307302316158737877db9155f1df945c7 (patch)
tree7f922cec79815d1a82c6d11d7f27b128570e5908
parentpython3Packages.python-hosts: fix src (diff)
parentnakama: 3.29.0 -> 3.30.0 (#432605) (diff)
downloadnixpkgs-f2f57f5307302316158737877db9155f1df945c7.tar.gz
Merge remote-tracking branch 'origin/master' into staging-next
-rw-r--r--doc/build-helpers/fetchers.chapter.md4
-rw-r--r--doc/release-notes/rl-2511.section.md1
-rw-r--r--nixos/modules/config/system-path.nix5
-rw-r--r--nixos/modules/tasks/network-interfaces.nix24
-rw-r--r--nixos/modules/testing/test-instrumentation.nix2
-rw-r--r--pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix10
-rw-r--r--pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix10
-rw-r--r--pkgs/applications/misc/gremlin-console/default.nix4
-rw-r--r--pkgs/build-support/fetchgit/builder.sh3
-rw-r--r--pkgs/build-support/fetchgit/default.nix23
-rwxr-xr-xpkgs/build-support/fetchgit/nix-prefetch-git62
-rw-r--r--pkgs/build-support/fetchgit/tests.nix8
-rw-r--r--pkgs/by-name/ba/baddns/package.nix6
-rw-r--r--pkgs/by-name/ba/basedpyright/package.nix4
-rw-r--r--pkgs/by-name/ca/catppuccin-qt5ct/package.nix22
-rw-r--r--pkgs/by-name/cd/cdncheck/package.nix4
-rw-r--r--pkgs/by-name/ch/checkov/package.nix4
-rw-r--r--pkgs/by-name/co/coin3d/package.nix4
-rw-r--r--pkgs/by-name/dr/drone-cli/package.nix2
-rw-r--r--pkgs/by-name/fa/fabric-ai/package.nix6
-rw-r--r--pkgs/by-name/fs/fsautocomplete/deps.json12
-rw-r--r--pkgs/by-name/fs/fsautocomplete/package.nix4
-rw-r--r--pkgs/by-name/go/gocryptfs/package.nix4
-rw-r--r--pkgs/by-name/io/iosevka/package.nix6
-rw-r--r--pkgs/by-name/li/libmsquic/package.nix4
-rw-r--r--pkgs/by-name/mg/mgba/package.nix4
-rw-r--r--pkgs/by-name/my/mympd/package.nix4
-rw-r--r--pkgs/by-name/na/nakama/package.nix4
-rwxr-xr-xpkgs/by-name/ni/nixos-install/nixos-install.sh8
-rw-r--r--pkgs/by-name/op/openimageio/package.nix4
-rw-r--r--pkgs/by-name/pd/pdns-recursor/package.nix4
-rw-r--r--pkgs/by-name/py/pyprland/package.nix4
-rw-r--r--pkgs/by-name/ra/rancher/package.nix2
-rw-r--r--pkgs/by-name/rs/rstfmt/package.nix14
-rw-r--r--pkgs/by-name/s7/s7/package.nix6
-rw-r--r--pkgs/by-name/sh/shellhub-agent/package.nix6
-rw-r--r--pkgs/by-name/sh/shopify-cli/manifests/package-lock.json12
-rw-r--r--pkgs/by-name/sh/shopify-cli/manifests/package.json4
-rw-r--r--pkgs/by-name/sh/shopify-cli/package.nix4
-rw-r--r--pkgs/by-name/sy/sydbox/package.nix6
-rw-r--r--pkgs/by-name/ta/tailscale/package.nix4
-rw-r--r--pkgs/by-name/tr/trilium-next-desktop/package.nix10
-rw-r--r--pkgs/by-name/tr/trilium-next-server/package.nix6
-rw-r--r--pkgs/by-name/ty/typescript-language-server/package.nix6
-rw-r--r--pkgs/by-name/wd/wdisplays/package.nix2
-rw-r--r--pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix2
-rw-r--r--pkgs/development/interpreters/babashka/default.nix4
-rw-r--r--pkgs/development/python-modules/accelerate/default.nix4
-rw-r--r--pkgs/development/python-modules/app-model/default.nix2
-rw-r--r--pkgs/development/python-modules/declinate/default.nix53
-rw-r--r--pkgs/development/python-modules/ebusdpy/default.nix31
-rw-r--r--pkgs/development/python-modules/editdistance-s/default.nix35
-rw-r--r--pkgs/development/python-modules/google-genai/default.nix4
-rw-r--r--pkgs/development/python-modules/groq/default.nix4
-rw-r--r--pkgs/development/python-modules/gwcs/default.nix4
-rw-r--r--pkgs/development/python-modules/identify/default.nix16
-rw-r--r--pkgs/development/python-modules/imgw-pib/default.nix4
-rw-r--r--pkgs/development/python-modules/inlinestyler/default.nix62
-rw-r--r--pkgs/development/python-modules/langgraph-runtime-inmem/default.nix4
-rw-r--r--pkgs/development/python-modules/letpot/default.nix4
-rw-r--r--pkgs/development/python-modules/nampa/default.nix17
-rw-r--r--pkgs/development/python-modules/nicegui/default.nix4
-rw-r--r--pkgs/development/python-modules/pyrecswitch/default.nix36
-rw-r--r--pkgs/development/python-modules/pyswitchmate/default.nix36
-rw-r--r--pkgs/development/python-modules/python-can/default.nix6
-rw-r--r--pkgs/development/python-modules/rosbags/default.nix66
-rw-r--r--pkgs/development/python-modules/sqlmap/default.nix4
-rw-r--r--pkgs/development/python-modules/types-markdown/default.nix4
-rw-r--r--pkgs/development/rocm-modules/6/default.nix4
-rw-r--r--pkgs/development/rocm-modules/6/hiprt/default.nix59
-rw-r--r--pkgs/servers/home-assistant/component-packages.nix9
-rw-r--r--pkgs/servers/home-assistant/custom-components/luxer_one/package.nix26
-rw-r--r--pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix4
-rw-r--r--pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix4
-rw-r--r--pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix4
-rw-r--r--pkgs/servers/openafs/1.8/module.nix76
-rw-r--r--pkgs/top-level/python-aliases.nix2
-rw-r--r--pkgs/top-level/python-packages.nix14
78 files changed, 638 insertions, 322 deletions
diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md
index 5ee1d78501ca..6a6ebe9013c2 100644
--- a/doc/build-helpers/fetchers.chapter.md
+++ b/doc/build-helpers/fetchers.chapter.md
@@ -829,6 +829,10 @@ Additionally, the following optional arguments can be given:
See [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) for more information.
+*`rootDir`* (String)
+
+: When not empty, copy only contents of the subdirectory of the repository to the result. Automatically sets `sparseCheckout` and `nonConeMode` to avoid checking out any extra pieces. Incompatible with `leaveDotGit`.
+
Some additional parameters for niche use-cases can be found listed in the function parameters in the declaration of `fetchgit`: `pkgs/build-support/fetchgit/default.nix`.
Future parameters additions might also happen without immediately being documented here.
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 645ab123fec3..6f4dc632c8ac 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -106,6 +106,7 @@
* `$debug/lib/debug/.build-id/48/3bd7f7229bdb06462222e1e353e4f37e15c293.sourceoverlay` is a symlink to a directory with the same structure as the expanded `$sourceRoot` but containing only a copy of files which were patched during the build
* `$debug/lib/debug/.build-id/48/3bd7f7229bdb06462222e1e353e4f37e15c293.debug` is the file containing debug symbols (like before).
+- `fetchgit`: Add `rootDir` argument to limit the resulting source to one subdirectory of the whole Git repository. Corresponding `--root-dir` option added to `nix-prefetch-git`.
## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 93574ffcb2ea..b9d58685f52a 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -88,7 +88,6 @@ in
corePackages = lib.mkOption {
type = lib.types.listOf lib.types.package;
- default = corePackages;
defaultText = lib.literalMD ''
these packages, with their `meta.priority` numerically increased
(thus lowering their installation priority):
@@ -180,6 +179,10 @@ in
config = {
+ # Set this here so that it has the right priority and allows ergonomic
+ # merging.
+ environment.corePackages = corePackages;
+
environment.systemPackages = config.environment.corePackages ++ config.environment.defaultPackages;
environment.pathsToLink = [
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 24781f230e75..09b6cec4e7ea 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1767,19 +1767,17 @@ in
text = cfg.hostName + "\n";
};
- environment.corePackages = lib.mkOptionDefault (
- [
- pkgs.host
- pkgs.hostname-debian
- pkgs.iproute2
- pkgs.iputils
- ]
- ++ optionals config.networking.wireless.enable [
- pkgs.wirelesstools # FIXME: obsolete?
- pkgs.iw
- ]
- ++ bridgeStp
- );
+ environment.corePackages = [
+ pkgs.host
+ pkgs.hostname-debian
+ pkgs.iproute2
+ pkgs.iputils
+ ]
+ ++ optionals config.networking.wireless.enable [
+ pkgs.wirelesstools # FIXME: obsolete?
+ pkgs.iw
+ ]
+ ++ bridgeStp;
# Wake-on-LAN configuration is shared by the scripted and networkd backends.
systemd.network.links = pipe interfaces [
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 5afdcc868a3f..9fb3ad6ab774 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -67,7 +67,7 @@ let
# we can also run non-NixOS guests during tests. This, however, is
# mostly futureproofing as the test instrumentation is still very
# tightly coupled to NixOS.
- PS1="" exec ${pkgs.coreutils}/bin/env bash --norc /dev/hvc0
+ PS1="" exec ${pkgs.bashNonInteractive}/bin/bash --norc /dev/hvc0
'';
serviceConfig.KillSignal = "SIGHUP";
};
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
index 1d3f6a0a3c9b..78ad89046f74 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
@@ -16,19 +16,19 @@ let
{
x86_64-linux = {
arch = "linux-x64";
- hash = "sha256-vGHRgaqoxRU14BjmQM68SVdhe6ElvJrp6NUQXkVU5OU=";
+ hash = "sha256-1NGZTdAw2VS7txYuyKrpsm0bvLYYpsFZfkLCT5j2MIk=";
};
aarch64-linux = {
arch = "linux-arm64";
- hash = "sha256-aGRXxUpuOhsxULg7mAe1t04hfwLF5t4bSSthLlz7Mes=";
+ hash = "sha256-7d5tSZOGkmtfaL/IFk7ksFRAOlv58/Jw/N+nhlyJEHE=";
};
x86_64-darwin = {
arch = "darwin-x64";
- hash = "sha256-e4+rr3k9SYIVH01wG0RxL+sush0rTuvkJu08cctXmYo=";
+ hash = "sha256-1qinxbsBU5Ot/ce5OcIH9ybhhHoRSHv98Mwr/Piwmis=";
};
aarch64-darwin = {
arch = "darwin-arm64";
- hash = "sha256-iOF9aDk9okoZsHvaW4mDOulLPGxVViAk1TQkIH0XK+A=";
+ hash = "sha256-1LMV1e9xCoXa0UhyUkNFJJ0Nr0xJasPbfYAr6h7l6EE=";
};
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "csdevkit";
publisher = "ms-dotnettools";
- version = "1.30.44";
+ version = "1.41.11";
inherit (extInfo) hash arch;
};
sourceRoot = "extension"; # This has more than one folder.
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
index 5c2b46d5fe72..7d6318ca2093 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
@@ -17,19 +17,19 @@ let
{
x86_64-linux = {
arch = "linux-x64";
- hash = "sha256-2UeXsvj1W62Ath0hcNomgyQF58uCKkwr8UfjoLhOyWs=";
+ hash = "sha256-PlA1uuudUPnKCas5brviS8ZMDweFEdti6N5fu8XCzvY=";
};
aarch64-linux = {
arch = "linux-arm64";
- hash = "sha256-Qn2PFh2O3ouoH1T9pDPDKVVoowTSyKYqY+FZ579J0nU=";
+ hash = "sha256-DyOT9AZAdW48G7SZfiFdveY9JwZDZjtT4Mp/LYY2JRk=";
};
x86_64-darwin = {
arch = "darwin-x64";
- hash = "sha256-lXwkoVw/t+1A0sVPSYaCoXtOusQtCZEjACEE0bLpr14=";
+ hash = "sha256-vew5YkrX7soPNiYO+KX5Uy2HOiJ701YWWZULtH5Aq+I=";
};
aarch64-darwin = {
arch = "darwin-arm64";
- hash = "sha256-b7NaFjoAlyeW5PJc4OwnvJ18FSbcpchDjhGQPahM8tg=";
+ hash = "sha256-rc6KVNZWNJYt8RkbqyPB4Q7aJB6jtlWMsd4UHGbqsoI=";
};
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -39,7 +39,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "csharp";
publisher = "ms-dotnettools";
- version = "2.84.19";
+ version = "2.87.31";
inherit (extInfo) hash arch;
};
diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix
index 2494d30d9ee2..c2c0334a6858 100644
--- a/pkgs/applications/misc/gremlin-console/default.nix
+++ b/pkgs/applications/misc/gremlin-console/default.nix
@@ -8,10 +8,10 @@
stdenv.mkDerivation rec {
pname = "gremlin-console";
- version = "3.7.3";
+ version = "3.7.4";
src = fetchzip {
url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
- sha256 = "sha256-27S1ukq9rHncFuPBZmwIP/bKuPYm3AxdBK3PliYTGEQ=";
+ sha256 = "sha256-Z971M4W359WKs2NjLeWej5IVHnFu5LLsffxl0jraB60=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh
index 819b0127a852..393d0a57d163 100644
--- a/pkgs/build-support/fetchgit/builder.sh
+++ b/pkgs/build-support/fetchgit/builder.sh
@@ -16,6 +16,7 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" --name "$name"
${fetchTags:+--fetch-tags} \
${sparseCheckout:+--sparse-checkout "$sparseCheckout"} \
${nonConeMode:+--non-cone-mode} \
- ${branchName:+--branch-name "$branchName"}
+ ${branchName:+--branch-name "$branchName"} \
+ ${rootDir:+--root-dir "$rootDir"}
runHook postFetch
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index d364c8ebf708..b2f5f15a309d 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -8,12 +8,16 @@
let
urlToName =
- url: rev:
+ {
+ url,
+ rev,
+ append,
+ }:
let
shortRev = lib.sources.shortRev rev;
appendShort = lib.optionalString ((builtins.match "[a-f0-9]*" rev) != null) "-${shortRev}";
in
- "${lib.sources.urlToName url}${appendShort}";
+ "${lib.sources.urlToName url}${if append == "" then appendShort else append}";
in
lib.makeOverridable (
@@ -24,15 +28,20 @@ lib.makeOverridable (
url,
tag ? null,
rev ? null,
- name ? urlToName url (lib.revOrTag rev tag),
+ name ? urlToName {
+ inherit url;
+ rev = lib.revOrTag rev tag;
+ # when rootDir is specified, avoid invalidating the result when rev changes
+ append = if rootDir != "" then "-${lib.strings.sanitizeDerivationName rootDir}" else "";
+ },
leaveDotGit ? deepClone || fetchTags,
outputHash ? lib.fakeHash,
outputHashAlgo ? null,
fetchSubmodules ? true,
deepClone ? false,
branchName ? null,
- sparseCheckout ? [ ],
- nonConeMode ? false,
+ sparseCheckout ? lib.optional (rootDir != "") rootDir,
+ nonConeMode ? rootDir != "",
nativeBuildInputs ? [ ],
# Shell code executed before the file has been fetched. This, in
# particular, can do things like set NIX_PREFETCH_GIT_CHECKOUT_HOOK to
@@ -53,6 +62,8 @@ lib.makeOverridable (
allowedRequisites ? null,
# fetch all tags after tree (useful for git describe)
fetchTags ? false,
+ # make this subdirectory the root of the result
+ rootDir ? "",
}:
/*
@@ -80,6 +91,7 @@ lib.makeOverridable (
assert nonConeMode -> (sparseCheckout != [ ]);
assert fetchTags -> leaveDotGit;
+ assert rootDir != "" -> !leaveDotGit;
let
revWithTag =
@@ -135,6 +147,7 @@ lib.makeOverridable (
preFetch
postFetch
fetchTags
+ rootDir
;
rev = revWithTag;
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 259138641ea9..7f3616af92fc 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -59,6 +59,7 @@ Options:
--fetch-submodules Fetch submodules.
--fetch-tags Fetch all tags (useful for git describe).
--builder Clone as fetchgit does, but url, rev, and out option are mandatory.
+ --root-dir dir Directory in the repository that will be copied to the output instead of the full repository.
--quiet Only print the final json summary.
"
exit 1
@@ -90,6 +91,7 @@ for arg; do
--fetch-submodules) fetchSubmodules=true;;
--fetch-tags) fetchTags=true;;
--builder) builder=true;;
+ --root-dir) argfun=set_rootDir;;
-h|--help) usage; exit;;
*)
: $((++argi))
@@ -155,10 +157,16 @@ url_to_name(){
local base
base=$(basename "$url" .git | cut -d: -f2)
- if [[ $ref =~ ^[a-z0-9]+$ ]]; then
- echo "$base-${ref:0:7}"
+ if test -n "$rootDir"; then
+ # Sanitize by removing leading dots and replacing all invalid character sequences with dashes.
+ # See sanitizeDerivationName in ../../../lib/strings.nix for reference.
+ echo "$base-$(sed -E 's/^\.+//;s/[^[:alnum:]+._?=-]+/-/g' <<< $rootDir)"
else
- echo "$base"
+ if [[ $ref =~ ^[a-z0-9]+$ ]]; then
+ echo "$base-${ref:0:7}"
+ else
+ echo "$base"
+ fi
fi
}
@@ -353,6 +361,23 @@ clone_user_rev() {
fi
}
+clone_user_rev_to_tmpfile(){
+ local url="$1"
+ local rev="${2:-HEAD}"
+
+ # nix>=2.20 rejects adding symlinked paths to the store, so use realpath
+ # to resolve to a physical path. https://github.com/NixOS/nix/issues/11941
+ tmpPath="$(realpath "$(mktemp -d --tmpdir git-checkout-tmp-XXXXXXXX)")"
+ exit_handlers+=(remove_tmpPath)
+
+ tmpOut="$tmpPath/out/$storePathName"
+ tmpClone="$tmpPath/clone"
+ mkdir -p "$tmpPath/out" "$tmpClone"
+
+ # Perform the checkout.
+ clone_user_rev "$tmpClone" "$url" "$rev"
+}
+
exit_handlers=()
run_exit_handlers() {
@@ -418,7 +443,8 @@ print_results() {
"fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false),
"deepClone": $([[ -n "$deepClone" ]] && echo true || echo false),
"fetchTags": $([[ -n "$fetchTags" ]] && echo true || echo false),
- "leaveDotGit": $([[ -n "$leaveDotGit" ]] && echo true || echo false)
+ "leaveDotGit": $([[ -n "$leaveDotGit" ]] && echo true || echo false),
+ "rootDir": "$(json_escape "$rootDir")"
}
EOF
fi
@@ -456,8 +482,13 @@ export GIT_CONFIG_NOSYSTEM=1
if test -n "$builder"; then
test -n "$out" -a -n "$url" -a -n "$rev" || usage
- mkdir -p "$out"
- clone_user_rev "$out" "$url" "$rev"
+ if test -n "$rootDir"; then
+ clone_user_rev_to_tmpfile "$url" "$rev"
+ mv "$tmpClone/$rootDir" "$out"
+ else
+ mkdir -p "$out"
+ clone_user_rev "$out" "$url" "$rev"
+ fi
else
if test -z "$hashType"; then
hashType=sha256
@@ -476,22 +507,19 @@ else
# If we don't know the hash or a path with that hash doesn't exist,
# download the file and add it to the store.
if test -z "$finalPath"; then
- # nix>=2.20 rejects adding symlinked paths to the store, so use realpath
- # to resolve to a physical path. https://github.com/NixOS/nix/issues/11941
- tmpPath="$(realpath "$(mktemp -d --tmpdir git-checkout-tmp-XXXXXXXX)")"
- exit_handlers+=(remove_tmpPath)
+ clone_user_rev_to_tmpfile "$url" "$rev"
- tmpFile="$tmpPath/$storePathName"
- mkdir -p "$tmpFile"
-
- # Perform the checkout.
- clone_user_rev "$tmpFile" "$url" "$rev"
+ if test -z "$rootDir"; then
+ mv "$tmpClone" "$tmpOut"
+ else
+ mv "$tmpClone/$rootDir" "$tmpOut"
+ fi
# Compute the hash.
- hash=$(nix-hash --type $hashType --base32 "$tmpFile")
+ hash=$(nix-hash --type $hashType --base32 "$tmpOut")
# Add the downloaded file to the Nix store.
- finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpFile")
+ finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpOut")
if test -n "$expHash" -a "$expHash" != "$hash"; then
echo "hash mismatch for URL \`$url'. Got \`$hash'; expected \`$expHash'." >&2
diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix
index fd6aebc335f7..e3fdd5fb8672 100644
--- a/pkgs/build-support/fetchgit/tests.nix
+++ b/pkgs/build-support/fetchgit/tests.nix
@@ -97,4 +97,12 @@
rm -rf .git
'';
};
+
+ rootDir = testers.invalidateFetcherByDrvHash fetchgit {
+ name = "fetchgit-with-rootdir";
+ url = "https://github.com/NixOS/nix";
+ rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
+ rootDir = "misc/systemd";
+ sha256 = "sha256-UhxHk4SrXYq7ZDMtXLig5SigpbITrVgkpFTmryuvpcM=";
+ };
}
diff --git a/pkgs/by-name/ba/baddns/package.nix b/pkgs/by-name/ba/baddns/package.nix
index c36e0b7eb0ec..65397f4b1e31 100644
--- a/pkgs/by-name/ba/baddns/package.nix
+++ b/pkgs/by-name/ba/baddns/package.nix
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "baddns";
- version = "1.7.86";
+ version = "1.10.185";
pyproject = true;
src = fetchFromGitHub {
owner = "blacklanternsecurity";
repo = "baddns";
tag = version;
- hash = "sha256-Jj36aNNYCwqK/Yux92YmCxywftoizXZE39qLhLpjAaw=";
+ hash = "sha256-pstfEpcEk0k5T/Os9pEyxTQ62MTW/XFQPOwY/OyHHwY=";
};
pythonRelaxDeps = true;
@@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec {
meta = {
description = "Tool to check subdomains for subdomain takeovers and other DNS issues";
homepage = "https://github.com/blacklanternsecurity/baddns/";
- changelog = "https://github.com/blacklanternsecurity/baddns/releases/tag/v${version}";
+ changelog = "https://github.com/blacklanternsecurity/baddns/releases/tag/${src.tag}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "baddns";
diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix
index 0e4b469bb483..12b95291209c 100644
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@@ -16,13 +16,13 @@
buildNpmPackage rec {
pname = "basedpyright";
- version = "1.31.0";
+ version = "1.31.1";
src = fetchFromGitHub {
owner = "detachhead";
repo = "basedpyright";
tag = "v${version}";
- hash = "sha256-vgOo44ZvuySxQP9qJC7kXUVkOT1RhJ+/giqNBTCzpAg=";
+ hash = "sha256-chwIsjMg91fLZ0VRSUo3ydtHXVNKtjqX539b0IlOPI4=";
};
npmDepsHash = "sha256-aJte4ApeXJQ9EYn87Uo+Xx7s+wi80I1JsZHeqklHGs4=";
diff --git a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
index d0b4c5380931..9212dab435e5 100644
--- a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
+++ b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
@@ -5,27 +5,31 @@
}:
stdenvNoCC.mkDerivation {
pname = "catppuccin-qt5ct";
- version = "2023-03-21";
+ version = "0-unstable-2025-03-29";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "qt5ct";
- rev = "89ee948e72386b816c7dad72099855fb0d46d41e";
- hash = "sha256-t/uyK0X7qt6qxrScmkTU2TvcVJH97hSQuF0yyvSO/qQ=";
+ rev = "cb585307edebccf74b8ae8f66ea14f21e6666535";
+ hash = "sha256-wDj6kQ2LQyMuEvTQP6NifYFdsDLT+fMCe3Fxr8S783w=";
};
installPhase = ''
runHook preInstall
- mkdir -p $out/share/qt5ct
+ mkdir -p $out/share/qt{5,6}ct
cp -r themes $out/share/qt5ct/colors
+ cp -r themes $out/share/qt6ct/colors
runHook postInstall
'';
- meta = with lib; {
- description = "Soothing pastel theme for qt5ct";
+ meta = {
+ description = "Soothing pastel theme for qt5ct & qt6ct";
homepage = "https://github.com/catppuccin/qt5ct";
- license = licenses.mit;
- maintainers = with maintainers; [ pluiedev ];
- platforms = platforms.all;
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
+ pluiedev
+ nullcube
+ ];
+ platforms = lib.platforms.all;
};
}
diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index 55989c4848a0..224fe159079e 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cdncheck";
- version = "1.1.30";
+ version = "1.1.31";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${version}";
- hash = "sha256-DA68sGa1CbWfNjmRjzh+/NpMPUIxe8HCj2QjzFjDXz4=";
+ hash = "sha256-1rt+vXfsM8hotCmZmel1MiP7VDqahhAMpJYn3Vyo3lY=";
};
vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index 5f30b9bc8b05..4eb22073b259 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -25,14 +25,14 @@ with py.pkgs;
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
- version = "3.2.458";
+ version = "3.2.460";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
tag = version;
- hash = "sha256-0tIDwUKYK4HIdvSu0xr01avwedlEKOF+COvfUHYn00o=";
+ hash = "sha256-DThOzb6ja0kdJ9X99hFsn7FCdk86xJeDKVdqRC1KLHw=";
};
pythonRelaxDeps = [
diff --git a/pkgs/by-name/co/coin3d/package.nix b/pkgs/by-name/co/coin3d/package.nix
index 186a5a3102b0..1d50662a8560 100644
--- a/pkgs/by-name/co/coin3d/package.nix
+++ b/pkgs/by-name/co/coin3d/package.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "coin";
- version = "4.0.3";
+ version = "4.0.4";
src = fetchFromGitHub {
owner = "coin3d";
repo = "coin";
rev = "v${finalAttrs.version}";
- hash = "sha256-dUFmcUOdNc3ZFtr+Hnh3Q3OY/JA/WxmiRJiU2RFSSus=";
+ hash = "sha256-Zk9tlGMbNhfHKv+Z5VFWr1g3wNuPFzof+7vsLAlOBC4=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/dr/drone-cli/package.nix b/pkgs/by-name/dr/drone-cli/package.nix
index d7c1222e1643..36b42718c186 100644
--- a/pkgs/by-name/dr/drone-cli/package.nix
+++ b/pkgs/by-name/dr/drone-cli/package.nix
@@ -26,8 +26,6 @@ buildGoModule rec {
"-X main.version=${version}"
];
- doCheck = false;
-
meta = with lib; {
mainProgram = "drone";
maintainers = with maintainers; [ techknowlogick ];
diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
index b31ba804afde..27bdb4b69f28 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "fabric-ai";
- version = "1.4.272";
+ version = "1.4.280";
src = fetchFromGitHub {
owner = "danielmiessler";
repo = "fabric";
tag = "v${version}";
- hash = "sha256-4ohZC+TKCKljawf0DAqzNQmEeFXi2jp4571uN+0UqZA=";
+ hash = "sha256-sORFkqT8+d0Cwo5W6hCNvNvgoMH/rsDPK6+sFm+lmf8=";
};
- vendorHash = "sha256-wPd0Rgc081ueK12MTeeJfuwUDyFfwXN/MveeOArjkqg=";
+ vendorHash = "sha256-VuP0ICBNH7FnXOjHLDv4pJZgKvpjSaudoV1K/ZmB7pY=";
# Fabric introduced plugin tests that fail in the nix build sandbox.
doCheck = false;
diff --git a/pkgs/by-name/fs/fsautocomplete/deps.json b/pkgs/by-name/fs/fsautocomplete/deps.json
index 104e36eb51c2..4078a2c8a143 100644
--- a/pkgs/by-name/fs/fsautocomplete/deps.json
+++ b/pkgs/by-name/fs/fsautocomplete/deps.json
@@ -76,8 +76,8 @@
},
{
"pname": "fsharp-analyzers",
- "version": "0.32.0",
- "hash": "sha256-MnhsK5tOeexL6uQhsV4nTRz8CGbz2o8VyHwAK8x91pE="
+ "version": "0.32.1",
+ "hash": "sha256-le6rPnAF7cKGBZ2w8H2u9glK+6rT2ZjiAVnrkH2IhrM="
},
{
"pname": "FSharp.Analyzers.Build",
@@ -86,8 +86,8 @@
},
{
"pname": "FSharp.Analyzers.SDK",
- "version": "0.32.0",
- "hash": "sha256-0mdnqvE4ltEfehzS+ylah5MSy+sXbYrKRHrNDlWvIjg="
+ "version": "0.32.1",
+ "hash": "sha256-JOqyzBUVMm1wx9g0YZmAZghj3/9f7nh9YenVt4mQI0M="
},
{
"pname": "FSharp.Compiler.Service",
@@ -206,8 +206,8 @@
},
{
"pname": "Ionide.Analyzers",
- "version": "0.14.6",
- "hash": "sha256-56FJUeWvxE2xbaX/qhfCN6ksiNWz7aGQySEskOnzFB0="
+ "version": "0.14.7",
+ "hash": "sha256-capdHUKfY3W8QYgg5Q6/dRggEF6w/yQ9rEKIh+VQLlc="
},
{
"pname": "Ionide.KeepAChangelog.Tasks",
diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
index ae6a2172f084..8c6e9e98d1cb 100644
--- a/pkgs/by-name/fs/fsautocomplete/package.nix
+++ b/pkgs/by-name/fs/fsautocomplete/package.nix
@@ -9,13 +9,13 @@
buildDotnetModule (finalAttrs: {
pname = "fsautocomplete";
- version = "0.78.4";
+ version = "0.78.5";
src = fetchFromGitHub {
owner = "fsharp";
repo = "FsAutoComplete";
tag = "v${finalAttrs.version}";
- hash = "sha256-SBNtVtPVQ+l0U+jsvSiJVdS6TR4+wZ8rScFrRKWJSX8=";
+ hash = "sha256-4Y3QUq5oa01a1S5+h3ccdeqjPfkUe8GaqxHjh9VFhXE=";
};
nugetDeps = ./deps.json;
diff --git a/pkgs/by-name/go/gocryptfs/package.nix b/pkgs/by-name/go/gocryptfs/package.nix
index eace2edb9f10..cc3047df55b7 100644
--- a/pkgs/by-name/go/gocryptfs/package.nix
+++ b/pkgs/by-name/go/gocryptfs/package.nix
@@ -12,13 +12,13 @@
buildGoModule rec {
pname = "gocryptfs";
- version = "2.6.0";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "rfjakob";
repo = "gocryptfs";
rev = "v${version}";
- sha256 = "sha256-zvem4Uc+pNCDVMsnl/BwMYLp3DSYnYy6jwWM2kduq7k=";
+ sha256 = "sha256-uQLFcabN418m1dvogJ71lJeTF3F9JycK/8qCPaXblSU=";
};
vendorHash = "sha256-dvOROh5TsMl+52RvKmDG4ftNv3WF19trgttu5BGWktU=";
diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 0d27d83a06b1..ad3ede680110 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;
buildNpmPackage rec {
pname = "Iosevka${toString set}";
- version = "33.2.7";
+ version = "33.2.8";
src = fetchFromGitHub {
owner = "be5invis";
repo = "iosevka";
rev = "v${version}";
- hash = "sha256-LS4c79/QmBSgsgSY/Tddmf2M6U0LcISMapnWK7Eu1Ak=";
+ hash = "sha256-rHkIvfS20A0cvFBcLfFLAvcVVF5BgbtMdDxMvwH0B+I=";
};
- npmDepsHash = "sha256-DyExvgNJBRlz8iVezlrJfTyobK0L6CMQN+gIMGoYYrw=";
+ npmDepsHash = "sha256-PYzNg5gduwtwc99GyatXnmHCh9mpAulz43Ehdle0rAM=";
nativeBuildInputs = [
remarshal
diff --git a/pkgs/by-name/li/libmsquic/package.nix b/pkgs/by-name/li/libmsquic/package.nix
index 594bab45668d..14cf36810b94 100644
--- a/pkgs/by-name/li/libmsquic/package.nix
+++ b/pkgs/by-name/li/libmsquic/package.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libmsquic";
- version = "2.4.14";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "microsoft";
repo = "msquic";
tag = "v${finalAttrs.version}";
- hash = "sha256-hsdtRxvAbo7pfsM6ioG3CiGJhgRilrydA6zvAcoux4c=";
+ hash = "sha256-GWkdwPms0jqVADp8D4HtvOi+9YORZpqbJ7OqKnS/jB0=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/mg/mgba/package.nix b/pkgs/by-name/mg/mgba/package.nix
index 5d42106e7fe9..3c8c2823445f 100644
--- a/pkgs/by-name/mg/mgba/package.nix
+++ b/pkgs/by-name/mg/mgba/package.nix
@@ -24,6 +24,7 @@ let
qtmultimedia
qttools
wrapQtAppsHook
+ qtwayland
;
in
stdenv.mkDerivation (finalAttrs: {
@@ -66,7 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
qtmultimedia
qttools
]
- ++ lib.optionals enableDiscordRpc [ discord-rpc ];
+ ++ lib.optionals enableDiscordRpc [ discord-rpc ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
cmakeFlags = [
(lib.cmakeBool "USE_DISCORD_RPC" enableDiscordRpc)
diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix
index 76b9aa0356b0..215d93172dde 100644
--- a/pkgs/by-name/my/mympd/package.nix
+++ b/pkgs/by-name/my/mympd/package.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mympd";
- version = "22.0.3";
+ version = "22.0.4";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${finalAttrs.version}";
- sha256 = "sha256-dQroukc25q81sMIbXsmGjaOT3FoRZwoZ6QkCBZ3plX4=";
+ sha256 = "sha256-sVZj79NUrymwi8L8akqyGGKnm4OAKr3Qf/K5U2iqm5E=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/na/nakama/package.nix b/pkgs/by-name/na/nakama/package.nix
index 8dd1f286076a..5f26b8548a8e 100644
--- a/pkgs/by-name/na/nakama/package.nix
+++ b/pkgs/by-name/na/nakama/package.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "nakama";
- version = "3.29.0";
+ version = "3.30.0";
src = fetchFromGitHub {
owner = "heroiclabs";
repo = "nakama";
tag = "v${version}";
- hash = "sha256-mgHvgq/sbwWVIKpfQuZVp9xHgVHOMYJt2YEdeKTaDqA=";
+ hash = "sha256-G+cNR4Ny8aR3ByuKvrCTp3U+GXpdYaHlrZqifoWDce0=";
};
vendorHash = null;
diff --git a/pkgs/by-name/ni/nixos-install/nixos-install.sh b/pkgs/by-name/ni/nixos-install/nixos-install.sh
index 2a592223a921..b15103c5ce14 100755
--- a/pkgs/by-name/ni/nixos-install/nixos-install.sh
+++ b/pkgs/by-name/ni/nixos-install/nixos-install.sh
@@ -122,6 +122,14 @@ while [[ "$checkPath" != "/" ]]; do
checkPath="$(dirname "$checkPath")"
done
+# Check if the mount point root directory is owned by root
+if [[ "$(stat -c '%u:%g' "$mountPoint")" != "0:0" ]]; then
+ echo "$0: $mountPoint is not owned by root:root (owned by $(stat -c '%U:%G' "$mountPoint"))"
+ echo "$0: installation root directory must be owned by root to avoid system issues"
+ echo "$0: run 'sudo chown root:root $mountPoint' to fix this"
+ exit 1
+fi
+
# Verify that user is not trying to use attribute building and flake
# at the same time
if [[ -z $buildingAttribute && -n $flake ]]; then
diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix
index bda0ef11c3b4..3c380a5b5545 100644
--- a/pkgs/by-name/op/openimageio/package.nix
+++ b/pkgs/by-name/op/openimageio/package.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "openimageio";
- version = "3.0.9.0";
+ version = "3.0.9.1";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "OpenImageIO";
tag = "v${finalAttrs.version}";
- hash = "sha256-N90Ll3ambwh83Ng5N7ToaE0ng2/WT37uhyvecn0crP0=";
+ hash = "sha256-tvtot+TZ2dPg8XlVBKT/kcKYKUPKjEcNDU7To5SCMrs=";
};
outputs = [
diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix
index 0461163607c7..bf5c07b37059 100644
--- a/pkgs/by-name/pd/pdns-recursor/package.nix
+++ b/pkgs/by-name/pd/pdns-recursor/package.nix
@@ -20,11 +20,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pdns-recursor";
- version = "5.2.2";
+ version = "5.2.5";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2";
- hash = "sha256-+clSdCMe48XJQZf20FAR1Vq/BrKTdTW6jnjiTqT7vW4=";
+ hash = "sha256-qKZXp6vW6dI3zdJnU/fc9czVuMSKyBILCNK41XodhWo=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix
index 730da05985ee..509225403b6b 100644
--- a/pkgs/by-name/py/pyprland/package.nix
+++ b/pkgs/by-name/py/pyprland/package.nix
@@ -7,7 +7,7 @@
python3Packages.buildPythonApplication rec {
pname = "pyprland";
- version = "2.4.6";
+ version = "2.4.7";
format = "pyproject";
disabled = python3Packages.pythonOlder "3.10";
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
owner = "hyprland-community";
repo = "pyprland";
tag = version;
- hash = "sha256-OH+BTPw574FykVYWG6TIOpSPeYB39UxyMy/gzMDw0z4=";
+ hash = "sha256-rtAw6tdZY0BKb6Qjk/LHYYMB9nCPzkmw95wdjhJ191s=";
};
nativeBuildInputs = with python3Packages; [ poetry-core ];
diff --git a/pkgs/by-name/ra/rancher/package.nix b/pkgs/by-name/ra/rancher/package.nix
index e5ada61609f9..12dcd424d283 100644
--- a/pkgs/by-name/ra/rancher/package.nix
+++ b/pkgs/by-name/ra/rancher/package.nix
@@ -15,6 +15,8 @@ buildGoModule rec {
hash = "sha256-K0uMo/sRol2F02iV7b9NcmZcQGZ9iSEIdbZgT+Ea+/c=";
};
+ env.CGO_ENABLED = 0;
+
ldflags = [
"-w"
"-s"
diff --git a/pkgs/by-name/rs/rstfmt/package.nix b/pkgs/by-name/rs/rstfmt/package.nix
index f933f6e204c3..657c0e9c1141 100644
--- a/pkgs/by-name/rs/rstfmt/package.nix
+++ b/pkgs/by-name/rs/rstfmt/package.nix
@@ -1,7 +1,7 @@
{
lib,
- python3,
fetchFromGitHub,
+ python3,
}:
python3.pkgs.buildPythonApplication rec {
@@ -16,11 +16,10 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-zvmKgNzfxyWYHoaD+q84I48r1Mpp4kU4oIGAwMSRRlA=";
};
- build-system = with python3.pkgs; [
- setuptools
- ];
+ build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
+ aiohttp
black
docutils
sphinx
@@ -29,15 +28,14 @@ python3.pkgs.buildPythonApplication rec {
# Project has no unittest just sample files
doCheck = false;
- pythonImportsCheck = [
- "rstfmt"
- ];
+ pythonImportsCheck = [ "rstfmt" ];
meta = {
description = "Formatter for reStructuredText";
homepage = "https://github.com/dzhu/rstfmt";
- changelog = "https://github.com/dzhu/rstfmt/releases/tag/v${version}";
+ changelog = "https://github.com/dzhu/rstfmt/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
+ mainProgram = "rstfmt";
};
}
diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index 78c5effc3fb6..aca440fc37d5 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -25,14 +25,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "s7";
- version = "11.5-unstable-2025-07-31";
+ version = "11.5-unstable-2025-08-09";
src = fetchFromGitLab {
domain = "cm-gitlab.stanford.edu";
owner = "bil";
repo = "s7";
- rev = "71e547b1a210d1ff06daeb4dee5247cd949d0178";
- hash = "sha256-gMZCmpGPSgM73PRbRY5BgyaTeRnojduNnZntvr75jzw=";
+ rev = "76c6f2b28cdada1e71dfbc0932df595f763e375a";
+ hash = "sha256-QB6aUF8538vd5IF8eQhYAbzU7jAxqw70RrUB1ewzY6s=";
};
buildInputs =
diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix
index 48baf1ab40a4..4893f271fff1 100644
--- a/pkgs/by-name/sh/shellhub-agent/package.nix
+++ b/pkgs/by-name/sh/shellhub-agent/package.nix
@@ -12,18 +12,18 @@
buildGoModule rec {
pname = "shellhub-agent";
- version = "0.19.2";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${version}";
- hash = "sha256-ZUsu/zfzCrn0tvmKxcFwKYQbS7JoPUSpg6/l3QHE4Cw=";
+ hash = "sha256-cDCpZB9lkEnkltY2OQ/Y5HSZmlukeQFbuxhtbeb8E2s=";
};
modRoot = "./agent";
- vendorHash = "sha256-1UI/JRDRnsRrdV1AfPyE/rWEDAytEYmr+EyXn60UB/Y=";
+ vendorHash = "sha256-17D8xrLlwX57JW4yXfPlo9RQRMCxVa7MjQQmzI/MBas=";
ldflags = [
"-s"
diff --git a/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
index 3298bc397e49..2adde4384f84 100644
--- a/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
+++ b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
@@ -1,14 +1,14 @@
{
"name": "shopify",
- "version": "3.83.1",
+ "version": "3.83.3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "shopify",
- "version": "3.83.1",
+ "version": "3.83.3",
"dependencies": {
- "@shopify/cli": "3.83.1"
+ "@shopify/cli": "3.83.3"
},
"bin": {
"shopify": "node_modules/@shopify/cli/bin/run.js"
@@ -579,9 +579,9 @@
}
},
"node_modules/@shopify/cli": {
- "version": "3.83.1",
- "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.83.1.tgz",
- "integrity": "sha512-jjyfKXZjYVHwWBAool91Yh6HTUsy8CuQiEYhMFl6gXa/aRiq/YW5jfEqeMA6XEFiqBtdMSQGLZ10pk9FbHVvMQ==",
+ "version": "3.83.3",
+ "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.83.3.tgz",
+ "integrity": "sha512-p98L8+NxEdZF2vHiUKgxB63kJNSLeV+vp7aipyjkOYVMH7FCJQ4/JJBWQ+69D2zcJEj/S+QD+ciLt4rHifb4mg==",
"license": "MIT",
"os": [
"darwin",
diff --git a/pkgs/by-name/sh/shopify-cli/manifests/package.json b/pkgs/by-name/sh/shopify-cli/manifests/package.json
index c0986b86b481..cd29a5ec22ea 100644
--- a/pkgs/by-name/sh/shopify-cli/manifests/package.json
+++ b/pkgs/by-name/sh/shopify-cli/manifests/package.json
@@ -1,11 +1,11 @@
{
"name": "shopify",
- "version": "3.83.1",
+ "version": "3.83.3",
"private": true,
"bin": {
"shopify": "node_modules/@shopify/cli/bin/run.js"
},
"dependencies": {
- "@shopify/cli": "3.83.1"
+ "@shopify/cli": "3.83.3"
}
}
diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix
index f8f0b06c7f88..86810478b211 100644
--- a/pkgs/by-name/sh/shopify-cli/package.nix
+++ b/pkgs/by-name/sh/shopify-cli/package.nix
@@ -5,7 +5,7 @@
shopify-cli,
}:
let
- version = "3.83.1";
+ version = "3.83.3";
in
buildNpmPackage {
pname = "shopify";
@@ -13,7 +13,7 @@ buildNpmPackage {
src = ./manifests;
- npmDepsHash = "sha256-2vjhdUIylVVTkFHy9hLcrYwN5rIqBI92axY/eXlQjK8=";
+ npmDepsHash = "sha256-HUBdnxKVpEIT+PbKYC8ZUKzUR26rqLI9LJReFdfG2y8=";
dontNpmBuild = true;
passthru = {
diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index 59dac6afe740..a0edff5679fb 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -12,7 +12,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sydbox";
- version = "3.37.2";
+ version = "3.37.6";
outputs = [
"out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "Sydbox";
repo = "sydbox";
tag = "v${finalAttrs.version}";
- hash = "sha256-XV3eB6XGDwoJK+wpfuARV7F4OqZJfoAqDmsYS8D2AK4=";
+ hash = "sha256-dcUK6GQK/l6HCTh/k5yaC5VetQmY6J+YWu8VHU1037g=";
};
- cargoHash = "sha256-uIcF4mzIYOgSfQVFl6kh3337AmdVFDDXIMXtVCqcoXg=";
+ cargoHash = "sha256-Ca4h7B5Vukd21HCEDpA5I+hgyQh7IFDLKeRxlVL0Uzo=";
nativeBuildInputs = [
mandoc
diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 149737474d5f..91772517b429 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -23,7 +23,7 @@
}:
let
- version = "1.86.2";
+ version = "1.86.4";
in
buildGoModule {
pname = "tailscale";
@@ -38,7 +38,7 @@ buildGoModule {
owner = "tailscale";
repo = "tailscale";
tag = "v${version}";
- hash = "sha256-hozfvKkvTeaabN1tYl0NlEpjfD4sZQe9Z+agdoXFHNE=";
+ hash = "sha256-cYj04DtoYKejygz1Euir/6/Eq1M046nzzhqSfpTi0OE=";
};
vendorHash = "sha256-4QTSspHLYJfzlontQ7msXyOB5gzq7ZwSvWmKuYY5klA=";
diff --git a/pkgs/by-name/tr/trilium-next-desktop/package.nix b/pkgs/by-name/tr/trilium-next-desktop/package.nix
index 292383aae9c7..08ecf72c2075 100644
--- a/pkgs/by-name/tr/trilium-next-desktop/package.nix
+++ b/pkgs/by-name/tr/trilium-next-desktop/package.nix
@@ -15,7 +15,7 @@
let
pname = "trilium-next-desktop";
- version = "0.97.1";
+ version = "0.97.2";
triliumSource = os: arch: sha256: {
url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";
@@ -26,10 +26,10 @@ let
darwinSource = triliumSource "macos";
# exposed like this for update.sh
- x86_64-linux.sha256 = "1lb1mp031pa4wg6wrp8l84vw1glmqc27l4gf85a47bi4b63das2l";
- aarch64-linux.sha256 = "1yrxk8q2aafgcvipwhkwmjidymwia0dgqnhchhngmris6zrbb3wj";
- x86_64-darwin.sha256 = "0d8li5h2rn3iyzxsbs4g7a98zzdn58x4iwhzvxcjxy7b6h4hldvg";
- aarch64-darwin.sha256 = "07r1rw84mlszr2bzjwz62lsy14j9xm22li2ksdc4ra93q58kmip1";
+ x86_64-linux.sha256 = "12ms6knzaawryf7qisfnj5fj7v1icvkq7r0fpw55aajm7y0mpmf0";
+ aarch64-linux.sha256 = "0qgvasic531crlckwqn8mm9aimm7kliab2y7i264k60pb8h5spmp";
+ x86_64-darwin.sha256 = "1dam3ig7z21vi6icd4ww46smgn4d7kis3r51h0r5cvi8mc9ahq1i";
+ aarch64-darwin.sha256 = "0wysa3kacxryv1g1rmqm4ikjv9hfp1bqjcv1yn8drsi80zscm4lj";
sources = {
x86_64-linux = linuxSource "x64" x86_64-linux.sha256;
diff --git a/pkgs/by-name/tr/trilium-next-server/package.nix b/pkgs/by-name/tr/trilium-next-server/package.nix
index 6ea019bf45f3..a8f92ae6f744 100644
--- a/pkgs/by-name/tr/trilium-next-server/package.nix
+++ b/pkgs/by-name/tr/trilium-next-server/package.nix
@@ -7,12 +7,12 @@
}:
let
- version = "0.97.1";
+ version = "0.97.2";
serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";
- serverSource_x64.sha256 = "1y0ass5b3c8qx28b31x2h7i1rlvdyjimsklgjpv8d47micsg6m7z";
+ serverSource_x64.sha256 = "1zbi1jh2iib6wcaab0wdhb2rhslmn06dn22h28h8jjj5qjpbqqz0";
serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";
- serverSource_arm64.sha256 = "12bnmbm1p98633xsyxq6rr05jl79bn820915a0gmq14np7vskhmp";
+ serverSource_arm64.sha256 = "1a6gnfprskq0cqvg625dazqq39h89d3g9rssdcyw7w0a7kw8nfrv";
serverSource =
if stdenv.hostPlatform.isx86_64 then
diff --git a/pkgs/by-name/ty/typescript-language-server/package.nix b/pkgs/by-name/ty/typescript-language-server/package.nix
index 97818eaa60b5..5bad96099d66 100644
--- a/pkgs/by-name/ty/typescript-language-server/package.nix
+++ b/pkgs/by-name/ty/typescript-language-server/package.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "typescript-language-server";
- version = "4.3.4";
+ version = "4.4.0";
src = fetchFromGitHub {
owner = "typescript-language-server";
repo = "typescript-language-server";
rev = "v${finalAttrs.version}";
- hash = "sha256-H+SEwvoLsKfwZgKqp0Bymkk0m4hk0PsGlMceL0GsEFY=";
+ hash = "sha256-5JvYTVHZUoTGokOiaJ6FF5dsNXaY7oFsWLf2doZv36Q=";
};
patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
- hash = "sha256-nSMhPfbWD93sGIKehBBE/bh4RzHXFtGAjeyG20m/LWQ=";
+ hash = "sha256-05o1aOaUEL/KI5hf7dKL2lKEDxbzpg89CyR8qMi1G8s=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/wd/wdisplays/package.nix b/pkgs/by-name/wd/wdisplays/package.nix
index d24bb42b8a73..1c2bf46d8ff4 100644
--- a/pkgs/by-name/wd/wdisplays/package.nix
+++ b/pkgs/by-name/wd/wdisplays/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Graphical application for configuring displays in Wayland compositors";
- homepage = "https://github.com/luispabon/wdisplays";
+ homepage = "https://github.com/artizirk/wdisplays";
maintainers = with maintainers; [ ma27 ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
diff --git a/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix
index 95fca5f6c711..8b4c7ba5e578 100644
--- a/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
- description = "Switch the preview pane between hidden and shown";
+ description = "Vim-like f<char>, jump to the next file whose name starts with <char>.";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
};
diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix
index 545aca3c175d..a2132508f48d 100644
--- a/pkgs/development/interpreters/babashka/default.nix
+++ b/pkgs/development/interpreters/babashka/default.nix
@@ -8,11 +8,11 @@
buildGraalvmNativeImage (finalAttrs: {
pname = "babashka-unwrapped";
- version = "1.12.206";
+ version = "1.12.207";
src = fetchurl {
url = "https://github.com/babashka/babashka/releases/download/v${finalAttrs.version}/babashka-${finalAttrs.version}-standalone.jar";
- sha256 = "sha256-2JrfFddG5ZSJkDXjaNnAyYfvuwR3muDgEVyG82KRFkU=";
+ sha256 = "sha256-bFZZkST5rMWyRTEsviMS2KnKfJXGUBI2UefZ3XY1V0I=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix
index 2d31ed1af77b..98059e764114 100644
--- a/pkgs/development/python-modules/accelerate/default.nix
+++ b/pkgs/development/python-modules/accelerate/default.nix
@@ -33,14 +33,14 @@
buildPythonPackage rec {
pname = "accelerate";
- version = "1.9.0";
+ version = "1.10.0";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "accelerate";
tag = "v${version}";
- hash = "sha256-h1XfBG7M8aAN9W09RgIowJ2vgWAjWbUnV1KBXa5aGJU=";
+ hash = "sha256-UsnGLBCt3uodzaBLeOKV4eYEoxwHkUlHDBAe6kAleDc=";
};
buildInputs = [ llvmPackages.openmp ];
diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix
index 70ca05f56e89..3dc700a076b9 100644
--- a/pkgs/development/python-modules/app-model/default.nix
+++ b/pkgs/development/python-modules/app-model/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module to implement generic application schema";
homepage = "https://github.com/pyapp-kit/app-model";
- changelog = "https://github.com/pyapp-kit/app-model/blob/v${version}/CHANGELOG.md";
+ changelog = "https://github.com/pyapp-kit/app-model/blob/${src.tag}/CHANGELOG.md";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/declinate/default.nix b/pkgs/development/python-modules/declinate/default.nix
new file mode 100644
index 000000000000..58bd28b1d53e
--- /dev/null
+++ b/pkgs/development/python-modules/declinate/default.nix
@@ -0,0 +1,53 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitLab,
+
+ # build-system
+ setuptools,
+ setuptools-scm,
+
+ # dependencies
+ typing-extensions,
+
+ # nativeCheckInputs
+ pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+ pname = "declinate";
+ version = "0.0.6";
+ pyproject = true;
+
+ src = fetchFromGitLab {
+ owner = "ternaris";
+ repo = "declinate";
+ tag = "v${version}";
+ hash = "sha256-JEO/GtbG/yQuj8vJJaWex9mGy6qpWOPHGlKrdG9vt28=";
+ };
+
+ build-system = [
+ setuptools
+ setuptools-scm
+ ];
+
+ dependencies = [
+ typing-extensions
+ ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "declinate"
+ ];
+
+ meta = {
+ description = "Command line interface generator";
+ homepage = "https://gitlab.com/ternaris/declinate";
+ changelog = "https://gitlab.com/ternaris/declinate/-/blob/${src.tag}/CHANGES.rst";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ nim65s ];
+ };
+}
diff --git a/pkgs/development/python-modules/ebusdpy/default.nix b/pkgs/development/python-modules/ebusdpy/default.nix
new file mode 100644
index 000000000000..e0d27afd0783
--- /dev/null
+++ b/pkgs/development/python-modules/ebusdpy/default.nix
@@ -0,0 +1,31 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ setuptools,
+}:
+
+buildPythonPackage rec {
+ pname = "ebusdpy";
+ version = "0.0.17";
+ pyproject = true;
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-t6O/fOBrJuDYpCVnkL+hUzyqMoGKFj5UYNoD6ExikNM=";
+ };
+
+ build-system = [ setuptools ];
+
+ # Package has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "ebusdpy" ];
+
+ meta = {
+ description = "eBusd python integration library";
+ homepage = "https://github.com/CrazYoshi/ebusdpy";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.jamiemagee ];
+ };
+}
diff --git a/pkgs/development/python-modules/editdistance-s/default.nix b/pkgs/development/python-modules/editdistance-s/default.nix
deleted file mode 100644
index a50fe7321dfc..000000000000
--- a/pkgs/development/python-modules/editdistance-s/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchFromGitHub,
- pytestCheckHook,
- cffi,
-}:
-
-buildPythonPackage rec {
- pname = "editdistance-s";
- version = "1.0.0";
- format = "setuptools";
-
- src = fetchFromGitHub {
- owner = "asottile";
- repo = "editdistance-s";
- rev = "v${version}";
- sha256 = "0w2qd5b6a3c3ahd0xy9ykq4wzqk0byqwdqrr26dyn8j2425j46lg";
- };
-
- propagatedNativeBuildInputs = [ cffi ];
-
- propagatedBuildInputs = [ cffi ];
-
- nativeCheckInputs = [ pytestCheckHook ];
-
- pythonImportsCheck = [ "editdistance_s" ];
-
- meta = with lib; {
- description = "Fast implementation of the edit distance (Levenshtein distance)";
- homepage = "https://github.com/asottile/editdistance-s";
- license = with licenses; [ mit ];
- maintainers = with maintainers; [ austinbutler ];
- };
-}
diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix
index 35a27dd48fd0..7b1311e11bf8 100644
--- a/pkgs/development/python-modules/google-genai/default.nix
+++ b/pkgs/development/python-modules/google-genai/default.nix
@@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "google-genai";
- version = "1.28.0";
+ version = "1.29.0";
pyproject = true;
src = fetchFromGitHub {
owner = "googleapis";
repo = "python-genai";
tag = "v${version}";
- hash = "sha256-tQ6iWIUUl9mtWz6Pa0tBOsoGcFQNe62NqXhob53AVq4=";
+ hash = "sha256-EOwIXZ373hsEfGxCE6DRjPRuqPQQoFHTzIDGK1K9X6Q=";
};
build-system = [
diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix
index 180df1e23be5..984a8cbbf98a 100644
--- a/pkgs/development/python-modules/groq/default.nix
+++ b/pkgs/development/python-modules/groq/default.nix
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "groq";
- version = "0.30.0";
+ version = "0.31.0";
pyproject = true;
src = fetchFromGitHub {
owner = "groq";
repo = "groq-python";
tag = "v${version}";
- hash = "sha256-URjfgZC+6YIY7SBfaOmDavQ73YWAqHf9KHunyvniy2E=";
+ hash = "sha256-6oTRqAt421WE0s5e2kqDtCgOLg1bSqTTQldQ5D05Flo=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/gwcs/default.nix b/pkgs/development/python-modules/gwcs/default.nix
index 58359d328efb..7d73a5aa4ce5 100644
--- a/pkgs/development/python-modules/gwcs/default.nix
+++ b/pkgs/development/python-modules/gwcs/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "gwcs";
- version = "0.25.1";
+ version = "0.25.2";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "spacetelescope";
repo = "gwcs";
tag = version;
- hash = "sha256-jGO3/qFNL8aovlU/jXIZpk2GHmwZ+o8tSSqnPHgtFqU=";
+ hash = "sha256-Pj/Ly/qMJdhdY8C/ZPaEV+hsYEh//ARvHitvlkjI8sM=";
};
build-system = [
diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index f59607f9981e..842e5203ae03 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -1,17 +1,17 @@
{
lib,
buildPythonPackage,
- editdistance-s,
fetchFromGitHub,
pytestCheckHook,
pythonOlder,
+ cffi,
setuptools,
ukkonen,
}:
buildPythonPackage rec {
pname = "identify";
- version = "2.6.12";
+ version = "2.6.13";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -20,24 +20,24 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = "identify";
tag = "v${version}";
- hash = "sha256-zV9NRHFh/bfbg+pO0xX5aXunc1y4aGfKDugyCFLj/xA=";
+ hash = "sha256-Du96uRQCymduvAruHSgjKv/OrDIPaMwPU+x/OTchERQ=";
};
build-system = [ setuptools ];
dependencies = [
- editdistance-s
+ cffi
pytestCheckHook
ukkonen
];
pythonImportsCheck = [ "identify" ];
- meta = with lib; {
+ meta = {
description = "File identification library for Python";
- homepage = "https://github.com/chriskuehl/identify";
- license = licenses.mit;
- maintainers = with maintainers; [ fab ];
+ homepage = "https://github.com/pre-commit/identify";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fab ];
mainProgram = "identify-cli";
};
}
diff --git a/pkgs/development/python-modules/imgw-pib/default.nix b/pkgs/development/python-modules/imgw-pib/default.nix
index eda351264543..8aee6a1bbbe0 100644
--- a/pkgs/development/python-modules/imgw-pib/default.nix
+++ b/pkgs/development/python-modules/imgw-pib/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "imgw-pib";
- version = "1.5.2";
+ version = "1.5.3";
pyproject = true;
src = fetchFromGitHub {
owner = "bieniu";
repo = "imgw-pib";
tag = version;
- hash = "sha256-7x6tqgyFkFLil8R20/v05wrsnoq+mLlsyKVvGDmwmpo=";
+ hash = "sha256-rsR1ZlbNCAlJmiTefgJ4gurGaC17z/kKgDHpuMkyxz8=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/inlinestyler/default.nix b/pkgs/development/python-modules/inlinestyler/default.nix
deleted file mode 100644
index bf0262aac439..000000000000
--- a/pkgs/development/python-modules/inlinestyler/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchFromGitHub,
- fetchpatch2,
-
- # build system
- setuptools,
-
- # dependencies
- cssutils,
- lxml,
- requests,
-
- # tests
- ipdb,
- pytestCheckHook,
-}:
-
-buildPythonPackage rec {
- pname = "inlinestyler";
- version = "0.2.5";
- pyproject = true;
-
- src = fetchFromGitHub {
- owner = "dlanger";
- repo = "inlinestyler";
- tag = version;
- hash = "sha256-9TKXqW+5SiiNXnHW2lOVh3zhFhodM7a1UB2yXsEuX3I=";
- };
-
- patches = [
- # https://github.com/dlanger/inlinestyler/pull/33
- (fetchpatch2 {
- url = "https://github.com/dlanger/inlinestyler/commit/29fc1c256fd8f37c3e2fda34c975f0bcfe72cf9a.patch";
- hash = "sha256-35GWrfvXgpy1KAZ/0pdxsiKNTpDku6/ZX3KWfRUGQmc=";
- })
- ];
-
- build-system = [ setuptools ];
-
- dependencies = [
- cssutils
- lxml
- requests
- ];
-
- pythonImportsCheck = [ "inlinestyler" ];
-
- nativeCheckInputs = [
- ipdb
- pytestCheckHook
- ];
-
- meta = with lib; {
- description = "Simple CSS inliner for generating HTML email messages";
- homepage = "https://github.com/dlanger/inlinestyler";
- changelog = "https://github.com/dlanger/inlinestyler/blob/${src.rev}/CHANGELOG";
- license = licenses.bsd3;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
index 87d660138956..bef0dd77c95b 100644
--- a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
+++ b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "langgraph-runtime-inmem";
- version = "0.6.8";
+ version = "0.6.10";
pyproject = true;
# Not available in any repository
src = fetchPypi {
pname = "langgraph_runtime_inmem";
inherit version;
- hash = "sha256-chPmwJ+tUJoRK5xX9+r6mbYf95ZbX4Z3mP6Ra19nBxM=";
+ hash = "sha256-wwd6Ru1xMMO95cOyzB7qjMvSWWIjH2mjSQlt92JHyLk=";
};
build-system = [
diff --git a/pkgs/development/python-modules/letpot/default.nix b/pkgs/development/python-modules/letpot/default.nix
index 2a5d9ea44fa9..c5a776479534 100644
--- a/pkgs/development/python-modules/letpot/default.nix
+++ b/pkgs/development/python-modules/letpot/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "letpot";
- version = "0.6.0";
+ version = "0.6.1";
pyproject = true;
src = fetchFromGitHub {
owner = "jpelgrom";
repo = "python-letpot";
tag = "v${version}";
- hash = "sha256-CUTZvzLC7YGiKXOJSj6gdPOznHQIQ+Bu2YW7LyLB0Sg=";
+ hash = "sha256-xcuBDygUpkPzwdGGG+GLQBaMPpkrj49Y/1KKh6w9jmA=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/nampa/default.nix b/pkgs/development/python-modules/nampa/default.nix
index c9f31d7e615d..3b810808eb09 100644
--- a/pkgs/development/python-modules/nampa/default.nix
+++ b/pkgs/development/python-modules/nampa/default.nix
@@ -2,14 +2,13 @@
lib,
buildPythonPackage,
fetchFromGitHub,
- future,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "nampa";
- version = "1.0";
+ version = "1.0-unstable-2024-12-18";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -17,20 +16,12 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "thebabush";
repo = "nampa";
- tag = version;
- hash = "sha256-ylDthh6fO0jKiYib0bed31Dxt4afiD0Jd5mfRKrsZpE=";
+ rev = "cb6a63aae64324f57bdc296064bc6aa2b99ff99a";
+ hash = "sha256-4NEfrx5cR6Zk713oBRZBe52mrbHKhs1doJFAdjnobig=";
};
- postPatch = ''
- # https://github.com/thebabush/nampa/pull/13
- substituteInPlace setup.py \
- --replace "0.1.1" "${version}"
- '';
-
build-system = [ setuptools ];
- dependencies = [ future ];
-
# Not used for binaryninja as plugin
doCheck = false;
@@ -39,7 +30,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python implementation of the FLIRT technology";
homepage = "https://github.com/thebabush/nampa";
- changelog = "https://github.com/thebabush/nampa/releases/tag/${version}";
+ changelog = "https://github.com/thebabush/nampa/commits/cb6a63aae64324f57bdc296064bc6aa2b99ff99a/";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/nicegui/default.nix b/pkgs/development/python-modules/nicegui/default.nix
index 618815b655b8..aba43f7c77cb 100644
--- a/pkgs/development/python-modules/nicegui/default.nix
+++ b/pkgs/development/python-modules/nicegui/default.nix
@@ -42,14 +42,14 @@
buildPythonPackage rec {
pname = "nicegui";
- version = "2.22.1";
+ version = "2.22.2";
pyproject = true;
src = fetchFromGitHub {
owner = "zauberzeug";
repo = "nicegui";
tag = "v${version}";
- hash = "sha256-v9ELS0EzmqbaUhyqKidvN7UvvCHwBne2QkJJmTkheBg=";
+ hash = "sha256-sxbQVMX7zN+sSKDzMzOpgt9WqNVF/yjOnKKzDFb3+So=";
};
pythonRelaxDeps = [ "requests" ];
diff --git a/pkgs/development/python-modules/pyrecswitch/default.nix b/pkgs/development/python-modules/pyrecswitch/default.nix
new file mode 100644
index 000000000000..751ed9aa3b3b
--- /dev/null
+++ b/pkgs/development/python-modules/pyrecswitch/default.nix
@@ -0,0 +1,36 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ pycryptodome,
+ setuptools,
+}:
+
+buildPythonPackage rec {
+ pname = "pyrecswitch";
+ version = "1.0.2";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "marcolertora";
+ repo = "pyrecswitch";
+ tag = version;
+ hash = "sha256-z9dOJ7WgUR2ntU6boUInRyKxSPBSoNWGtE3pOZcFYA0=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [ pycryptodome ];
+
+ # Package has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "pyrecswitch" ];
+
+ meta = {
+ description = "Pure-python interface for controlling Ankuoo RecSwitch MS6126";
+ homepage = "https://github.com/marcolertora/pyrecswitch";
+ license = lib.licenses.agpl3Plus;
+ maintainers = [ lib.maintainers.jamiemagee ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyswitchmate/default.nix b/pkgs/development/python-modules/pyswitchmate/default.nix
new file mode 100644
index 000000000000..e047bc78ddab
--- /dev/null
+++ b/pkgs/development/python-modules/pyswitchmate/default.nix
@@ -0,0 +1,36 @@
+{
+ lib,
+ bleak,
+ buildPythonPackage,
+ fetchFromGitHub,
+ setuptools,
+}:
+
+buildPythonPackage rec {
+ pname = "pyswitchmate";
+ version = "0.5.1";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "Danielhiversen";
+ repo = "pySwitchmate";
+ tag = version;
+ hash = "sha256-14rjlIsSFNP2OzuRamAJw9BaA+Z5EuQBEsrD02uQdFk=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [ bleak ];
+
+ # Project has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "switchmate" ];
+
+ meta = {
+ description = "A library to communicate with Switchmate";
+ homepage = "https://github.com/Danielhiversen/pySwitchmate";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.jamiemagee ];
+ };
+}
diff --git a/pkgs/development/python-modules/python-can/default.nix b/pkgs/development/python-modules/python-can/default.nix
index cb94e9697dcb..693c3611e5bc 100644
--- a/pkgs/development/python-modules/python-can/default.nix
+++ b/pkgs/development/python-modules/python-can/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "python-can";
- version = "4.5.0";
+ version = "4.6.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "hardbyte";
repo = "python-can";
tag = "v${version}";
- hash = "sha256-XCv2oOkGq8c2gTo+8UcZbuBYXyhhQstWLyddk3db38s=";
+ hash = "sha256-oKa/LT7tTBLp47t6CQFCEmzBu8b6NQzFCSfi6Ii3NTI=";
};
build-system = [
@@ -90,7 +90,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "CAN support for Python";
homepage = "https://python-can.readthedocs.io";
- changelog = "https://github.com/hardbyte/python-can/releases/tag/v${version}";
+ changelog = "https://github.com/hardbyte/python-can/releases/tag/${src.tag}";
license = licenses.lgpl3Only;
maintainers = with maintainers; [
fab
diff --git a/pkgs/development/python-modules/rosbags/default.nix b/pkgs/development/python-modules/rosbags/default.nix
new file mode 100644
index 000000000000..7c2a97aeb49f
--- /dev/null
+++ b/pkgs/development/python-modules/rosbags/default.nix
@@ -0,0 +1,66 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitLab,
+
+ # build-system
+ setuptools,
+ setuptools-scm,
+
+ # dependencies
+ lz4,
+ numpy,
+ ruamel-yaml,
+ typing-extensions,
+ zstandard,
+
+ # nativeCheckInputs
+ pytestCheckHook,
+
+ # checkInputs
+ declinate,
+}:
+
+buildPythonPackage rec {
+ pname = "rosbags";
+ version = "0.10.11";
+ pyproject = true;
+
+ src = fetchFromGitLab {
+ owner = "ternaris";
+ repo = "rosbags";
+ tag = "v${version}";
+ hash = "sha256-uHRmeHwNswZt5q+RSlzjqZiXhH6qYAkf8AufrRNbBtY=";
+ };
+
+ build-system = [
+ setuptools
+ setuptools-scm
+ ];
+
+ dependencies = [
+ lz4
+ numpy
+ ruamel-yaml
+ typing-extensions
+ zstandard
+ ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+
+ checkInputs = [
+ declinate
+ ];
+
+ pythonImportsCheck = [
+ "rosbags"
+ ];
+
+ meta = {
+ description = "Pure Python library to read, modify, convert, and write rosbag files";
+ homepage = "https://gitlab.com/ternaris/rosbags";
+ changelog = "https://gitlab.com/ternaris/rosbags/-/blob/${src.tag}/CHANGES.rst";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ nim65s ];
+ };
+}
diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index ba87c81b4ac6..c165c04091ce 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "sqlmap";
- version = "1.9.7";
+ version = "1.9.8";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-E2cb/hp7sg56S9By3AT3BGnqQSVlQzRV3wEW+uuJozI=";
+ hash = "sha256-CQiJ/8MtsoGcfnVA3hI4KZaX+p0ihQmasfwgOTd9we8=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/types-markdown/default.nix b/pkgs/development/python-modules/types-markdown/default.nix
index 0a5073d4cc8a..b1055bcbfdff 100644
--- a/pkgs/development/python-modules/types-markdown/default.nix
+++ b/pkgs/development/python-modules/types-markdown/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "types-markdown";
- version = "3.8.0.20250708";
+ version = "3.8.0.20250809";
pyproject = true;
src = fetchPypi {
pname = "types_markdown";
inherit version;
- hash = "sha256-KGkCUf6QdX9amc1nHHlQK8LeB67y01/lQRfDsceZgEo=";
+ hash = "sha256-+mGec1h4okQzKku+Frz8ROSf9iZMJpYFYnjwZCzfoiM=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index c399061c1992..47588fd29446 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -142,6 +142,8 @@ let
hipfft = self.callPackage ./hipfft { };
+ hiprt = self.callPackage ./hiprt { };
+
tensile = pyPackages.callPackage ./tensile {
inherit (self)
rocmUpdateScript
@@ -323,6 +325,7 @@ let
rocprim
rocalution
hipfft
+ hiprt
rocm-core
hipcub
hipblas
@@ -355,6 +358,7 @@ let
hipblaslt
rocfft
hipfft
+ hiprt
rccl
rocsparse
hipsparse
diff --git a/pkgs/development/rocm-modules/6/hiprt/default.nix b/pkgs/development/rocm-modules/6/hiprt/default.nix
new file mode 100644
index 000000000000..01deca5685bd
--- /dev/null
+++ b/pkgs/development/rocm-modules/6/hiprt/default.nix
@@ -0,0 +1,59 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ cmake,
+ clr,
+ gcc,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "hiprt";
+ version = "2.5.a21e075.3";
+
+ src = fetchFromGitHub {
+ owner = "GPUOpen-LibrariesAndSDKs";
+ repo = "HIPRT";
+ tag = finalAttrs.version;
+ sha256 = "sha256-3yGhwIsFHlFMCEzuYnXuXNzs99m7f2LTkYaTGs0GEcI=";
+ };
+
+ postPatch = ''
+ g++ contrib/easy-encryption/cl.cpp -o contrib/easy-encryption/bin/linux/ee64 #replacing prebuilt binary
+ '';
+
+ nativeBuildInputs = [
+ gcc # required for replacing easy-encryption binary
+ cmake
+ ];
+
+ buildInputs = [
+ clr
+ ];
+
+ cmakeFlags = [
+ "-D CMAKE_BUILD_TYPE=Release"
+ "-D BAKE_KERNEL=OFF"
+ "-D BAKE_COMPILED_KERNEL=OFF"
+ "-D BITCODE=ON"
+ "-D PRECOMPILE=ON"
+ "-D NO_UNITTEST=ON"
+ "-D FORCE_DISABLE_CUDA=ON"
+ ];
+
+ postInstall = ''
+ mv $out/bin $out/lib
+ ln -sr $out/lib/libhiprt*64.so $out/lib/libhiprt64.so
+ install -v -Dm644 ../scripts/bitcodes/hiprt*_amd_lib_linux.bc $out/lib/
+ '';
+
+ meta = {
+ homepage = "https://gpuopen.com/hiprt";
+ description = "Ray tracing library for HIP";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
+ mksafavi
+ ];
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 4a4e24d518a1..d3dab1154da8 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1361,7 +1361,8 @@
]; # missing inputs: pyebox
"ebusd" =
ps: with ps; [
- ]; # missing inputs: ebusdpy
+ ebusdpy
+ ];
"ecoal_boiler" =
ps: with ps; [
ecoaliface
@@ -4881,7 +4882,8 @@
];
"recswitch" =
ps: with ps; [
- ]; # missing inputs: pyrecswitch
+ pyrecswitch
+ ];
"reddit" =
ps: with ps; [
praw
@@ -5758,7 +5760,8 @@
];
"switchmate" =
ps: with ps; [
- ]; # missing inputs: PySwitchmate
+ pyswitchmate
+ ];
"symfonisk" =
ps: with ps; [
];
diff --git a/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix b/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix
new file mode 100644
index 000000000000..efda15717365
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix
@@ -0,0 +1,26 @@
+{
+ lib,
+ fetchFromGitHub,
+ buildHomeAssistantComponent,
+ ruff,
+}:
+
+buildHomeAssistantComponent rec {
+ owner = "tjhorner";
+ domain = "luxer";
+ version = "0-unstable-2023-03-27";
+
+ src = fetchFromGitHub {
+ owner = "tjhorner";
+ repo = "home-assistant-luxer-one";
+ rev = "f6a810034ab76e6a8635de755c4a1750e86b1674";
+ hash = "sha256-WmsL0NLe2ICqNGbEQ4vg1EzcZgIGi++G9aDyKjnmJMs=";
+ };
+
+ meta = {
+ description = "Home Assistant integration for Luxer One";
+ homepage = "https://github.com/tjhorner/home-assistant-luxer-one";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.haylin ];
+ };
+}
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
index c4cd945ee329..9ba934a4dad7 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
@@ -2,8 +2,8 @@
grafanaPlugin {
pname = "grafana-metricsdrilldown-app";
- version = "1.0.8";
- zipHash = "sha256-fydkuhaGNrIL+byFwvgp2kG5nm02WnO7t77qtSuj7pY=";
+ version = "1.0.9";
+ zipHash = "sha256-YEchhyKvHmUErLs5IY1ECPOiaaYRzVHRyObk0XvzCBo=";
meta = with lib; {
description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries";
license = licenses.agpl3Only;
diff --git a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix
index 1bb0a1f34a38..1a0898f0d1a1 100644
--- a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix
@@ -2,8 +2,8 @@
grafanaPlugin {
pname = "ventura-psychrometric-panel";
- version = "5.0.1";
- zipHash = "sha256-WcMgjgDobexUrfZOBmXRWv0FD3us3GgglxRdpo9BecA=";
+ version = "5.0.2";
+ zipHash = "sha256-375akpkIh4aB2N0T+O++VKmQkuVVMpn8V1/wugbzThU=";
meta = with lib; {
description = "Grafana plugin to display air conditions on a psychrometric chart";
license = licenses.bsd3Lbnl;
diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
index 3f42e65c2f4b..dbfb4c90a859 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
@@ -2,8 +2,8 @@
grafanaPlugin {
pname = "volkovlabs-variable-panel";
- version = "4.0.0";
- zipHash = "sha256-fHOo/Au8yPQXIkG/BupNcMpFNgDLRrqpwRpmbq6xYhM=";
+ version = "4.1.0";
+ zipHash = "sha256-3AkCebT9KcQdsi+T3+0XMhwZaEmqlOmY90RidcVqUb4=";
meta = with lib; {
description = "Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard";
license = licenses.asl20;
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index c630ce82451e..8e5f9f5d54de 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -30,51 +30,83 @@ stdenv.mkDerivation {
patches = [
# LINUX: Refactor afs_linux_dentry_revalidate()
(fetchpatch {
- url = "https://gerrit.openafs.org/changes/16276/revisions/c1d074317e5c8cb8212e0b19a29f7d710bcabb32/patch";
- decode = "base64 -d";
- hash = "sha256-8ga9ks9pr6pWaV2t67v+FaG0yVExhqELkvkpdLvO8Nc=";
+ url = "https://github.com/openafs/openafs/commit/02603ec7bb2b6dadd9fc6f30f1d180732673f3d9.patch";
+ hash = "sha256-A5fM6v/WMzl7Jj1liHaPYqlZRa2/q2rxj6H3r25VpXY=";
})
# Linux-6.14: Handle dops.d_revalidate with parent
(fetchpatch {
- url = "https://gerrit.openafs.org/changes/16277/revisions/0051bd0ee82b05e8caacdc0596e5b62609bebd2e/patch";
- decode = "base64 -d";
+ url = "https://github.com/openafs/openafs/commit/5f85032cdb7f0148dc6165773acb6d6ffe4b6914.patch";
hash = "sha256-08jedwZ1KX1RSs8y9sh7BUvv5xK9tlzZ6uBOR4kS0Jo=";
})
# Linux: Add required MODULE_DESCRIPTION
(fetchpatch {
- url = "https://gerrit.openafs.org/changes/16372/revisions/39189eba45542376e668636bd79a93ae6a8a7cd2/patch";
- decode = "base64 -d";
- hash = "sha256-j5ckKQvybEvmlnFs5jX8g8Dfw37LYWGnfsl4hnZ3+A4=";
+ url = "https://github.com/openafs/openafs/commit/e76b520f1316e7059a7855078f117ce194734317.patch";
+ hash = "sha256-B3h2XLaRL3jaFFKl2naydVedugVo25A2PEK4ds5WHJo=";
})
# linux: inode_ops mkdir returns struct dentry *
(fetchpatch {
- url = "https://gerrit.openafs.org/changes/16373/revisions/769847e205d5908a0c430f7bcfbd2f48e19f8bf8/patch";
- decode = "base64 -d";
- hash = "sha256-znv5gunyPnJgi4SRFERJudtYFqiS+AVYDWfvr52Ku3s=";
+ url = "https://github.com/openafs/openafs/commit/eeb4f7012ce8b22ff24d073e52e837ef36507afb.patch";
+ hash = "sha256-2LqB2QGTMoE4Z7fcW4XZV/R9OzR6BI6pD99ODtKQHk8=";
+ })
+ # cf: check for dentry flag macros/enums
+ (fetchpatch {
+ url = "https://github.com/openafs/openafs/commit/62e2df3182bea9ea7d5e86d4d3a0dfc955bc3753.patch";
+ hash = "sha256-d8zRwt/Wq3UmI/hW033ZyzEP/6her/jspzGTfbunGxw=";
+ })
+ # Linux: Use folio_wait_locked()
+ (fetchpatch {
+ url = "https://github.com/openafs/openafs/commit/16070e998960f7fe0c15dfa13b88c7b1fa36dce2.patch";
+ hash = "sha256-GbqXEviQJUqzEOpRtUHP2iM0Gx6+PYkflmMDAd21t/Y=";
+ })
+ # Linux: Refactor afs_linux_write_end()/begin()
+ (fetchpatch {
+ url = "https://github.com/openafs/openafs/commit/d946ce6f218a2013bc002fb44ad23b89f2d21212.patch";
+ hash = "sha256-9JxMasRbpbdsdcwkJdaiIbNmqqC7VF++/Dl1WmsnRkg=";
})
# Linux: Use __filemap_get_folio()
(fetchpatch {
- url = "https://gerrit.openafs.org/changes/16374/revisions/f187add554da9e9c52752edbfa98f486f683cf25/patch";
+ url = "https://github.com/openafs/openafs/commit/0c44e9f27fd0e058b59a9b63d755036829590e81.patch";
+ hash = "sha256-9/anvdp/Pw6Iy4+FC6qTZUTZ318gh88jTr7uDDtu2+Q=";
+ })
+ # LINUX: Use folio_page() to convert folio to page
+ (fetchpatch {
+ url = "https://github.com/openafs/openafs/commit/39ce8f11df2d650bb4d86c76c127c292880a5c76.patch";
+ hash = "sha256-C0ESzTaYq2S41bcuz4Zkd35Sucw+8xrD0E9gx1lHeJ4=";
+ })
+ # LINUX: Remove test for DCACHE_NFSFS_RENAMED
+ (fetchpatch {
+ url = "https://github.com/openafs/openafs/commit/78f5daf8bd79603c53630ba6eb712ab87ebc5dc5.patch";
+ hash = "sha256-CwKp+8toPsKlagcN0r6uafGH0M2bcpFJMbMjd0FsRr8=";
+ })
+ # linux: change lookup_one_len to lookup_noperm
+ (fetchpatch {
+ url = "https://gerrit.openafs.org/changes/16435/revisions/d3c424dcaba6ed8415a7617f0ae3622fe84e988a/patch";
decode = "base64 -d";
- hash = "sha256-+ay87ThSn6QyPZcN0+oE01Wqbxmz0Z1KXYwocQCvYLg=";
+ hash = "sha256-AqLhS6A68E5M+3CyNnIgv7CB5jGC/hQ4PIqPv0zggq4=";
})
- # Linux: Use folio_wait_locked()
+ # linux: refactor afs_linux_writepage
(fetchpatch {
- url = "https://gerrit.openafs.org/changes/16375/revisions/87a93f6488585553d833e1397e7f0dae0545cb7e/patch";
+ url = "https://gerrit.openafs.org/changes/16436/revisions/1f488463969b436a882c656020d1f3b92c6df440/patch";
decode = "base64 -d";
- hash = "sha256-MOVX2LFe8OBnvsQ2UdLvwKrwztOmnu1rdIou4CF+EBs=";
+ hash = "sha256-Wx8Xx97Kox76sSFOdpqxjMzXFrA2IFqKptpYEsfRTac=";
})
- # cf: Introduce AC_CHECK_LINUX_SYMBOL
+ # linux: convert aops->writepage to writepages
(fetchpatch {
- url = "https://gerrit.openafs.org/changes/16376/revisions/bab5968d7f4639d4a0cbe81aaa3e9716dda00632/patch";
+ url = "https://gerrit.openafs.org/changes/16437/revisions/fd33425820589ed52dc712df63ea8d4b5944de87/patch";
decode = "base64 -d";
- hash = "sha256-d6DZqDTW1uEKSB5PsomS4ix9fYYQzdQVmDATKl6n7x4=";
+ hash = "sha256-B011gge+vzGeUxkGOkKoK/jZn16pvGGc8DpAzzbjV+8=";
})
- # cf: check for dentry flag macros/enums
+ # Linux: Use __readahead_folio
+ (fetchpatch {
+ url = "https://gerrit.openafs.org/changes/16438/revisions/8a2cbf0ba08097de4b8ab0c57fe2fddf83739b9b/patch";
+ decode = "base64 -d";
+ hash = "sha256-MDb7vOekq/lwBgELMq+VfuvAXiHQmd0vp04ToqIm3lI=";
+ })
+ # Linux: Rename page->index to page->__folio_index
(fetchpatch {
- url = "https://gerrit.openafs.org/changes/16377/revisions/f791d8ca4804486c656bc7c221076480df39b465/patch";
+ url = "https://gerrit.openafs.org/changes/16439/revisions/9a5596a25618f153be7ae7eb17f29f3b7752d863/patch";
decode = "base64 -d";
- hash = "sha256-7B0VJE3FeSQU1ElvXI5zXCPq1JRLAycyhqIQuDdR7xE=";
+ hash = "sha256-OYlMcmnIkoC841E0ONNWtSCUKokyxOmd0d+AWcXwbAI=";
})
];
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 788cfb18a309..06f54b2c247c 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -230,6 +230,7 @@ mapAliases ({
dogpile_cache = dogpile-cache; # added 2021-10-28
dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20
dugong = throw "dugong is unmaintained since 2022 and has therefore been removed"; # added 2024-12-12
+ editdistance-s = throw "editdistance-s has been removed since it was added solely for the identity package, which has moved on to ukkonen"; # added 2025-08-04
eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03
EasyProcess = easyprocess; # added 2023-02-19
email_validator = email-validator; # added 2022-06-22
@@ -349,6 +350,7 @@ mapAliases ({
ipdbplugin = throw "ipdbplugin has been removed because it has no longer maintained for 6 years"; # added 2024-05-21
ipython_genutils = ipython-genutils; # added 2023-10-12
influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10
+ inlinestyler = throw "inlinestyler has been removed because it is no longer maintained"; # added 2025-08-09
itanium_demangler = itanium-demangler; # added 2022-10-17
jaeger-client = throw "jaeger-client was removed because it is deprecated upstream. OpenTelemetry is recommended instead."; # Added 2024-12-09
jaraco_classes = jaraco-classes; # added 2023-07-14
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7155875a82fd..5b1078db590b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3445,6 +3445,8 @@ self: super: with self; {
decli = callPackage ../development/python-modules/decli { };
+ declinate = callPackage ../development/python-modules/declinate { };
+
decopatch = callPackage ../development/python-modules/decopatch { };
decora-wifi = callPackage ../development/python-modules/decora-wifi { };
@@ -4494,6 +4496,8 @@ self: super: with self; {
ebooklib = callPackage ../development/python-modules/ebooklib { };
+ ebusdpy = callPackage ../development/python-modules/ebusdpy { };
+
ec2-metadata = callPackage ../development/python-modules/ec2-metadata { };
ec2instanceconnectcli = callPackage ../tools/virtualization/ec2instanceconnectcli { };
@@ -4527,8 +4531,6 @@ self: super: with self; {
editdistance = callPackage ../development/python-modules/editdistance { };
- editdistance-s = callPackage ../development/python-modules/editdistance-s { };
-
editdistpy = callPackage ../development/python-modules/editdistpy { };
editor = callPackage ../development/python-modules/editor { };
@@ -7013,8 +7015,6 @@ self: super: with self; {
inline-snapshot = callPackage ../development/python-modules/inline-snapshot { };
- inlinestyler = callPackage ../development/python-modules/inlinestyler { };
-
inotify = callPackage ../development/python-modules/inotify { };
inotify-simple = callPackage ../development/python-modules/inotify-simple { };
@@ -13752,6 +13752,8 @@ self: super: with self; {
}
);
+ pyrecswitch = callPackage ../development/python-modules/pyrecswitch { };
+
pyrect = callPackage ../development/python-modules/pyrect { };
pyregion = callPackage ../development/python-modules/pyregion { };
@@ -14097,6 +14099,8 @@ self: super: with self; {
pyswitchbot = callPackage ../development/python-modules/pyswitchbot { };
+ pyswitchmate = callPackage ../development/python-modules/pyswitchmate { };
+
pysychonaut = callPackage ../development/python-modules/pysychonaut { };
pysyncobj = callPackage ../development/python-modules/pysyncobj { };
@@ -15876,6 +15880,8 @@ self: super: with self; {
ropper = callPackage ../development/python-modules/ropper { };
+ rosbags = callPackage ../development/python-modules/rosbags { };
+
rotary-embedding-torch = callPackage ../development/python-modules/rotary-embedding-torch { };
rouge-score = callPackage ../development/python-modules/rouge-score { };