diff --git a/nix/apps/does-it-build/default.nix b/nix/apps/does-it-build/default.nix index a2b0244..588d0af 100644 --- a/nix/apps/does-it-build/default.nix +++ b/nix/apps/does-it-build/default.nix @@ -1,8 +1,7 @@ -{ pkgs, nixpkgs-next, lib, config, my-projects-versions, ... }: +{ pkgs, lib, config, my-projects-versions, ... }: let does-it-build-base = (import (pkgs.fetchFromGitHub my-projects-versions.does-it-build.fetchFromGitHub)) { - # needs a recent rust version. - pkgs = nixpkgs-next; + inherit pkgs; }; does-it-build = does-it-build-base.overrideAttrs (finalAttrs: previousAttrs: { DOES_IT_BUILD_OVERRIDE_VERSION = my-projects-versions.does-it-build.commit; diff --git a/nix/hive.nix b/nix/hive.nix index 6d3a58e..3406272 100644 --- a/nix/hive.nix +++ b/nix/hive.nix @@ -2,8 +2,7 @@ meta = let nixpkgs-version = builtins.fromJSON (builtins.readFile ./nixpkgs.json); - nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgs-version."nixos-25.05".commit}.tar.gz"); - nixpkgs-next = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgs-version."nixos-25.11".commit}.tar.gz") { }; + nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgs-version."nixos-25.11".commit}.tar.gz"); in { # Override to pin the Nixpkgs version (recommended). This option @@ -16,7 +15,6 @@ specialArgs = { my-projects-versions = builtins.fromJSON (builtins.readFile ./my-projects.json); - inherit nixpkgs-next; inherit nixpkgs-path; networkingConfig = { diff --git a/nix/modules/caddy/default.nix b/nix/modules/caddy/default.nix index 07c3646..dfdf0f6 100644 --- a/nix/modules/caddy/default.nix +++ b/nix/modules/caddy/default.nix @@ -6,7 +6,7 @@ let "github.com/noratrieb-mirrors/certmagic-s3@v1.1.3" "github.com/sagikazarmark/caddy-fs-s3@v0.10.0" ]; - hash = "sha256-aZnF6dMCOfQufDhABS4ggfB0gkhDVYpdn2f60oqqKI8="; + hash = "sha256-ERccS8hBcjttV92MgJkgLBNY1RWRztYujby80MH52Xo="; }; in { diff --git a/nix/modules/garage/default.nix b/nix/modules/garage/default.nix index 23e1cad..409dcc6 100644 --- a/nix/modules/garage/default.nix +++ b/nix/modules/garage/default.nix @@ -20,7 +20,7 @@ in }; services.garage = { enable = true; - package = pkgs.garage_2_1_0; + package = pkgs.garage_2; settings = { metadata_dir = "/var/lib/garage/meta"; data_dir = "/var/lib/garage/data"; diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index f1929d3..c1c6d94 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -1,8 +1,4 @@ { - "nixos-25.05": { - "lastUpdated": "2026-01-31T13:55:04.757Z", - "commit": "ac62194c3917d5f474c1a844b6fd6da2db95077d" - }, "nixos-25.11": { "lastUpdated": "2026-02-14T15:07:37.351Z", "commit": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a"