diff options
| author | rushmorem <rushmore@webenchanter.com> | 2016-09-14 19:04:23 +0200 |
|---|---|---|
| committer | rushmorem <rushmore@webenchanter.com> | 2016-09-14 19:24:33 +0200 |
| commit | c34d83eb366245f3a7b3533713cc6a83bed090d5 (patch) | |
| tree | 795321984f10af18cc8fe4c5530bf6795769d37c /pkgs/tools/filesystems/lizardfs | |
| parent | 068106cf6a985b5ea5755d0bbad31f941804b62c (diff) | |
| download | nixpkgs-c34d83eb366245f3a7b3533713cc6a83bed090d5.tar nixpkgs-c34d83eb366245f3a7b3533713cc6a83bed090d5.tar.gz nixpkgs-c34d83eb366245f3a7b3533713cc6a83bed090d5.tar.bz2 nixpkgs-c34d83eb366245f3a7b3533713cc6a83bed090d5.tar.lz nixpkgs-c34d83eb366245f3a7b3533713cc6a83bed090d5.tar.xz nixpkgs-c34d83eb366245f3a7b3533713cc6a83bed090d5.tar.zst nixpkgs-c34d83eb366245f3a7b3533713cc6a83bed090d5.zip | |
lizardfs: 3.10.0 -> 3.10.2
Diffstat (limited to 'pkgs/tools/filesystems/lizardfs')
| -rw-r--r-- | pkgs/tools/filesystems/lizardfs/412.patch | 43 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/lizardfs/default.nix | 8 |
2 files changed, 3 insertions, 48 deletions
diff --git a/pkgs/tools/filesystems/lizardfs/412.patch b/pkgs/tools/filesystems/lizardfs/412.patch deleted file mode 100644 index a2890cad399..00000000000 --- a/pkgs/tools/filesystems/lizardfs/412.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 26a27dedb7bee36f3ac5f48e22b977ea001d5903 Mon Sep 17 00:00:00 2001 -From: Maksymilian Paszkiewicz <mpaszkiewicz@skytechnology.pl> -Date: Mon, 23 May 2016 12:25:19 +0200 -Subject: [PATCH] common: Fix minor compile and copyright issues - -This commit adds include <cmath> directive to -slice_read_planner.cc and fixes copyright -statement in filesystem_operations.cc - -Closes #411 -Closes #412 - -Change-Id: I3ac995708a09f64e1389871be2e961d594e4bc68 ---- - src/common/slice_read_planner.cc | 2 ++ - src/master/filesystem_operations.cc | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/common/slice_read_planner.cc b/src/common/slice_read_planner.cc -index 94c106c..d0284f1 100644 ---- a/src/common/slice_read_planner.cc -+++ b/src/common/slice_read_planner.cc -@@ -20,6 +20,8 @@ - - #include "common/slice_read_planner.h" - -+#include <cmath> -+ - /*! - * Prepares read planner for serving selected parts of a slice type. - * Firstly, function checks if: -diff --git a/src/master/filesystem_operations.cc b/src/master/filesystem_operations.cc -index 69ff270..dc30b1f 100644 ---- a/src/master/filesystem_operations.cc -+++ b/src/master/filesystem_operations.cc -@@ -1,5 +1,6 @@ - /* -- Copyright 2013-2015 Skytechnology sp. z o.o.. -+ Copyright 2005-2010 Jakub Kruszona-Zawadzki, Gemius SA, 2013-2014 EditShare, -+ 2013-2016 Skytechnology sp. z o.o.. - - This file is part of LizardFS. - diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 0301d2e18fb..a50d8341f6b 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { name = "lizardfs-${version}"; - version = "3.10.0"; + version = "3.10.2"; src = fetchFromGitHub { owner = "lizardfs"; repo = "lizardfs"; - rev = "v.${version}"; - sha256 = "18p2pj9crjqgxxxzdfcs3j3fqhinmwi7qxcf71jsw17syqwyygh8"; + rev = "v${version}"; + sha256 = "0xw6skprxw0wcbqh4yx8f8a4q00x0sfz42llqgd047bcbga1k5zg"; }; buildInputs = @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { zlib boost pkgconfig judy pam makeWrapper ]; - patches = [ ./412.patch ]; - postInstall = '' wrapProgram $out/sbin/lizardfs-cgiserver \ --prefix PATH ":" "${python}/bin" |