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: e1dac71685d8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a04f3da2e1a1
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Jan 22, 2020

  1. cinnamon.*: add licenses 

    Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
    @mkg20001 @worldofpeace
    mkg20001 and worldofpeace committed Jan 22, 2020
    Copy the full SHA
    7d72324 View commit details

  2. Merge pull request #78260 from mkg20001/licenses 

    cinnamon.*: add licenses
    @worldofpeace
    worldofpeace authored Jan 22, 2020
    Copy the full SHA
    a04f3da View commit details
1 change: 1 addition & 0 deletions pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -70,6 +70,7 @@ stdenv.mkDerivation rec {
gtk-doc.
'';

license = [ licenses.gpl2 licenses.lgpl2 ];
platforms = platforms.linux;
maintainers = [ maintainers.mkg20001 ];
};
1 change: 1 addition & 0 deletions pkgs/desktops/cinnamon/cinnamon-menus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://github.com/linuxmint/cinnamon-menus";
description = "A menu system for the Cinnamon project";
license = [ licenses.gpl2 licenses.lgpl2 ];
platforms = platforms.linux;
maintainers = [ maintainers.mkg20001 ];
};
1 change: 1 addition & 0 deletions pkgs/desktops/cinnamon/cinnamon-translations/default.nix
View file
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://github.com/linuxmint/cinnamon-translations";
description = "Translations files for the Cinnamon desktop";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.mkg20001 ];
};
6 changes: 6 additions & 0 deletions pkgs/desktops/cinnamon/cjs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -78,6 +78,12 @@ stdenv.mkDerivation rec {
This module contains JavaScript bindings based on gobject-introspection.
'';

license = with licenses; [
gpl2Plus
lgpl2Plus
mit
mpl11
];
platforms = platforms.linux;
maintainers = [ maintainers.mkg20001 ];
};