From 79221aff79f8b3c9ee99d9b2b9608dc8525472bc Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Tue, 7 Nov 2023 10:02:17 +0100 Subject: [PATCH] remove dependency on nix.dev it's not used for anything --- flake.lock | 93 +++++++----------------------------------------------- flake.nix | 3 -- 2 files changed, 12 insertions(+), 84 deletions(-) diff --git a/flake.lock b/flake.lock index 10ca055f89..8471ad4a07 100644 --- a/flake.lock +++ b/flake.lock @@ -47,24 +47,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "lowdown-src": { "flake": false, "locked": { @@ -97,25 +79,6 @@ "type": "github" } }, - "nix-dev": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1699288356, - "narHash": "sha256-g1ZVPueBuvAz8o7TPwi++dKDrxa+c3kDEQfcMHcwcbU=", - "owner": "NixOS", - "repo": "nix.dev", - "rev": "51e43e38294523839c4d3b5f9e51c2c374c4f076", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nix.dev", - "type": "github" - } - }, "nix-pills": { "flake": false, "locked": { @@ -137,7 +100,7 @@ "flake-utils": [ "flake-utils" ], - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1676674622, @@ -155,18 +118,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685533922, - "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", + "lastModified": 1642635915, + "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d", + "rev": "6d8215281b2f87a5af9ed7425a26ac575da0438f", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" } }, "nixpkgs-regression": { @@ -202,21 +164,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1642635915, - "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6d8215281b2f87a5af9ed7425a26ac575da0438f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1698318101, "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", @@ -231,7 +178,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1695283060, "narHash": "sha256-CJz71xhCLlRkdFUSQEL0pIAAfcnWFXMzd9vXhPrnrEg=", @@ -247,7 +194,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1698876495, "narHash": "sha256-nsQo2/mkDUFeAjuu92p0dEqhRvHHiENhkKVIV1y0/Oo=", @@ -267,7 +214,7 @@ "inputs": { "flake-compat": "flake-compat", "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -289,7 +236,7 @@ "inputs": { "flake-compat": "flake-compat_2", "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -340,30 +287,14 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "nix-dev": "nix-dev", "nix-pills": "nix-pills", "nixos-common-styles": "nixos-common-styles", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "released-nix-stable": "released-nix-stable", "released-nix-unstable": "released-nix-unstable", "released-nixpkgs-stable": "released-nixpkgs-stable", "released-nixpkgs-unstable": "released-nixpkgs-unstable" } - }, - "systems": { - "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", diff --git a/flake.nix b/flake.nix index c657245669..3ecfd80980 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,6 @@ rec { inputs.released-nix-stable.url = "github:nixos/nix/latest-release"; inputs.nix-pills.url = "github:NixOS/nix-pills"; inputs.nix-pills.flake = false; - inputs.nix-dev.url = "github:NixOS/nix.dev"; inputs.nixos-common-styles.url = "github:NixOS/nixos-common-styles"; inputs.nixos-common-styles.inputs.flake-utils.follows = "flake-utils"; @@ -146,7 +145,6 @@ rec { "NIXOS_AMIS=${nixosAmis}" "NIX_PILLS_MANUAL_IN=${nixPills.html-split}/share/doc/nix-pills" "NIX_PILLS_MANUAL_EPUB=${nixPills.epub}/share/doc/nix-pills/nix-pills.epub" - "NIX_DEV_MANUAL_IN=${nix-dev.packages.${system}.default}" "-j 1" ]; @@ -174,7 +172,6 @@ rec { export NIXOS_AMIS="${nixosAmis}" export NIX_PILLS_MANUAL_IN="${nixPills.html-split}/share/doc/nix-pills" export NIX_PILLS_MANUAL_EPUB="${nixPills.epub}/share/doc/nix-pills/nix-pills.epub" - export NIX_DEV_MANUAL_IN="${nix-dev.packages.${system}.default}" rm -f site-styles/common-styles ln -s ${nixos-common-styles.packages."${system}".commonStyles} site-styles/common-styles