Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 21517c60d948
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 51076ed20c55
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 22, 2018

  1. lib/licenses: mark some as unfree 

    AMD license agreement (currently unavailable at the given URL, but
included in tarball) disallows reverse-engineering, modification,
redistribution etc;

BSL licenses limit commercial production use.

(cherry picked from commit 8fb1e5e)
    @lheckemann
    lheckemann committed Nov 22, 2018
    Copy the full SHA
    c7519bd View commit details

  2. lib/licenses: remove bsl10 

    Licence isn't used anywhere and nonfree.

(cherry picked from commit 4ef0760)
    @lheckemann
    lheckemann committed Nov 22, 2018
    Copy the full SHA
    51076ed View commit details
Showing with 2 additions and 5 deletions.
  1. +2 −5 lib/licenses.nix
7 changes: 2 additions & 5 deletions lib/licenses.nix
View file
Original file line number Diff line number Diff line change
@@ -42,6 +42,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
amd = {
fullName = "AMD License Agreement";
url = http://developer.amd.com/amd-license-agreement/;
free = false;
};

apsl20 = spdx {
@@ -99,14 +100,10 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = ''BSD 4-clause "Original" or "Old" License'';
};

bsl10 = {
fullName = "Business Source License 1.0";
url = https://mariadb.com/bsl10;
};

bsl11 = {
fullName = "Business Source License 1.1";
url = https://mariadb.com/bsl11;
free = false;
};

clArtistic = spdx {