diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-11-26 11:27:09 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-11-26 11:27:09 +0100 |
commit | 925b3356077e2791bf636f68fa4e8cc93d6961bf (patch) | |
tree | 2f8f61fdd095cfef2fdb074d2233ad5e7e3dc664 /pkgs/desktops | |
parent | b191034d8ad7ba5f490d1a8751d298b7b5a528b0 (diff) | |
parent | 8ebfce0eda627ffa739e16279ac543f4d50cd60c (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/desktops')
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix index 23cdf41d5c0b5..3df800f402d46 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/action/show/Apps/Calculator; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = gnome3.maintainers; - license = licenses.gpl2; + license = licenses.gpl3; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix index e1b81339e91e8..0a177fbab31ca 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/action/show/Apps/Calculator; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = gnome3.maintainers; - license = licenses.gpl2; + license = licenses.gpl3; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix index 0b670ec9f65b1..c55650e705a9e 100644 --- a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/Mines; description = "Clear hidden mines from a minefield"; maintainers = gnome3.maintainers; - license = licenses.gpl2; + license = licenses.gpl3; platforms = platforms.linux; }; } |