Merge pull request #7744 from codyopel/sodium

libsodium: refactor & remove duplicate

pkgs/development/haskell-modules/hackage-packages.nix

@@ -107016,7 +107016,7 @@ self: {
 
   "saltine-quickcheck" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex
-     , QuickCheck, saltine, sodium, tasty, tasty-quickcheck
+     , QuickCheck, saltine, libsodium, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "saltine-quickcheck";
@@ -107028,12 +107028,12 @@ self: {
        testDepends = [
          base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck
        ];
-       extraLibraries = [ sodium ];
+       extraLibraries = [ libsodium ];
        jailbreak = true;
        homepage = "https://github.com/tsuraan/saltine-quickcheck";
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) sodium;};
+     }) { inherit (pkgs) libsodium;};
 
   "salvia" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, fclabels

pkgs/development/libraries/libsodium/default.nix

@@ -12,10 +12,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
-    description = "Version of NaCl with hardware tests at runtime, not build time";
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = stdenv.lib.platforms.all;
+  meta = with stdenv.lib; {
+    description = "A modern and easy-to-use crypto library";
+    homepage = http://doc.libsodium.org/;
+    license = licenses.isc;
+    maintainers = with maintainers; [ raskin viric ];
+    platforms = platforms.all;
   };
 }

pkgs/development/libraries/sodium/default.nix

@@ -1,28 +0,0 @@
-{stdenv, fetchurl}:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="sodium";
-    version="1.0.2";
-    name="${baseName}-${version}";
-    hash="06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn";
-    url="http://download.dnscrypt.org/libsodium/releases/libsodium-1.0.2.tar.gz";
-    sha256="06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn";
-  };
-  buildInputs = [
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
-  src = fetchurl {
-    inherit (s) url sha256;
-  };
-  meta = {
-    inherit (s) version;
-    description = ''A cryptography library with simple API'';
-    license = stdenv.lib.licenses.mit ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/development/libraries/sodium/default.upstream

@@ -1 +0,0 @@
-url http://download.dnscrypt.org/libsodium/releases/

pkgs/servers/nosql/hyperdex/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool,
-  python, sodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc,
+  python, libsodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc,
   flex, pandoc, help2man, autoconf-archive, callPackage }:
 
 assert stdenv.isLinux;

pkgs/servers/nosql/hyperdex/libmacaroons.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip, autoconf, automake, libtool, 
-  pkgconfig, sodium, python }:
+  pkgconfig, libsodium, python }:
 stdenv.mkDerivation rec {
   name = "libmacaroons-${version}";
   version = "HEAD";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     url = "https://github.com/rescrv/libmacaroons/archive/6febf3ce6c4c77a46d24b40ed29b03ffbfb175a7.zip";
     sha256 = "0b4qgim87398chvc3qhxfqv2l1cyl65rhyknln8lk0gq9y00p1ik";
   };
-  buildInputs = [ unzip autoconf automake libtool python sodium pkgconfig ];
+  buildInputs = [ unzip autoconf automake libtool python libsodium pkgconfig ];
   preConfigure = "autoreconf -i";
   
   meta = with stdenv.lib; {

pkgs/top-level/all-packages.nix

@@ -7649,8 +7649,6 @@ let
 
   socket_wrapper = callPackage ../development/libraries/socket_wrapper { };
 
-  sodium = callPackage ../development/libraries/sodium {};
-
   sofia_sip = callPackage ../development/libraries/sofia-sip { };
 
   soprano = callPackage ../development/libraries/soprano { };