From 9becb84220595db93e6cd3d83e61f098d2020b79 Mon Sep 17 00:00:00 2001 From: cato-001 Date: Sat, 14 Mar 2026 15:04:50 +0100 Subject: [PATCH 1/2] feat: use nixpkgs as nixpkgs url --- flake.lock | 17 +++--- flake.nix | 2 +- templates/default/flake.nix | 2 +- templates/golang/flake.lock | 119 ------------------------------------ templates/golang/flake.nix | 2 +- 5 files changed, 10 insertions(+), 132 deletions(-) delete mode 100644 templates/golang/flake.lock diff --git a/flake.lock b/flake.lock index 8042b52..8cd80cd 100644 --- a/flake.lock +++ b/flake.lock @@ -23,18 +23,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767047869, - "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", - "type": "github" + "lastModified": 1769741972, + "narHash": "sha256-RxSg1EioTWNpoLaykiT1UQKTo/K0PPdLqCyQgNjNqWs=", + "path": "/nix/store/h8zcrjvwn0i1f6licsd41gb4brljiif7-source", + "rev": "63590ac958a8af30ebd52c7a0309d8c52a94dd77", + "type": "path" }, "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "root": { diff --git a/flake.nix b/flake.nix index db17aaf..ac62ec8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "My common project templates"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-25.11"; + nixpkgs.url = "nixpkgs"; blueprint = { url = "github:numtide/blueprint"; diff --git a/templates/default/flake.nix b/templates/default/flake.nix index 6532e25..2ef3a20 100644 --- a/templates/default/flake.nix +++ b/templates/default/flake.nix @@ -2,7 +2,7 @@ description = "TODO: please replace"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-25.11"; + nixpkgs.url = "nixpkgs"; blueprint = { url = "github:numtide/blueprint"; diff --git a/templates/golang/flake.lock b/templates/golang/flake.lock deleted file mode 100644 index 80d5054..0000000 --- a/templates/golang/flake.lock +++ /dev/null @@ -1,119 +0,0 @@ -{ - "nodes": { - "blueprint": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1763308703, - "narHash": "sha256-O9Y+Wer8wOh+N+4kcCK5p/VLrXyX+ktk0/s3HdZvJzk=", - "owner": "numtide", - "repo": "blueprint", - "rev": "5a9bba070f801d63e2af3c9ef00b86b212429f4f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "blueprint", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gomod2nix": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767019875, - "narHash": "sha256-NodN+lhWTD59b44Q2bPjE1edINfjfRkQYdZsrxifCeU=", - "owner": "nix-community", - "repo": "gomod2nix", - "rev": "49662a44272806ff785df2990a420edaaca15db4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "gomod2nix", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1767047869, - "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "blueprint": "blueprint", - "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/templates/golang/flake.nix b/templates/golang/flake.nix index ba4e347..9ee8063 100644 --- a/templates/golang/flake.nix +++ b/templates/golang/flake.nix @@ -2,7 +2,7 @@ description = "TODO: please replace"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-25.11"; + nixpkgs.url = "nixpkgs"; blueprint = { url = "github:numtide/blueprint"; From 8362a65426ec734eabbf68f1fd5515f769b40f0f Mon Sep 17 00:00:00 2001 From: cato-001 Date: Sat, 14 Mar 2026 15:06:58 +0100 Subject: [PATCH 2/2] feat: update flake profile --- .direnv/flake-profile | 2 +- .direnv/flake-profile-1-link | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 .direnv/flake-profile-1-link diff --git a/.direnv/flake-profile b/.direnv/flake-profile index 0c05709..c7ae5b7 120000 --- a/.direnv/flake-profile +++ b/.direnv/flake-profile @@ -1 +1 @@ -flake-profile-1-link \ No newline at end of file +flake-profile-2-link \ No newline at end of file diff --git a/.direnv/flake-profile-1-link b/.direnv/flake-profile-1-link deleted file mode 120000 index ac3f27a..0000000 --- a/.direnv/flake-profile-1-link +++ /dev/null @@ -1 +0,0 @@ -/nix/store/yhc48v456plfcphg7x5s13lnlkrg5vnc-nix-shell-env \ No newline at end of file