nixpkgs-review: use nixpkgs version

saves one nixpkgs copy
This commit is contained in:
Jörg Thalheim 2022-04-10 21:40:10 +02:00
parent bf5586390f
commit 982fddd51a
No known key found for this signature in database
3 changed files with 3 additions and 54 deletions

View File

@ -16,21 +16,6 @@
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1610051610,
"narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"mmdoc": {
"inputs": {
"nixpkgs": [
@ -83,45 +68,11 @@
"type": "github"
}
},
"nixpkgs-review": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1629814514,
"narHash": "sha256-iBNBw+gh6CiXyeaTfm46g7DxYQ3fLKyHcPWHPxF5Xfc=",
"owner": "mic92",
"repo": "nixpkgs-review",
"rev": "561ba2fff1993d5b71c12f90a5090507bfadf25e",
"type": "github"
},
"original": {
"owner": "mic92",
"repo": "nixpkgs-review",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1613848021,
"narHash": "sha256-9JICogf6yTscjE3bmeX13vks+omv8408I3B7gWIau5U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1c5ca28030c459fc10d69b8608c66ed3a45f8fe9",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"root": {
"inputs": {
"flake-compat": "flake-compat",
"mmdoc": "mmdoc",
"nixpkgs": "nixpkgs",
"nixpkgs-review": "nixpkgs-review"
"nixpkgs": "nixpkgs"
}
}
},

View File

@ -1,7 +1,6 @@
{
description = "A flake for nixpkgs-update";
inputs.nixpkgs-review.url = "github:mic92/nixpkgs-review";
inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
inputs.nixpkgs = { type = "github"; owner = "nixos"; repo = "nixpkgs"; };
inputs.mmdoc.url = "github:ryantm/mmdoc";
@ -10,7 +9,7 @@
nixConfig.extra-substituters = [ "https://nixpkgs-update.cachix.org" ];
nixConfig.extra-trusted-public-keys = [ "nixpkgs-update.cachix.org-1:6y6Z2JdoL3APdu6/+Iy8eZX2ajf09e4EE9SnxSML1W8=" ];
outputs = { self, flake-compat, nixpkgs, nixpkgs-review, mmdoc } @ args:
outputs = { self, flake-compat, nixpkgs, mmdoc } @ args:
{
packages."x86_64-linux" = import ./pkgs/default.nix (args // { system = "x86_64-linux"; });
defaultPackage."x86_64-linux" = self.packages."x86_64-linux".nixpkgs-update;

View File

@ -1,5 +1,4 @@
{ nixpkgs
, nixpkgs-review
, mmdoc
, system
, self
@ -25,7 +24,7 @@ let
GIST = gist;
# TODO: are there more coreutils paths that need locking down?
TIMEOUT = coreutils;
NIXPKGSREVIEW = (import nixpkgs-review { inherit pkgs; });
NIXPKGSREVIEW = nixpkgs-review;
};
haskellPackages = pkgs.haskellPackages.override {