From 217fa8d35ab5e841dcb8eca23b751c79c9fe4531 Mon Sep 17 00:00:00 2001 From: DavHau Date: Wed, 19 Jul 2023 14:47:25 +0200 Subject: [PATCH] chore: remove nixpkgsV1 --- flake.lock | 16 ---------------- flake.nix | 1 - v1/nix/modules/flake-parts/packages.nix | 4 ++-- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index fd098b870f..8cdd20e00f 100644 --- a/flake.lock +++ b/flake.lock @@ -97,21 +97,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1665580254, - "narHash": "sha256-hO61XPkp1Hphl4HGNzj1VvDH5URt7LI6LaY/385Eul4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f634d427b0224a5f531ea5aa10c3960ba6ec5f0f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgsV1": { "locked": { "lastModified": 1686501370, "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", @@ -154,7 +139,6 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "nixpkgs": "nixpkgs", - "nixpkgsV1": "nixpkgsV1", "pre-commit-hooks": "pre-commit-hooks" } }, diff --git a/flake.nix b/flake.nix index 09b8c69b00..b4cf5e700e 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,6 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - nixpkgsV1.url = "nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; diff --git a/v1/nix/modules/flake-parts/packages.nix b/v1/nix/modules/flake-parts/packages.nix index 37fba97d90..c333b89d61 100644 --- a/v1/nix/modules/flake-parts/packages.nix +++ b/v1/nix/modules/flake-parts/packages.nix @@ -18,7 +18,7 @@ eval-cache.cacheFileRel = "/v1/nix/modules/drvs/${config.name}/cache-${system}.json"; eval-cache.repoRoot = self; eval-cache.enable = true; - deps.npm = inputs.nixpkgsV1.legacyPackages.${system}.nodejs.pkgs.npm.override (old: rec { + deps.npm = inputs.nixpkgs.legacyPackages.${system}.nodejs.pkgs.npm.override (old: rec { version = "8.19.4"; src = builtins.fetchTarball { url = "https://registry.npmjs.org/npm/-/npm-${version}.tgz"; @@ -39,7 +39,7 @@ setup ]; specialArgs.packageSets = { - nixpkgs = inputs.nixpkgsV1.legacyPackages.${system}; + nixpkgs = inputs.nixpkgs.legacyPackages.${system}; writers = config.writers; }; specialArgs.drv-parts = inputs.drv-parts;