shimun/resume-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove nix-extras

Browse Source
This commit is contained in:
shimun 2021-01-03 17:59:32 +01:00
parent 5a4f91a51c
commit 52440ef098
Signed by: shimun
GPG Key ID: E81D8382DC2F971B
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock generated
View File

@ -15,23 +15,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-extras": {
"flake": false,
"locked": {
"lastModified": 1574214871,
"narHash": "sha256-agE1aUir8UdqMJVyz2Xhe+jAR1AG1kmlF5mEHdHYmB4=",
"owner": "colehaus",
"repo": "nix-extras",
"rev": "f33ab8f70982073b08c67e0d4f6144d029f0441d",
"type": "github"
},
"original": {
"owner": "colehaus",
"repo": "nix-extras",
"rev": "f33ab8f70982073b08c67e0d4f6144d029f0441d",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1603791972, "lastModified": 1603791972,
@ -67,7 +50,6 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nix-extras": "nix-extras",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"resume-cli": "resume-cli" "resume-cli": "resume-cli"
} }

14
flake.nix
View File

@ -2,10 +2,6 @@
description = "CLI tool to easily setup a new resume"; description = "CLI tool to easily setup a new resume";
inputs = { inputs = {
nix-extras = {
url = "github:colehaus/nix-extras/f33ab8f70982073b08c67e0d4f6144d029f0441d";
flake = false;
};
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
resume-cli = { resume-cli = {
url = "github:jsonresume/resume-cli/7fb40dab8ca6aa519bd3c4ac2729b9fa4256cdcb"; url = "github:jsonresume/resume-cli/7fb40dab8ca6aa519bd3c4ac2729b9fa4256cdcb";
@ -17,19 +13,17 @@
nixpkgs.url = "nixpkgs/20.09"; nixpkgs.url = "nixpkgs/20.09";
}; };
outputs = { self, nixpkgs, resume-cli, nix-extras, flake-utils }: outputs = { self, nixpkgs, resume-cli, flake-utils }:
let let
forPkgs = pkgs: forPkgs = pkgs:
let let
dbg = pkgs.lib.traceVal; dbg = pkgs.lib.traceVal;
callNode2nix = import "${nix-extras}/callNode2nix.nix";
node2nix = callNode2nix { inherit pkgs; name = "resume-cli"; package = "${resume-cli}/package.json"; packageLock = "${resume-cli}/package-lock.json"; };
nixifiedSrc = nixifiedSrc =
with pkgs; (pkgs.runCommandLocal "node2nix-merge" { buildInputs = [ pkgs.nodePackages.node2nix ]; } ''
(runCommandLocal "node2nix-merge" { } ''
mkdir -p $out mkdir -p $out
cp -r ${resume-cli}/* $out cp -r ${resume-cli}/* $out
cp -rf ${node2nix}/* $out/ cd $out
node2nix --input package.json --lock package-lock.json
'' ''
); );
nodePackages = pkgs.callPackage "${nixifiedSrc}" { inherit pkgs; system = pkgs.system; }; nodePackages = pkgs.callPackage "${nixifiedSrc}" { inherit pkgs; system = pkgs.system; };