Browse Source

Update Nixpkgs flake input

posix
Emery Hemingway 8 months ago
parent
commit
6889fb09c2
3 changed files with 10 additions and 12 deletions
  1. 9
    9
      flake.lock
  2. 1
    1
      flake.nix
  3. 0
    2
      overlay/default.nix

+ 9
- 9
flake.lock View File

@@ -3,11 +3,11 @@
3 3
     "genode": {
4 4
       "flake": false,
5 5
       "locked": {
6
-        "lastModified": 1602243357,
7
-        "narHash": "sha256-1Q3D8W8xujTW38CxhXvQIFfxeKuLvBoCzmROiMPxVKA=",
6
+        "lastModified": 1603455398,
7
+        "narHash": "sha256-/ABZEGffnm6Tp3mem1MbMpL1TQbc+LcprQELvvox0Ks=",
8 8
         "owner": "genodelabs",
9 9
         "repo": "genode",
10
-        "rev": "91f82816189c1aad5d03168cc86c4b4946787b5c",
10
+        "rev": "5be1c793a5c600b37f3df346b7438ad2aced9fc6",
11 11
         "type": "github"
12 12
       },
13 13
       "original": {
@@ -18,16 +18,16 @@
18 18
     },
19 19
     "nixpkgs": {
20 20
       "locked": {
21
-        "lastModified": 1603868764,
22
-        "narHash": "sha256-WPummiqYWunZJ3sXUN1ez3ww68YZdnR5VhLEttn17Cw=",
23
-        "owner": "NixOS",
21
+        "lastModified": 1604174028,
22
+        "narHash": "sha256-b/AMdA8G3JIgErvqNJD0QwiqeD2LWw+aVFLlL9VQK7Y=",
23
+        "owner": "ehmry",
24 24
         "repo": "nixpkgs",
25
-        "rev": "5596cbfb9e914989ffe62cf7e21f332acb3b05b9",
25
+        "rev": "098487ccb89e3771f4a63a3b2faf500c4002f65e",
26 26
         "type": "github"
27 27
       },
28 28
       "original": {
29
-        "owner": "NixOS",
30
-        "ref": "release-20.09",
29
+        "owner": "ehmry",
30
+        "ref": "genodepkgs",
31 31
         "repo": "nixpkgs",
32 32
         "type": "github"
33 33
       }

+ 1
- 1
flake.nix View File

@@ -6,7 +6,7 @@
6 6
     flake = false;
7 7
   };
8 8
 
9
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-20.09";
9
+  inputs.nixpkgs.url = "github:ehmry/nixpkgs/genodepkgs";
10 10
 
11 11
   outputs = { self, genode, nixpkgs }:
12 12
     let

+ 0
- 2
overlay/default.nix View File

@@ -110,8 +110,6 @@ in {
110 110
 
111 111
   solo5-tools = callPackage ./solo5-tools { };
112 112
 
113
-  tup = prev.tup.overrideAttrs (attrs: { setupHook = ./tup/setup-hook.sh; });
114
-
115 113
   zlib = overrideHostAttrs zlib (attrs: {
116 114
     postInstall = attrs.postInstall or "" + ''
117 115
       pushd ''${!outputLib}/lib

Loading…
Cancel
Save