diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-03-17 11:28:28 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-03-17 11:28:28 +0100 |
| commit | b1eeae8cacf4e32f25781f9835312b545365468d (patch) | |
| tree | b241b3c5394d6f62909296cd36c49924f0fef627 /pkgs/desktops/xfce | |
| parent | 516133a4fd078514f54dcd00c5b56f641e7bb9dc (diff) | |
| parent | 8acaea6d5717866133ad00e3f6f05ef7b84be176 (diff) | |
| download | nixpkgs-b1eeae8cacf4e32f25781f9835312b545365468d.tar nixpkgs-b1eeae8cacf4e32f25781f9835312b545365468d.tar.gz nixpkgs-b1eeae8cacf4e32f25781f9835312b545365468d.tar.bz2 nixpkgs-b1eeae8cacf4e32f25781f9835312b545365468d.tar.lz nixpkgs-b1eeae8cacf4e32f25781f9835312b545365468d.tar.xz nixpkgs-b1eeae8cacf4e32f25781f9835312b545365468d.tar.zst nixpkgs-b1eeae8cacf4e32f25781f9835312b545365468d.zip | |
Merge branch 'master' into x-updates
Conflicts (easy): pkgs/desktops/xfce/core/xfdesktop.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/pango/default.nix
Diffstat (limited to 'pkgs/desktops/xfce')
| -rw-r--r-- | pkgs/desktops/xfce/core/xfdesktop.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index b106cccbf6d..8067e1841ca 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfdesktop"; ver_maj = "4.10"; - ver_min = "1"; + ver_min = "2"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1bfl2xzmci7vqwwz2k2gp7ykysjnq9dcwpnzkwbpv5hv3qwgx0r8"; + sha256 = "0zbrvfj4fxnjz593brxjsjy9pv5bbf12jnbydy4pwc1ya6zf19j9"; }; name = "${p_name}-${ver_maj}.${ver_min}"; |