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: 47d65314df38
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: b66fb91f1705
Choose a head ref
  • 13 commits
  • 28 files changed
  • 11 contributors

Commits on Sep 21, 2019

  1. python3Packages.python-language-server: add setuptools as a dependency 

    (cherry picked from commit 727aaae)
    @symphorien @Mic92
    symphorien authored and Mic92 committed Sep 21, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 43C9E53FFCF51DEC
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2306020 View commit details

  2. python37Packages.sentry-sdk: Fix tests 

    The tests depend on many third-party libraries, presumably because
Sentry offers integration for each of them. I added these as build
inputs but not propagated build inputs, because they are only needed for
the tests.

(cherry picked from commit ce6145d)
    @ruuda @Mic92
    ruuda authored and Mic92 committed Sep 21, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1abe649 View commit details

  3. python37Packages.sentry-sdk: use checkInputs 

    Instead of buildInputs, as there dependencies are only used in tests.

(cherry picked from commit 8a9ebc0)
    @ruuda @Mic92
    ruuda authored and Mic92 committed Sep 21, 2019
    Copy the full SHA
    6687613 View commit details

  4. firefox-bin: 69.0 -> 69.0.1 

    (cherry picked from commit ae20db1)
    @taku0 @Mic92
    taku0 authored and Mic92 committed Sep 21, 2019
    Copy the full SHA
    61201f8 View commit details

  5. firefox: 69.0 -> 69.0.1 

    (cherry picked from commit a4edff0)
    @taku0 @Mic92
    taku0 authored and Mic92 committed Sep 21, 2019
    Copy the full SHA
    1bf3db5 View commit details

  6. gcc: fix mising avr limits.h 

    Fixes #69172

(cherry picked from commit 7b58739)
    @matthewbauer @Mic92
    matthewbauer authored and Mic92 committed Sep 21, 2019
    Copy the full SHA
    62bdec6 View commit details

  7. treewide: mark packages as buildable on darwin (PR #45364) 

    vcunat amended the commit a bit; see the PR for details/discussion.

(cherry picked from commit 991c0e1)
    @vcunat
    vcunat committed Sep 21, 2019
    Copy the full SHA
    2b72c13 View commit details

  8. dropbox: 73.4.118 -> 81.4.195 

    (cherry picked from commit 36c772b)
    @srghma @Mic92
    srghma authored and Mic92 committed Sep 21, 2019
    Copy the full SHA
    564a4c6 View commit details

  9. openjdk8: add setJavaClassPath-hook to jdk as well 

    This hook got removed from JDK[1], however without this hook,
the classpath in a Java-build isn't created anymore which caused
several[2][3] broken packages.

[1] https://github.com/NixOS/nixpkgs/pull/65247/files#r324459267
[2] https://hydra.nixos.org/build/100896633
[3] https://hydra.nixos.org/build/100895668

ZHF #68361

(cherry picked from commit 19f8806)
    @Ma27 @Mic92
    Ma27 authored and Mic92 committed Sep 21, 2019
    Copy the full SHA
    f7f4387 View commit details

  10. nixos/gitea: fix dump 

    (cherry picked from commit 86b83f3)
    @c0deaddict
    c0deaddict committed Sep 21, 2019
    Copy the full SHA
    0e351ae View commit details

  11. Merge pull request #69200 from c0deaddict/release-19.09 

    nixos/gitea: fix dump
    @etu
    etu authored Sep 21, 2019
    Copy the full SHA
    ee20bd1 View commit details

  12. kexi: patch error due to Qt 5.13 

    (cherry picked from commit 550d67c)
    @worldofpeace
    Nathan van Doorn authored and worldofpeace committed Sep 21, 2019
    Copy the full SHA
    98d67eb View commit details

  13. mcomix: add missing setuptools dependency 

    (cherry picked from commit eef06df)
    @delroth @worldofpeace
    delroth authored and worldofpeace committed Sep 21, 2019
    Copy the full SHA
    b66fb91 View commit details
Showing with 425 additions and 402 deletions.
  1. +1 −0 nixos/modules/services/misc/gitea.nix
  2. +1 −1 pkgs/applications/graphics/mcomix/default.nix
  3. +373 −373 pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
  4. +2 −2 pkgs/applications/networking/browsers/firefox/packages.nix
  5. +1 −1 pkgs/applications/networking/dropbox/default.nix
  6. +12 −1 pkgs/applications/office/kexi/default.nix
  7. +1 −3 pkgs/applications/science/math/giac/default.nix
  8. +1 −1 pkgs/applications/science/math/lrcalc/default.nix
  9. +1 −1 pkgs/applications/science/math/nauty/default.nix
  10. +1 −1 pkgs/applications/science/math/pynac/default.nix
  11. +1 −1 pkgs/applications/science/math/singular/default.nix
  12. +1 −1 pkgs/development/compilers/ecl/16.1.2.nix
  13. +6 −1 pkgs/development/compilers/gcc/8/default.nix
  14. +6 −1 pkgs/development/compilers/gcc/9/default.nix
  15. +2 −0 pkgs/development/compilers/openjdk/8.nix
  16. +1 −1 pkgs/development/libraries/arb/default.nix
  17. +1 −1 pkgs/development/libraries/fplll/default.nix
  18. +1 −1 pkgs/development/libraries/iml/default.nix
  19. +1 −1 pkgs/development/libraries/mpfi/default.nix
  20. +1 −1 pkgs/development/libraries/science/math/brial/default.nix
  21. +1 −1 pkgs/development/libraries/science/math/cliquer/default.nix
  22. +1 −1 pkgs/development/libraries/science/math/m4ri/default.nix
  23. +1 −1 pkgs/development/libraries/science/math/m4rie/default.nix
  24. +1 −1 pkgs/development/libraries/science/math/rankwidth/default.nix
  25. +1 −1 pkgs/development/libraries/science/math/rubiks/default.nix
  26. +0 −1 pkgs/development/python-modules/cvxopt/default.nix
  27. +2 −2 pkgs/development/python-modules/python-language-server/default.nix
  28. +3 −1 pkgs/development/python-modules/sentry-sdk/default.nix
1 change: 1 addition & 0 deletions nixos/modules/services/misc/gitea.nix
View file
Original file line number Diff line number Diff line change
@@ -322,6 +322,7 @@ in
"d '${cfg.stateDir}/conf' - ${cfg.user} gitea - -"
"d '${cfg.stateDir}/custom' - ${cfg.user} gitea - -"
"d '${cfg.stateDir}/custom/conf' - ${cfg.user} gitea - -"
"d '${cfg.stateDir}/log' - ${cfg.user} gitea - -"
"d '${cfg.repositoryRoot}' - ${cfg.user} gitea - -"
"Z '${cfg.stateDir}' - ${cfg.user} gitea - -"

2 changes: 1 addition & 1 deletion pkgs/applications/graphics/mcomix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ python27Packages.buildPythonApplication rec {
sha256 = "0fzsf9pklhfs1rzwzj64c0v30b74nk94p93h371rpg45qnfiahvy";
};

propagatedBuildInputs = with python27Packages; [ pygtk pillow ];
propagatedBuildInputs = with python27Packages; [ pygtk pillow setuptools ];

doCheck = false;

Loading