diff --git a/flake.lock b/flake.lock index 55eca5a..353abe8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,40 +1,23 @@ { "nodes": { - "edge-nixpkgs": { - "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1716361217, - "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", + "lastModified": 1716408587, + "narHash": "sha256-el71IUaQdEmntmd51GBpkJs/Hqh6S4dmfmUGP8GQaME=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", + "rev": "1a7abfa62e8a36f7f2dbe463722ed9ea31be5e43", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "edge-nixpkgs": "edge-nixpkgs", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 80fb1ee..1ce9208 100644 --- a/flake.nix +++ b/flake.nix @@ -5,16 +5,11 @@ # - https://discourse.nixos.org/t/differences-between-nix-channels/13998 # How to update the revision # - `nix flake update --commit-lock-file` # https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-flake-update.html - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; - edge-nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; }; outputs = - { - self, - nixpkgs, - edge-nixpkgs, - }: + { self, nixpkgs }: let # Candidates: https://github.com/NixOS/nixpkgs/blob/release-23.11/lib/systems/flake-systems.nix forAllSystems = nixpkgs.lib.genAttrs [ @@ -26,12 +21,11 @@ ]; in rec { - formatter = forAllSystems (system: edge-nixpkgs.legacyPackages.${system}.nixfmt-rfc-style); + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style); devShells = forAllSystems ( system: let pkgs = nixpkgs.legacyPackages.${system}; - edge-pkgs = edge-nixpkgs.legacyPackages.${system}; in { default = @@ -41,13 +35,13 @@ # https://github.com/NixOS/nix/issues/730#issuecomment-162323824 bashInteractive nil - edge-pkgs.nixfmt-rfc-style + nixfmt-rfc-style - edge-pkgs.go_1_22 - edge-pkgs.dprint - edge-pkgs.yamlfmt - edge-pkgs.goreleaser - edge-pkgs.typos + go_1_22 + dprint + yamlfmt + goreleaser + typos go-task ]; }; @@ -58,11 +52,10 @@ system: let pkgs = nixpkgs.legacyPackages.${system}; - edge-pkgs = edge-nixpkgs.legacyPackages.${system}; version = "v1.1.2"; in rec { - selfup = edge-pkgs.buildGo122Module { + selfup = pkgs.buildGo122Module { pname = "selfup"; src = pkgs.lib.cleanSource self; version = version;