Merge branch 'master' into hardened-stdenv

2016-08-13 16:59:55 +02:00
parent fa3a35b241 79149ac12d
commit bd4490e277
106 changed files with 3736 additions and 2595 deletions
@@ -1,19 +1,101 @@
 [
-  {
-    "include": "../../libs.json",
-    "packages": [
-      "github.com/aybabtme/rgbterm",
-      "github.com/vaughan0/go-ini",
-      "github.com/howeyc/gopass",
-      "github.com/AdRoll/hologram",
-      "github.com/mitchellh/go-homedir",
-      "github.com/goamz/goamz",
-      "github.com/nmcclain/asn1-ber",
-      "gopkg.in/asn1-ber.v1",
-      "github.com/peterbourgon/g2s",
-      "github.com/nmcclain/ldap",
-      "github.com/golang/protobuf",
-      "golang.org/x/crypto"
-    ]
-  }
+    {
+        "goPackagePath": "golang.org/x/crypto",
+        "fetch": {
+            "type": "git",
+            "url": "https://go.googlesource.com/crypto",
+            "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+            "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/golang/protobuf",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/golang/protobuf",
+            "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+            "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/howeyc/gopass",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/howeyc/gopass",
+            "rev": "2c70fa70727c953c51695f800f25d6b44abb368e",
+            "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"
+        }
+    },
+    {
+        "goPackagePath": "github.com/aybabtme/rgbterm",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/aybabtme/rgbterm",
+            "rev": "c07e2f009ed2311e9c35bca12ec00b38ccd48283",
+            "sha256": "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam"
+        }
+    },
+    {
+        "goPackagePath": "github.com/vaughan0/go-ini",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/vaughan0/go-ini",
+            "rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1",
+            "sha256": "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"
+        }
+    },
+    {
+        "goPackagePath": "github.com/mitchellh/go-homedir",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/mitchellh/go-homedir",
+            "rev": "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4",
+            "sha256": "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/goamz/goamz",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/goamz/goamz",
+            "rev": "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7",
+            "sha256": "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b"
+        }
+    },
+    {
+        "goPackagePath": "github.com/nmcclain/asn1-ber",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/go-asn1-ber/asn1-ber",
+            "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72",
+            "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"
+        }
+    },
+    {
+        "goPackagePath": "gopkg.in/asn1-ber.v1",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/go-asn1-ber/asn1-ber",
+            "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72",
+            "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"
+        }
+    },
+    {
+        "goPackagePath": "github.com/peterbourgon/g2s",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/peterbourgon/g2s",
+            "rev": "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc",
+            "sha256": "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj"
+        }
+    },
+    {
+        "goPackagePath": "github.com/nmcclain/ldap",
+        "fetch": {
+            "type": "git",
+            "url": "https://github.com/go-ldap/ldap",
+            "rev": "83e65426fd1c06626e88aa8a085e5bfed0208e29",
+            "sha256": "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz"
+        }
+    }
 ]
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "shc-${version}";
+  version = "3.9.3";
+  rev = "${version}";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "neurobin";
+    repo = "shc";
+    sha256 = "00fqzg4a0f4kp4wr8swhi5zqds3gh3gf7cgi1cipn16av0818xsa";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://neurobin.github.io/shc;
+    description = "Shell Script Compiler";
+    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3;
+  };
+}