git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #141509 from Artturin/ncompressmodernise

ncompress: modernize build and switch to a github source

commit2138b27b1809616dd81290a81e6d7a5bf3571e71 authorMichael Raskin <7c6f434c@mail.ru> dateFri 15 Oct 2021, 04:57 (5 years ago) parentf2a619b510de41
3 files changed+17−26
pkgs/development/python-modules/binwalk/default.nix+1−2 pkgs/tools/compression/ncompress/builder.sh−15 pkgs/tools/compression/ncompress/default.nix+16−9
pkgs/development/python-modules/binwalk/default.nix+1−2
@@ -4,7 +4,6 @@
44, stdenv
55, zlib
66, xz
7−, ncompress
87, gzip
98, bzip2
109, gnutar
@@ -31,7 +30,7 @@ buildPythonPackage rec {
3130 sha256 = "sha256-lfHXutAp06Xr/TSBpDwBUBC/mWI9XuyImoKwA3inqgU=";
3231 };
3332
34− propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ]
33+ propagatedBuildInputs = [ zlib xz gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ]
3534 ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ]
3635 ++ lib.optionals (!stdenv.isDarwin) [ cramfsprogs cramfsswap sasquatch ];
3736
pkgs/tools/compression/ncompress/builder.shdeleted−15
@@ -1,15 +0,0 @@
1−source $stdenv/setup
2−installFlags="PREFIX=$out"
3−
4−preBuild() {
5− cp Makefile.def Makefile
6− sed -i GNUmakefile -e 's/compress %/%/g'
7−}
8−
9−postInstall() {
10− rm $out/bin/uncompress* $out/bin/zcat*
11− ln -s compress $out/bin/uncompress
12− ln -s compress $out/bin/zcat
13−}
14−
15−genericBuild
pkgs/tools/compression/ncompress/default.nix+16−9
@@ -1,20 +1,27 @@
1−{lib, stdenv, fetchurl}:
1+{ lib, stdenv, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
44 pname = "ncompress";
55 version = "5.0";
66
7− builder = ./builder.sh;
8−
9− src = fetchurl {
10− url = "mirror://sourceforge/project/ncompress/${pname}-${version}.tar.gz";
11− sha256 = "004r086c11sw9vg2j3srgxpz98w8pycjl33bk3pgqnd0s92igrn4";
7+ src = fetchFromGitHub {
8+ owner = "vapier";
9+ repo = "ncompress";
10+ rev = "v${version}";
11+ sha256 = "sha256-Yhs3C5/kR7Ve56E84usYJprxIMAIwXVahLi1N9TIfj0=";
1212 };
1313
14− meta = {
14+ makeFlags = [ "PREFIX=$(out)" ];
15+ installTargets = "install_core";
16+
17+ postInstall = ''
18+ mv $out/bin/uncompress $out/bin/uncompress-ncompress
19+ '';
20+
21+ meta = with lib; {
1522 homepage = "http://ncompress.sourceforge.net/";
16− license = lib.licenses.publicDomain;
23+ license = licenses.publicDomain;
1724 description = "A fast, simple LZW file compressor";
18− platforms = lib.platforms.unix;
25+ platforms = platforms.unix;
1926 };
2027}