diff options
author | ajs124 <ajs124@users.noreply.github.com> | 2022-07-06 23:09:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-06 23:09:28 +0200 |
commit | 2837f807c9814a3a81fd9dbae300abc36c6ef532 (patch) | |
tree | 646544e0ad1bc2cd59da4be446dab74b8ca45838 | |
parent | 0cd1b87d0ecbc6bcd61bb885c7e888e80ddd4cd5 (diff) | |
parent | 2674894432ab1c175c19a8de2d8f993d01615ae5 (diff) |
Merge pull request #180066 from helsinki-systems/rem/nodejs-12_x
nodejs-12_x: remove
33 files changed, 24 insertions, 1046 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 223705609e14a..dabd4a02e31ba 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1047,7 +1047,6 @@ ./services/web-apps/code-server.nix ./services/web-apps/baget.nix ./services/web-apps/convos.nix - ./services/web-apps/cryptpad.nix ./services/web-apps/dex.nix ./services/web-apps/discourse.nix ./services/web-apps/documize.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 7a6a6b5ed30bb..8d6678f7daf5e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -98,6 +98,7 @@ with lib; (mkRemovedOptionModule [ "services" "virtuoso" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "openfire" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "riak" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "cryptpad" ] "The corresponding package was removed from nixpkgs.") # Do NOT add any option renames here, see top of the file ]; diff --git a/nixos/modules/services/web-apps/cryptpad.nix b/nixos/modules/services/web-apps/cryptpad.nix deleted file mode 100644 index e6772de768e0e..0000000000000 --- a/nixos/modules/services/web-apps/cryptpad.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.cryptpad; -in -{ - options.services.cryptpad = { - enable = mkEnableOption "the Cryptpad service"; - - package = mkOption { - default = pkgs.cryptpad; - defaultText = literalExpression "pkgs.cryptpad"; - type = types.package; - description = " - Cryptpad package to use. - "; - }; - - configFile = mkOption { - type = types.path; - default = "${cfg.package}/lib/node_modules/cryptpad/config/config.example.js"; - defaultText = literalExpression ''"''${package}/lib/node_modules/cryptpad/config/config.example.js"''; - description = '' - Path to the JavaScript configuration file. - - See <link - xlink:href="https://github.com/xwiki-labs/cryptpad/blob/master/config/config.example.js"/> - for a configuration example. - ''; - }; - }; - - config = mkIf cfg.enable { - systemd.services.cryptpad = { - description = "Cryptpad Service"; - wantedBy = [ "multi-user.target" ]; - after = [ "networking.target" ]; - serviceConfig = { - DynamicUser = true; - Environment = [ - "CRYPTPAD_CONFIG=${cfg.configFile}" - "HOME=%S/cryptpad" - ]; - ExecStart = "${cfg.package}/bin/cryptpad"; - PrivateTmp = true; - Restart = "always"; - StateDirectory = "cryptpad"; - WorkingDirectory = "%S/cryptpad"; - }; - }; - }; -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e08be48db24f1..d596db8ab7467 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -110,7 +110,6 @@ in { cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {}; custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; - cryptpad = handleTest ./cryptpad.nix {}; deluge = handleTest ./deluge.nix {}; dendrite = handleTest ./matrix/dendrite.nix {}; dex-oidc = handleTest ./dex-oidc.nix {}; diff --git a/nixos/tests/cryptpad.nix b/nixos/tests/cryptpad.nix deleted file mode 100644 index db271f937ef42..0000000000000 --- a/nixos/tests/cryptpad.nix +++ /dev/null @@ -1,18 +0,0 @@ -import ./make-test-python.nix ({ lib, ... }: - -with lib; - -{ - name = "cryptpad"; - meta.maintainers = with maintainers; [ davhau ]; - - nodes.machine = - { pkgs, ... }: - { services.cryptpad.enable = true; }; - - testScript = '' - machine.wait_for_unit("cryptpad.service") - machine.wait_for_open_port(3000) - machine.succeed("curl -L --fail http://localhost:3000/sheet") - ''; -}) diff --git a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh index 389229e04f242..3d1b470edfcdf 100644 --- a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh +++ b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh @@ -6,7 +6,7 @@ curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package-lock.json -o package-lock.json node2nix \ - --nodejs-12 \ + --nodejs-16 \ --node-env ../../../../development/node-packages/node-env.nix \ --development \ --input package.json \ diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix index 02fdb925fb1b0..0c0b678d98f22 100644 --- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ../../../../development/node-packages/node-env.nix { diff --git a/pkgs/applications/version-management/cz-cli/node-composition.nix b/pkgs/applications/version-management/cz-cli/node-composition.nix index 53bdef1f98646..4dfddf3e5bcaf 100644 --- a/pkgs/applications/version-management/cz-cli/node-composition.nix +++ b/pkgs/applications/version-management/cz-cli/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index 8fd8c0ffcce3c..bbb39db07b714 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 5b33c02809eb9..1687fb7c52fc1 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -19,10 +19,6 @@ , zlib , writeShellApplication , nuget-to-nix -# Keeping this option until upstream removes support for EoL Node.js 12 entirely -# Also refer to: https://github.com/actions/runner/pull/1716 -, withNode12 ? false -, nodejs-12_x }: let nugetSource = linkFarmFromDrvs "nuget-packages" ( @@ -192,9 +188,6 @@ stdenv.mkDerivation rec { ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" - ] - ++ lib.optionals (!withNode12) [ - "GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv" ]; checkInputs = [ git ]; @@ -202,7 +195,6 @@ stdenv.mkDerivation rec { runHook preCheck mkdir -p _layout/externals - ${lib.optionalString withNode12 "ln -s ${nodejs-12_x} _layout/externals/node12"} ln -s ${nodejs-16_x} _layout/externals/node16 printf 'Disabled tests:\n%s\n' '${lib.concatMapStringsSep "\n" (x: " - ${x}") disabledTests}' @@ -251,7 +243,6 @@ stdenv.mkDerivation rec { # externals/node{12,16}. As opposed to the official releases, we don't # link the Alpine Node flavors. mkdir -p $out/externals - ${lib.optionalString withNode12 "ln -s ${nodejs-12_x} $out/externals/node12"} ln -s ${nodejs-16_x} $out/externals/node16 # Install Nodejs scripts called from workflows diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix index 653dbe4a257a7..af8e916490903 100644 --- a/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix index 86fec8950002f..a98493ab20e15 100644 --- a/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix @@ -1,6 +1,6 @@ { callPackage , cypress -, nodejs-12_x +, nodejs-14_x , # FIXME: duplicated from ./regen-nix. node2nix should expose this nodePackages , xorg @@ -30,7 +30,7 @@ stdenv.mkDerivation { passthru.fc = fontConfigEtc; nativeBuildInputs = [ cypress - nodejs-12_x + nodejs-14_x xorg.xorgserver nodePackages.jsonplaceholder ]; diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix index 86061211d7b3c..ba35dafe5269e 100755 --- a/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix @@ -3,7 +3,7 @@ #!nix-shell -i bash node2nix \ - --nodejs-12 \ + --nodejs-16 \ --input $src/package.json \ --lock $src/package-lock.json \ --composition cypress-example-kitchensink.nix \ diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix index 64326c6b21602..f929727d59d62 100644 --- a/pkgs/development/web/newman/node-composition.nix +++ b/pkgs/development/web/newman/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix deleted file mode 100644 index ea7c211163e2b..0000000000000 --- a/pkgs/development/web/nodejs/v12.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ callPackage, icu68, python2, lib, stdenv, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - icu = icu68; - python = python2; - }; -in - buildNodejs { - inherit enableNpm; - version = "12.22.12"; - sha256 = "1whl0zi6fs9ay33bhcn2kh9xynran05iipahg1zzr6sv97wbfhmw"; - patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; - } diff --git a/pkgs/misc/base16-builder/generate.sh b/pkgs/misc/base16-builder/generate.sh index 1d06b6230dbb0..fb13a70bc6795 100755 --- a/pkgs/misc/base16-builder/generate.sh +++ b/pkgs/misc/base16-builder/generate.sh @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -exec node2nix --nodejs-12 \ +exec node2nix --nodejs-16 \ --input node-packages.json \ --output node-packages-generated.nix \ --supplement-input supplement.json \ diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index 006429c9ed447..dacf1581ada01 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix { diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh index 1fceed1c72c1c..06245937bcb27 100755 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh @@ -6,7 +6,7 @@ curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.11.0 curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.11.0/package-lock.json -o package-lock.json node2nix \ - --nodejs-12 \ + --nodejs-16 \ --node-env ../../../development/node-packages/node-env.nix \ --development \ --input package.json \ diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix index 9f0040e2f4465..f9a1999f36d73 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/psitransfer/node-composition.nix b/pkgs/servers/psitransfer/node-composition.nix index 749d685105d57..1de33eb05b838 100644 --- a/pkgs/servers/psitransfer/node-composition.nix +++ b/pkgs/servers/psitransfer/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix deleted file mode 100644 index c10623f3b00bb..0000000000000 --- a/pkgs/servers/web-apps/cryptpad/bower-packages.nix +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) -{ fetchbower, buildEnv }: -buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "jquery" "2.2.4" "2.2.4" "0kaln93pzjlr4vqf2zvsm9dwgjkrii9xlsqg48hc1vs16cl109rn") - (fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g") - (fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1") - (fetchbower "ckeditor" "4.14.0" "4.14.0" "0lw9q0k8c0jlxvf35vrccab9c3c8rgpc6x66czj9si8yy2lyliyp") - (fetchbower "codemirror" "5.63.3" "^5.19.0" "09di53sfsgpd328fvz1qjlmybk5mmnb2p9r38xw329bi9b21rq0r") - (fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli") - (fetchbower "marked" "1.1.0" "1.1.0" "1sdgqw9iki9c1pfm4c5h6c956mchbip2jywjrcmrlb75k53flsjz") - (fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv") - (fetchbower "json.sortify" "2.1.0" "~2.1.0" "1rz9xz0gnm4ak31n10vhslqsw8fw493gjylwj8xsy3bxqq1ygpnh") - (fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a") - (fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9") - (fetchbower "chainpad-crypto" "0.2.6" "^0.2.0" "0h6ibv6gcym7mm080swdw4l6l159xjmxgqnahyxw3aydha5cj1z0") - (fetchbower "chainpad-listmap" "1.0.0" "^1.0.0" "0qzqblw67y1p69xc9n734srfhjviwwb2jbqxgxs0rf4vdyspwvcb") - (fetchbower "chainpad" "5.2.4" "^5.2.0" "1f4nap0r8w50qpmjdfhhjhpz5xcl0n4zaxxnav1qaxi5j6dyg8h6") - (fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg") - (fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l") - (fetchbower "scrypt-async" "1.2.0" "1.2.0" "0d076ax708p9b8hcmk4f82j925nlnm0hmp0ni45ql37g7iirfpyv") - (fetchbower "require-css" "0.1.10" "0.1.10" "106gz9i76v71q9zx2pnqkkj342m630lvssnw54023a0ljc0gqcwq") - (fetchbower "bootstrap" "4.6.0" "^v4.0.0" "1pp2n88pkms25p7mbna7vxxl5mkpdn8nvnfzwcwpp6b0871njmr6") - (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1") - (fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5") - (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf") - (fetchbower "bootstrap-tokenfield" "0.12.1" "0.12.1" "1dh791s6ih8bf9ihck9n39h68c273jb3lg4mqk94bvqraz45fvwx") - (fetchbower "localforage" "1.10.0" "^1.5.2" "019rh006v2w5x63mgk78qhw59kf8czbkwdvfngmac8fs6gz88lc8") - (fetchbower "html2canvas" "0.4.1" "^0.4.1" "0yg7y90nav068q0i5afc2c221zkddpf28hi0hwc46cawx4180c69") - (fetchbower "croppie" "2.6.5" "^2.5.0" "1j1v5620zi13ad42r358i4ay891abwn6nz357484kgq2bgjj6ccx") - (fetchbower "sortablejs" "1.14.0" "^1.6.0" "104d688lrbwxi3hnfr4q169850ffyfv1s8qnycqxhx0zfh3887m0") - (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi") - (fetchbower "jszip" "Stuk/jszip#3.7.1" "Stuk/jszip#^3.1.5" "0lzq1zd2glvfh3wwj73c9sffas56ql5472yj1cwq3g7iva5iliwq") - (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5") - (fetchbower "dragula.js" "3.7.2" "3.7.2" "0dbkmrl8bcxiplprmmp9fj96ri5nahb2ql8cc7zwawncv0drvlh0") - (fetchbower "MathJax" "3.0.5" "3.0.5" "087a9av15qj43m8pr3b9g59ncmydhmg40m6dfzsac62ykianh2a0") - (fetchbower "chainpad-netflux" "1.0.0" "^1.0.0" "08rpc73x1vyvd6zkb7w0m1smzjhq3b7cwb30nlmg93x873zjlsl6") - (fetchbower "netflux-websocket" "1.0.0" "^1.0.0" "10hgc5ra3ll7qc2r8aal6p03gx6dgz06l2b54lh995pvf901wzi6") -]; } diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix deleted file mode 100644 index 4e8daf38453ca..0000000000000 --- a/pkgs/servers/web-apps/cryptpad/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ stdenv -, pkgs -, lib -, buildBowerComponents -, fetchbower -, fetchurl -, nodejs -}: - -let - nodePackages = import ./node-packages.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; - }; - - bowerPackages = (buildBowerComponents { - name = "${cryptpad.name}-bower-packages"; - generated = ./bower-packages.nix; - src = cryptpad.src; - }).overrideAttrs (old: { - bowerPackages = old.bowerPackages.override (old_: { - # add missing dependencies: - # Those dependencies are EOL and they are not installed by buildBowerComponents, - # but they are required, otherwise the resolver crashes. - # * add the second jquery ~2.1.0 entry - # * add the second bootstrap ~3.1.1 entry - paths = old_.paths ++ [ - (fetchbower "jquery" "2.1.0" "~2.1.0" "02kwvz93vzpv10qnp7s0dz3al0jh77awwrizb6wadsvgifxssnlr") - (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811") - ]; - }); - }); - - # find an element in an attribute set - findValue = pred: default: set: - let - list = - lib.concatMap - (name: - let v = set.${name}; in - if pred name v then [ v ] else [ ] - ) - (lib.attrNames set) - ; - in - if list == [ ] then default - else lib.head list - ; - - # The cryptpad package attribute key changes for each release. Get it out - # programatically instead. - cryptpad = findValue - (k: v: v.packageName == "cryptpad") - (throw "cryptpad not found") - nodePackages - ; - - combined = cryptpad.override { - postInstall = '' - out_cryptpad=$out/lib/node_modules/cryptpad - - substituteInPlace $out_cryptpad/lib/workers/index.js --replace "lib/workers/db-worker" "$out_cryptpad/lib/workers/db-worker" - - # add the bower components - ln -sv \ - ${bowerPackages}/bower_components \ - $out_cryptpad/www/bower_components - - # add executable - mkdir $out/bin - cat <<EOF > $out/bin/cryptpad - #!${stdenv.shell} - exec ${nodejs}/bin/node $out_cryptpad/server.js - EOF - chmod +x $out/bin/cryptpad - ''; - - meta = { - longDescription = '' - CryptPad is a collaboration suite that is end-to-end-encrypted and open-source. - It is built to enable collaboration, synchronizing changes to documents in real time. - Because all data is encrypted, the service and its administrators have no way of seeing the content being edited and stored. - ''; - maintainers = with lib.maintainers; [ davhau ]; - mainProgram = "cryptpad"; - }; - - }; -in -combined diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh deleted file mode 100755 index da2253889f880..0000000000000 --- a/pkgs/servers/web-apps/cryptpad/generate.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nix - -# This script is meant to be run in the current directory - -cryptpadSrc=$(nix eval '(import ../../../.. {}).cryptpad.src' --raw) -echo "cryptpad src: $cryptpadSrc" - -nix-shell -I nixpkgs=../../../.. -p '(nodePackages.override { nodejs = nodejs-12_x; }).bower2nix' --run "bower2nix $cryptpadSrc/bower.json bower-packages.nix" - - -set -euo pipefail - -node2nix --nodejs-12 \ - --input node-packages.json \ - --output node-packages-generated.nix \ - --composition node-packages.nix \ - --node-env ../../../development/node-packages/node-env.nix diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix deleted file mode 100644 index 7321022c7ebfe..0000000000000 --- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix +++ /dev/null @@ -1,754 +0,0 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@mcrowe/minibloom-0.2.0" = { - name = "_at_mcrowe_slash_minibloom"; - packageName = "@mcrowe/minibloom"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@mcrowe/minibloom/-/minibloom-0.2.0.tgz"; - sha1 = "1bed96aec18388198da37443899b2c3ff5948053"; - }; - }; - "accepts-1.3.7" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; - }; - }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; - }; - }; - "async-limiter-1.0.1" = { - name = "async-limiter"; - packageName = "async-limiter"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; - sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; - }; - }; - "body-parser-1.18.3" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.18.3"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz"; - sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4"; - }; - }; - "bytes-3.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; - }; - }; - "chainpad-crypto-0.2.6" = { - name = "chainpad-crypto"; - packageName = "chainpad-crypto"; - version = "0.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.6.tgz"; - sha512 = "yk7bBj22rs9PaX6LiqQxiw+Vj/afBStsNP1xP/B4Uh9a8iyJ7JrSZJ2Hj3d6fyqxJlBrMAX82Aj5PCZb5dzzHw=="; - }; - }; - "chainpad-server-5.1.0" = { - name = "chainpad-server"; - packageName = "chainpad-server"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-5.1.0.tgz"; - sha512 = "BdjgOOLTXXo1EjQ7lURDe7oqsqfQISNvwhILfp3K3diY2K1hxpPLbjYzOSgxNOTADeOAff0xnInR5eUCESVWaQ=="; - }; - }; - "content-disposition-0.5.2" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; - sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; - }; - }; - "content-type-1.0.4" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; - }; - }; - "cookie-0.3.1" = { - name = "cookie"; - packageName = "cookie"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; - sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; - }; - }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; - }; - }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - }; - "depd-1.1.2" = { - name = "depd"; - packageName = "depd"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; - }; - }; - "destroy-1.0.4" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; - }; - }; - "ee-first-1.1.1" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; - }; - }; - "encodeurl-1.0.2" = { - name = "encodeurl"; - packageName = "encodeurl"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; - }; - }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; - }; - }; - "etag-1.8.1" = { - name = "etag"; - packageName = "etag"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; - }; - }; - "express-4.16.4" = { - name = "express"; - packageName = "express"; - version = "4.16.4"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz"; - sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg=="; - }; - }; - "finalhandler-1.1.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; - sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; - }; - }; - "forwarded-0.2.0" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; - sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; - }; - }; - "fresh-0.5.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; - }; - }; - "fs-extra-7.0.1" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz"; - sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; - }; - }; - "gar-1.0.4" = { - name = "gar"; - packageName = "gar"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gar/-/gar-1.0.4.tgz"; - sha512 = "w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w=="; - }; - }; - "get-folder-size-2.0.1" = { - name = "get-folder-size"; - packageName = "get-folder-size"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-folder-size/-/get-folder-size-2.0.1.tgz"; - sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA=="; - }; - }; - "graceful-fs-4.2.8" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; - }; - }; - "http-errors-1.6.3" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; - sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; - }; - }; - "iconv-lite-0.4.23" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.23"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz"; - sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA=="; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; - "ipaddr.js-1.9.1" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; - }; - }; - "jsonfile-4.0.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; - }; - }; - "lex-1.7.9" = { - name = "lex"; - packageName = "lex"; - version = "1.7.9"; - src = fetchurl { - url = "https://registry.npmjs.org/lex/-/lex-1.7.9.tgz"; - sha1 = "5d5636ccef574348362938b79a47f0eed8ed0d43"; - }; - }; - "looper-3.0.0" = { - name = "looper"; - packageName = "looper"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz"; - sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; - }; - }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - }; - "merge-descriptors-1.0.1" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; - }; - }; - "mime-1.4.1" = { - name = "mime"; - packageName = "mime"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; - sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; - }; - }; - "mime-db-1.50.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.50.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz"; - sha512 = "9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A=="; - }; - }; - "mime-types-2.1.33" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.33"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz"; - sha512 = "plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g=="; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - }; - "negotiator-0.6.2" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; - }; - }; - "netflux-websocket-0.1.21" = { - name = "netflux-websocket"; - packageName = "netflux-websocket"; - version = "0.1.21"; - src = fetchurl { - url = "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-0.1.21.tgz"; - sha512 = "Zjl5lefg8urC0a0T7YCPGiUgRsISZBsTZl1STylmQz8Bq4ohcZ8cP3r6VoCpeVcvJ1Y/e3ZCXPxndWlNP9Jfug=="; - }; - }; - "nthen-0.1.8" = { - name = "nthen"; - packageName = "nthen"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz"; - sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw=="; - }; - }; - "on-finished-2.3.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; - }; - }; - "parseurl-1.3.3" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; - }; - }; - "path-to-regexp-0.1.7" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; - }; - }; - "proxy-addr-2.0.7" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; - sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; - }; - }; - "pull-stream-3.6.14" = { - name = "pull-stream"; - packageName = "pull-stream"; - version = "3.6.14"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.14.tgz"; - sha512 = "KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew=="; - }; - }; - "qs-6.5.2" = { - name = "qs"; - packageName = "qs"; - version = "6.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; - }; - }; - "range-parser-1.2.1" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; - }; - }; - "raw-body-2.3.3" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz"; - sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw=="; - }; - }; - "safe-buffer-5.1.2" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; - }; - }; - "safer-buffer-2.1.2" = { - name = "safer-buffer"; - packageName = "safer-buffer"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - }; - "saferphore-0.0.1" = { - name = "saferphore"; - packageName = "saferphore"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/saferphore/-/saferphore-0.0.1.tgz"; - sha1 = "cc962eda4e2b2452e6437fd32dcfb6f69ef2ea63"; - }; - }; - "send-0.16.2" = { - name = "send"; - packageName = "send"; - version = "0.16.2"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; - sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; - }; - }; - "serve-static-1.13.2" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.13.2"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; - sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw=="; - }; - }; - "setprototypeof-1.1.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; - }; - }; - "sortify-1.0.4" = { - name = "sortify"; - packageName = "sortify"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sortify/-/sortify-1.0.4.tgz"; - sha1 = "f0178687c83231be8a34fc0ec5462ea957b60284"; - }; - }; - "statuses-1.4.0" = { - name = "statuses"; - packageName = "statuses"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; - sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="; - }; - }; - "stream-to-pull-stream-1.7.3" = { - name = "stream-to-pull-stream"; - packageName = "stream-to-pull-stream"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.3.tgz"; - sha512 = "6sNyqJpr5dIOQdgNy/xcDWwDuzAsAwVzhzrWlAPAQ7Lkjx/rv0wgvxEyKwTq6FmNd5rjTrELt/CLmaSw7crMGg=="; - }; - }; - "tiny-each-async-2.0.3" = { - name = "tiny-each-async"; - packageName = "tiny-each-async"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tiny-each-async/-/tiny-each-async-2.0.3.tgz"; - sha1 = "8ebbbfd6d6295f1370003fbb37162afe5a0a51d1"; - }; - }; - "tweetnacl-0.12.2" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz"; - sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb"; - }; - }; - "tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.12.2"; - src = fetchgit { - url = "https://github.com/dchest/tweetnacl-js.git"; - rev = "8a21381d696acdc4e99c9f706f1ad23285795f79"; - sha256 = "10f27b673944107995b3f6dcd65caecd705acdae9c37b7e79b810a8a72a40a31"; - }; - }; - "type-is-1.6.18" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.18"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; - }; - }; - "ulimit-0.0.2" = { - name = "ulimit"; - packageName = "ulimit"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ulimit/-/ulimit-0.0.2.tgz"; - sha1 = "2b51f9dc8381ae4102636cec5eb338c2630588a0"; - }; - }; - "ultron-1.1.1" = { - name = "ultron"; - packageName = "ultron"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"; - sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; - }; - }; - "universalify-0.1.2" = { - name = "universalify"; - packageName = "universalify"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; - sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; - }; - }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; - }; - }; - "vary-1.1.2" = { - name = "vary"; - packageName = "vary"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; - }; - }; - "ws-3.3.3" = { - name = "ws"; - packageName = "ws"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz"; - sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; - }; - }; - }; -in -{ - "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#4.11.0" = nodeEnv.buildNodePackage { - name = "cryptpad"; - packageName = "cryptpad"; - version = "4.11.0"; - src = fetchgit { - url = "https://github.com/xwiki-labs/cryptpad.git"; - rev = "390e38acf63a9d7ae581eaa926ea678a519fcc14"; - sha256 = "d75f0568fd146da6512646d9516138f94b0bbbd9a4691eef11d370bf5810176a"; - }; - dependencies = [ - sources."@mcrowe/minibloom-0.2.0" - sources."accepts-1.3.7" - sources."array-flatten-1.1.1" - sources."async-limiter-1.0.1" - sources."body-parser-1.18.3" - sources."bytes-3.0.0" - (sources."chainpad-crypto-0.2.6" // { - dependencies = [ - sources."tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2" - ]; - }) - sources."chainpad-server-5.1.0" - sources."content-disposition-0.5.2" - sources."content-type-1.0.4" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."debug-2.6.9" - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."express-4.16.4" - sources."finalhandler-1.1.1" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-extra-7.0.1" - sources."gar-1.0.4" - sources."get-folder-size-2.0.1" - sources."graceful-fs-4.2.8" - sources."http-errors-1.6.3" - sources."iconv-lite-0.4.23" - sources."inherits-2.0.3" - sources."ipaddr.js-1.9.1" - sources."jsonfile-4.0.0" - sources."lex-1.7.9" - sources."looper-3.0.0" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."mime-1.4.1" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" - sources."ms-2.0.0" - sources."negotiator-0.6.2" - sources."netflux-websocket-0.1.21" - sources."nthen-0.1.8" - sources."on-finished-2.3.0" - sources."parseurl-1.3.3" - sources."path-to-regexp-0.1.7" - sources."proxy-addr-2.0.7" - sources."pull-stream-3.6.14" - sources."qs-6.5.2" - sources."range-parser-1.2.1" - sources."raw-body-2.3.3" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."saferphore-0.0.1" - sources."send-0.16.2" - sources."serve-static-1.13.2" - sources."setprototypeof-1.1.0" - sources."sortify-1.0.4" - sources."statuses-1.4.0" - sources."stream-to-pull-stream-1.7.3" - sources."tiny-each-async-2.0.3" - sources."tweetnacl-0.12.2" - sources."type-is-1.6.18" - sources."ulimit-0.0.2" - sources."ultron-1.1.1" - sources."universalify-0.1.2" - sources."unpipe-1.0.0" - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - sources."ws-3.3.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "realtime collaborative visual editor with zero knowlege server"; - license = "AGPL-3.0+"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json deleted file mode 100644 index fc6c498f438e9..0000000000000 --- a/pkgs/servers/web-apps/cryptpad/node-packages.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#4.11.0" } -] diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix deleted file mode 100644 index 0961603968eac..0000000000000 --- a/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! - -{pkgs ? import <nixpkgs> { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: - -let - nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages-generated.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.nix b/pkgs/servers/web-apps/whitebophir/node-packages.nix index 0961603968eac..862d223400999 100644 --- a/pkgs/servers/web-apps/whitebophir/node-packages.nix +++ b/pkgs/servers/web-apps/whitebophir/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/graphics/ldgallery/viewer/default.nix b/pkgs/tools/graphics/ldgallery/viewer/default.nix index f4cebde86070b..c47abd91f2a05 100644 --- a/pkgs/tools/graphics/ldgallery/viewer/default.nix +++ b/pkgs/tools/graphics/ldgallery/viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-12_x, pandoc, CoreServices }: +{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-14_x, pandoc, CoreServices }: with lib; @@ -18,7 +18,7 @@ let inherit (stdenv.hostPlatform) system; # some native node dependencies still require NodeJS 12 with Python 2 - nodejs = nodejs-12_x; + nodejs = nodejs-14_x; }; nodePkg = nodePackages.package.override { diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix index 02fdb925fb1b0..0c0b678d98f22 100644 --- a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix +++ b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ../../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/networking/airfield/deps.sh b/pkgs/tools/networking/airfield/deps.sh index 81767110283fc..a880801d1a917 100755 --- a/pkgs/tools/networking/airfield/deps.sh +++ b/pkgs/tools/networking/airfield/deps.sh @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -node2nix --nodejs-12 -i deps.json \ +node2nix --nodejs-16 -i deps.json \ --no-copy-node-env \ -e ../../../development/node-packages/node-env.nix -c node.nix diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 9f0040e2f4465..f9a1999f36d73 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a9c0377ba5bcc..db1bc330c2c2e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -220,6 +220,7 @@ mapAliases ({ cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07 cryptol = throw "cryptol was removed due to prolonged broken build"; # Added 2020-08-21 + cryptpad = throw "cryptpad has been removed, because it was unmaintained in nixpkgs"; # Added 2022-07-04 ctl = throw "ctl has been removed: abandoned by upstream"; # Added 2022-05-13 # CUDA Toolkit @@ -952,7 +953,8 @@ mapAliases ({ nmap-unfree = nmap; # Added 2021-04-06 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 - nodejs-10_x = throw "nodejs-10_X has been removed. Use a newer version instead."; # Added 2022-05-31 + nodejs-10_x = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31 + nodejs-12_x = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f25df0eea7b03..cc3125310ff05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4926,10 +4926,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - cryptpad = callPackage ../servers/web-apps/cryptpad { - nodejs = nodejs-12_x; - }; - ethash = callPackage ../development/libraries/ethash { }; ethminer = callPackage ../tools/misc/ethminer { cudaSupport = config.cudaSupport or true; }; @@ -8089,10 +8085,6 @@ with pkgs; nodejs-slim = nodejs-slim-16_x; - nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; - nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { - enableNpm = false; - }; nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { }; nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { enableNpm = false; |