diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-31 17:26:20 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-31 17:26:20 -0700 |
| commit | 09b4a7cc1bdb0392c385a630168b3c8430e475c5 (patch) | |
| tree | 8e1e72e845fc6a39e154e2666ac04fee98430f45 /pkgs/tools/misc | |
| parent | cb7c053383ff76a454484992b3a6d6a2f1530c15 (diff) | |
| parent | 85e2c8ff23feb5f6344acde44d8b51d46c4ba89a (diff) | |
| download | nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.tar nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.tar.gz nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.tar.bz2 nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.tar.lz nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.tar.xz nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.tar.zst nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/entr/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/tools/misc/pipelight/pipelight.patch | 4 |
2 files changed, 34 insertions, 2 deletions
diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix new file mode 100644 index 000000000000..8770a5858875 --- /dev/null +++ b/pkgs/tools/misc/entr/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, coreutils, ncurses }: + +stdenv.mkDerivation rec { + name = "entr-${version}"; + version = "3.2"; + + src = fetchurl { + url = "http://entrproject.org/code/${name}.tar.gz"; + sha256 = "0ikigpfzyjmr8j6snwlvxzqamrjbhlv78m8w1h0h7kzczc5f1vmi"; + }; + + postPatch = '' + substituteInPlace Makefile.bsd --replace /bin/echo echo + substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat + substituteInPlace entr.c --replace /usr/bin/clear ${ncurses}/bin/clear + substituteInPlace entr.1 --replace /bin/cat cat + substituteInPlace entr.1 --replace /usr/bin/clear clear + ''; + dontAddPrefix = true; + doCheck = true; + checkTarget = "test"; + installFlags = [ "PREFIX=$(out)" ]; + + meta = { + homepage = http://entrproject.org/; + description = "Run arbitrary commands when files change."; + + license = stdenv.lib.licenses.isc; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/pipelight/pipelight.patch b/pkgs/tools/misc/pipelight/pipelight.patch index bde6ecf943d9..66dd0fdab4c0 100644 --- a/pkgs/tools/misc/pipelight/pipelight.patch +++ b/pkgs/tools/misc/pipelight/pipelight.patch @@ -43,7 +43,7 @@ diff -urN pipelight.old/bin/pipelight-plugin.in pipelight.new/bin/pipelight-plug -fi +download_file() +{ -+ curl --cacert /etc/ssl/certs/ca-bundle.crt -o "$1" "$2" ++ curl --cacert /etc/ssl/certs/ca-certificates.crt -o "$1" "$2" +} # Use shasum instead of sha256sum on MacOS / *BSD @@ -111,7 +111,7 @@ diff -urN pipelight.old/share/install-dependency pipelight.new/share/install-dep -fi +download_file() +{ -+ curl --cacert /etc/ssl/certs/ca-bundle.crt -o "$1" "$2" ++ curl --cacert /etc/ssl/certs/ca-certificates.crt -o "$1" "$2" +} +get_download_size() +{ |