diff --git a/.envrc b/.envrc index bef6a60..41d594f 100644 --- a/.envrc +++ b/.envrc @@ -8,6 +8,4 @@ watch_file *.nix watch_file nix/*.nix watch_file flake.lock -export NIXPKGS_ALLOW_UNFREE=1 - use flake . --impure --accept-flake-config diff --git a/flake.lock b/flake.lock index 6c75261..52dad5e 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780511130, - "narHash": "sha256-2v9lT4ya59Lh1FqPeLnz1MoX9y/wz2huqfe9RtQZITk=", + "lastModified": 1786430034, + "narHash": "sha256-Vux08kA5PICwS2sViCMfwVLAHNoH8TkKAeBo25LjpMI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "535f3e6942cb1cead3929c604320d3db54b542b9", + "rev": "70cc4559b10a6062b05ff1af17e0add065ccaed9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index f702753..bf7269d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "GitButler CLI (`but`) + agent skill, packaged for Nix dev shells"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; flake-utils.url = "github:numtide/flake-utils"; }; @@ -47,7 +47,7 @@ packages = [ lib.gitbutler-cli lib.pr-stack-footer - pkgs.nixfmt-rfc-style + pkgs.nixfmt ]; }; } @@ -62,6 +62,5 @@ "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; - allow-unfree = true; }; }