nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-08-23 12:07:11 +00:00
committed by GitHub
parent fae1ce4c68 aba3a61aef
commit 2b3854161a
14 changed files with 30 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@@ -319,11 +319,11 @@
"vendorHash": null
},
"digitalocean_digitalocean": {
"hash": "sha256-cnu4ybC6c1+WZGcl3lM7KWuPJTRZ0PTivSbGEct9lDs=",
"hash": "sha256-pv2Suo2PpX0+D5rYno6sprrirt70mwx+lBjGPW8UTmA=",
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
"owner": "digitalocean",
"repo": "terraform-provider-digitalocean",
"rev": "v2.99.1",
"rev": "v2.100.0",
"spdx": "MPL-2.0",
"vendorHash": null
},

43
pkgs/build-support/fetchmtn/builder.sh
View File

@@ -1,43 +0,0 @@
set -x
if ! [ -f "$cacheDB" ]; then
echo "Creating cache DB $cacheDB"
mtn --db "$cacheDB" db init
fi
echo "getting revision $selector";
done=;
for source in $dbs; do
if mtn pull --db "$cacheDB" "$source" "${branch}"; then
revision="$(mtn --db "$cacheDB" au toposort $(mtn --db "$cacheDB" au select "$selector") | tail -1)";
if [ -n "$revision" ]; then
if mtn --db "$cacheDB" au get_revision "$revision"; then
echo "found revision $revision"
done=1;
else
echo "revision $revision does not exist";
fi
else
echo "selector $selector does not match any revision";
fi
else
echo "pulling branch $branch wasn't successful";
fi;
if test -n "$done"; then
break;
fi;
done;
echo "checking out the revision $revision";
if test -n "$done"; then
mtn checkout --db "$cacheDB" -r "$revision" "$out" -b "${branch}"
else
echo "Needed revision still not found. Exiting";
exit 1;
fi;
echo "clearing _MTN in the output"
rm -rf "$out/_MTN"

40
pkgs/build-support/fetchmtn/default.nix
View File

@@ -1,40 +0,0 @@
# You can specify some extra mirrors and a cache DB via options
{
lib,
stdenvNoCC,
monotone,
defaultDBMirrors ? [ ],
cacheDB ? "./mtn-checkout.db",
}:
lib.fetchers.withNormalizedHash { } (
# dbs is a list of strings, each is an url for sync
# selector is mtn selector, like h:org.example.branch
{
name ? "mtn-checkout",
dbs ? [ ],
outputHash,
outputHashAlgo,
selector ? "h:" + branch,
branch,
}:
stdenvNoCC.mkDerivation {
builder = ./builder.sh;
nativeBuildInputs = [ monotone ];
inherit outputHash outputHashAlgo;
outputHashMode = "recursive";
dbs = defaultDBMirrors ++ dbs;
inherit
branch
cacheDB
name
selector
;
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
}
)

4
pkgs/by-name/ev/evcc/package.nix
View File

@@ -17,13 +17,13 @@
}:
let
version = "0.314.2";
version = "0.314.3";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
tag = version;
hash = "sha256-tqbalQxR6iH0xl5PTCmHTs4wYOI9Kca+IIqcyxo32c0=";
hash = "sha256-rGka5IaiKmcU2xS846Ej9S/GJuKbtWXWX77vLAuH4sY=";
};
vendorHash = "sha256-+EXNCUsgYJ3LKgcljX+VQriUYSghVTNLgwbrdZ2Htdc=";

6
pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
View File

