From e3442bc05e0d5d3aa7b4a50056637790716f9ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Tue, 2 Jan 2024 13:18:55 +0100 Subject: [PATCH] Clean up imports --- flake.lock | 133 ++++++++++++++++++++++------------------------------- flake.nix | 21 +-------- 2 files changed, 57 insertions(+), 97 deletions(-) diff --git a/flake.lock b/flake.lock index 523aa83..8589e18 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,7 @@ "agenix": { "inputs": { "darwin": [ - "darwin-old-for-agenix" + "darwin" ], "home-manager": [ "home-manager" @@ -112,25 +112,6 @@ "type": "github" } }, - "darwin-old-for-agenix": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1689065945, - "narHash": "sha256-0LICmtzO3nkbeRCYdkzHCnEVjldSFiHMG56uA/W2BAE=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "22620845fee1cc16f4ea639509c50fd989ccc1ce", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "22620845fee1cc16f4ea639509c50fd989ccc1ce", - "repo": "nix-darwin", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -241,6 +222,46 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "hercules-ci-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704152458, + "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "path": "/nix/store/a5spqvgdp4qxhz4arxxn2374jv0r7acv-source", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "type": "path" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -296,11 +317,9 @@ }, "hercules-ci-agent": { "inputs": { - "flake-parts": [ - "flake-parts" - ], + "flake-parts": "flake-parts_2", "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1703653834, @@ -318,10 +337,8 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": "nixpkgs_4" + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1704029560, @@ -384,9 +401,7 @@ }, "nh": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1703024852, @@ -402,27 +417,6 @@ "type": "github" } }, - "niko-nur": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1690830552, - "narHash": "sha256-8n8PipmWZnnE56QlhcGQCKG5cMU8v+NTaFkJzBM6k4w=", - "owner": "nrabulinski", - "repo": "nur-packages", - "rev": "b19fe09dd3f325ff2731b83f230e2573b67db4aa", - "type": "github" - }, - "original": { - "owner": "nrabulinski", - "repo": "nur-packages", - "type": "github" - } - }, "nix-std": { "locked": { "lastModified": 1701658249, @@ -485,19 +479,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", - "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1703255338, "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", @@ -513,7 +494,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1703637592, "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", @@ -529,23 +510,23 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1690753480, - "narHash": "sha256-GQgPs8fCh/LsyQoYMUZgT2p7jFVWyHu9p+1Nl/dp8GY=", - "owner": "nixos", + "lastModified": 1703992652, + "narHash": "sha256-C0o8AUyu8xYgJ36kOxJfXIroy9if/G6aJbNOpA5W0+M=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e06dd56947c1dc3dc837c3149bfe02c71a6edd7", + "rev": "32f63574c85fbc80e4ba1fbb932cde9619bad25e", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1704008649, "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=", @@ -624,7 +605,6 @@ "agenix": "agenix", "conduit": "conduit", "darwin": "darwin", - "darwin-old-for-agenix": "darwin-old-for-agenix", "disko": "disko", "flake-parts": "flake-parts", "hercules-ci-agent": "hercules-ci-agent", @@ -632,8 +612,7 @@ "home-manager": "home-manager", "mailserver": "mailserver", "nh": "nh", - "niko-nur": "niko-nur", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nvidia-patch": "nvidia-patch", "racket": "racket", "wrapper-manager": "wrapper-manager", diff --git a/flake.nix b/flake.nix index cbc706d..dc8d1de 100644 --- a/flake.nix +++ b/flake.nix @@ -50,22 +50,14 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - niko-nur = { - url = "github:nrabulinski/nur-packages"; - # Not overriding nixpkgs to get cache hits - # inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; - }; darwin = { url = "github:lnl7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; - # agenix checks fail because of https://github.com/LnL7/nix-darwin/pull/687 - darwin-old-for-agenix.url = "github:lnl7/nix-darwin?ref=22620845fee1cc16f4ea639509c50fd989ccc1ce"; agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.darwin.follows = "darwin-old-for-agenix"; + inputs.darwin.follows = "darwin"; inputs.home-manager.follows = "home-manager"; }; mailserver = { @@ -81,29 +73,18 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; - # stylix = { - # url = "github:danth/stylix"; - # inputs = { - # nixpkgs.follows = "nixpkgs"; - # home-manager.follows = "home-manager"; - # }; - # }; racket = { url = "github:nrabulinski/racket.nix"; inputs.nixpkgs.follows = "nixpkgs"; }; hercules-ci-agent = { url = "github:hercules-ci/hercules-ci-agent"; - inputs.flake-parts.follows = "flake-parts"; }; hercules-ci-effects = { url = "github:hercules-ci/hercules-ci-effects"; - inputs.flake-parts.follows = "flake-parts"; }; nh = { url = "github:viperML/nh"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; }; conduit = { url = "gitlab:famedly/conduit?ref=next";