Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update nixpkgs #537

Merged
merged 3 commits into from
Aug 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions flake.lock

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

12 changes: 12 additions & 0 deletions pkgs/clightning-mistune-workaround/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{ clightning, python3 }:

clightning.override {
python3 = python3.override {
packageOverrides = self: super: {
mistune = self.callPackage ./mistune.nix {
version = "0.8.4";
sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e";
};
};
};
}
27 changes: 27 additions & 0 deletions pkgs/clightning-mistune-workaround/mistune.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, version
, sha256
, format ? "setuptools"
, extraMeta ? {}
}:

buildPythonPackage rec {
inherit version format;
pname = "mistune";

src = fetchPypi {
inherit pname version sha256;
};

buildInputs = [ nose ];
pythonImportsCheck = [ "mistune" ];

meta = with lib; {
description = "The fastest markdown parser in pure Python";
homepage = "https://github.com/lepture/mistune";
license = licenses.bsd3;
} // extraMeta;
}
8 changes: 8 additions & 0 deletions pkgs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ let self = {
packageOverrides = import ./python-packages self;
}).pkgs;

# Fix clightning build by using python package mistune 0.8.4, which is a
# strict requirement. This version is affected by CVE-2022-34749, but this
# is irrelevant in this context.
#
# TODO-EXTERNAL:
# Remove this when the clightning build is fixed upstream.
clightning = pkgs.callPackage ./clightning-mistune-workaround { inherit (pkgs) clightning; };

# Internal pkgs
netns-exec = pkgs.callPackage ./netns-exec { };
krops = import ./krops { inherit pkgs; };
Expand Down
9 changes: 4 additions & 5 deletions pkgs/pinned.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,20 @@ pkgs: pkgsUnstable:
inherit (pkgs)
bitcoin
bitcoind
charge-lnd
electrs
elementsd
extra-container
lightning-pool
lndconnect;
lndconnect
nbxplorer;

inherit (pkgsUnstable)
btcpayserver
clightning
charge-lnd
fulcrum
hwi
lightning-loop
lnd
nbxplorer;
lnd;

inherit pkgs pkgsUnstable;
}
2 changes: 1 addition & 1 deletion pkgs/python-packages/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ let
inherit (self) callPackage;

joinmarketPkg = pkg: callPackage pkg { inherit (nbPkgs.joinmarket) version src; };
clightningPkg = pkg: callPackage pkg { inherit (nbPkgs.pinned) clightning; };
clightningPkg = pkg: callPackage pkg { inherit (nbPkgs) clightning; };

unstable = (import ../nixpkgs-pinned.nix).nixpkgs-unstable;
in {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/rtl/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ pkgs, lib, makeWrapper }:
let
inherit (pkgs) nodejs;
nodejs = pkgs.nodejs-14_x;
nodePackages = import ./composition.nix { inherit pkgs nodejs; };
in
nodePackages.package.overrideAttrs (old: {
Expand Down
18 changes: 9 additions & 9 deletions test/nixos-search/flake.lock

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