diff --git a/flake.lock b/flake.lock index f74a5d03..08e84cc5 100644 --- a/flake.lock +++ b/flake.lock @@ -230,6 +230,22 @@ "type": "github" } }, + "nixpkgs-25_05": { + "locked": { + "lastModified": 1763334038, + "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "prybar": { "inputs": { "flake-utils": "flake-utils_2", @@ -279,6 +295,7 @@ "nixpkgs": "nixpkgs", "nixpkgs-23_05": "nixpkgs-23_05", "nixpkgs-24_11": "nixpkgs-24_11", + "nixpkgs-25_05": "nixpkgs-25_05", "prybar": "prybar", "replit-rtld-loader": "replit-rtld-loader", "ztoc-rs": "ztoc-rs" diff --git a/flake.nix b/flake.nix index e0ee6301..0087c62d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ description = "Nix expressions for defining Replit development environments"; inputs.nixpkgs-23_05.url = "github:nixos/nixpkgs/nixos-23.05"; inputs.nixpkgs-24_11.url = "github:nixos/nixpkgs/nixos-24.11"; + inputs.nixpkgs-25_05.url = "github:nixos/nixpkgs/nixos-25.05"; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; inputs.fenix.url = "github:nix-community/fenix"; inputs.fenix.inputs.nixpkgs.follows = "nixpkgs"; @@ -16,7 +17,7 @@ inputs.replit-rtld-loader.url = "github:replit/replit_rtld_loader"; inputs.replit-rtld-loader.inputs.nixpkgs.follows = "nixpkgs"; - outputs = { self, nixpkgs, nixpkgs-23_05, nixpkgs-24_11, prybar, java-language-server, nil, fenix, replit-rtld-loader, ... }: + outputs = { self, nixpkgs, nixpkgs-23_05, nixpkgs-24_11, nixpkgs-25_05, prybar, java-language-server, nil, fenix, replit-rtld-loader, ... }: let mkPkgs = nixpkgs-spec: system: import nixpkgs-spec { inherit system; @@ -36,6 +37,7 @@ pkgs-23_05 = mkPkgs nixpkgs-23_05 "x86_64-linux"; pkgs-24_11 = mkPkgs nixpkgs-24_11 "x86_64-linux"; + pkgs-25_05 = mkPkgs nixpkgs-25_05 "x86_64-linux"; patched-unstable = nixpkgs.legacyPackages.x86_64-linux.applyPatches { name = "nixpkgs-unstable-patched"; @@ -117,6 +119,7 @@ inherit pkgs; inherit pkgs-23_05; inherit pkgs-24_11; + inherit pkgs-25_05; } ); } diff --git a/pkgs/modules/default.nix b/pkgs/modules/default.nix index 63069beb..2d84ebd5 100644 --- a/pkgs/modules/default.nix +++ b/pkgs/modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-23_05, pkgs-24_11 }: +{ pkgs, pkgs-23_05, pkgs-24_11, pkgs-25_05 }: with builtins; let mkModule = path: pkgs.callPackage ../moduleit/entrypoint.nix { @@ -110,10 +110,10 @@ let (import ./nix) (import ./php) (import ./postgresql { - postgresql = pkgs.postgresql_16; + postgresql = pkgs-25_05.postgresql_16; }) (import ./postgresql { - postgresql = pkgs.postgresql_17; + postgresql = pkgs-25_05.postgresql_17; }) (import ./qbasic) (import ./R)