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

Commits on Jan 3, 2021

  1. pinnwand: use poetry-core instead of poetry 

    to reduce build-time closure
    @FRidh
    FRidh committed Jan 3, 2021
    Copy the full SHA
    8c46ea4 View commit details

  2. Merge pull request #108318 from FRidh/pinnwand 

    pinnwand: use poetry-core instead of poetry
    @mweinelt
    mweinelt authored Jan 3, 2021
    Copy the full SHA
    a319714 View commit details
Showing with 10 additions and 2 deletions.
  1. +10 −2 pkgs/servers/pinnwand/default.nix
12 changes: 10 additions & 2 deletions pkgs/servers/pinnwand/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, python3, fetchFromGitHub, nixosTests }:
{ lib, python3, fetchFromGitHub, nixosTests, fetchpatch }:

let
python = python3.override {
@@ -25,7 +25,7 @@ in with python.pkgs; buildPythonApplication rec {
};

nativeBuildInputs = [
poetry
poetry-core
];

propagatedBuildInputs = [
@@ -43,6 +43,14 @@ in with python.pkgs; buildPythonApplication rec {
pytest
'';

patches = [
# Use poetry-core instead of poetry. Fixed in 1.2.3
(fetchpatch {
url = "https://github.com/supakeen/pinnwand/commit/38ff5729c59abb97e4b416d3ca66466528b0eac7.patch";
sha256 = "F3cZe29z/7glmS3KWzcfmZnhYmC0LrLLS0zHk7WS2rQ=";
})
];

passthru.tests = nixosTests.pinnwand;

meta = with lib; {