Merge master into staging-next

pkgs/development/libraries/science/networking/ns-3/default.nix

@@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ns-3";
-  version = "34";
+  version = "35";
 
   src = fetchFromGitLab {
     owner = "nsnam";
     repo   = "ns-3-dev";
     rev    = "ns-3.${version}";
-    sha256 = "sha256-udP7U+pHnNUdo35d9sN1o+aR9ctw9fgU3UunCjisGUI=";
+    sha256 = "sha256-3w+lCWWra9sndL8+vkGfH5plrDYYCMFi1PzwIVRku6I=";
   };
 
   nativeBuildInputs = [ wafHook python ];

pkgs/misc/vim-plugins/generated.nix

@@ -2926,6 +2926,18 @@ final: prev:
     meta.homepage = "https://github.com/cohama/lexima.vim/";
   };
 
+  lingua-franca-vim = buildVimPluginFrom2Nix {
+    pname = "lingua-franca";
+    version = "2021-9-5";
+    src = fetchFromGitHub {
+      owner = "lf-lang";
+      repo = "lingua-franca.vim";
+      rev = "439b92a13744ee21cb3cd9c399e179efbcaa2967";
+      sha256 = "sha256-Bf2MabUe3fy0meL6zIYgal/yFxtLKsg3b/BUI/AVlrM=";
+    };
+    meta.homepage = "https://github.com/lf-lang/lingua-franca.vim";
+  };
+
   lf-vim = buildVimPluginFrom2Nix {
     pname = "lf.vim";
     version = "2021-02-18";

pkgs/misc/vim-plugins/vim-plugin-names

@@ -380,6 +380,7 @@ ledger/vim-ledger
 lepture/vim-jinja
 lervag/vimtex
 lewis6991/gitsigns.nvim@main
+lf-lang/lingua-franca.vim
 lfe-support/vim-lfe
 lfilho/cosco.vim
 lifepillar/vim-gruvbox8

pkgs/servers/web-apps/lemmy/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lemmy-ui",
-  "version": "0.12.2",
   "description": "An isomorphic UI for lemmy",
+  "version": "0.13.3",
   "author": "Dessalines <tyhou13@gmx.com>",
   "license": "AGPL-3.0",
   "scripts": {
@@ -16,23 +16,25 @@
   },
   "repository": "https://github.com/LemmyNet/lemmy-ui",
   "dependencies": {
-    "@typescript-eslint/parser": "^4.28.3",
+    "@typescript-eslint/parser": "^4.32.0",
     "autosize": "^5.0.1",
+    "check-password-strength": "^2.0.3",
     "choices.js": "^9.0.1",
     "emoji-short-name": "^1.0.0",
     "express": "~4.17.1",
-    "i18next": "^20.3.3",
+    "i18next": "^21.1.1",
-    "inferno": "^7.4.9",
+    "inferno": "^7.4.10",
-    "inferno-create-element": "^7.4.9",
+    "inferno-create-element": "^7.4.10",
     "inferno-helmet": "^5.2.1",
-    "inferno-hydrate": "^7.4.9",
+    "inferno-hydrate": "^7.4.10",
-    "inferno-i18next": "github:nimbusec-oss/inferno-i18next#semver:^7.4.2",
+    "inferno-i18next-dess": "^0.0.1",
-    "inferno-router": "^7.4.9",
+    "inferno-router": "^7.4.10",
-    "inferno-server": "^7.4.9",
+    "inferno-server": "^7.4.10",
     "isomorphic-cookie": "^1.2.4",
     "jwt-decode": "^3.1.2",
     "markdown-it": "^12.1.0",
     "markdown-it-container": "^3.0.0",
+    "markdown-it-html5-embed": "^1.0.0",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
     "moment": "^2.29.1",
@@ -43,52 +45,52 @@
     "tippy.js": "^6.3.1",
     "toastify-js": "^1.11.1",
     "tributejs": "^5.1.3",
-    "ws": "^8.2.0"
+    "ws": "^8.2.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.14.6",
+    "@babel/core": "^7.15.5",
     "@babel/plugin-transform-runtime": "^7.14.5",
-    "@babel/plugin-transform-typescript": "^7.14.6",
+    "@babel/plugin-transform-typescript": "^7.15.4",
-    "@babel/preset-env": "7.15.0",
+    "@babel/preset-env": "7.15.6",
     "@babel/preset-typescript": "^7.14.5",
-    "@babel/runtime": "^7.14.6",
+    "@babel/runtime": "^7.15.4",
     "@types/autosize": "^4.0.0",
     "@types/express": "^4.17.13",
-    "@types/node": "^16.7.1",
+    "@types/node": "^16.10.1",
     "@types/node-fetch": "^2.5.11",
     "@types/serialize-javascript": "^5.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.28.3",
+    "@typescript-eslint/eslint-plugin": "^4.32.0",
     "babel-loader": "^8.2.2",
     "babel-plugin-inferno": "^6.3.0",
-    "bootstrap": "^5.0.2",
+    "bootstrap": "^5.1.1",
-    "bootswatch": "^5.0.2",
+    "bootswatch": "^5.1.1",
-    "clean-webpack-plugin": "^4.0.0-alpha.0",
+    "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^9.0.1",
-    "css-loader": "^6.0.0",
+    "css-loader": "^6.3.0",
     "eslint": "^7.30.0",
-    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^7.0.1",
+    "husky": "^7.0.2",
     "import-sort-style-module": "^6.0.0",
     "iso-639-1": "^2.1.9",
-    "lemmy-js-client": "0.12.0",
+    "lemmy-js-client": "0.13.0",
     "lint-staged": "^11.0.1",
-    "mini-css-extract-plugin": "^2.1.0",
+    "mini-css-extract-plugin": "^2.3.0",
     "node-fetch": "^2.6.1",
     "node-sass": "^6.0.1",
-    "prettier": "^2.3.2",
+    "prettier": "^2.4.1",
     "prettier-plugin-import-sort": "^0.0.7",
-    "prettier-plugin-organize-imports": "^2.2.0",
+    "prettier-plugin-organize-imports": "^2.3.4",
-    "prettier-plugin-packagejson": "^2.2.11",
+    "prettier-plugin-packagejson": "^2.2.13",
     "rimraf": "^3.0.2",
     "run-node-webpack-plugin": "^1.3.0",
     "sass-loader": "^12.1.0",
     "sortpack": "^2.2.0",
-    "style-loader": "^3.1.0",
+    "style-loader": "^3.3.0",
-    "terser": "^5.7.1",
+    "terser": "^5.9.0",
-    "typescript": "^4.3.5",
+    "typescript": "^4.4.3",
-    "webpack": "5.51.1",
+    "webpack": "5.54.0",
     "webpack-cli": "^4.7.2",
-    "webpack-dev-server": "4.0.0",
+    "webpack-dev-server": "4.3.0",
     "webpack-node-externals": "^3.0.0"
   },
   "engines": {

pkgs/servers/web-apps/lemmy/pin.json

@@ -0,0 +1,7 @@
+{
+  "version": "0.13.3",
+  "serverSha256": "sha256-Ht+gcNv8gQAQtEuAJ/QH4nNvo+PZogNB09f4eRlvIYg=",
+  "serverCargoSha256": "sha256-j/l/muCQefvuuWsi+Iahr1M4V6AUzmxm3pr7cJxw7Ww=",
+  "uiSha256": "sha256-uHb+V3zadiHlExpmAdRLoV3F/0mrYrko6RTDJcw9YO4=",
+  "uiYarnDepsSha256": "sha256-53sa6uL1+SvhtUtKdS36rBcJVgVXhnNdITWPyauLrx4="
+}

pkgs/servers/web-apps/lemmy/server.nix

@@ -7,19 +7,22 @@
 , libiconv
 , Security
 }:
-
+let
+  pinData = lib.importJSON ./pin.json;
+  version = pinData.version;
+in
 rustPlatform.buildRustPackage rec {
+  inherit version;
   pname = "lemmy-server";
-  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "LemmyNet";
     repo = "lemmy";
     rev = version;
-    sha256 = "sha256-jhUpQ2f+b0BEXVfQOIujxam2PQA44wluUraJVJxL6LU=";
+    sha256 = pinData.serverSha256;
   };
 
-  cargoSha256 = "sha256-2i8zCwd33LtUKxOChx/SLP9sWMRmxGkKK8xzaJImMHM=";
+  cargoSha256 = pinData.serverCargoSha256;
 
   buildInputs = [ postgresql ]
     ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
@@ -31,6 +34,8 @@ rustPlatform.buildRustPackage rec {
   OPENSSL_LIB_DIR = "${openssl.out}/lib";
   OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
 
+  passthru.updateScript = ./update.sh;
+
   meta = with lib; {
     description = "🐀 Building a federated alternative to reddit in rust";
     homepage = "https://join-lemmy.org/";

pkgs/servers/web-apps/lemmy/ui.nix

@@ -5,9 +5,12 @@
 , python3
 , pkg-config
 , fetchFromGitHub
+, fetchYarnDeps
 }:
 
 let
+  pinData = lib.importJSON ./pin.json;
+
   pkgConfig = {
     node-sass = {
       nativeBuildInputs = [ ];
@@ -20,27 +23,27 @@ let
   };
 
   name = "lemmy-ui";
-  version = "0.12.2";
+  version = pinData.version;
-in
-mkYarnPackage {
 
   src = fetchFromGitHub {
     owner = "LemmyNet";
     repo = name;
     rev = version;
     fetchSubmodules = true;
-    sha256 = "sha256-iFLJqUnz4m9/JTSaJSUugzY5KkiKtH0sMYY4ALm2Ebk=";
+    sha256 = pinData.uiSha256;
   };
+in
+mkYarnPackage {
 
-  inherit pkgConfig name version;
+  inherit src pkgConfig name version;
 
   extraBuildInputs = [ libsass ];
 
-  yarnNix = ./yarn.nix;
-
-  # Fails mysteriously on source/package.json
-  # Upstream package.json is missing a newline at the end
   packageJSON = ./package.json;
+  offlineCache = fetchYarnDeps {
+    yarnLock = src + "/yarn.lock";
+    sha256 = pinData.uiYarnDepsSha256;
+  };
 
   yarnPreBuild = ''
     export npm_config_nodedir=${nodejs}
@@ -63,6 +66,8 @@ mkYarnPackage {
 
   distPhase = "true";
 
+  passthru.updateScript = ./update.sh;
+
   meta = with lib; {
     description = "Building a federated alternative to reddit in rust";
     homepage = "https://join-lemmy.org/";
@@ -71,4 +76,3 @@ mkYarnPackage {
     platforms = platforms.linux;
   };
 }
-

pkgs/servers/web-apps/lemmy/update.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep moreutils
+
+# TODO set to `verbose` or `extdebug` once implemented in oil
+shopt --set xtrace
+
+var directory = $(dirname $0 | xargs realpath)
+var owner = "LemmyNet"
+var ui_repo = "lemmy-ui"
+var server_repo = "lemmy"
+var latest_rev = $(curl -q https://api.github.com/repos/${owner}/${server_repo}/releases/latest | \
+  jq -r '.tag_name')
+var latest_version = $(echo $latest_rev)
+var current_version = $(jq -r '.version' $directory/pin.json)
+if ($latest_version === $current_version) {
+  echo "lemmy is already up-to-date"
+  return 0
+} else {
+  # for some strange reason, hydra fails on reading upstream package.json directly
+  var source = "https://raw.githubusercontent.com/$owner/$ui_repo/$latest_version"
+  var package_json = "$(curl -qf $source/package.json)"
+  echo $package_json > $directory/package.json
+
+  var server_tarball_meta = $(nix-prefetch-github $owner $server_repo --rev "$latest_rev")
+  var server_tarball_hash = "sha256-$(echo $server_tarball_meta | jq -r '.sha256')"
+  var ui_tarball_meta = $(nix-prefetch-github $owner $ui_repo --rev "$latest_rev")
+  var ui_tarball_hash = "sha256-$(echo $ui_tarball_meta | jq -r '.sha256')"
+
+  jq ".version = \"$latest_version\" | \
+      .\"serverSha256\" = \"$server_tarball_hash\" | \
+      .\"uiSha256\" = \"$ui_tarball_hash\" | \
+      .\"serverCargoSha256\" = \"\" | \
+      .\"uiYarnDepsSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json
+
+  var new_cargo_sha256 = $(nix-build -A lemmy-server 2>&1 | \
+    tail -n 2 | \
+    head -n 1 | \
+    sd '\s+got:\s+' '')
+
+  var new_offline_cache_sha256 = $(nix-build -A lemmy-ui 2>&1 | \
+    tail -n 2 | \
+    head -n 1 | \
+    sd '\s+got:\s+' '')
+
+  jq ".\"serverCargoSha256\" = \"$new_cargo_sha256\" | \
+      .\"uiYarnDepsSha256\" = \"$new_offline_cache_sha256\"" \
+    $directory/pin.json | sponge $directory/pin.json
+}

pkgs/tools/nix/statix/default.nix

@@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec {
   pname = "statix";
   # also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix
   # the version can be found in flake.nix of the source code
-  version = "0.3.1";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "nerdypepper";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Jh3ErzK8vqEdDtZP7O/PAmHQznUTB18nCQwfckFxyLA=";
+    sha256 = "sha256-8xWtwa9ZtkcpWvLG2QS3jPlz2c+E5MjYWhZ/g5bjhkc=";
   };
 
-  cargoSha256 = "sha256-y+vBHAHTe++tYOWWQ5ioFlprRfDximZE8KSGNNBSPAk=";
+  cargoSha256 = "sha256-f8f5wJyK+q6zTfNiCRN89ptlSWfSnrzLyefTIpw5mts=";
 
   cargoBuildFlags = lib.optionals withJson [ "--features" "json" ];
 

pkgs/top-level/all-packages.nix

@@ -20702,7 +20702,9 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { };
+  lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix {
+    nodejs = nodejs-14_x;
+  };
 
   lighttpd = callPackage ../servers/http/lighttpd { };