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

Commits on Nov 3, 2017

  1. licenses.ffsl: non-free 

    FFSL forbids commercial redistribution
    @woffs
    woffs committed Nov 3, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9bda3f2 View commit details

Commits on Nov 10, 2017

  1. Merge #31210: licenses.ffsl: it's non-free

    @vcunat
    vcunat committed Nov 10, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e62e4c1 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 lib/licenses.nix
1 change: 1 addition & 0 deletions lib/licenses.nix
View file
Original file line number Diff line number Diff line change
@@ -219,6 +219,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
ffsl = {
fullName = "Floodgap Free Software License";
url = http://www.floodgap.com/software/ffsl/license.html;
free = false;
};

free = {