diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-20 14:54:53 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-20 14:54:53 -0700 |
| commit | 3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270 (patch) | |
| tree | 27521a28a39c219ddd0031faafeb3bb8ba8322ae /pkgs/desktops | |
| parent | 1bada3e658d529d13d0fc7f4e83f9556ccefd327 (diff) | |
| parent | 4a074fae2b9e89e69a36c5278c891d6da362fe19 (diff) | |
| download | nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.tar nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.tar.gz nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.tar.bz2 nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.tar.lz nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.tar.xz nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.tar.zst nixlib-3fcbd5a8298c8fc92dfea24e82bb97e0adf9a270.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/xfce/core/exo.nix | 10 | ||||
| -rw-r--r-- | pkgs/desktops/xfce/default.nix | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index b0958d232fc7..7d5447ae52ab 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { majorVersion = "0.3"; - minorVersion = "0.1"; + minorVersion = "1.3"; name = "pantheon-terminal-${majorVersion}.${minorVersion}"; src = fetchurl { url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz"; - sha256 = "14wspqxp79myyyjngr1x7jg1kw15g3nm2pav2zffp8xs16s1i5za"; + sha256 = "0bfrqxig26i9qhm15kk7h9lgmzgnqada5snbbwqkp0n0pnyyh4ss"; }; preConfigure = '' diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index f48a3e3808bd..83610a4e4a65 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { p_name = "exo"; ver_maj = "0.10"; - ver_min = "6"; + ver_min = "7"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1cc0e5a432e050a5e5aa64d126b988f4440da4f27474aaf42a4d8e13651d0752"; + sha256 = "521581481128af93e815f9690020998181f947ac9e9c2b232b1f144d76b1b35c"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { + meta = with stdenv.lib; { homepage = "http://www.xfce.org/projects/${p_name}"; description = "Application library for the Xfce desktop environment"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 459158a136ac..f2a9f848342c 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -4,7 +4,7 @@ let callPackage = newScope (deps // xfce_self); -deps = rec { # xfce-global dependency overrides should be here +deps = { # xfce-global dependency overrides should be here inherit (pkgs.gnome) libglade libwnck vte gtksourceview; inherit (pkgs.perlPackages) URI; }; |