diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2017-04-02 19:50:28 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-04-02 20:11:44 +0200 |
| commit | a77571399d71167bf16b4183090a6f7e203d7e0f (patch) | |
| tree | 2f9cd4c704ec8bed33369e20ea3f56b485608e93 /pkgs/top-level | |
| parent | 3490c39f38ad467ad805f390ca881e7ba529a087 (diff) | |
| download | nixlib-a77571399d71167bf16b4183090a6f7e203d7e0f.tar nixlib-a77571399d71167bf16b4183090a6f7e203d7e0f.tar.gz nixlib-a77571399d71167bf16b4183090a6f7e203d7e0f.tar.bz2 nixlib-a77571399d71167bf16b4183090a6f7e203d7e0f.tar.lz nixlib-a77571399d71167bf16b4183090a6f7e203d7e0f.tar.xz nixlib-a77571399d71167bf16b4183090a6f7e203d7e0f.tar.zst nixlib-a77571399d71167bf16b4183090a6f7e203d7e0f.zip | |
surf: 0.7 -> 2.0
This renders surf-webkit2 obsolete; it is now aliased to surf.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 324e2d35cfd2..9dca8e7e26cd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -121,6 +121,7 @@ doNotDisplayTwice rec { speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 sshfsFuse = sshfs-fuse; # added 2016-09 + surf-webkit2 = surf; # added 2017-04-02 system_config_printer = system-config-printer; # added 2016-01-03 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 tftp_hpa = tftp-hpa; # added 2015-04-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a96fade045f..840cfb3c4fb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15561,11 +15561,7 @@ with pkgs; subunit = callPackage ../development/libraries/subunit { }; - surf = callPackage ../applications/networking/browsers/surf { - webkit = webkitgtk2; - }; - - surf-webkit2 = callPackage ../applications/networking/browsers/surf/webkit2.nix { }; + surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; |