@@ -7,17 +7,17 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "flutter_rust_bridge_codegen";
version = "2.12.0";
version = "2.13.0";
src = fetchFromGitHub {
owner = "fzyzcjy";
repo = "flutter_rust_bridge";
tag = "v${finalAttrs.version}";
hash = "sha256-8lLHnJ3IWDZHsj444Gvl0BN+wRlc5JeQfdOQi0QG1Wg=";
hash = "sha256-NMM5QyqoduhXMpV9b6b3qRpfwqWtHkoucVN4xO81+fw=";
fetchSubmodules = true;
};
cargoHash = "sha256-R6Brxb8OGkInAH/+GPoxc2f/bSWcsWP3aUMh1VrKBuc=";
cargoHash = "sha256-xxdBo5rxuWiq5YMRPpVp2+0JX1lKvvzrT8z5Rq8S9g0=";
cargoBuildFlags = [
"--package"
"flutter_rust_bridge_codegen"

8
pkgs/by-name/go/gogcli/package.nix
View File

@@ -1,19 +1,19 @@
{
lib,
buildGoModule,
buildGo127Module,
fetchFromGitHub,
testers,
}:
buildGoModule (finalAttrs: {
buildGo127Module (finalAttrs: {
pname = "gogcli";
version = "0.36.0";
version = "0.37.0";
src = fetchFromGitHub {
owner = "openclaw";
repo = "gogcli";
tag = "v${finalAttrs.version}";
hash = "sha256-7XfjpAzUHH1VUJzgllKa/4GvQZhTCX8TePTXRB+oJRE=";
hash = "sha256-UQa9Z7zv2IuH7GL1udNee2F+uB2BAZA5a0/2XtFcBWg=";
};
vendorHash = "sha256-+Nbuwok3dY/82gUDKeGgrC0F1ZqXSW8IpV6Q1yzIPvo=";

6
pkgs/by-name/oh/oha/package.nix
View File

@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "oha";
version = "1.15.0";
version = "1.16.0";
src = fetchFromGitHub {
owner = "hatoo";
repo = "oha";
tag = "v${finalAttrs.version}";
hash = "sha256-WkV4tiDjaFy0fttR7HhhqxWF2VggQfdNMLIZzxjTCOA=";
hash = "sha256-ajJFrcHvXKtbmLbu8xlinr68PgI+IlP5CTlkVD2uvVM=";
};
cargoHash = "sha256-KZZKV5DXABfgjXRc+BhO0AGONaKxoCNKYxTnupzvZV0=";
cargoHash = "sha256-ONsYMaX4ZFmRd8+Pr33jg1iGkm4k5RktYl/6FHhfLhw=";
env = {
CARGO_PROFILE_RELEASE_LTO = "fat";

6
pkgs/by-name/pi/pixi/package.nix
View File

@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "pixi";
version = "0.76.2";
version = "0.77.0";
src = fetchFromGitHub {
owner = "prefix-dev";
repo = "pixi";
tag = "v${finalAttrs.version}";
hash = "sha256-mUdSpMCpVRpogJirImJr4do7qAdIO+XcVL85KiD9jHw=";
hash = "sha256-ljGzeOa7OZvyNrMu94ZTlj684z6/hQeQn9g0fEWzANg=";
};
cargoHash = "sha256-d4oYB247GKaAp3mrAuWphjFX/tz0FmW4Q8O+xYhpoz8=";
cargoHash = "sha256-jz/rq8sZZCOvGsAkoahLSbERYYOuzoOctnuVvOJ5JLs=";
nativeBuildInputs = [
pkg-config

6
pkgs/by-name/sp/spacetimedb/package.nix
View File

@@ -15,16 +15,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "spacetimedb";
version = "2.8.1";
version = "2.8.3";
src = fetchFromGitHub {
owner = "clockworklabs";
repo = "spacetimedb";
tag = "v${finalAttrs.version}";
hash = "sha256-kiclTiP1oMJJhHkmHmTJFkDvP8tOfHGsBDn6DOu4uc8=";
hash = "sha256-RlTzuItgepuHD3sWVF+twLlma460JGAHuvT67MtsmAM=";
};
cargoHash = "sha256-ljAK8WoQitvmoWap0mj9ws+F6thtu2iT/31s4lk9vgA=";
cargoHash = "sha256-j5+ueZG39oP7D/vn2gYOsAWGKaO/WtQOHLczSRN6WrA=";
nativeBuildInputs = [
pkg-config

2
pkgs/pkgs-lib/formats.nix
View File

@@ -24,7 +24,6 @@ let
singleton
strings
toJSON
toPretty
types
versionAtLeast
warn
@@ -39,6 +38,7 @@ let
toLua
mkLuaInline
toPlist
toPretty
;
inherit (lib.types)

9
pkgs/servers/web-apps/discourse/default.nix
View File

@@ -59,8 +59,8 @@ let
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse";
rev = "v${version}";
sha256 = "sha256-sGygaOCygtDVjg8uBGdDVaRouUKib8aAukaBAY8aQ9w=";
tag = "v${version}";
hash = "sha256-sGygaOCygtDVjg8uBGdDVaRouUKib8aAukaBAY8aQ9w=";
};
pnpm = pnpm_10;
@@ -589,7 +589,10 @@ let
};
meta = {
homepage = "https://www.discourse.org/";
platforms = lib.platforms.linux;
platforms = [
"x86_64-linux"
"aarch64-linux"
];
maintainers = with lib.maintainers; [
leona
talyz

4
pkgs/tools/package-management/nix-eval-jobs/default.nix
View File

@@ -12,13 +12,13 @@
}:
stdenv.mkDerivation rec {
pname = "nix-eval-jobs";
version = "2.35.1";
version = "2.35.2";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix-eval-jobs";
tag = "v${version}";
hash = "sha256-EFJnN35L7UieL8zV8qPrpqfdfzztWksY8JYuXF+mr9o=";
hash = "sha256-qHxk1wVKqz/UMtVC14ugkhySbqYcRQbwobyeO/fhAf0=";
};
buildInputs = [

1
pkgs/top-level/aliases.nix
View File

@@ -815,6 +815,7 @@ mapAliases {
fedifetcher = throw "'fedifetcher' has been removed because there is now a similar native feature in Mastodon."; # Added 2025-12-08
fennel = throw "'fennel' has been renamed to/replaced by 'luaPackages.fennel'"; # Converted to throw 2025-10-27
fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
fetchmtn = throw "fetchmtn has been removed as it is not used in-tree and the only publically-readable Monotone network server might be now Monotone's source code itself (which is a bootstrapping problem). Use local checkouts or locally vendor/adapt a copy from an older Nixpkgs checkout."; # Added 2026-08-22
fflogs = throw "fflogs has been removed because it stopped working on 2026-06-29 and was replaced by archon-lite"; # Added 2026-07-03
FIL-plugins = throw "'FIL-plugins' has been renamed to/replaced by 'fil-plugins'"; # Converted to throw 2025-10-27
filesender = throw "'filesender' has been removed because of its simplesamlphp dependency"; # Added 2025-10-17

2
pkgs/top-level/all-packages.nix
View File

@@ -469,8 +469,6 @@ with pkgs;
fetchgitLocal = callPackage ../build-support/fetchgitlocal { };
fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or { });
fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { };
fetchpijul = callPackage ../build-support/fetchpijul { };