diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 12:19:01 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 12:19:01 +0100 |
| commit | 6345089ca0af23a29387f48060a53dff0d0d30f5 (patch) | |
| tree | aa11989838217951662f46c011205e11d525e4dc /pkgs/top-level/all-packages.nix | |
| parent | 658951917437e7d587c8a206cc6497a7f1192891 (diff) | |
| parent | e69a3248f7c8308b0d583941e8f1bb1a99a431a7 (diff) | |
| download | nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.gz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.bz2 nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.lz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.xz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.zst nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.zip | |
Merge #29392: gnome3: 3.24 -> 3.26
It might be slightly confusing that a couple of the changes will be twice in the history, but let's merge this way.
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d323b48013f..59ac6093674f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9683,7 +9683,6 @@ with pkgs; giflib = giflib_5_1; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; - giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { }; giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; libungif = callPackage ../development/libraries/giflib/libungif.nix { }; @@ -16905,9 +16904,9 @@ with pkgs; }; deepin-terminal = callPackage ../applications/misc/deepin-terminal { - vte = gnome3.vte; + inherit (gnome3) libgee vte; wnck = libwnck3; - gee = libgee_0_8; + vala = vala_0_34; }; termite = callPackage ../applications/misc/termite { |