diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-03-06 11:48:57 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-03-06 11:48:57 +0200 |
| commit | ad47355786a24be1c86ee674c74cb774c469fb52 (patch) | |
| tree | 5320ae68bf71f9e6e2ebe018979489081d63a454 /pkgs/tools/misc | |
| parent | a6d19c28f158722ce650a3a1ede352ee4179cdcf (diff) | |
| parent | 54c7ef17a913fde534a22edbe5557aa24d1f4847 (diff) | |
| download | nixlib-ad47355786a24be1c86ee674c74cb774c469fb52.tar nixlib-ad47355786a24be1c86ee674c74cb774c469fb52.tar.gz nixlib-ad47355786a24be1c86ee674c74cb774c469fb52.tar.bz2 nixlib-ad47355786a24be1c86ee674c74cb774c469fb52.tar.lz nixlib-ad47355786a24be1c86ee674c74cb774c469fb52.tar.xz nixlib-ad47355786a24be1c86ee674c74cb774c469fb52.tar.zst nixlib-ad47355786a24be1c86ee674c74cb774c469fb52.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/bdf2psf/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/ms-sys/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 192aed7489d3..c6591927657c 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.134"; + version = "1.137"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1am5ka5qrbh60jjihzqac03ii3ydprvqm3w54dc55a0zwl61njsz"; + sha256 = "08pgpwg0ccf0j4r8dbaadh1yr4h4fnvkfb5ym49kwvm2p2vxdq32"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index c0b1de6c1e8c..4d6a317276a0 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ms-sys-${version}"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { url = "mirror://sourceforge/ms-sys/${name}.tar.gz"; - sha256 = "0c7ld5pglcacnrvy2gzzg1ny1jyknlj9iz1mvadq3hn8ai1d83px"; + sha256 = "0mijf82cbji4laip6hiy3l5ka5mzq5sivjvyv7wxnc2fd3v7hgp0"; }; buildInputs = [ gettext ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - description = "A program for writing Microsoft compatible boot records"; + description = "A program for writing Microsoft-compatible boot records"; homepage = http://ms-sys.sourceforge.net/; license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index c45c62cb3ada..d4c920f4acc8 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20160122"; + name = "parallel-20160222"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1xs8y8jh7wyjs27079xz0ja7xfi4dywz8d6hbkl44mafdnnfjfiy"; + sha256 = "1sjmvinwr9j2a0jdk9y9nf2x4hhzcbl529slkwpz0vva0cwybywd"; }; nativeBuildInputs = [ makeWrapper ]; |