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: fadb04457919
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: e726e341c607
Choose a head ref

Commits on Apr 20, 2020

  1. Copy the full SHA
    d7df659 View commit details
  2. Copy the full SHA
    441f5d5 View commit details

Commits on Apr 23, 2020

  1. Copy the full SHA
    a4adb1f View commit details

Commits on Apr 26, 2020

  1. coqPackages.coqhammer: 1.1.1 → 1.2

    Add support for Coq 8.11
    vbgl committed Apr 26, 2020
    Copy the full SHA
    ef964a8 View commit details
  2. Revert "docs/python: document builders using doInstallCheck and not d…

    …oCheck (#86051)"
    
    For disabling tests when overriding, use `.overridePythonAttrs`.
    
    Discussion about aliasing `.overridePythonAttrs` to `.overrideAttrs`.
    NixOS/nixpkgs#82772
    
    This reverts commit 3581287.
    FRidh committed Apr 26, 2020
    Copy the full SHA
    ca2fd28 View commit details
  3. Copy the full SHA
    6617a79 View commit details
  4. linux: 4.4.219 -> 4.4.220

    NeQuissimus committed Apr 26, 2020
    Copy the full SHA
    6efb2ba View commit details
  5. linux: 4.9.219 -> 4.9.220

    NeQuissimus committed Apr 26, 2020
    Copy the full SHA
    4883dde View commit details
  6. Copy the full SHA
    be48bf2 View commit details
  7. Copy the full SHA
    334627d View commit details
  8. Copy the full SHA
    4af476e View commit details
  9. Copy the full SHA
    a9fa602 View commit details
  10. Copy the full SHA
    6c1201a View commit details
  11. skaffold: 1.6.0 -> 1.8.0

    Trundle authored and Jon committed Apr 26, 2020
    Copy the full SHA
    0f20af8 View commit details
  12. kicad: update.sh: set -e

    and some more suggestions from veprbl
    
    warn if an empty item gets through anyway
    
    and use UTC time
    
    cc #82634
    evils authored and veprbl committed Apr 26, 2020
    Copy the full SHA
    75963b9 View commit details
  13. kicad-unstable: 2020-02-10 -> 2020-04-25

    cc #82634
    evils authored and veprbl committed Apr 26, 2020
    Copy the full SHA
    b80bd00 View commit details
  14. Merge pull request #85594 from mkg20001/jetbrains-update

    jetbrains: 2019.3.5 -> 2020.1
    worldofpeace authored Apr 26, 2020
    Copy the full SHA
    ac57a6c View commit details
  15. Merge pull request #85872 from vbgl/coq-equations-1.2.1

    coqPackages.equations: 1.2 → 1.2.1
    DamienCassou authored Apr 26, 2020
    Copy the full SHA
    d19994b View commit details
  16. Merge pull request #85543 from DamienCassou/damien/ledger-autosync

    ledger-autosync: 1.0.1 -> 1.0.2
    DamienCassou authored Apr 26, 2020
    Copy the full SHA
    5fec592 View commit details
  17. elpa-packages: 2020-04-26

    adisbladis committed Apr 26, 2020
    Copy the full SHA
    5adfa39 View commit details
  18. melpa-packages: 2020-04-26

    adisbladis committed Apr 26, 2020
    Copy the full SHA
    8c65a2f View commit details
  19. Merge pull request #86058 from vbgl/coq-coqhammer-1.2

    coqPackages.coqhammer: 1.1.1 → 1.2
    DamienCassou authored Apr 26, 2020
    Copy the full SHA
    5eb2125 View commit details
  20. Copy the full SHA
    a7971df View commit details
  21. Merge pull request #85654 from DamienCassou/damien/git-autofixup

    perlPackages.GitAutofixup: init at 0.002007
    worldofpeace authored Apr 26, 2020
    Copy the full SHA
    c351f28 View commit details
  22. unison: fix unison-fsmonitor wrapper in an empty PATH

    Fixes:
    /nix/store/hyk3aky49zm2chq5cwclrsm56iqwfzwj-unison-2.51.2/bin/unison-fsmonitor: line 2: grep: command not found
    
    Happens when running unison in a systemd service.
    symphorien authored and bjornfor committed Apr 26, 2020
    Copy the full SHA
    e726e34 View commit details
5 changes: 0 additions & 5 deletions doc/languages-frameworks/python.section.md
Original file line number Diff line number Diff line change
@@ -1059,11 +1059,6 @@ let
in newpkgs.inkscape
```

If you'd like to disable tests for a particular Python based package built with
`buildPythonPackage` or `buildPythonApplication`, you'd need to set
`doInstallCheck = false` and not `doCheck = false` as the later will take no
effect.

### `python setup.py bdist_wheel` cannot create .whl

Executing `python setup.py bdist_wheel` in a `nix-shell `fails with
96 changes: 63 additions & 33 deletions pkgs/applications/editors/emacs-modes/elpa-generated.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

108 changes: 54 additions & 54 deletions pkgs/applications/editors/emacs-modes/melpa-packages.nix
Original file line number Diff line number Diff line change
@@ -164,36 +164,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac

ivy-rtags = fix-rtags super.ivy-rtags;

mandoku = super.mandoku.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit = super.magit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-circleci = super.magit-circleci.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-find-file = super.magit-find-file.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
@@ -224,30 +200,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-p4 = super.magit-p4.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-rbr = super.magit-rbr.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-stgit = super.magit-stgit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
@@ -314,12 +266,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

kapacitor = super.kapacitor.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

kubernetes = super.kubernetes.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
@@ -478,6 +424,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
packageRequires = with self; [ evil highlight ];
});

kapacitor = super.kapacitor.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

forge = super.forge.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
@@ -486,6 +438,54 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac

helm-rtags = fix-rtags super.helm-rtags;

mandoku = super.mandoku.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-p4 = super.magit-p4.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-rbr = super.magit-rbr.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

magit-circleci = super.magit-circleci.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

orgit =
(super.orgit.overrideAttrs (attrs: {
# searches for Git at build time
Loading