Merge pull request #70256 from Ma27/drop-nodejs-11_x
nodejs-11_x: remove
This commit is contained in:
commit
141b7210cb
@ -519,6 +519,11 @@
|
|||||||
Please use the fork <literal>cawbird</literal> instead which has been adapted to the API changes and is still maintained.
|
Please use the fork <literal>cawbird</literal> instead which has been adapted to the API changes and is still maintained.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The <literal>nodejs-11_x</literal> package has been removed as it's EOLed by upstream.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{ stdenv, fetchgit, fetchNodeModules, buildPythonPackage
|
{ stdenv, fetchgit, fetchNodeModules, buildPythonPackage
|
||||||
, pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests
|
, pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests
|
||||||
, sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic
|
, sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic
|
||||||
, sassc, nodejs-11_x
|
, sassc, nodejs
|
||||||
, writeText }:
|
, writeText }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||||||
|
|
||||||
node_modules = fetchNodeModules {
|
node_modules = fetchNodeModules {
|
||||||
src = "${src}/srht";
|
src = "${src}/srht";
|
||||||
nodejs = nodejs-11_x;
|
nodejs = nodejs;
|
||||||
sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p";
|
sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
sassc
|
sassc
|
||||||
nodejs-11_x
|
nodejs
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
@ -75,6 +75,7 @@ buildPythonPackage rec {
|
|||||||
homepage = https://git.sr.ht/~sircmpwn/srht;
|
homepage = https://git.sr.ht/~sircmpwn/srht;
|
||||||
description = "Core modules for sr.ht";
|
description = "Core modules for sr.ht";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
|
broken = true;
|
||||||
maintainers = with maintainers; [ eadwu ];
|
maintainers = with maintainers; [ eadwu ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
|||||||
patches = [
|
patches = [
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://github.com/MagicStack/asyncpg/commit/aaeb7076e5acb045880b46155014c0640624797e.patch";
|
url = "https://github.com/MagicStack/asyncpg/commit/aaeb7076e5acb045880b46155014c0640624797e.patch";
|
||||||
sha256 = "0r6g6pvb39vzci8g67mv9rlrvavqvfz6vlv8988wv53bpz1mss3p";
|
sha256 = "0l420cmk7469wgb1xq2rxinvja1f2brb5cm4smj2s2wqgymbrf6h";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -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";
|
|
||||||
}
|
|
@ -4452,10 +4452,6 @@ in
|
|||||||
nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix {
|
nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix {
|
||||||
enableNpm = false;
|
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-12_x = callPackage ../development/web/nodejs/v12.nix { };
|
||||||
nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
|
nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
|
||||||
enableNpm = false;
|
enableNpm = false;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user