From 7c74ebd2a631ab52618829c367e112ed24fb97a6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 2 Oct 2019 17:09:43 +0200 Subject: [PATCH 1/3] python3Packages.asyncpg: fix hash The hash to the patch is broken, even with the original revision which adds asyncpg (ee2161c5e82b2c7be9dcfcb0105e99fee1bddd3f). As the downloaded patch seems fine, I guess that it was generated with `nix-prefetch-url` (the hashes for `fetchpatch` usually differ) and the issue wasn't found as the fixed-output-derivation was already in the contributor's store. See https://hydra.nixos.org/build/102495795 ZHF #68361 --- pkgs/development/python-modules/asyncpg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index a71ffd85367..6722d3ee0fd 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { url = "https://github.com/MagicStack/asyncpg/commit/aaeb7076e5acb045880b46155014c0640624797e.patch"; - sha256 = "0r6g6pvb39vzci8g67mv9rlrvavqvfz6vlv8988wv53bpz1mss3p"; + sha256 = "0l420cmk7469wgb1xq2rxinvja1f2brb5cm4smj2s2wqgymbrf6h"; }) ]; From 334641d1127fdd90475bd128011dabc21d9b8141 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 2 Oct 2019 17:12:58 +0200 Subject: [PATCH 2/3] nodejs-11_x: remove Package is EOLed by upstream: https://github.com/nodejs/Release Fixes #69008 --- nixos/doc/manual/release-notes/rl-1909.xml | 5 +++++ .../applications/version-management/sourcehut/core.nix | 6 +++--- pkgs/development/web/nodejs/v11.nix | 10 ---------- pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/web/nodejs/v11.nix diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index f42471c5969..66f803ac442 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -519,6 +519,11 @@ Please use the fork cawbird instead which has been adapted to the API changes and is still maintained. + + + The nodejs-11_x package has been removed as it's EOLed by upstream. + + diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index ca054c5cfde..21ee99684bd 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchNodeModules, buildPythonPackage , pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests , sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic -, sassc, nodejs-11_x +, sassc, nodejs , writeText }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { node_modules = fetchNodeModules { src = "${src}/srht"; - nodejs = nodejs-11_x; + nodejs = nodejs; sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p"; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ sassc - nodejs-11_x + nodejs ]; propagatedBuildInputs = [ diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix deleted file mode 100644 index 7b60a3772d3..00000000000 --- a/pkgs/development/web/nodejs/v11.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, openssl, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; -in - buildNodejs { - inherit enableNpm; - version = "11.15.0"; - sha256 = "68a776c5d8b8b91a8f2adac2ca4ce4390ae1804883ec7ec9c0d6a6a64d306a76"; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 614cd4e4e40..f76b3d98712 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4452,10 +4452,6 @@ in nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; }; - nodejs-11_x = callPackage ../development/web/nodejs/v11.nix { }; - nodejs-slim-11_x = callPackage ../development/web/nodejs/v11.nix { - enableNpm = false; - }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; From 594378ceeab609270541926860d7805620b39d00 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 2 Oct 2019 17:13:37 +0200 Subject: [PATCH 3/3] sourcehut: mark as broken There were several custom python dependencies broken. I decided to modify the `sourcehut` expression as it wouldn't even evaluate without nodejs-11_x I didn't manage to get it building. --- pkgs/applications/version-management/sourcehut/core.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 21ee99684bd..4b12d66a3a2 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -75,6 +75,7 @@ buildPythonPackage rec { homepage = https://git.sr.ht/~sircmpwn/srht; description = "Core modules for sr.ht"; license = licenses.bsd3; + broken = true; maintainers = with maintainers; [ eadwu ]; }; }