diff options
author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:33 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:38 +0300 |
commit | 003473613a084b38a1f0335ba8035461b4190e5d (patch) | |
tree | cc4598d81eb607acba0d89664fe13fd44138dd7e /pkgs/tools/misc | |
parent | 39696b6d56fbe93834a8997057b3507e8cd2a234 (diff) | |
parent | 50bbc56b0bd87715bc17230365fe5eb441bfac68 (diff) | |
download | nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.gz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.bz2 nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.lz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.xz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.zst nixlib-003473613a084b38a1f0335ba8035461b4190e5d.zip |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/bashplotlib/default.nix | 23 | ||||
-rw-r--r-- | pkgs/tools/misc/debianutils/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/debootstrap/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/neofetch/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/you-get/default.nix | 4 |
5 files changed, 31 insertions, 8 deletions
diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix new file mode 100644 index 000000000000..2757f5f3e215 --- /dev/null +++ b/pkgs/tools/misc/bashplotlib/default.nix @@ -0,0 +1,23 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonApplication rec { + pname = "bashplotlib-${version}"; + version = "2017-10-11"; + + src = fetchFromGitHub { + owner = "glamp"; + repo = "bashplotlib"; + rev = "fdc52be2c1fed13753692eced328143ab1db6f3d"; + sha256 = "1ycql6j65zywyav2n3c0x1i5cm9w6glzqc3v0cgdvv1bdg4wi0gf"; + }; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/glamp/bashplotlib; + description = "Plotting in the terminal"; + maintainers = with maintainers; [ dtzWill ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index d93cc479a803..bec0cbbd2b9b 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.8.4"; + version = "4.8.6"; name = "debianutils-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz"; - sha256 = "1chypq3dbkgvl16lgzdvqvlr7cdm3814nqmp8ch8j7x6mscsnqf0"; + sha256 = "0wrz8ak4896f5i8wirijr9hdvc43xzxpg2gjs0snmpys8iqh82fv"; }; meta = { diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 7b143183bc0c..0ed883bf342b 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.97"; + version = "1.0.98"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1w2wdiazfykjkwainxfk72rccqsh1l1i90h93phsvayv0gsbxrnk"; + sha256 = "07wfvjhzc5schhpn1dkvhwbi115yn4f1q99g0g39m79bbyxm50d8"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 097eb2408f85..cece77b8d3e6 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "3.4.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "10h4f7n6bllbq459nm9wppvk65n81zzv556njfqplzw3mpdrbiyx"; + sha256 = "1ijg6fmrqjgn87899q8cpbir93hqrq4070wzm62s9nmggdgzx6mn"; }; dontBuild = true; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index f0a8eda00285..bfce454473ad 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1060"; + version = "0.4.1077"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1c4drn6khqrjvyzzsiaracnpcvahbiya6v5p18h2lyl7xia8gk51"; + sha256 = "1qf4n1zgbr533a0qbxp8548f25jwqdwfl42gi5dyfhm4f1y1jk1a"; }; meta = with stdenv.lib; { |