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

Commits on Apr 19, 2018

  1. tree-wide: fix instance of "meta.maintainer" -> "meta.maintainers" 

    Encountered one of these when using check-meta, did a quick
search to find other instances.
    @dtzWill
    dtzWill committed Apr 19, 2018
    Copy the full SHA
    4f27362 View commit details

  2. Merge pull request #39160 from dtzWill/fix/meta-maintainer-singular 

    tree-wide: fix instance of "meta.maintainer" -> "meta.maintainers"
    @FRidh
    FRidh authored Apr 19, 2018
    Copy the full SHA
    5a66aaf View commit details
2 changes: 1 addition & 1 deletion doc/languages-frameworks/python.section.md
View file
Original file line number Diff line number Diff line change
@@ -374,7 +374,7 @@ and `CFLAGS`.
description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
homepage = http://hgomersall.github.com/pyFFTW/;
license = with licenses; [ bsd2 bsd3 ];
maintainer = with maintainers; [ fridh ];
maintainers = with maintainers; [ fridh ];
};
};
}
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/yolk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ buildPythonApplication rec {
meta = {
description = "Command-line tool for querying PyPI and Python packages installed on your system";
homepage = https://github.com/cakebread/yolk;
maintainer = with maintainers; [];
maintainers = with maintainers; [];
license = licenses.bsd3;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/zipfile36/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,6 +28,6 @@ buildPythonPackage rec {
description = "Read and write ZIP files - backport of the zipfile module from Python 3.6";
homepage = https://gitlab.com/takluyver/zipfile36;
license = lib.licenses.psfl;
maintainer = lib.maintainers.fridh;
maintainers = lib.maintainers.fridh;
};
}
}
4 changes: 2 additions & 2 deletions pkgs/misc/vscode-extensions/cpptools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -120,9 +120,9 @@ vscode-utils.buildVscodeMarketplaceExtension {

meta = with stdenv.lib; {
license = licenses.unfree;
maintainer = [ maintainers.jraygauthier ];
maintainers = [ maintainers.jraygauthier ];
# A 32 bit linux would also be possible with some effort (specific download of binaries +
# patching of the elf files with 32 bit interpreter).
platforms = [ "x86_64-linux" ];
};
}
}
4 changes: 2 additions & 2 deletions pkgs/misc/vscode-extensions/python/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,6 +36,6 @@ vscode-utils.buildVscodeMarketplaceExtension {

meta = with lib; {
license = licenses.mit;
maintainer = [ maintainers.jraygauthier ];
maintainers = [ maintainers.jraygauthier ];
};
}
}