Merge branch 'master' into hardened-stdenv

pkgs/shells/elvish/deps.json

@@ -1,9 +1,20 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/mattn/go-sqlite3",
-      "github.com/elves/getopt"
-    ]
-  }
+    {
+        "goPackagePath": "github.com/elves/getopt",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/elves/getopt",
+            "rev": "f91a7bf920995832d55a1182f26657bc975b9c24",
+            "sha256": "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mattn/go-sqlite3",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mattn/go-sqlite3",
+            "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42",
+            "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"
+        }
+    }
 ]

pkgs/shells/oh/deps.json

@@ -1,10 +1,29 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/michaelmacinnis/adapted",
-      "github.com/peterh/liner",
-      "golang.org/x/sys"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/sys",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/sys",
+            "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f",
+            "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"
+        }
+    },
+    {
+        "goPackagePath": "github.com/michaelmacinnis/adapted",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/michaelmacinnis/adapted",
+            "rev": "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978",
+            "sha256": "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv"
+        }
+    },
+    {
+        "goPackagePath": "github.com/peterh/liner",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/peterh/liner",
+            "rev": "ad1edfd30321d8f006ccf05f1e0524adeb943060",
+            "sha256": "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317"
+        }
+    }
 ]