diff options
| author | Ian-Woo Kim <ianwookim@gmail.com> | 2014-10-07 16:16:00 +0200 |
|---|---|---|
| committer | Ian-Woo Kim <ianwookim@gmail.com> | 2014-10-07 16:16:00 +0200 |
| commit | 6d724303c35d95c906e2a19bee387a15a75b1973 (patch) | |
| tree | a10e8b879503dff88e85dc1024b5ddf9a28ef148 /pkgs/tools/system | |
| parent | 526b4d9f797efd3a3283276cd952dbb7a139e72f (diff) | |
| parent | 4d246d00e5ce203739d3746791e24a337f41665c (diff) | |
| download | nixlib-6d724303c35d95c906e2a19bee387a15a75b1973.tar nixlib-6d724303c35d95c906e2a19bee387a15a75b1973.tar.gz nixlib-6d724303c35d95c906e2a19bee387a15a75b1973.tar.bz2 nixlib-6d724303c35d95c906e2a19bee387a15a75b1973.tar.lz nixlib-6d724303c35d95c906e2a19bee387a15a75b1973.tar.xz nixlib-6d724303c35d95c906e2a19bee387a15a75b1973.tar.zst nixlib-6d724303c35d95c906e2a19bee387a15a75b1973.zip | |
Merge remote-tracking branch 'nixos/master' into proot
Conflicts: pkgs/tools/system/proot/default.nix
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/at/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/system/ddrescue/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 5108174c8870..9a6e610389bb 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/var/setuid-wrappers/sendmail" }: stdenv.mkDerivation { - name = "at-3.1.15"; + name = "at-3.1.16"; src = fetchurl { # Debian is apparently the last location where it can be found. - url = mirror://debian/pool/main/a/at/at_3.1.15.orig.tar.gz; - sha256 = "1z7pgglr0zmwapb4sc1bdb3z0hgig1asyzqv4gs5xafmjd94za03"; + url = mirror://debian/pool/main/a/at/at_3.1.16.orig.tar.gz; + sha256 = "1hfmnhgi95vsfaa69qlakpwd22al0m0rhqms6sawxvaldafgb6nb"; }; patches = [ ./install.patch ]; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index e247c84dcf90..a164a26fbcd6 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lzip }: stdenv.mkDerivation rec { - name = "ddrescue-1.18.1"; + name = "ddrescue-1.19"; src = fetchurl { url = "mirror://gnu/ddrescue/${name}.tar.lz"; - sha256 = "1ad1ifby89wys8lxh4d24y5lih6hkz54jhv6sf6bs1i7sd7lnqaq"; + sha256 = "1f278w7i9sx45jk6fsw1kyzx743k3alx1c4w1q8sk05ckafhr3gd"; }; buildInputs = [ lzip ]; |