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: 1058537c7cd9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 71caa7c54a72
Choose a head ref
  • 7 commits
  • 7 files changed
  • 1 contributor

Commits on Aug 5, 2018

  1. beecrypt: add license 

    see issue #43716
    @pSub
    pSub committed Aug 5, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    e917784 View commit details

  2. bitbucket-cli: add license 

    see issue #43716
    @pSub
    pSub committed Aug 5, 2018
    Copy the full SHA
    f2256c5 View commit details

  3. brasero: correct license, is actually gpl2Plus 

    see issue #43716
    @pSub
    pSub committed Aug 5, 2018
    Copy the full SHA
    5c831c7 View commit details

  4. brasero: inherit meta in wrapper 

    see issue #43716
    @pSub
    pSub committed Aug 5, 2018
    Copy the full SHA
    4269eb1 View commit details

  5. cointop: add license 

    see issue #43716
    @pSub
    pSub committed Aug 5, 2018
    Copy the full SHA
    4d432df View commit details

  6. construo: add license 

    see issue #43716
    @pSub
    pSub committed Aug 5, 2018
    Copy the full SHA
    7b4f037 View commit details

  7. convmv: add license 

    see issue #43716
    @pSub
    pSub committed Aug 5, 2018
    Copy the full SHA
    71caa7c View commit details
1 change: 1 addition & 0 deletions pkgs/applications/misc/cointop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,5 +26,6 @@ buildGoPackage rec {
homepage = https://cointop.sh;
platforms = stdenv.lib.platforms.linux; # cannot test others
maintainers = [ ];
license = stdenv.lib.licenses.asl20;
};
}
1 change: 1 addition & 0 deletions pkgs/development/libraries/beecrypt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,5 +11,6 @@ stdenv.mkDerivation {

meta = {
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl2;
};
}
1 change: 1 addition & 0 deletions pkgs/development/python-modules/bitbucket-cli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,5 +19,6 @@ buildPythonPackage rec {
description = "Bitbucket command line interface";
homepage = https://bitbucket.org/zhemao/bitbucket-cli;
maintainers = with maintainers; [ refnil ];
license = licenses.bsd2;
};
}
1 change: 1 addition & 0 deletions pkgs/games/construo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Masses and springs simulation game";
homepage = http://fs.fsf.org/construo/;
license = stdenv.lib.licenses.gpl3;
};
}
2 changes: 1 addition & 1 deletion pkgs/tools/cd-dvd/brasero/default.nix
View file
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
description = "A Gnome CD/DVD Burner";
homepage = https://wiki.gnome.org/Apps/Brasero;
maintainers = [ maintainers.bdimcheff ];
license = licenses.gpl2;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}
2 changes: 2 additions & 0 deletions pkgs/tools/cd-dvd/brasero/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -12,4 +12,6 @@ in symlinkJoin {
wrapProgram $out/bin/brasero \
--prefix PATH ':' ${binPath}
'';

inherit (brasero-original) meta;
}
1 change: 1 addition & 0 deletions pkgs/tools/misc/convmv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
description = "Converts filenames from one encoding to another";
platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin;
maintainers = [ ];
license = licenses.gpl2Plus;
};
}