diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6deb4efe4453..2a6d43f423ce 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -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 }, diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh deleted file mode 100644 index cace650df841..000000000000 --- a/pkgs/build-support/fetchmtn/builder.sh +++ /dev/null @@ -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" diff --git a/pkgs/build-support/fetchmtn/default.nix b/pkgs/build-support/fetchmtn/default.nix deleted file mode 100644 index 1332bace3b12..000000000000 --- a/pkgs/build-support/fetchmtn/default.nix +++ /dev/null @@ -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; - - } -) diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index d2c1df3bed5c..fe679b20756f 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -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="; diff --git a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix index b4355c78e50a..0f07eb062fb5 100644 --- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix +++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix @@ -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" diff --git a/pkgs/by-name/go/gogcli/package.nix b/pkgs/by-name/go/gogcli/package.nix index 259ee3daafca..8fe979ecb36c 100644 --- a/pkgs/by-name/go/gogcli/package.nix +++ b/pkgs/by-name/go/gogcli/package.nix @@ -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="; diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 33b7d35d2ef6..11e6f191e65c 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -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"; diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 48bd37f31bfa..9f680937a8c2 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -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 diff --git a/pkgs/by-name/sp/spacetimedb/package.nix b/pkgs/by-name/sp/spacetimedb/package.nix index 1c8d057e284a..a4cd63d42509 100644 --- a/pkgs/by-name/sp/spacetimedb/package.nix +++ b/pkgs/by-name/sp/spacetimedb/package.nix @@ -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 diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index e6fdfff69f21..fc48c78a3d73 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -24,7 +24,6 @@ let singleton strings toJSON - toPretty types versionAtLeast warn @@ -39,6 +38,7 @@ let toLua mkLuaInline toPlist + toPretty ; inherit (lib.types) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 6bf64f137a0c..b66d9ddfa942 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -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 diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index bf3e872fae79..134b1b7ff0b0 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -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 = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 82b78605c219..8ee71c92d77d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f27507060819..35b23ad6b69a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };