Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6f36a97b2bcd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 531bd1f7da30
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 24, 2016

  1. gnome-calculator: update license to gpl3

    @evfool
    evfool committed Nov 24, 2016
    Copy the full SHA
    845f7da View commit details

  2. Merge pull request #20680 from evfool/master 

    gnome-calculator: update license to gpl3
    @jgeerds
    jgeerds authored Nov 24, 2016
    Copy the full SHA
    531bd1f View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
  2. +1 −1 pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}