From b80f82378997b1c88b42df45ad2213cc89a050db Mon Sep 17 00:00:00 2001 From: Allan Espinosa Date: Fri, 11 Mar 2016 03:42:16 -0600 Subject: unrar: build on darwin --- pkgs/tools/archivers/unrar/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/tools/archivers') diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index cbfced7aa6b2..768c7afd7eb7 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0qw77gvr57azjbn76cjlm4sv1hf2hh90g7n7n33gfvlpnbs7mf3p"; }; + postPatch = '' + sed 's/^CXX=g++/#CXX/' -i makefile + ''; + buildPhase = '' make unrar make clean -- cgit 1.4.1 From fb6786de36437402882dcc135433477c39ecde44 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 18 Mar 2016 06:02:18 +0100 Subject: zpaq: 705 -> 706 Changes: - Fixes handling of some corrupted archives. - Conforms to new spec zpaq205.pdf. - New man page. - Add Makefile [and adapt Nix expression to use it]. --- pkgs/tools/archivers/zpaq/default.nix | 43 ++++++++++++++++------------------- 1 file changed, 19 insertions(+), 24 deletions(-) (limited to 'pkgs/tools/archivers') diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 2b761df3863f..fe5dc54a27dc 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -1,23 +1,14 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, perl, unzip }: let s = # Generated upstream information rec { baseName="zpaq"; - version="705"; + version="706"; name="${baseName}-${version}"; - hash="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq"; - url="http://mattmahoney.net/dc/zpaq705.zip"; - sha256="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq"; + hash="0wn5hs02aac61rjbba3s6wibyk73f1mfcbqnf34hcpyj2gl5i59k"; + url="http://mattmahoney.net/dc/zpaq706.zip"; + sha256="0wn5hs02aac61rjbba3s6wibyk73f1mfcbqnf34hcpyj2gl5i59k"; }; - isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD; - isx86 = stdenv.isi686 || stdenv.isx86_64; - compileFlags = with stdenv; "" - + (lib.optionalString (isUnix) " -Dunix -pthread") - + (lib.optionalString (isi686) " -march=i686") - + (lib.optionalString (isx86_64) " -march=nocona") - + (lib.optionalString (!isx86) " -DNOJIT") - + " -O3 -mtune=generic -DNDEBUG" - ; in stdenv.mkDerivation { inherit (s) name version; @@ -28,20 +19,24 @@ stdenv.mkDerivation { sourceRoot = "."; + nativeBuildInputs = [ perl /* for pod2man */ ]; buildInputs = [ unzip ]; - buildPhase = '' - g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so - g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaq.cpp -o zpaq + preBuild = let + CPPFLAGS = with stdenv; "" + + (lib.optionalString (!isi686 && !isx86_64) "-DNOJIT ") + + "-Dunix"; + CXXFLAGS = with stdenv; "" + + (lib.optionalString (isi686) "-march=i686 ") + + (lib.optionalString (isx86_64) "-march=nocona ") + + "-O3 -mtune=generic -DNDEBUG"; + in '' + buildFlagsArray=( "CPPFLAGS=${CPPFLAGS}" "CXXFLAGS=${CXXFLAGS}" ) ''; - installPhase = '' - mkdir -p "$out"/{bin,include,lib,share/doc/zpaq} - cp libzpaq.so "$out/lib" - cp zpaq "$out/bin" - cp libzpaq.h "$out/include" - cp readme.txt "$out/share/doc/zpaq" - ''; + enableParallelBuilding = true; + + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { inherit (s) version; -- cgit 1.4.1 From d7a0a99f7fbcdb1af3bfc3dadf4fc04f6b6ece4f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 20 Mar 2016 22:55:21 +0100 Subject: zpaq: 706 -> 707 Fixes v7.06 bug in creating multipart encrypted archives with incorrectly salted index. --- pkgs/tools/archivers/zpaq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/archivers') diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index fe5dc54a27dc..011793248cd7 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="706"; + version="707"; name="${baseName}-${version}"; - hash="0wn5hs02aac61rjbba3s6wibyk73f1mfcbqnf34hcpyj2gl5i59k"; - url="http://mattmahoney.net/dc/zpaq706.zip"; - sha256="0wn5hs02aac61rjbba3s6wibyk73f1mfcbqnf34hcpyj2gl5i59k"; + hash="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3"; + url="http://mattmahoney.net/dc/zpaq707.zip"; + sha256="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3"; }; in stdenv.mkDerivation { -- cgit 1.4.1 From 8db43cbd9dd9235752da680f8daf09a7b15839e8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 25 Mar 2016 06:16:31 +0000 Subject: innoextract: 1.5 -> 1.6 --- pkgs/tools/archivers/innoextract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/archivers') diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 6b442e7bf660..1f27730b19a0 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake, python, doxygen, lzma, boost}: stdenv.mkDerivation rec { - name = "innoextract-1.5"; + name = "innoextract-1.6"; src = fetchurl { url = "http://constexpr.org/innoextract/files/${name}.tar.gz"; - sha256 = "1ks8z8glak63xvqlv7dnmlzkjrwsn81lhybmai2mja6g5jclwngj"; + sha256 = "0gh3q643l8qlwla030cmf3qdcdr85ixjygkb7j4dbm7zbwa3yik6"; }; buildInputs = [ python doxygen lzma boost ]; -- cgit 1.4.1