Pick up nlewo/nix2container#126, fix for cachix/devenv#1083

jab · Mar 31, 2024 · cbaf48e · cbaf48e
1 parent 7592b9d
commit cbaf48e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 10 deletions.
diff --git a/devenv.lock b/devenv.lock
@@ -123,6 +123,21 @@
         "type": "github"
       }
     },
+    "mk-shell-bin": {
+      "locked": {
+        "lastModified": 1677004959,
+        "owner": "rrbutani",
+        "repo": "nix-mk-shell-bin",
+        "rev": "ff5d8bd4d68a347be5042e2f16caee391cd75887",
+        "treeHash": "496327dabdc787353a29987f492dd4939151baad",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rrbutani",
+        "repo": "nix-mk-shell-bin",
+        "type": "github"
+      }
+    },
     "nix2container": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -131,11 +146,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708764364,
+        "lastModified": 1711883218,
         "owner": "nlewo",
         "repo": "nix2container",
-        "rev": "c891f90d2e3c48a6b33466c96e4851e0fc0cf455",
-        "treeHash": "747af167fd4350bd81b11ce824a756bb85b1757c",
+        "rev": "2154ad0459abfa258edaab038b4716f474656e99",
+        "treeHash": "d849a384060d067343dc61834cfdb482447d589b",
         "type": "github"
       },
       "original": {
@@ -223,11 +238,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1711519547,
+        "lastModified": 1711850184,
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a",
-        "treeHash": "a2d07a1647ab5265bebc6a0141c89c455eefefcb",
+        "rev": "9fc61b5eb0e50fc42f1d358f5240722907b79726",
+        "treeHash": "12717080b383a97c635c70e3e165b60e0c2ec60c",
         "type": "github"
       },
       "original": {
@@ -239,6 +254,7 @@
     "root": {
       "inputs": {
         "devenv": "devenv",
+        "mk-shell-bin": "mk-shell-bin",
         "nix2container": "nix2container",
         "nixpkgs": "nixpkgs",
         "nixpkgs-python": "nixpkgs-python",

diff --git a/devenv.yaml b/devenv.yaml
@@ -1,10 +1,12 @@
 inputs:
-  nixpkgs:
-    url: github:NixOS/nixpkgs/nixpkgs-unstable
-  nixpkgs-python:
-    url: github:cachix/nixpkgs-python
+  mk-shell-bin:
+    url: github:rrbutani/nix-mk-shell-bin
   nix2container:
     url: github:nlewo/nix2container
     inputs:
       nixpkgs:
         follows: nixpkgs
+  nixpkgs-python:
+    url: github:cachix/nixpkgs-python
+  nixpkgs:
+    url: github:NixOS/nixpkgs/nixpkgs-unstable