fix flakes

This commit is contained in:
Dmitriy Kholkin 2021-09-28 02:21:20 +03:00
parent 1f56d7ef14
commit 27351e8d64
Signed by: AtaraxiaDev
GPG Key ID: FD266B810DF48DF2
2 changed files with 47 additions and 68 deletions

22
flake.lock generated
View File

@ -1,27 +1,12 @@
{
"nodes": {
"flake-utils": {
"locked": {
"lastModified": 1631561581,
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1623798125,
"narHash": "sha256-I6xUuLZWCkdNNvZdNm7P4NtmqMaCI2QHQcrAYvTB3B0=",
"lastModified": 1632753066,
"narHash": "sha256-oLs+Jm9zSRUVhTzPzKbQByLPor4IxdhZ6xUThAE1+s0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c0c5925832c1da45b1100a10ae5c5a55a6952acf",
"rev": "1224e4bec7b8019f8847dd268a642000073bcfa3",
"type": "github"
},
"original": {
@ -32,7 +17,6 @@
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
}

View File

@ -2,60 +2,55 @@
description = "Base16-template builder for nix.";
inputs.nixpkgs.url = "nixpkgs/release-21.05";
inputs.flake-utils.url = "github:numtide/flake-utils";
outputs = { self, nixpkgs, flake-utils }@inputs:
flake-utils.lib.eachDefaultSystem
(system:
with nixpkgs.legacyPackages.${system};
{
# Home-Manager Module
hmModule = ./base16.nix;
outputs = { self, nixpkgs }@inputs:
with nixpkgs.legacyPackages."x86_64-linux"; rec {
# Home-Manager Module
hmModule = ./base16.nix;
packages.update-base16 = (let
mkScript = { name, file, env ? [ ] }:
writeTextFile {
name = "${name}";
executable = true;
destination = "/bin/${name}";
text = ''
for i in ${lib.concatStringsSep " " env}; do
export PATH="$i/bin:$PATH"
done
exec ${bash}/bin/bash ${file} $@
'';
};
in mkScript rec {
name = "update-base16";
env = [ curl nix-prefetch-git gnused jq ];
file = writeTextFile {
name = "${name}.sh";
packages.x86_64-linux.update-base16 = (let
mkScript = { name, file, env ? [ ] }:
writeTextFile {
name = "${name}";
executable = true;
destination = "/bin/${name}";
text = ''
generate_sources () {
out=$1
curl "https://raw.githubusercontent.com/chriskempson/base16-$out-source/master/list.yaml"\
| sed -nE "s~^([-_[:alnum:]]+): *(.*)~\1 \2~p"\
| while read name src; do
echo "{\"key\":\"$name\",\"value\":"
nix-prefetch-git $src
echo "}"
done\
| jq -s ".|del(.[].value.date)|from_entries"\
> $out.json
}
generate_sources templates &
generate_sources schemes &
wait
for i in ${lib.concatStringsSep " " env}; do
export PATH="$i/bin:$PATH"
done
exec ${bash}/bin/bash ${file} $@
'';
};
});
defaultPackage = packages.update-base16;
devShell = mkShell {
buildInputs = [ packages.update-base16 ];
in mkScript rec {
name = "update-base16";
env = [ curl nix-prefetch-git gnused jq ];
file = writeTextFile {
name = "${name}.sh";
executable = true;
text = ''
generate_sources () {
out=$1
curl "https://raw.githubusercontent.com/chriskempson/base16-$out-source/master/list.yaml"\
| sed -nE "s~^([-_[:alnum:]]+): *(.*)~\1 \2~p"\
| while read name src; do
echo "{\"key\":\"$name\",\"value\":"
nix-prefetch-git $src
echo "}"
done\
| jq -s ".|del(.[].value.date)|from_entries"\
> $out.json
}
generate_sources templates &
generate_sources schemes &
wait
'';
};
}
);
});
defaultPackage.x86_64-linux = packages.x86_64-linux.update-base16;
devShell.x86_64-linux = mkShell {
buildInputs = [ packages.x86_64-linux.update-base16 ];
};
};
}