summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2017-10-13 11:04:27 +0800
committerGitHub <noreply@github.com>2017-10-13 11:04:27 +0800
commitf2e7019346eb5c65992eca474a6b332ceb558083 (patch)
treec0d0145cf75b907498d575ea956375241f89d857 /pkgs/development/libraries
parent829730d38f19c203ad6c9e052964a9b65ae43a2b (diff)
parent515ea69f098432e20d07f9b72c530b22344dfe61 (diff)
downloadnixpkgs-f2e7019346eb5c65992eca474a6b332ceb558083.tar
nixpkgs-f2e7019346eb5c65992eca474a6b332ceb558083.tar.gz
nixpkgs-f2e7019346eb5c65992eca474a6b332ceb558083.tar.bz2
nixpkgs-f2e7019346eb5c65992eca474a6b332ceb558083.tar.lz
nixpkgs-f2e7019346eb5c65992eca474a6b332ceb558083.tar.xz
nixpkgs-f2e7019346eb5c65992eca474a6b332ceb558083.tar.zst
nixpkgs-f2e7019346eb5c65992eca474a6b332ceb558083.zip
Merge pull request #30340 from peterhoeg/p/cryfs
cryfs: init at 0.9.7 and minor updates to dependencies (scrypt and spdlog)
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/spdlog/default.nix15
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
index a47eabe5d8d..1c9e67f8767 100644
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/pkgs/development/libraries/spdlog/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "spdlog-${version}";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
-    owner = "gabime";
-    repo = "spdlog";
-    rev = "v${version}";
-    sha256 = "0pfagrkq6afpkl269vbi1fd6ckakzpr5b5cbapb8rr7hgsrilxza";
+    owner  = "gabime";
+    repo   = "spdlog";
+    rev    = "v${version}";
+    sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
   # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ];
 
@@ -28,8 +28,5 @@ stdenv.mkDerivation rec {
     license        = licenses.mit;
     maintainers    = with maintainers; [ obadz ];
     platforms      = platforms.all;
-
-    # This is a header-only library, no point in hydra building it:
-    hydraPlatforms = [];
   };
 }