diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-09-08 17:57:14 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-09-13 11:31:47 +0000 |
commit | ee7984efa14902a2ddd820c937457667a4f40c6a (patch) | |
tree | c9c1d046733cefe5e21fdd8a52104175d47b2443 /nixpkgs/pkgs/servers/web-apps | |
parent | ffc9d4ba381da62fd08b361bacd1e71e2a3d934d (diff) | |
parent | b3c692172e5b5241b028a98e1977f9fb12eeaf42 (diff) | |
download | nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.gz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.bz2 nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.lz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.xz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.zst nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.zip |
Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42'
Diffstat (limited to 'nixpkgs/pkgs/servers/web-apps')
41 files changed, 811 insertions, 307 deletions
diff --git a/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix b/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix index 1c35ebeff3b0..f7a02b5c13dd 100644 --- a/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix @@ -14,12 +14,12 @@ let }); in package.override rec { - name = "bookstack"; + pname = "bookstack"; version = "21.05.3"; src = fetchFromGitHub { owner = "bookstackapp"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "0dymrmy771lv6h9432vw7d12x5xgchjn9s3z8maz3b9d5xlx9gw8"; }; diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/bower-packages.nix index be0c3ab72c75..83c707472931 100644 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/bower-packages.nix +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/bower-packages.nix @@ -1,42 +1,40 @@ # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "jquery" "2.1.0" "~2.1.0" "02kwvz93vzpv10qnp7s0dz3al0jh77awwrizb6wadsvgifxssnlr") (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.56.0+components1" "^5.19.0" "0fv8rxw6dspyv4bl6p2aka57544f45527rallnhnm5scv77qnakm") + (fetchbower "codemirror" "5.61.1" "^5.19.0" "1abm1fcps86y2qm033wa96pd6ixf9w01vlhly5i51j0j94arnz4g") (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.4" "^0.2.0" "0sqqc2j0pc34ig6319n18i85j03hibqkhz3cbr70vbd8x43vfzby") - (fetchbower "chainpad-listmap" "0.9.0" "^0.9.0" "173yr5a6zxq7nb3fha6f1ajv2vy0mvqwmm949ww7ihvrhh7cd0f5") - (fetchbower "chainpad" "5.2.2" "^5.2.0" "1rmh039bqk11xnnh99sqrqksr4idly75y5q4f5wyl9cg4slsqrdp") + (fetchbower "chainpad-crypto" "0.2.6" "^0.2.0" "0h6ibv6gcym7mm080swdw4l6l159xjmxgqnahyxw3aydha5cj1z0") + (fetchbower "chainpad-listmap" "0.10.2" "^0.10.0" "03j3qws0icam4c0yqrz7f6maf1dxhlc56hc6csr2d9dx0wshd57s") + (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 "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556") - (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811") - (fetchbower "bootstrap" "4.5.0" "^v4.0.0" "0cfdn6z8jwx6y8lbbq6xpkfhq2vra0i84nkj9ji2bil1fzgzi40f") + (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" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6") - (fetchbower "localforage" "1.8.1" "^1.5.2" "0ci265385racnxvn4g1n672yaxi47msw6k042nxdb5vlpf5g327j") + (fetchbower "bootstrap-tokenfield" "0.12.1" "0.12.1" "1dh791s6ih8bf9ihck9n39h68c273jb3lg4mqk94bvqraz45fvwx") + (fetchbower "localforage" "1.9.0" "^1.5.2" "18ds5427gaschld5afwi128hqy8kysa1b1ckbrzbmqz8xnlshmc2") (fetchbower "html2canvas" "0.4.1" "^0.4.1" "0yg7y90nav068q0i5afc2c221zkddpf28hi0hwc46cawx4180c69") (fetchbower "croppie" "2.6.5" "^2.5.0" "1j1v5620zi13ad42r358i4ay891abwn6nz357484kgq2bgjj6ccx") - (fetchbower "sortablejs" "1.10.2" "^1.6.0" "10q4gyblhjy7w51clr0k9j7h722l4ybzn5535givwpmp6xagv11v") + (fetchbower "sortablejs" "1.14.0" "^1.6.0" "104d688lrbwxi3hnfr4q169850ffyfv1s8qnycqxhx0zfh3887m0") (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi") - (fetchbower "jszip" "Stuk/jszip#3.5.0" "Stuk/jszip#^3.1.5" "1ra19d82cq1hrnbw88l8c61bs12kpgxvbfiiwpfi8fhy0l8hcsvk") + (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" "0.11.2" "^0.11.0" "1dqfricbm6s8iv7w1bsx1700m5cpk5rk1f4spqv0fqyf6mdz366v") - (fetchbower "netflux-websocket" "0.1.20" "^0.1.20" "1xwqq7nw7fmhglndbplarkdzxfmkq831aqs8nm6qj0hz2ggbibhz") + (fetchbower "chainpad-netflux" "0.12.9" "^0.12.0" "1b2jkfl354gs9iy05i6db9g0hnngacxd2wdv59lc0icbmx62fpvi") + (fetchbower "netflux-websocket" "0.1.21" "^0.1.20" "13ia8cqipq1jnyzzxwf9yy91gzwnwb2g5kzb6l8id5gdr415q5yn") (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz") ]; } diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/default.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/default.nix index abd20d644990..4e8daf38453c 100644 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/default.nix @@ -2,6 +2,7 @@ , pkgs , lib , buildBowerComponents +, fetchbower , fetchurl , nodejs }: @@ -12,30 +13,39 @@ let inherit (stdenv.hostPlatform) system; }; - bowerPackages = buildBowerComponents { + bowerPackages = (buildBowerComponents { name = "${cryptpad.name}-bower-packages"; - # this list had to be tweaked by hand: - # * add the second jquery ~2.1.0 entry - # * add the second bootstrap ~3.1.1 entry 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 + (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. @@ -43,7 +53,7 @@ let (k: v: v.packageName == "cryptpad") (throw "cryptpad not found") nodePackages - ; + ; combined = cryptpad.override { postInstall = '' @@ -64,6 +74,17 @@ let 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 +combined diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/generate.sh b/nixpkgs/pkgs/servers/web-apps/cryptpad/generate.sh index 697b5a74a08a..925420c49a58 100755 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/generate.sh +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/generate.sh @@ -1,11 +1,18 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nodePackages.bower2nix +#! 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-10_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 \ - -# TODO: bower2nix > bower-packages.nix + --node-env ../../../development/node-packages/node-env.nix diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix index 47e64e9d911e..cbc12d113cfb 100644 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix @@ -4,6 +4,15 @@ 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"; @@ -49,22 +58,22 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "chainpad-crypto-0.2.5" = { + "chainpad-crypto-0.2.6" = { name = "chainpad-crypto"; packageName = "chainpad-crypto"; - version = "0.2.5"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.5.tgz"; - sha512 = "K9vRsAspuX+uU1goXPz0CawpLIaOHq+1JP3WfDLqaz67LbCX/MLIUt9aMcSeIJcwZ9uMpqnbMGRktyVPoz6MCA=="; + url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.6.tgz"; + sha512 = "yk7bBj22rs9PaX6LiqQxiw+Vj/afBStsNP1xP/B4Uh9a8iyJ7JrSZJ2Hj3d6fyqxJlBrMAX82Aj5PCZb5dzzHw=="; }; }; - "chainpad-server-4.0.9" = { + "chainpad-server-5.1.0" = { name = "chainpad-server"; packageName = "chainpad-server"; - version = "4.0.9"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.9.tgz"; - sha512 = "8h1W41ktE05TM6LuXrklpW2TUxWeNyIDiRaQygKsXaA/7pyJxF7+AmPVS+xW0c31VkHjQDPiaMzPoxhcxXnIyA=="; + url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-5.1.0.tgz"; + sha512 = "BdjgOOLTXXo1EjQ7lURDe7oqsqfQISNvwhILfp3K3diY2K1hxpPLbjYzOSgxNOTADeOAff0xnInR5eUCESVWaQ=="; }; }; "content-disposition-0.5.2" = { @@ -184,13 +193,13 @@ let sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; }; }; - "forwarded-0.1.2" = { + "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; + sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; "fresh-0.5.2" = { @@ -229,13 +238,13 @@ let sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA=="; }; }; - "graceful-fs-4.2.4" = { + "graceful-fs-4.2.8" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.4"; + version = "4.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; }; }; "http-errors-1.6.3" = { @@ -337,22 +346,22 @@ let sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; }; }; - "mime-db-1.45.0" = { + "mime-db-1.49.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.45.0"; + version = "1.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; - sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; + sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; }; }; - "mime-types-2.1.28" = { + "mime-types-2.1.32" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.28"; + version = "2.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; - sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; + sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; }; }; "ms-2.0.0" = { @@ -373,13 +382,13 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; - "netflux-websocket-0.1.20" = { + "netflux-websocket-0.1.21" = { name = "netflux-websocket"; packageName = "netflux-websocket"; - version = "0.1.20"; + version = "0.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-0.1.20.tgz"; - sha512 = "svFkw4ol4gmkcXKnx5kF/8tR9mmtTCDzUlLy4mSlcNl/4iWlbDmgwp/+aJ3nqtv8fg12m+DAFGX2+fbC0//dcg=="; + url = "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-0.1.21.tgz"; + sha512 = "Zjl5lefg8urC0a0T7YCPGiUgRsISZBsTZl1STylmQz8Bq4ohcZ8cP3r6VoCpeVcvJ1Y/e3ZCXPxndWlNP9Jfug=="; }; }; "nthen-0.1.8" = { @@ -418,13 +427,13 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "proxy-addr-2.0.6" = { + "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + 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" = { @@ -647,27 +656,28 @@ let }; in { - "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.20.1" = nodeEnv.buildNodePackage { + "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#4.9.0" = nodeEnv.buildNodePackage { name = "cryptpad"; packageName = "cryptpad"; - version = "3.20.1"; + version = "4.9.0"; src = fetchgit { url = "https://github.com/xwiki-labs/cryptpad.git"; - rev = "9bc27d7d0d50d17c345bd545a45341a05293c558"; - sha256 = "4a1fc833b38b2097741500cef38c6b04f5b752c21736e95eb492c33012016332"; + rev = "b1281fb4abd14e9758d58df4801e0a00eda7bc44"; + sha256 = "ed2d0e2520645fccdada7fa5f25bb878c0ee0e61d6c81a98c18906c12750578c"; }; 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.5" // { + (sources."chainpad-crypto-0.2.6" // { dependencies = [ sources."tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2" ]; }) - sources."chainpad-server-4.0.9" + sources."chainpad-server-5.1.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" @@ -681,12 +691,12 @@ in sources."etag-1.8.1" sources."express-4.16.4" sources."finalhandler-1.1.1" - sources."forwarded-0.1.2" + 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.4" + sources."graceful-fs-4.2.8" sources."http-errors-1.6.3" sources."iconv-lite-0.4.23" sources."inherits-2.0.3" @@ -698,16 +708,16 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."ms-2.0.0" sources."negotiator-0.6.2" - sources."netflux-websocket-0.1.20" + 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.6" + sources."proxy-addr-2.0.7" sources."pull-stream-3.6.14" sources."qs-6.5.2" sources."range-parser-1.2.1" diff --git a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json index 07e02a1a0a2e..fde63614a46a 100644 --- a/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json +++ b/nixpkgs/pkgs/servers/web-apps/cryptpad/node-packages.json @@ -1,3 +1,3 @@ [ - { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.20.1" } + { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#4.9.0" } ] diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/auto_generated_path.patch b/nixpkgs/pkgs/servers/web-apps/discourse/auto_generated_path.patch new file mode 100644 index 000000000000..9dcb1cb5595e --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/auto_generated_path.patch @@ -0,0 +1,13 @@ +diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb +index 380a63e987..b2ce7fa982 100644 +--- a/lib/plugin/instance.rb ++++ b/lib/plugin/instance.rb +@@ -403,7 +403,7 @@ class Plugin::Instance + end + + def auto_generated_path +- File.dirname(path) << "/auto_generated" ++ "#{Rails.root}/public/assets/auto_generated_plugin_assets/#{name}" + end + + def after_initialize(&block) diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/default.nix index 72ea8a943dc2..ca0f30d78942 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, runCommandNoCC, lib, nixosTests, writeShellScript +{ stdenv, pkgs, makeWrapper, runCommand, lib, writeShellScript , fetchFromGitHub, bundlerEnv, callPackage , ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk @@ -6,16 +6,16 @@ , redis, postgresql, which, brotli, procps, rsync, nodePackages, v8 , plugins ? [] -}: +}@args: let - version = "2.7.5"; + version = "2.7.7"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-OykWaiBAHcZy41i+aRzBHCRgwnfQUBijHjb+ofIk25M="; + sha256 = "sha256-rhcTQyirgPX0ITjgotJAYLLSU957GanxAYYhy9j123U="; }; runtimeDeps = [ @@ -55,6 +55,7 @@ let , version ? null , meta ? null , bundlerEnvArgs ? {} + , preserveGemsDir ? false , src , ... }@args: @@ -65,19 +66,29 @@ let in stdenv.mkDerivation (builtins.removeAttrs args [ "bundlerEnvArgs" ] // { pluginName = if name != null then name else "${pname}-${version}"; - phases = [ "unpackPhase" "installPhase" ]; + dontConfigure = true; + dontBuild = true; installPhase = '' runHook preInstall mkdir -p $out cp -r * $out/ - '' + lib.optionalString (bundlerEnvArgs != {}) '' - ln -sf ${rubyEnv}/lib/ruby/gems $out/gems - '' + '' + '' + lib.optionalString (bundlerEnvArgs != {}) ( + if preserveGemsDir then '' + cp -r ${rubyEnv}/lib/ruby/gems/* $out/gems/ + '' + else '' + if [[ -e $out/gems ]]; then + echo "Warning: The repo contains a 'gems' directory which will be removed!" + echo " If you need to preserve it, set 'preserveGemsDir = true'." + rm -r $out/gems + fi + ln -sf ${rubyEnv}/lib/ruby/gems $out/gems + '' + '' runHook postInstall - ''; + ''); }); - rake = runCommandNoCC "discourse-rake" { + rake = runCommand "discourse-rake" { nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin @@ -157,6 +168,11 @@ let # Use the Ruby API version in the plugin gem path, to match the # one constructed by bundlerEnv ./plugin_gem_api_version.patch + + # Change the path to the auto generated plugin assets, which + # defaults to the plugin's directory and isn't writable at the + # time of asset generation + ./auto_generated_path.patch ]; # We have to set up an environment that is close enough to @@ -243,6 +259,11 @@ let # Use mv instead of rename, since rename doesn't work across # device boundaries ./use_mv_instead_of_rename.patch + + # Change the path to the auto generated plugin assets, which + # defaults to the plugin's directory and isn't writable at the + # time of asset generation + ./auto_generated_path.patch ]; postPatch = '' @@ -273,7 +294,6 @@ let ln -sf /run/discourse/config $out/share/discourse/config ln -sf /run/discourse/assets/javascripts/plugins $out/share/discourse/app/assets/javascripts/plugins ln -sf /run/discourse/public $out/share/discourse/public - ln -sf /run/discourse/plugins $out/share/discourse/plugins ln -sf ${assets} $out/share/discourse/public.dist/assets ${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} $out/share/discourse/plugins/${p.pluginName or ""}") plugins} @@ -293,7 +313,7 @@ let enabledPlugins = plugins; plugins = callPackage ./plugins/all-plugins.nix { inherit mkDiscoursePlugin; }; ruby = rubyEnv.wrappedRuby; - tests = nixosTests.discourse; + tests = import ../../../../nixos/tests/discourse.nix { package = pkgs.discourse.override args; }; }; }; in discourse diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix index f64fbb137dfc..2766b645349f 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix @@ -3,9 +3,14 @@ let callPackage = newScope args; in { + discourse-calendar = callPackage ./discourse-calendar {}; discourse-canned-replies = callPackage ./discourse-canned-replies {}; + discourse-checklist = callPackage ./discourse-checklist {}; + discourse-data-explorer = callPackage ./discourse-data-explorer {}; discourse-github = callPackage ./discourse-github {}; + discourse-ldap-auth = callPackage ./discourse-ldap-auth {}; discourse-math = callPackage ./discourse-math {}; + discourse-migratepassword = callPackage ./discourse-migratepassword {}; discourse-solved = callPackage ./discourse-solved {}; discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {}; discourse-yearly-review = callPackage ./discourse-yearly-review {}; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile new file mode 100644 index 000000000000..bda8e6ec3cf3 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } + +# gem "rails" +gem 'rrule', '0.4.2', require: false diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock new file mode 100644 index 000000000000..d5622c0ac377 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -0,0 +1,27 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (6.1.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + concurrent-ruby (1.1.9) + i18n (1.8.10) + concurrent-ruby (~> 1.0) + minitest (5.14.4) + rrule (0.4.2) + activesupport (>= 4.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + zeitwerk (2.4.2) + +PLATFORMS + ruby + +DEPENDENCIES + rrule (= 0.4.2) + +BUNDLED WITH + 2.2.20 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix new file mode 100644 index 000000000000..b610a5c21a1b --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -0,0 +1,18 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-calendar"; + bundlerEnvArgs.gemdir = ./.; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-calendar"; + rev = "519cf403ae3003291de20145aca243e2ffbcb4a2"; + sha256 = "0398cf7k03i7j7v5w1mysjzk2npbkvr7icj5sjwa8i8xzg34gck4"; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-calendar"; + maintainers = with maintainers; [ ryantm ]; + license = licenses.mit; + description = "Adds the ability to create a dynamic calendar in the first post of a topic"; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix new file mode 100644 index 000000000000..26db0e6fd107 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -0,0 +1,76 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk"; + type = "gem"; + }; + version = "6.1.4"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + type = "gem"; + }; + version = "1.1.9"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; + type = "gem"; + }; + version = "1.8.10"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; + type = "gem"; + }; + version = "5.14.4"; + }; + rrule = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w338b7dgvd144fl5b8xy2lfc6zgbcjac7b4z158jc8h070yzc9v"; + type = "gem"; + }; + version = "0.4.2"; + }; + tzinfo = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + type = "gem"; + }; + version = "2.0.4"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; + type = "gem"; + }; + version = "2.4.2"; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index 558abec36f47..f90fabc05745 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-canned-replies"; - rev = "e3f1de8928df5955b64994079b7e2073556e5456"; - sha256 = "1g4fazm6cn6hbfd08mq2zhc6dgm4qj1r1f1amhbgxhk6qsxf42cd"; + rev = "672a96a8160d3767cf5fd6647309c7b5dcf8a55d"; + sha256 = "105zgpc7j3xmlkaz3cgxw1rfgy5d3dzln58ix569jmzifbsijml7"; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-canned-replies"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix new file mode 100644 index 000000000000..89edb3f71d7e --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -0,0 +1,17 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-checklist"; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-checklist"; + rev = "6e7b9c5040c55795c7fd4db9569b3e93dad092c2"; + sha256 = "sha256-2KAVBrfAvhLZC9idi+ijbVqOCq9rSXbDVEOZS+mWJ10="; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-checklist"; + maintainers = with maintainers; [ ryantm ]; + license = licenses.gpl2Only; + description = "A simple checklist rendering plugin for discourse "; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix new file mode 100644 index 000000000000..90218759cac5 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -0,0 +1,17 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-data-explorer"; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-data-explorer"; + rev = "23287ece952cb45203819e7b470ebc194c58cb13"; + sha256 = "1vc2072r72fkvcfpy6vpn9x4gl9lpjk29pnj8095xs22im8j5in1"; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-data-explorer"; + maintainers = with maintainers; [ ryantm ]; + license = licenses.mit; + description = "SQL Queries for admins in Discourse"; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index 0486ea1402b9..b6ebd834a530 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - faraday (1.5.0) + faraday (1.7.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -11,6 +11,7 @@ GEM faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) faraday-patron (~> 1.0) + faraday-rack (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) @@ -18,20 +19,21 @@ GEM faraday-excon (1.1.0) faraday-httpclient (1.0.1) faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) + faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) + faraday-rack (1.0.0) multipart-post (2.1.1) octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) public_suffix (4.0.6) - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.5) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) PLATFORMS - x86_64-linux + ruby DEPENDENCIES octokit (= 4.21.0) diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index bb6d16bfe465..63488de18ff1 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "154fd5ea597640c2259ce489b4ce75b48ac1973c"; - sha256 = "0wb5p219z42rc035rnh2iwrbsj000nxa9shbmc325rzcg6xlhdhw"; + rev = "b6ad8e39a13e2ad5c6943ea697ca23f2c5f9fec1"; + sha256 = "0vxwp4kbf44clcqilb8ni0ykk4jrgiv4rbd05pgfvndcp3izm2i6"; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index ae20ec895210..90009a3beb8b 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -11,15 +11,15 @@ version = "2.8.0"; }; faraday = { - dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah"; + sha256 = "0r6ik2yvsbx6jj30vck32da2bbvj4m0gf4jhp09vr75i1d6jzfvb"; type = "gem"; }; - version = "1.5.0"; + version = "1.7.0"; }; faraday-em_http = { groups = ["default"]; @@ -76,10 +76,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka"; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; faraday-patron = { groups = ["default"]; @@ -91,6 +91,16 @@ }; version = "1.0.0"; }; + faraday-rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; multipart-post = { groups = ["default"]; platforms = []; @@ -127,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.5"; }; sawyer = { dependencies = ["addressable" "faraday"]; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile new file mode 100644 index 000000000000..897a808c1d7d --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem 'pyu-ruby-sasl', '0.0.3.3', require: false +gem 'rubyntlm', '0.3.4', require: false +gem 'net-ldap', '0.14.0' +gem 'omniauth-ldap', '1.0.5' diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock new file mode 100644 index 000000000000..2843cb0d8f09 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock @@ -0,0 +1,28 @@ +GEM + remote: https://rubygems.org/ + specs: + hashie (4.1.0) + net-ldap (0.14.0) + omniauth (1.9.1) + hashie (>= 3.4.6) + rack (>= 1.6.2, < 3) + omniauth-ldap (1.0.5) + net-ldap (~> 0.12) + omniauth (~> 1.0) + pyu-ruby-sasl (~> 0.0.3.2) + rubyntlm (~> 0.3.4) + pyu-ruby-sasl (0.0.3.3) + rack (2.2.3) + rubyntlm (0.3.4) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + net-ldap (= 0.14.0) + omniauth-ldap (= 1.0.5) + pyu-ruby-sasl (= 0.0.3.3) + rubyntlm (= 0.3.4) + +BUNDLED WITH + 2.2.20 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix new file mode 100644 index 000000000000..92a3c2544cda --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix @@ -0,0 +1,18 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-ldap-auth"; + bundlerEnvArgs.gemdir = ./.; + src = fetchFromGitHub { + owner = "jonmbake"; + repo = "discourse-ldap-auth"; + rev = "eca02c560f2f2bf42feeb1923bc17e074f16b891"; + sha256 = "sha256-HLNoDvvxkBMvqP6WbRrJY0CYnK92W77nzSpuwgl0VPA="; + }; + meta = with lib; { + homepage = "https://github.com/jonmbake/discourse-ldap-auth"; + maintainers = with maintainers; [ ryantm ]; + license = licenses.mit; + description = "Discourse plugin to enable LDAP/Active Directory authentication."; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix new file mode 100644 index 000000000000..e684a5064791 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix @@ -0,0 +1,74 @@ +{ + hashie = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q"; + type = "gem"; + }; + version = "4.1.0"; + }; + net-ldap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18fyxfbh32ai72cwgz8s9w0fg0xq7j534y217flw54mmzsj8i6qp"; + type = "gem"; + }; + version = "0.14.0"; + }; + omniauth = { + dependencies = ["hashie" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz"; + type = "gem"; + }; + version = "1.9.1"; + }; + omniauth-ldap = { + dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ld3mx46xa1qhc0cpnck1n06xcxs0ag4n41zgabxri27a772f9wz"; + type = "gem"; + }; + version = "1.0.5"; + }; + pyu-ruby-sasl = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn"; + type = "gem"; + }; + version = "0.0.3.3"; + }; + rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + type = "gem"; + }; + version = "2.2.3"; + }; + rubyntlm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18d1lxhx62swggf4cqg76h7hp04f5801c8h07w08cm9xng2niqby"; + type = "gem"; + }; + version = "0.3.4"; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile new file mode 100644 index 000000000000..0fcdf01d56f9 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem 'bcrypt', '3.1.3' +gem 'unix-crypt', '1.3.0' diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock new file mode 100644 index 000000000000..2c9fb9049304 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock @@ -0,0 +1,15 @@ +GEM + remote: https://rubygems.org/ + specs: + bcrypt (3.1.3) + unix-crypt (1.3.0) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + bcrypt (= 3.1.3) + unix-crypt (= 1.3.0) + +BUNDLED WITH + 2.2.20 diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix new file mode 100644 index 000000000000..4c46dfb181e7 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix @@ -0,0 +1,18 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-migratepassword"; + bundlerEnvArgs.gemdir = ./.; + src = fetchFromGitHub { + owner = "communiteq"; + repo = "discourse-migratepassword"; + rev = "91d6a008de91853becca01846aa4662bd227670e"; + sha256 = "sha256-aKj0zXyXDnG20qVdhGvn4fwXiBeHFj2pv4bTUP81MP0="; + }; + meta = with lib; { + homepage = "https://github.com/communiteq/discourse-migratepassword"; + maintainers = with maintainers; [ ryantm ]; + license = licenses.gpl2Only; + description = "Support migrated password hashes"; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix new file mode 100644 index 000000000000..22b4053bbd4e --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix @@ -0,0 +1,22 @@ +{ + bcrypt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d2gqv8vry4ps0asb7nn1z4zxi3mcscy7yrim0npdd294ffyinvj"; + type = "gem"; + }; + version = "3.1.3"; + }; + unix-crypt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wflipsmmicmgvqilp9pml4x19b337kh6p6jgrzqrzpkq2z52gdq"; + type = "gem"; + }; + version = "1.3.0"; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index 2d451418bdd9..c92c5a1016aa 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "b96374bf4ab7e6d5cecb0761918b060a524eb9bf"; - sha256 = "0zrv70p0wz93akpcj6gpwjkw7az3iz9bx4n2z630kyrlmxdbj32a"; + rev = "8bf54370200fe9d94541f69339430a7dc1019d62"; + sha256 = "1sk91h4dilkxm1wpv8zw59wgw860ywwlcgiw2kd23ybdk9n7b3lh"; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/update.py b/nixpkgs/pkgs/servers/web-apps/discourse/update.py index ae4dadfc3a73..a207b0ebf318 100755 --- a/nixpkgs/pkgs/servers/web-apps/discourse/update.py +++ b/nixpkgs/pkgs/servers/web-apps/discourse/update.py @@ -12,6 +12,7 @@ import os import stat import json import requests +import textwrap from distutils.version import LooseVersion from pathlib import Path from typing import Iterable @@ -77,7 +78,11 @@ def _call_nix_update(pkg, version): def _nix_eval(expr: str): nixpkgs_path = Path(__file__).parent / '../../../../' - return json.loads(subprocess.check_output(['nix', 'eval', '--json', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True)) + try: + output = subprocess.check_output(['nix', 'eval', '--json', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True) + except subprocess.CalledProcessError: + return None + return json.loads(output) def _get_current_package_version(pkg: str): @@ -111,6 +116,18 @@ def _diff_file(filepath: str, old_version: str, new_version: str): return +def _remove_platforms(rubyenv_dir: Path): + for platform in ['arm64-darwin-20', 'x86_64-darwin-18', + 'x86_64-darwin-19', 'x86_64-darwin-20', + 'x86_64-linux']: + with open(rubyenv_dir / 'Gemfile.lock', 'r') as f: + for line in f: + if platform in line: + subprocess.check_output( + ['bundle', 'lock', '--remove-platform', platform], cwd=rubyenv_dir) + break + + @click_log.simple_verbosity_option(logger) @@ -173,10 +190,7 @@ def update(rev): f.write(repo.get_file(fn, rev)) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) - for platform in ['arm64-darwin-20', 'x86_64-darwin-18', - 'x86_64-darwin-19', 'x86_64-darwin-20', - 'x86_64-linux']: - subprocess.check_output(['bundle', 'lock', '--remove-platform', platform], cwd=rubyenv_dir) + _remove_platforms(rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) _call_nix_update('discourse', repo.rev2version(rev)) @@ -187,9 +201,14 @@ def update_plugins(): """ plugins = [ + {'name': 'discourse-calendar'}, {'name': 'discourse-canned-replies'}, + {'name': 'discourse-checklist'}, + {'name': 'discourse-data-explorer'}, {'name': 'discourse-github'}, + {'name': 'discourse-ldap-auth', 'owner': 'jonmbake'}, {'name': 'discourse-math'}, + {'name': 'discourse-migratepassword', 'owner': 'discoursehosting'}, {'name': 'discourse-solved'}, {'name': 'discourse-spoiler-alert'}, {'name': 'discourse-yearly-review'}, @@ -202,13 +221,59 @@ def update_plugins(): repo_name = plugin.get('repo_name') or name repo = DiscourseRepo(owner=owner, repo=repo_name) + + filename = _nix_eval(f'builtins.unsafeGetAttrPos "src" discourse.plugins.{name}') + if filename is None: + filename = Path(__file__).parent / 'plugins' / name / 'default.nix' + filename.parent.mkdir() + + has_ruby_deps = False + for line in repo.get_file('plugin.rb', repo.latest_commit_sha).splitlines(): + if 'gem ' in line: + has_ruby_deps = True + break + + with open(filename, 'w') as f: + f.write(textwrap.dedent(f""" + {{ lib, mkDiscoursePlugin, fetchFromGitHub }}: + + mkDiscoursePlugin {{ + name = "{name}";"""[1:] + (""" + bundlerEnvArgs.gemdir = ./.;""" if has_ruby_deps else "") + f""" + src = {fetcher} {{ + owner = "{owner}"; + repo = "{repo_name}"; + rev = "replace-with-git-rev"; + sha256 = "replace-with-sha256"; + }}; + meta = with lib; {{ + homepage = ""; + maintainers = with maintainers; [ ]; + license = licenses.mit; # change to the correct license! + description = ""; + }}; + }}""")) + + all_plugins_filename = Path(__file__).parent / 'plugins' / 'all-plugins.nix' + with open(all_plugins_filename, 'r+') as f: + content = f.read() + pos = -1 + while content[pos] != '}': + pos -= 1 + content = content[:pos] + f' {name} = callPackage ./{name} {{}};' + os.linesep + content[pos:] + f.seek(0) + f.write(content) + f.truncate() + + else: + filename = filename['file'] + prev_commit_sha = _nix_eval(f'discourse.plugins.{name}.src.rev') if prev_commit_sha == repo.latest_commit_sha: click.echo(f'Plugin {name} is already at the latest revision') continue - filename = _nix_eval(f'builtins.unsafeGetAttrPos "src" discourse.plugins.{name}')['file'] prev_hash = _nix_eval(f'discourse.plugins.{name}.src.outputHash') new_hash = subprocess.check_output([ 'nix-universal-prefetch', fetcher, @@ -244,7 +309,9 @@ def update_plugins(): with open(gemfile, 'a') as f: f.write(gemfile_text) + subprocess.check_output(['bundle', 'lock', '--add-platform', 'ruby'], cwd=rubyenv_dir) subprocess.check_output(['bundle', 'lock', '--update'], cwd=rubyenv_dir) + _remove_platforms(rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) diff --git a/nixpkgs/pkgs/servers/web-apps/galene/default.nix b/nixpkgs/pkgs/servers/web-apps/galene/default.nix index c24857d9dc5f..0ae5523c35a3 100644 --- a/nixpkgs/pkgs/servers/web-apps/galene/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/galene/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "galene"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - sha256 = "sha256-yb+gEex4WEvIAEMuSTkw25rsBTL9tlfhf9qQtISWUd0="; + sha256 = "sha256-CqwxHLXhiBYPS+93/MycS2IR//31puhI+oSpMS/jR1s="; }; vendorSha256 = "sha256-Vm7tTTQJyZZVbORl5ziy4GJ34kHh5dh0ojX/ZuTpshA="; diff --git a/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix b/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix index 0e1d933ab589..40f8b1b43278 100644 --- a/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix @@ -29,7 +29,7 @@ let in mkYarnPackage rec { - name = "hedgedoc"; + pname = "hedgedoc"; version = "1.8.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix b/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix index d18891f619fc..5d7cbc1c02db 100644 --- a/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix +++ b/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { @@ -651,7 +651,7 @@ sha256 = "1pa8cqbr758vx1q2ymsmbkp9cz3b7bghxzi90zc4hfq1nzav5w85"; }; in - runCommandNoCC "Idle.js" { buildInputs = [gnutar]; } '' + runCommand "Idle.js" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -2403,7 +2403,7 @@ sha256 = "0b6axzi9kwsd24pcqfk5rmy9nhsdyklpd3z8w9wiynd64435dilz"; }; in - runCommandNoCC "CodeMirror.git" { buildInputs = [gnutar]; } '' + runCommand "CodeMirror.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -3531,7 +3531,7 @@ sha256 = "0hlv66cxrqih7spnissl44jd8f8x9dyvzc68fn0g2fwwrnpjjib7"; }; in - runCommandNoCC "diff-match-patch.git" { buildInputs = [gnutar]; } '' + runCommand "diff-match-patch.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -6203,7 +6203,7 @@ sha256 = "0d2zf62fmad760rg9hrkyhp03k5apms3fm0mf64yy8q6p3iw7jvw"; }; in - runCommandNoCC "js-sequence-diagrams.git" { buildInputs = [gnutar]; } '' + runCommand "js-sequence-diagrams.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -6923,7 +6923,7 @@ sha256 = "036v1a9z79mc961xxx0rw8p6n2w1z8bnqpapgfg2kbw8f87jfxyi"; }; in - runCommandNoCC "lz-string.git" { buildInputs = [gnutar]; } '' + runCommand "lz-string.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -7323,7 +7323,7 @@ sha256 = "1rgmap95akwf9z72msxpqcfy95h8pqz9c8vn9xvvibfb5jf46lv0"; }; in - runCommandNoCC "meta-marked" { buildInputs = [gnutar]; } '' + runCommand "meta-marked" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . diff --git a/nixpkgs/pkgs/servers/web-apps/lemmy/default.nix b/nixpkgs/pkgs/servers/web-apps/lemmy/default.nix index e9b6eb116290..c07865688f99 100644 --- a/nixpkgs/pkgs/servers/web-apps/lemmy/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/lemmy/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "lemmy-server"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "LemmyNet"; repo = "lemmy"; rev = version; - sha256 = "sha256-wDRBeAYjPpAd3DL99fH4Yng994hGmAmxlBqzOeXTP88="; + sha256 = "sha256-AFVipxzKwNiillVmMA+Q7nMKajN9mzw37mBpqzf+XpM="; }; - cargoSha256 = "sha256-7wF5mUjSeJvCNLZcR6XB31RX2RLOOEyTGpOQxg+NcWk="; + cargoSha256 = "sha256-nxuynzQRUqne1KZIvP152afWbG2Zb9zyCqy7Bx4PeJ8="; buildInputs = [ postgresql ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { OPENSSL_INCLUDE_DIR = "${openssl.dev}/include"; meta = with lib; { - description = "Ultra relevant and instant full-text search API"; + description = "🐀 Building a federated alternative to reddit in rust"; homepage = "https://join-lemmy.org/"; license = licenses.agpl3Only; maintainers = with maintainers; [ happysalada ]; diff --git a/nixpkgs/pkgs/servers/web-apps/matomo/default.nix b/nixpkgs/pkgs/servers/web-apps/matomo/default.nix index 9a0a1bed0c8c..673b5bbc3b2d 100644 --- a/nixpkgs/pkgs/servers/web-apps/matomo/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "4.3.1"; - sha256 = "Ve4P1cVV/uZ59BcQaUZLTTOwpjX7veof9jR0l3Y9xOQ="; + version = "4.4.1"; + sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl"; }; matomo-beta = { - version = "4.3.1"; + version = "4.4.1"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "Ve4P1cVV/uZ59BcQaUZLTTOwpjX7veof9jR0l3Y9xOQ="; + sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl"; }; }; common = pname: { version, sha256, beta ? null }: @@ -102,7 +102,7 @@ let license = licenses.gpl3Plus; homepage = "https://matomo.org/"; platforms = platforms.all; - maintainers = with maintainers; [ florianjacob kiwi ]; + maintainers = with maintainers; [ florianjacob kiwi sebbel ]; }; }; in diff --git a/nixpkgs/pkgs/servers/web-apps/moodle/default.nix b/nixpkgs/pkgs/servers/web-apps/moodle/default.nix index bd90e908f1c4..d6fcedf8dc6c 100644 --- a/nixpkgs/pkgs/servers/web-apps/moodle/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ] }: let - version = "3.11"; + version = "3.11.2"; stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version)); in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-rZKY26ZPvubSr6nZ+Kguj1uKoEJbF3pEIKjjh6weyYo"; + sha256 = "sha256-owe/8CVz7+uBrHJQDN4csWVcdk49AvT1ip88lAe/tKg="; }; phpConfig = writeText "config.php" '' diff --git a/nixpkgs/pkgs/servers/web-apps/plausible/default.nix b/nixpkgs/pkgs/servers/web-apps/plausible/default.nix index 2cdd33a245e5..40e7d878da29 100644 --- a/nixpkgs/pkgs/servers/web-apps/plausible/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/plausible/default.nix @@ -13,7 +13,6 @@ let pname = "plausible"; version = "1.3.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "plausible"; diff --git a/nixpkgs/pkgs/servers/web-apps/plausible/yarn.nix b/nixpkgs/pkgs/servers/web-apps/plausible/yarn.nix index 303ccb31c551..3b29c311445c 100644 --- a/nixpkgs/pkgs/servers/web-apps/plausible/yarn.nix +++ b/nixpkgs/pkgs/servers/web-apps/plausible/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/nixpkgs/pkgs/servers/web-apps/sogo/default.nix b/nixpkgs/pkgs/servers/web-apps/sogo/default.nix index 20fc0f6f0c0c..fc7af3bcf2dc 100644 --- a/nixpkgs/pkgs/servers/web-apps/sogo/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/sogo/default.nix @@ -1,19 +1,19 @@ { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir -, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config, nixosTests }: -with lib; gnustep.stdenv.mkDerivation rec { +, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests }: +gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "5.1.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - sha256 = "19qkznk20fi47zxvg24hqnim5bpjlawk76w04jgd93yqakidl8ax"; + sha256 = "0y9im5y6ffdc7sy2qphq0xai4ig1ks7vj10vy4mn1psdlc5kd516"; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 ]; - buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkg-config ] - ++ optional (openldap != null) openldap; + buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config ] + ++ lib.optional (openldap != null) openldap; patches = [ # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches @@ -68,7 +68,7 @@ with lib; gnustep.stdenv.mkDerivation rec { passthru.tests.sogo = nixosTests.sogo; - meta = { + meta = with lib; { description = "A very fast and scalable modern collaboration suite (groupware)"; license = with licenses; [ gpl2Only lgpl21Only ]; homepage = "https://sogo.nu/"; diff --git a/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix index cdbb8c4a3451..d5ecdf2f5d41 100644 --- a/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix +++ b/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix @@ -4,112 +4,112 @@ let sources = { - "@financial-times/polyfill-useragent-normaliser-1.9.0" = { + "@financial-times/polyfill-useragent-normaliser-1.10.0" = { name = "_at_financial-times_slash_polyfill-useragent-normaliser"; packageName = "@financial-times/polyfill-useragent-normaliser"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@financial-times/polyfill-useragent-normaliser/-/polyfill-useragent-normaliser-1.9.0.tgz"; - sha512 = "jrVQ42tT1RrWyR/hkJlro2HhHZMPGXknKfJyZabe0CYj1c1KIqdS1JhhXEOt0T9ntaRCYq56y2/hAMM6LOU73g=="; + url = "https://registry.npmjs.org/@financial-times/polyfill-useragent-normaliser/-/polyfill-useragent-normaliser-1.10.0.tgz"; + sha512 = "OQYm8qoegUzHZgpNjw0QSmcoH8Tu+fbY9/wTOqbK/2lj3qWNZpGdBimTV1qp8xwF+SVyL2vNzZEjTxSlbjNOSA=="; }; }; - "@financial-times/useragent_parser-1.5.1" = { + "@financial-times/useragent_parser-1.6.0" = { name = "_at_financial-times_slash_useragent_parser"; packageName = "@financial-times/useragent_parser"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@financial-times/useragent_parser/-/useragent_parser-1.5.1.tgz"; - sha512 = "g6MJ5tVszip1wAOq41yk8Z0WJqjfpu3hKaos/IaechYC4RqIn8bTanNR/EGD6oeOdJ9/fTPbQQX5/3ZQwSTXtQ=="; + url = "https://registry.npmjs.org/@financial-times/useragent_parser/-/useragent_parser-1.6.0.tgz"; + sha512 = "v6Ucl//xSVhpyTtHMVCA9uv9W7CVwj8vBAQFKFDkfGC1DquBobOMhnzH9Odc+Tunf+i4WRnNgt90fQ7CSAbU3g=="; }; }; - "@formatjs/ecma402-abstract-1.5.1" = { + "@formatjs/ecma402-abstract-1.8.0" = { name = "_at_formatjs_slash_ecma402-abstract"; packageName = "@formatjs/ecma402-abstract"; - version = "1.5.1"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.1.tgz"; - sha512 = "io9XhgIpEbc6jSdn4QVnJeFaUzy6gS5fGiIRCUJ7QKqCNp69JS8EJPW8gCtvwz+JQtx2SJvhaMJbzz3rGkTXBA=="; + url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.8.0.tgz"; + sha512 = "X+nxZcIQr0YfYNtw1ZkHjN3YSyi0fEmdAJqRzk24KwNvqLv7GmVfw70mf7ADnwOvkcrSaAdx24GfAqckGTv9ww=="; }; }; - "@formatjs/intl-datetimeformat-3.2.3" = { + "@formatjs/intl-datetimeformat-4.1.0" = { name = "_at_formatjs_slash_intl-datetimeformat"; packageName = "@formatjs/intl-datetimeformat"; - version = "3.2.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-3.2.3.tgz"; - sha512 = "KnQUVuctlozQHULnBi+WLZDAGznFYviVU2HqgCYin2ZEz45IJ9dIZH9gqwsIgiLDgudptHfbj98I3JeKJhprcg=="; + url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-4.1.0.tgz"; + sha512 = "rEAPnIIsiOpjXMqoMdxClJ4Q2uhKTN1WH2fQUCJrg4FYdqfevJeymSowdLcOi1AYARIoTXTmlqS8pHIJx62VEw=="; }; }; - "@formatjs/intl-displaynames-4.0.4" = { + "@formatjs/intl-displaynames-5.1.0" = { name = "_at_formatjs_slash_intl-displaynames"; packageName = "@formatjs/intl-displaynames"; - version = "4.0.4"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-4.0.4.tgz"; - sha512 = "oNeLM0vZDFNZSqrz70XhxbMGtjfQ7T/UUcA9K4DvjWX6vmgCbpw5rdwEddhTotY3EmTyUJueK+14e2gIwfCbBA=="; + url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.1.0.tgz"; + sha512 = "2pwIlHcNBZ281ySsz/E6JURVDxWsIxHn/HyxmylxBQMeW2HeFq1YuP6ycAxSMfp+EtWAN4v8TgWJQM+YBI22FA=="; }; }; - "@formatjs/intl-getcanonicallocales-1.5.3" = { + "@formatjs/intl-getcanonicallocales-1.6.0" = { name = "_at_formatjs_slash_intl-getcanonicallocales"; packageName = "@formatjs/intl-getcanonicallocales"; - version = "1.5.3"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.5.3.tgz"; - sha512 = "QVBnSPZ32Y80wkXbf36hP9VbyklbOb8edppxFcgO9Lbd47zagllw65Y81QOHEn/j11JcTn2OhW0vea95LHvQmA=="; + url = "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.6.0.tgz"; + sha512 = "1967VujZeow0K0NpzerdNOaskcE0KwnnchxT8TzlkLs4RjXx7Uz0bjQPtUYGV7kvbgMJ9qb6tWmCqIwe3sBKUw=="; }; }; - "@formatjs/intl-listformat-5.0.4" = { + "@formatjs/intl-listformat-6.1.0" = { name = "_at_formatjs_slash_intl-listformat"; packageName = "@formatjs/intl-listformat"; - version = "5.0.4"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-5.0.4.tgz"; - sha512 = "0DQ2NF1PmO3+mvZp4V/SPNk7kUaLDcZR3eWbN8cGvSafWOrcv1iEcTXOd8ow8u9OA0gBTWwgPDcQFn7W0mU8kw=="; + url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.1.0.tgz"; + sha512 = "NsDKO0U1mVFZmoyZ0ztFL+biqztDKv1qdSvPA1S5yOYZddDy6G9SpnBZgNjhxUFIBqycNW95ibO/jrI5Ou4s5Q=="; }; }; - "@formatjs/intl-locale-2.4.13" = { + "@formatjs/intl-locale-2.4.26" = { name = "_at_formatjs_slash_intl-locale"; packageName = "@formatjs/intl-locale"; - version = "2.4.13"; + version = "2.4.26"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.13.tgz"; - sha512 = "hrglCuFjRpMrutmuL+Ck84KBxeHhouk7d5B/G9kqHL4zmrW6AsBwU+0KeyvareiY3MWzYZhQj1Nm3JEGulQRUQ=="; + url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.26.tgz"; + sha512 = "f5NyHb5qdfA0oO2IGLhNU0k9BWq8xI26VqxzZqjTfEKnn8xJ+SBE9drwRfTqlRz6pmvztPmkDg3FSflmGdDKGw=="; }; }; - "@formatjs/intl-numberformat-6.1.3" = { + "@formatjs/intl-numberformat-7.1.0" = { name = "_at_formatjs_slash_intl-numberformat"; packageName = "@formatjs/intl-numberformat"; - version = "6.1.3"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-6.1.3.tgz"; - sha512 = "bLVEt4G7IfacLpiBKg2VfHKnPrzWOWX/jxEi+OIUk6M2bEfYj8Vi1nYGb8+D7ZHCbuj/L7+lnlL4bItPTXT8JA=="; + url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-7.1.0.tgz"; + sha512 = "zwjacMSn+Ide2RXK2PN0veB7N7ay10tQ1Pb8eXeMB7zjRjJXHROi8O1ZA0dpJid0lw/5+5G2/lEdYvsPWLkaZA=="; }; }; - "@formatjs/intl-pluralrules-4.0.5" = { + "@formatjs/intl-pluralrules-4.0.20" = { name = "_at_formatjs_slash_intl-pluralrules"; packageName = "@formatjs/intl-pluralrules"; - version = "4.0.5"; + version = "4.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.5.tgz"; - sha512 = "mWsCpc/SZ6rk0Qb3zpv5bUz6uJysW6qap0qJJz6d0MJpszN3GNsk8CbP5q62oUaWvBmHoeXBvAG9VVEu1TUexw=="; + url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.20.tgz"; + sha512 = "ayyjvIh9ShXQxo0Y9GhUTyW9zyB3jiBFRIEhMmGowpIlTVRhOwl57XZ+YuUgo/yCvtJqnvGPu/4/fQTouxHuGw=="; }; }; - "@formatjs/intl-relativetimeformat-8.0.3" = { + "@formatjs/intl-relativetimeformat-9.1.0" = { name = "_at_formatjs_slash_intl-relativetimeformat"; packageName = "@formatjs/intl-relativetimeformat"; - version = "8.0.3"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.0.3.tgz"; - sha512 = "OIobPtY5vtwe5IM0B0J3KmewYB/NTcbgiW9yRdWzMA1TeFSd8LfuficICYuzUZt25Kh/eIw4g37ArhS1WH/6Iw=="; + url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-9.1.0.tgz"; + sha512 = "F4HmAk/ZYy9VNbrNOayGfPKEnj2ey6M9kMKf+UKL6QL21FOxLyY6e4okSG6VbAjZ0cYgKvEiNDjSuWP86qSo0g=="; }; }; - "@juggle/resize-observer-3.3.0" = { + "@juggle/resize-observer-3.3.1" = { name = "_at_juggle_slash_resize-observer"; packageName = "@juggle/resize-observer"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.0.tgz"; - sha512 = "P1v2nvK7z2gOLVM/bveIRLG9L99uEahTGgTltyF03zixZAjI9YmKLj5Z9MpS9wBIUt5WDoQORT2lXvLOIF89iA=="; + url = "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.1.tgz"; + sha512 = "zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw=="; }; }; "@types/component-emitter-1.2.10" = { @@ -121,40 +121,40 @@ let sha512 = "bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg=="; }; }; - "@types/cookie-0.4.0" = { + "@types/cookie-0.4.1" = { name = "_at_types_slash_cookie"; packageName = "@types/cookie"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz"; - sha512 = "y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg=="; + url = "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz"; + sha512 = "XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q=="; }; }; - "@types/cors-2.8.10" = { + "@types/cors-2.8.12" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.10"; + version = "2.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz"; - sha512 = "C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz"; + sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; }; }; - "@types/node-14.14.31" = { + "@types/node-16.4.11" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.31"; + version = "16.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz"; - sha512 = "vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.4.11.tgz"; + sha512 = "nWSFUbuNiPKJEe1IViuodSI+9cM+vpM8SWF/O6dJK7wmGRNq55U7XavJHrlRrPkSMuUZUFzg1xaZ1B+ZZCrRWw=="; }; }; - "@webcomponents/template-1.4.4" = { + "@webcomponents/template-1.5.0" = { name = "_at_webcomponents_slash_template"; packageName = "@webcomponents/template"; - version = "1.4.4"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webcomponents/template/-/template-1.4.4.tgz"; - sha512 = "QqCmmywIKJTilkl6UIPLxEBBuqhDaOBpvQyKOnUEwl9lJuVHBrVlhMIhhnp9VSZJ6xEUnp+PiX8DST1k0q/v4Q=="; + url = "https://registry.npmjs.org/@webcomponents/template/-/template-1.5.0.tgz"; + sha512 = "DPQgBAedzjsFD7rgv7b6OKmpHq5VTBUCLmYfDiov2FC2C79QGaz+4iNmlVAem5iSicvN8DWTwU1kZ48XYLtuqg=="; }; }; "Base64-1.1.0" = { @@ -220,13 +220,13 @@ let sha1 = "4b728faf0a19555194d4fbd05582f833fdcd137b"; }; }; - "balanced-match-1.0.0" = { + "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; "base64-arraybuffer-0.1.4" = { @@ -436,13 +436,13 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "engine.io-4.1.1" = { + "engine.io-5.1.1" = { name = "engine.io"; packageName = "engine.io"; - version = "4.1.1"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-4.1.1.tgz"; - sha512 = "t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-5.1.1.tgz"; + sha512 = "aMWot7H5aC8L4/T8qMYbLdvKlZOdJTH54FxfdFunTGvhMx1BHkJOntWArsVfgAZVwAO9LC2sryPWRcEeUzCe5w=="; }; }; "engine.io-parser-4.0.2" = { @@ -472,13 +472,13 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "event-source-polyfill-1.0.22" = { + "event-source-polyfill-1.0.24" = { name = "event-source-polyfill"; packageName = "event-source-polyfill"; - version = "1.0.22"; + version = "1.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.22.tgz"; - sha512 = "Fnk9E2p4rkZ3eJGBn2HDeZoBTpyjPxj8RX/whdr4Pm5622xYgYo1k48SUD649Xlo6nnoKRr2WwcUlneil/AZ8g=="; + url = "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.24.tgz"; + sha512 = "aEtMhrH5ww3X6RgbsNcwu0whw8zjOoeRnwPqRKqKuxWS5KlAZhCY+rTm6wMlHOXbxmLGn8lW6Xox7rfpBExzGA=="; }; }; "event-target-shim-5.0.1" = { @@ -535,13 +535,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "glob-7.1.6" = { + "glob-7.1.7" = { name = "glob"; packageName = "glob"; - version = "7.1.6"; + version = "7.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; + sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; }; }; "graceful-fs-4.2.6" = { @@ -715,22 +715,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.46.0" = { + "mime-db-1.49.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.46.0"; + version = "1.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz"; - sha512 = "svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; + sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; }; }; - "mime-types-2.1.29" = { + "mime-types-2.1.32" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.29"; + version = "2.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz"; - sha512 = "Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; + sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; }; }; "minimatch-3.0.4" = { @@ -895,13 +895,13 @@ let sha512 = "JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g=="; }; }; - "polyfill-library-3.103.0" = { + "polyfill-library-3.107.1" = { name = "polyfill-library"; packageName = "polyfill-library"; - version = "3.103.0"; + version = "3.107.1"; src = fetchurl { - url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.103.0.tgz"; - sha512 = "z6DMbqDGO87IeG/sjN/PGPgGLzhKftVj6OeRujxgQn+Kz7x+E8uzFvdB3X8dqoE4xaY6aX3ar0UzRxRlYPH9yg=="; + url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.107.1.tgz"; + sha512 = "HrN61Tp8Wjz1xcmYmstm0m6ySeiVSVqadDFhFMZmoiWlRoPQRfdeVWv88IqZKmxYITZ85z26wmOJdGYrGs6tjw=="; }; }; "process-nextick-args-2.0.1" = { @@ -985,13 +985,13 @@ let sha512 = "emnwZtu6NrlBlvT6HrlbAOs024JX4orWew8H5owBOyUJ7eFXn8lGe4bsXTBD6AAWzP/p7LL86AjVIH8Apqec5w=="; }; }; - "semver-7.3.4" = { + "semver-7.3.5" = { name = "semver"; packageName = "semver"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; - sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; }; "send-0.17.1" = { @@ -1021,22 +1021,22 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; - "socket.io-3.1.2" = { + "socket.io-4.1.3" = { name = "socket.io"; packageName = "socket.io"; - version = "3.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.2.tgz"; - sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.3.tgz"; + sha512 = "tLkaY13RcO4nIRh1K2hT5iuotfTaIQw7cVIe0FUykN3SuQi0cm7ALxuyT5/CtDswOMWUzMGTibxYNx/gU7In+Q=="; }; }; - "socket.io-adapter-2.1.0" = { + "socket.io-adapter-2.3.1" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; - version = "2.1.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz"; - sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg=="; + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.1.tgz"; + sha512 = "8cVkRxI8Nt2wadkY6u60Y4rpW3ejA1rxgcK2JuyIhmF+RMNpTy1QRtkHIDUOf3B4HlQwakMsWbKftMv/71VMmw=="; }; }; "socket.io-parser-4.0.4" = { @@ -1075,6 +1075,15 @@ let sha512 = "BmeFZRYH9XXf56omx0LuiG+gBXRqwmrKsOtcsGTJh8tw9U0cgRKTrOnyDpP1uvI1AVEkoRKYaAvR902ByotFOw=="; }; }; + "statsd-client-0.4.7" = { + name = "statsd-client"; + packageName = "statsd-client"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/statsd-client/-/statsd-client-0.4.7.tgz"; + sha512 = "+sGCE6FednJ/vI7vywErOg/mhVqmf6Zlktz7cdGRnF/cQWXD9ifMgtqU1CIIXmhSwm11SCk4zDN+bwNCvIR/Kg=="; + }; + }; "statuses-1.5.0" = { name = "statuses"; packageName = "statuses"; @@ -1084,15 +1093,6 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; - "stream-cache-0.0.2" = { - name = "stream-cache"; - packageName = "stream-cache"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-cache/-/stream-cache-0.0.2.tgz"; - sha1 = "1ac5ad6832428ca55667dbdee395dad4e6db118f"; - }; - }; "stream-from-promise-1.0.0" = { name = "stream-from-promise"; packageName = "stream-from-promise"; @@ -1138,13 +1138,13 @@ let sha1 = "ae21768175d1559d48bef35420b2f4962f09c330"; }; }; - "tslib-2.1.0" = { + "tslib-2.3.0" = { name = "tslib"; packageName = "tslib"; - version = "2.1.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"; - sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"; + sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="; }; }; "uglify-js-2.8.29" = { @@ -1156,13 +1156,13 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.13.0" = { + "uglify-js-3.14.1" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.0"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.0.tgz"; - sha512 = "TWYSWa9T2pPN4DIJYbU9oAjQx+5qdV5RUDxwARg8fmJZrD/V27Zj0JngW5xg1DFz42G0uDYl2XhzF6alSzD62w=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.1.tgz"; + sha512 = "JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -1273,13 +1273,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-7.4.3" = { + "ws-7.4.6" = { name = "ws"; packageName = "ws"; - version = "7.4.3"; + version = "7.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz"; - sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="; + url = "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz"; + sha512 = "YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="; }; }; "yaku-1.0.1" = { @@ -1312,33 +1312,33 @@ let }; in { - "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.9.1" = nodeEnv.buildNodePackage { + "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.14.6" = nodeEnv.buildNodePackage { name = "whitebophir"; packageName = "whitebophir"; - version = "1.9.1"; + version = "1.14.6"; src = fetchgit { url = "https://github.com/lovasoa/whitebophir.git"; - rev = "626397d43f14c3579d6434ac76fc373b994f1741"; - sha256 = "3c3d74b7c011e1d0f2781210de996fc0ecc35b29b93c74a27eb436902d0489fe"; + rev = "37d1d6811af911739d57520dc20dae6cac154464"; + sha256 = "bda4e0077ef64861146e073c91b7488edfc0290f37478da6563e9ea16e6e4824"; }; dependencies = [ - sources."@financial-times/polyfill-useragent-normaliser-1.9.0" - sources."@financial-times/useragent_parser-1.5.1" - sources."@formatjs/ecma402-abstract-1.5.1" - sources."@formatjs/intl-datetimeformat-3.2.3" - sources."@formatjs/intl-displaynames-4.0.4" - sources."@formatjs/intl-getcanonicallocales-1.5.3" - sources."@formatjs/intl-listformat-5.0.4" - sources."@formatjs/intl-locale-2.4.13" - sources."@formatjs/intl-numberformat-6.1.3" - sources."@formatjs/intl-pluralrules-4.0.5" - sources."@formatjs/intl-relativetimeformat-8.0.3" - sources."@juggle/resize-observer-3.3.0" + sources."@financial-times/polyfill-useragent-normaliser-1.10.0" + sources."@financial-times/useragent_parser-1.6.0" + sources."@formatjs/ecma402-abstract-1.8.0" + sources."@formatjs/intl-datetimeformat-4.1.0" + sources."@formatjs/intl-displaynames-5.1.0" + sources."@formatjs/intl-getcanonicallocales-1.6.0" + sources."@formatjs/intl-listformat-6.1.0" + sources."@formatjs/intl-locale-2.4.26" + sources."@formatjs/intl-numberformat-7.1.0" + sources."@formatjs/intl-pluralrules-4.0.20" + sources."@formatjs/intl-relativetimeformat-9.1.0" + sources."@juggle/resize-observer-3.3.1" sources."@types/component-emitter-1.2.10" - sources."@types/cookie-0.4.0" - sources."@types/cors-2.8.10" - sources."@types/node-14.14.31" - sources."@webcomponents/template-1.4.4" + sources."@types/cookie-0.4.1" + sources."@types/cors-2.8.12" + sources."@types/node-16.4.11" + sources."@webcomponents/template-1.5.0" sources."Base64-1.1.0" sources."abort-controller-3.0.0" sources."accept-language-parser-1.5.0" @@ -1346,7 +1346,7 @@ in sources."align-text-0.1.4" sources."async-mutex-0.3.1" sources."audio-context-polyfill-1.0.0" - sources."balanced-match-1.0.0" + sources."balanced-match-1.0.2" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" sources."brace-expansion-1.1.11" @@ -1372,7 +1372,7 @@ in sources."diff-4.0.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-4.1.1" // { + (sources."engine.io-5.1.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -1381,14 +1381,14 @@ in sources."engine.io-parser-4.0.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."event-source-polyfill-1.0.22" + sources."event-source-polyfill-1.0.24" sources."event-target-shim-5.0.1" sources."fastestsmallesttextencoderdecoder-1.0.22" sources."fresh-0.5.2" sources."from2-2.3.0" sources."from2-string-1.1.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."handlebars-4.7.7" sources."html5shiv-3.7.3" @@ -1408,8 +1408,8 @@ in sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."mime-1.6.0" - sources."mime-db-1.46.0" - sources."mime-types-2.1.29" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" @@ -1425,7 +1425,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."picturefill-3.0.3" - (sources."polyfill-library-3.103.0" // { + (sources."polyfill-library-3.107.1" // { dependencies = [ sources."source-map-0.5.7" sources."uglify-js-2.8.29" @@ -1440,7 +1440,7 @@ in sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."seamless-scroll-polyfill-1.2.3" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."send-0.17.1" // { dependencies = [ (sources."debug-2.6.9" // { @@ -1453,13 +1453,13 @@ in }) sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" - (sources."socket.io-3.1.2" // { + (sources."socket.io-4.1.3" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-2.1.0" + sources."socket.io-adapter-2.3.1" (sources."socket.io-parser-4.0.4" // { dependencies = [ sources."debug-4.3.2" @@ -1468,15 +1468,15 @@ in }) sources."source-map-0.6.1" sources."spdx-licenses-1.0.0" + sources."statsd-client-0.4.7" sources."statuses-1.5.0" - sources."stream-cache-0.0.2" sources."stream-from-promise-1.0.0" sources."stream-to-string-1.2.0" sources."string_decoder-1.1.1" sources."toidentifier-1.0.0" sources."toposort-2.0.2" - sources."tslib-2.1.0" - sources."uglify-js-3.13.0" + sources."tslib-2.3.0" + sources."uglify-js-3.14.1" sources."uglify-to-browserify-1.0.2" sources."unorm-1.6.0" sources."usertiming-0.1.8" @@ -1488,7 +1488,7 @@ in sources."window-size-0.1.0" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.3" + sources."ws-7.4.6" sources."yaku-1.0.1" sources."yallist-4.0.0" sources."yargs-3.10.0" diff --git a/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.json b/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.json index 7ba8afd1513c..72eabcc7ec11 100644 --- a/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.json +++ b/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.json @@ -1,3 +1,3 @@ [ - { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.9.1" } + { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.14.6" } ] diff --git a/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix index 7dbf4054ef27..41eb08ae75bf 100644 --- a/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.7.2"; + version = "5.8"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-640FIIFZRp0L48szn3tqFQo59QP69nnCVQKEM/UTEhk="; + sha256 = "sha256-0pgTq1U2Exj1GfKo+mYxEmoKj5GsMPYstgAsEIV36H8="; }; installPhase = '' |