diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-05 16:24:57 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-05 16:24:57 -0700 |
| commit | 0ecc61b4d7558b026ed1cd37136bee8d4cb3267c (patch) | |
| tree | df75a5c5a2dacf17c002ae97e65e8db36917990c /pkgs/tools/misc | |
| parent | e2c9270eb69deedddb99aa993dca02d6c27d6a74 (diff) | |
| parent | 3944e4f980c610848f6b297aef7b12db14abf401 (diff) | |
| download | nixlib-0ecc61b4d7558b026ed1cd37136bee8d4cb3267c.tar nixlib-0ecc61b4d7558b026ed1cd37136bee8d4cb3267c.tar.gz nixlib-0ecc61b4d7558b026ed1cd37136bee8d4cb3267c.tar.bz2 nixlib-0ecc61b4d7558b026ed1cd37136bee8d4cb3267c.tar.lz nixlib-0ecc61b4d7558b026ed1cd37136bee8d4cb3267c.tar.xz nixlib-0ecc61b4d7558b026ed1cd37136bee8d4cb3267c.tar.zst nixlib-0ecc61b4d7558b026ed1cd37136bee8d4cb3267c.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/gparted/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/misc/screenfetch/default.nix | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 847090101184..2b9c2297af28 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "gparted-0.22.0"; + name = "gparted-0.23.0"; src = fetchurl { - sha256 = "09vg5lxvh81x54ps5ayfjd4jl84wprn42i1wifnfmj44dqd5wxda"; + sha256 = "0m57bni3nkbbqq920ydzvasy2qc5j6w6bdssyn12jk4157gxvlbz"; url = "mirror://sourceforge/gparted/${name}.tar.bz2"; }; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { partitions. GParted enables you to change the partition organization while preserving the partition contents. ''; - homepage = http://gparted.sourceforge.net; + homepage = http://gparted.org; license = licenses.gpl2Plus; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index 418afee8135f..92cc800d83d3 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, makeWrapper -, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop +, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop, gnugrep }: stdenv.mkDerivation { @@ -28,6 +28,7 @@ stdenv.mkDerivation { --prefix PATH : "${findutils}/bin" \ --prefix PATH : "${xdpyinfo}/bin" \ --prefix PATH : "${xprop}/bin" \ + --prefix PATH : "${gnugrep}/bin" ''; meta = { |