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: 77b5a1965fcc
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: 810a56870b01
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 3, 2019

  1. sourcehut: use recurseIntoAttrs 

    (cherry picked from commit c83db0c)
    @veprbl
    veprbl committed Oct 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veprbl Dmitry Kalinkin
    GPG key ID: 06AF1D3C38F04E0E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f5b52d2 View commit details

  2. pythonPackages.trackpy: disable plot tests 

    ZHF #68361

(cherry picked from commit 64205fa)
Signed-off-by: Jonathan Ringer <jonringer117@gmail.com>
    Jonathan Ringer committed Oct 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jonringer Jonathan Ringer
    GPG key ID: 5C841D3CFDFEC4E0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    810a568 View commit details
Showing with 3 additions and 2 deletions.
  1. +2 −2 pkgs/applications/version-management/sourcehut/default.nix
  2. +1 −0 pkgs/development/python-modules/trackpy/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/sourcehut/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ python37, openssl
, callPackage }:
, callPackage, recurseIntoAttrs }:

# To expose the *srht modules, they have to be a python module so we use `buildPythonModule`
# Then we expose them through all-packages.nix as an application through `toPythonApplication`
@@ -25,7 +25,7 @@ let
scmsrht = self.callPackage ./scm.nix { };
};
};
in with python.pkgs; {
in with python.pkgs; recurseIntoAttrs {
inherit python;
buildsrht = toPythonApplication buildsrht;
dispatchsrht = toPythonApplication dispatchsrht;
1 change: 1 addition & 0 deletions pkgs/development/python-modules/trackpy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -45,6 +45,7 @@ buildPythonPackage rec {
pytest trackpy --ignore trackpy/tests/test_motion.py \
--ignore trackpy/tests/test_feature_saving.py \
--ignore trackpy/tests/test_feature.py \
--ignore trackpy/tests/test_plots.py \
--ignore trackpy/tests/test_legacy_linking.py
'';