Update Nixpkgs input

This commit is contained in:
Ehmry - 2021-04-12 20:55:38 +02:00
parent 9e1bd74bdd
commit 1c09089856
2 changed files with 7 additions and 31 deletions

View File

@ -33,16 +33,16 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1615205753,
"narHash": "sha256-XIYZwHzrTgRkwQ8Dl+yoFbkOHxPinWlp11X8m4IOxHQ=",
"owner": "ehmry",
"lastModified": 1617984351,
"narHash": "sha256-mo/tmR1sVmQ+4uziIAZpdNnr9AG0NAAo9Md3tucf73k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c5de11a19e5c30fce1b1abf5e3e71489e2666f5e",
"rev": "842f900e73c7ce985218cc4f455e34d1d56475c1",
"type": "github"
},
"original": {
"owner": "ehmry",
"ref": "genodepkgs",
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}

View File

@ -1,7 +1,7 @@
{
description = "Nix flavored Genode distribution";
inputs.nixpkgs.url = "github:ehmry/nixpkgs/genodepkgs";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
outputs = { self, nixpkgs, nimble }:
let
@ -101,30 +101,6 @@
}) erisInfo);
in assert length caps == 1; head caps;
generators = prev.generators // rec {
toDhall = { }:
x:
with builtins;
let concatItems = final.strings.concatStringsSep ", ";
in if isAttrs x then
"{ ${
concatItems (prev.attrsets.mapAttrsToList
(key: value: "${key} = ${toDhall { } value}") x)
} }"
else if isList x then
"[ ${concatItems (map (toDhall { }) x)} ]"
else if isString x || isPath x then
''"${x}"''
else if isInt x then
"${if x < 0 then "" else "+"}${toString}"
else if isFloat x then
toString x
else if isBool x then
(if x then "True" else "False")
else
"abort generators.toDhall: unhandled value (${x})";
};
uuidFrom = seed:
let digest = builtins.hashString "sha256" seed;
in (lib.lists.foldl ({ str, off }: