From 946bbc15226e183222f3efc408cb28b7b84a53d4 Mon Sep 17 00:00:00 2001 From: xenia Date: Thu, 29 May 2025 15:13:56 -0400 Subject: [PATCH] update nixpkgs to 25.05 --- flake.lock | 8 ++++---- flake.nix | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index ab1b1ff..e09a1b2 100644 --- a/flake.lock +++ b/flake.lock @@ -30,16 +30,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748370509, - "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", + "lastModified": 1748302896, + "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", + "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 797fafe..c9e7451 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "dragnpkgs together with nixpkgs and lix"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"; @@ -29,18 +29,18 @@ # self reference in the registry to be downloadable by URL in case it makes it into a # flake.lock meta.registry-entry = { - from = { id = "dragnpkgs-unstable"; type = "indirect"; }; + from = { id = "dragnpkgs"; type = "indirect"; }; to = { type = "git"; url = "https://git.lain.faith/haskal/dragnpkgs.git"; - ref = "main"; + ref = "nixos-25.05"; } // self.lib.filterAttrs (n: _: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") self; }; # the nix path entry for self - meta.path-entry = "dragnpkgs-unstable=flake:dragnpkgs-unstable"; + meta.path-entry = "dragnpkgs=flake:dragnpkgs"; lib = nixpkgs.lib.extend (final: prev: { licenses = prev.licenses // { fyptl = import ./lib/licenses/fyptl.nix; }; @@ -122,17 +122,17 @@ }; }; - config.nix.registry.dragnpkgs-unstable = + config.nix.registry.dragnpkgs = lib.mkIf config.dragnpkgs.setFlakeRegistry self.meta.registry-entry; config.nix.registry.nixpkgs = lib.mkIf config.dragnpkgs.setNixpkgsFlakeAlias { from = { id = "nixpkgs"; type = "indirect"; }; - to = { id = "dragnpkgs-unstable"; type = "indirect"; }; + to = { id = "dragnpkgs"; type = "indirect"; }; }; config.nix.registry.templates = lib.mkIf config.dragnpkgs.setTemplatesFlakeAlias { from = { id = "templates"; type = "indirect"; }; - to = { id = "dragnpkgs-unstable"; type = "indirect"; }; + to = { id = "dragnpkgs"; type = "indirect"; }; }; config.nix.nixPath = lib.mkIf config.dragnpkgs.setNixPath [