Merge master into staging-next

maintainers/maintainer-list.nix

···
     github = "ony";
     githubId = 11265;
   };
+  ooliver1 = {
+    name = "Oliver Wilkes";
+    email = "[e-mail]";
+    github = "ooliver1";
+    githubId = 34910574;
+    keys = [{
+      fingerprint = "D055 8A23 3947 B7A0 F966  B07F 0B41 0348 9833 7273";
+    }];
+  };
   opeik = {
     email = "[e-mail]";
     github = "opeik";

nixos/doc/manual/release-notes/rl-2311.section.md

···
 
 ## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
 
+- `writeTextFile` now requires `executable` to be boolean, values like `null` or `""` will now fail to evaluate.
+
 - The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`.
 
 - `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`.

nixos/modules/services/mail/public-inbox.nix

···
           default = {};
           description = lib.mdDoc "public inboxes";
           type = types.submodule {
-            # Keeping in line with the tradition of unnecessarily specific types, allow users to set
-            # freeform settings either globally under the `publicinbox` section, or for specific
-            # inboxes through additional nesting.
+            # Support both global options like `services.public-inbox.settings.publicinbox.imapserver`
+            # and inbox specific options like `services.public-inbox.settings.publicinbox.foo.address`.
             freeformType = with types; attrsOf (oneOf [ iniAtom (attrsOf iniAtom) ]);
 
             options.css = mkOption {
···
               default = [];
               description = lib.mdDoc "The local path name of a CSS file for the PSGI web interface.";
             };
+            options.imapserver = mkOption {
+              type = with types; listOf str;
+              default = [];
+              example = [ "imap.public-inbox.org" ];
+              description = lib.mdDoc "IMAP URLs to this public-inbox instance";
+            };
             options.nntpserver = mkOption {
               type = with types; listOf str;
               default = [];
               example = [ "nntp://news.public-inbox.org" "nntps://news.public-inbox.org" ];
               description = lib.mdDoc "NNTP URLs to this public-inbox instance";
+            };
+            options.pop3server = mkOption {
+              type = with types; listOf str;
+              default = [];
+              example = [ "pop.public-inbox.org" ];
+              description = lib.mdDoc "POP3 URLs to this public-inbox instance";
             };
             options.wwwlisting = mkOption {
               type = with types; enum [ "all" "404" "match=domain" ];

nixos/tests/public-inbox.nix

···
 
   meta.maintainers = with pkgs.lib.maintainers; [ julm ];
 
-  machine = { config, pkgs, nodes, ... }: let
+  nodes.machine = { config, pkgs, nodes, ... }: let
     inherit (config.services) gitolite public-inbox;
     # Git repositories paths in Gitolite.
     # Only their baseNameOf is used for configuring public-inbox.
···
     # Delete a mail.
     # Note that the use of an extension not listed in the addresses
     # require to use --all
-    machine.succeed("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all")
-    machine.fail("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'")
+    machine.succeed("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all")
+    machine.fail("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'")
   '';
 })

pkgs/applications/audio/yoshimi/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "yoshimi";
-  version = "2.2.3";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "Yoshimi";
     repo = pname;
     rev = version;
-    hash = "sha256-zVIOHm84wx6ZFK0seS9fWZfujDz259AXTv7zljbwrUk=";
+    hash = "sha256-rVlwOxp8C/A56JDd6Bzi2smblJVqQWZiFqIP4oRhElM=";
   };
 
   sourceRoot = "source/src";

pkgs/applications/blockchains/stellar-core/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "stellar-core";
-  version = "19.10.0";
+  version = "19.11.0";
 
   src = fetchFromGitHub {
     owner = "stellar";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-BcZsj2TbeJW91aiZ2I7NbDa+rgjfs6lQUsWOnhFQXtw=";
+    sha256 = "sha256-48fEVbK5yswPkTwlfemXB2ieAs2+SIM6dspqOBiRKCU=";
     fetchSubmodules = true;
   };
 

pkgs/applications/misc/cobalt/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "cobalt";
-  version = "0.18.4";
+  version = "0.18.5";
 
   src = fetchFromGitHub {
     owner = "cobalt-org";
     repo = "cobalt.rs";
     rev = "v${version}";
-    sha256 = "sha256-O7qFpp7Xr6K82o/KUMP0J5y2B32op+QBGUXo9Q5R5LQ=";
+    sha256 = "sha256-Y1rWKoh4cjLOvBJy4bXIHsvGtLmTu9n0aqf6PdflH6E=";
   };
 
-  cargoHash = "sha256-ZBAF4BqQ+JMZ3Rpg2RxUhhVvPE5pN68qljVl0o2/VNA=";
+  cargoHash = "sha256-r0nxsDcdXNiZn9dVMTOAxlI/kd0nZFh7JvB2JYDR2aw=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 

pkgs/applications/misc/mob/default.nix

···
 
 buildGoModule rec {
   pname = "mob";
-  version = "4.4.2";
+  version = "4.4.3";
 
   src = fetchFromGitHub {
     owner = "remotemobprogramming";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-muKlzOrqtegy35QcGJvwYqIJ9XZsaAvyofsrWPqCi7k=";
+    sha256 = "sha256-XWXoY/e/xceO3sOGvA2hrdvbdb8nomMg7AGUW090I74=";
   };
 
   vendorHash = null;

pkgs/applications/networking/browsers/chromium/upstream-info.json

···
     }
   },
   "beta": {
-    "version": "114.0.5735.45",
-    "sha256": "1z7z4mq3yw9i17xprza3v33wx28zpk7s3g8xcgapdydw0rgxz30v",
-    "sha256bin64": "1387x7mab2sh3wg39z48gl8fjhq39jllbcgzic8rdzpbhlcgs7br",
-    "deps": {
-      "gn": {
-        "version": "2023-04-19",
-        "url": "https://gn.googlesource.com/gn",
-        "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa",
-        "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
-      }
-    }
-  },
-  "dev": {
-    "version": "115.0.5790.3",
-    "sha256": "1haai0jabghwl37k929138s4l6izmifssdvn2wgsig9jhiihxz29",
-    "sha256bin64": "12avl8ilvhmlvbag045yhnx0bbbsyx5d3jqh5af07pmbcxksgf96",
+    "version": "115.0.5790.13",
+    "sha256": "0ias5jn8lwpds3gsmjps0rlks58ln5znwx52h767f8mc9y24fagx",
+    "sha256bin64": "11v374p82k8xbak37c377km9y2hvy8avw6mjl9az5kzb2am3g566",
     "deps": {
       "gn": {
         "version": "2023-05-19",
         "url": "https://gn.googlesource.com/gn",
         "rev": "e9e83d9095d3234adf68f3e2866f25daf766d5c7",
         "sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a"
+      }
+    }
+  },
+  "dev": {
+    "version": "116.0.5803.2",
+    "sha256": "0s3l0wvbvy0wcwxipbl9vlbp1441yfj8ylrwhlh7gy898ajl9q0j",
+    "sha256bin64": "0qgp0m67bpaali7w6bxy1jzw0aig4iiqqgg023k1q32712s192cs",
+    "deps": {
+      "gn": {
+        "version": "2023-05-26",
+        "url": "https://gn.googlesource.com/gn",
+        "rev": "e3978de3e8dafb50a2b11efa784e08699a43faf8",
+        "sha256": "17hwbcxmqsq3yfnafl4bbysdkk957mvqsn34iipzb61gyjbj7i6j"
       }
     }
   },

pkgs/applications/networking/browsers/opera/default.nix

···
 in
 stdenv.mkDerivation rec {
   pname = "opera";
-  version = "98.0.4759.39";
+  version = "99.0.4788.31";
 
   src = fetchurl {
     url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
-    hash = "sha256-3HVgEOscds+VBn9ajmkRnPdqNi9lLItJrb3uRH6L96Q=";
+    hash = "sha256-73A47Yl454ZyOkglLvnp10zjoE1bf8v5tm4Rng3UBac=";
   };
 
   unpackPhase = "dpkg-deb -x $src .";

pkgs/applications/networking/browsers/vivaldi/default.nix

···
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "6.0.2979.18";
+  version = "6.0.2979.22";
 
   suffix = {
     aarch64-linux = "arm64";
···
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
     hash = {
-      aarch64-linux = "sha256-S3b0mmWsQhWDKPz34Gzb50q+wAURAFNEt6IvCqo8CMs=";
-      x86_64-linux = "sha256-uqhXL7kndmGoOOalyQ6mVxRB3k8L11UJzADCnNakj64=";
+      aarch64-linux = "sha256-x7wBbd7BdurnWGFeHD5kYb5t0/zGEXQaUwbHnNA4iME=";
+      x86_64-linux = "sha256-uN2nBWlullxpOZP2PzVCwKcNmO9XmDS3WiFOcp0dOqg=";
     }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
 

pkgs/applications/networking/gabutdm/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "gabutdm";
-  version = "2.1.5";
+  version = "2.1.6";
 
   src = fetchFromGitHub {
     owner = "gabutakut";
     repo = pname;
     rev = version;
-    hash = "sha256-8fV7STYSpmNnLyoAjz+RuF/0nFeNiu8AIxkON1MbWr4=";
+    hash = "sha256-ai5LsoK21XwXqL4LRuKsOR1/JV6LnP+1ZJ9fMHpj178=";
   };
 
   nativeBuildInputs = [
···
   '';
 
   meta = with lib; {
-    description = "Simple and faster download manager";
+    description = "Simple and fast download manager";
     homepage = "https://github.com/gabutakut/gabutdm";
     license = licenses.lgpl21Plus;
     mainProgram = "com.github.gabutakut.gabutdm";

pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "whatsapp-for-linux";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "eneshecan";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-odE5syAFasGosc1WMU/pvQtk3YxuCci1YevZqNKfzYw=";
+    sha256 = "sha256-YmiEzemoGLwCUVfnuTmruSkI0oBg7yNuodWmXTMGh8g=";
   };
 
   nativeBuildInputs = [

pkgs/applications/radio/cloudlog/default.nix

···
 
 stdenvNoCC.mkDerivation rec {
   pname = "cloudlog";
-  version = "2.4.2";
+  version = "2.4.3";
 
   src = fetchFromGitHub {
     owner = "magicbug";
     repo = "Cloudlog";
     rev = version;
-    sha256 = "sha256-btfHHrb7m6ITWe/18u2pmZiZKpKebKMThqcXFIvO/P8=";
+    sha256 = "sha256-2L+Yp8yxhmoVh34cW1s5Xy1f0X2xUo3UP32XcAV2LsM=";
   };
 
   postPath = ''

pkgs/applications/science/biology/diamond/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "diamond";
-  version = "2.1.6";
+  version = "2.1.7";
 
   src = fetchFromGitHub {
     owner = "bbuchfink";
     repo = "diamond";
     rev = "v${version}";
-    sha256 = "sha256-2FxJTF/fF/Xi0TglXDlf3sSwncv2f6gc129nTbk8YU0=";
+    sha256 = "sha256-5AjP7zH0WZhJqhcjgQjeK/WPCqy1Tl1gXXqRsHbqkys=";
   };
 
 

pkgs/build-support/trivial-builders/default.nix

···
     runCommand name
       { inherit text executable checkPhase allowSubstitutes preferLocalBuild;
         passAsFile = [ "text" ];
-        meta = lib.optionalAttrs (toString executable != "" && matches != null) {
+        meta = lib.optionalAttrs (executable && matches != null) {
           mainProgram = lib.head matches;
         } // meta;
       }

pkgs/development/libraries/cista/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "cista";
-  version = "0.13";
+  version = "0.14";
 
   src = fetchFromGitHub {
     owner = "felixguendling";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-dQOVmKRXfApN0QRx/PmLVzeCGppFJBnNWIOoLbDbrds=";
+    sha256 = "sha256-E2B+dNFk0ssKhT9dULNFzpa8auRQ9Q0czuUjX6hxWPw=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/development/libraries/wxsqlite3/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "wxsqlite3";
-  version = "4.9.3";
+  version = "4.9.4";
 
   src = fetchFromGitHub {
     owner = "utelle";
     repo = "wxsqlite3";
     rev = "v${version}";
-    hash = "sha256-HdsPCdZF1wMTGYFaXzq+f4bUFjgCAklsKhhdyMKaxp8=";
+    hash = "sha256-aM79DI/Kj1QEIJ1HMttlfqK/WZER9RJhQbrnbPto57U=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

pkgs/development/python-modules/frigidaire/default.nix

···
 
 buildPythonPackage rec {
   pname = "frigidaire";
-  version = "0.18.12";
+  version = "0.18.13";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
···
     owner = "bm1549";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-U6ko6P5/ANGy84GQDuSQq+YArou0TrXH5SIc5x4euvU=";
+    hash = "sha256-FikBV4KjutQfupGPXcVT1h+BfQ099WRrmbrEJOaVCQI=";
   };
 
   postPatch = ''

pkgs/development/python-modules/plumbum/default.nix

···
 
 buildPythonPackage rec {
   pname = "plumbum";
-  version = "1.8.1";
+  version = "1.8.2";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "tomerfiliba";
     repo = "plumbum";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5nRI9y2Y7itkqDdLRSX4qWfh96WmhqdP1Eo7HLoRHaQ=";
+    hash = "sha256-b8JcGRHiZSv/ViyEogpLgGXOMHHSC+cjWT0FqhkolcA=";
   };
 
   postPatch = ''

pkgs/development/python-modules/pydelijn/default.nix

···
 
 buildPythonPackage rec {
   pname = "pydelijn";
-  version = "1.0.0";
+  version = "1.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c5b6565c50d4f97d28baca9faf487281c2a5db635060b69f659e27c28a1a6e93";
+    sha256 = "sha256-xyBq2h3ipUarkjCXq9GIbY7bhsf9729aQwHde3o5K6g=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/pyopencl/default.nix

···
 , platformdirs
 , pybind11
 , pytest
+, pytestCheckHook
 , pytools
+, setuptools
 , six
 }:
 
···
     if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];
 in buildPythonPackage rec {
   pname = "pyopencl";
-  version = "2022.3.1";
+  version = "2023.1";
 
-  nativeCheckInputs = [ pytest ];
+  format = "pyproject";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-2d5gcnKRmlB6nCTD3+7q/nLAX3zWyeN7IRno7jxTqJE=";
+  };
+
+  nativeBuildInputs = [ setuptools ];
+
   buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;
 
   propagatedBuildInputs = [
···
     six
   ];
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-Sj2w/mG1zclSZ1Jt7r1xp+HXlWlNSw/idh8GMLzKNiE=";
-  };
-
-  # py.test is not needed during runtime, so remove it from `install_requires`
-  postPatch = ''
-    substituteInPlace setup.py --replace "pytest>=2" ""
-  '';
+  nativeCheckInputs = [ pytestCheckHook ];
 
   preBuild = ''
     export HOME=$(mktemp -d)
···
 
   # gcc: error: pygpu_language_opencl.cpp: No such file or directory
   doCheck = false;
+
+  pythonImportsCheck = [ "pyopencl" ];
 
   meta = with lib; {
     description = "Python wrapper for OpenCL";

pkgs/development/tools/database/dbmate/default.nix

···
 
 buildGoModule rec {
   pname = "dbmate";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "amacneil";
     repo = "dbmate";
     rev = "refs/tags/v${version}";
-    hash = "sha256-bWmRdrULXXVIaO5f3rntsVURnyojYFbhbZ43WvGzoZk=";
+    hash = "sha256-EwGyRDgd9di1gjefq9G3u+lVD2XEfdCULuLhtDAFDkY=";
   };
 
-  vendorHash = "sha256-m1Nbu1bE04iOXnxW5kJfI9W95FU87eRKkOzg+YVvRsg=";
+  vendorHash = "sha256-t5GPbDBwq92erEpbkfIc/RMWkDr6Mb4oQ4BWmhCLrSc=";
 
   doCheck = false;
 

pkgs/development/tools/language-servers/millet/Cargo.lock

···
 
 [[package]]
 name = "analysis"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "config",
  "diagnostic",
···
 
 [[package]]
 name = "chain-map"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "fast-hash",
  "str-util",
···
 
 [[package]]
 name = "cm-syntax"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "lex-util",
  "paths",
···
 ]
 
 [[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
+[[package]]
 name = "config"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "fast-hash",
  "serde",
···
 
 [[package]]
 name = "input"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "cm-syntax",
  "config",
···
 
 [[package]]
 name = "lang-srv"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "analysis",
  "anyhow",
···
 
 [[package]]
 name = "lex-util"
-version = "0.10.0"
+version = "0.10.1"
 
 [[package]]
 name = "libc"
···
 
 [[package]]
 name = "millet-cli"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "analysis",
+ "codespan-reporting",
  "config",
  "diagnostic",
  "env_logger",
···
  "paths",
  "pico-args",
  "sml-naive-fmt",
+ "text-pos",
+ "text-size-util",
 ]
 
 [[package]]
 name = "millet-ls"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "anyhow",
  "env_logger",
···
 
 [[package]]
 name = "mlb-hir"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "fast-hash",
  "paths",
···
 
 [[package]]
 name = "mlb-statics"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "config",
  "diagnostic",
···
 
 [[package]]
 name = "mlb-syntax"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "lex-util",
  "paths",
···
 
 [[package]]
 name = "panic-hook"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "better-panic",
 ]
···
 
 [[package]]
 name = "slash-var-path"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "fast-hash",
  "str-util",
···
 
 [[package]]
 name = "sml-comment"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "sml-syntax",
 ]
 
 [[package]]
 name = "sml-dynamics"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "fast-hash",
  "fmt-util",
···
 
 [[package]]
 name = "sml-dynamics-tests"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "config",
  "sml-dynamics",
···
 
 [[package]]
 name = "sml-file-syntax"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "config",
  "elapsed",
···
 
 [[package]]
 name = "sml-fixity"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "fast-hash",
  "once_cell",
···
 
 [[package]]
 name = "sml-hir"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "la-arena",
  "sml-lab",
···
 
 [[package]]
 name = "sml-hir-lower"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "config",
  "diagnostic",
···
 
 [[package]]
 name = "sml-lab"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "str-util",
 ]
 
 [[package]]
 name = "sml-lex"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "diagnostic",
  "lex-util",
···
 
 [[package]]
 name = "sml-naive-fmt"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "fast-hash",
  "sml-comment",
···
 
 [[package]]
 name = "sml-namespace"
-version = "0.10.0"
+version = "0.10.1"
 
 [[package]]
 name = "sml-parse"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "diagnostic",
  "event-parse",
···
 
 [[package]]
 name = "sml-path"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "str-util",
 ]
 
 [[package]]
 name = "sml-scon"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "num-bigint",
  "num-traits",
···
 
 [[package]]
 name = "sml-statics"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "chain-map",
  "config",
···
 
 [[package]]
 name = "sml-statics-types"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "chain-map",
  "code-h2-md-map",
···
 
 [[package]]
 name = "sml-symbol-kind"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "sml-namespace",
  "sml-statics-types",
···
 
 [[package]]
 name = "sml-syntax"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "char-name",
  "code-h2-md-map",
···
 
 [[package]]
 name = "sml-ty-var-scope"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "fast-hash",
  "sml-hir",
···
 
 [[package]]
 name = "tests"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "analysis",
  "cm-syntax",
···
 
 [[package]]
 name = "xtask"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "anyhow",
  "flate2",

pkgs/development/tools/language-servers/millet/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "millet";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "azdavis";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-QAXvkSGC7IydFXcWdrVf9QlMBlJVFDLNgfXu+P6yWlE=";
+    hash = "sha256-f5vftRc/hI0erXZiU+0HbNHPqNUUz6Df2+uIGsRu2+M=";
   };
 
   cargoLock = {

pkgs/development/tools/parsing/re-flex/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "re-flex";
-  version = "3.3.3";
+  version = "3.3.4";
 
   src = fetchFromGitHub {
     owner = "Genivia";
     repo = "RE-flex";
     rev = "v${version}";
-    sha256 = "sha256-pfCszi75TAo9ibpuWlfIDm5OO7Eo6joNPIer4JoDJRw=";
+    sha256 = "sha256-Fb6Z3LejlWY1L7PkITRh4bCVKpzuwpGOeTc2ZoLxRO0=";
   };
 
   nativeBuildInputs = [ boost autoconf automake ];

pkgs/games/hyperrogue/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "hyperrogue";
-  version = "12.1o";
+  version = "12.1q";
 
   src = fetchFromGitHub {
     owner = "zenorogue";
     repo = "hyperrogue";
     rev = "v${version}";
-    sha256 = "sha256-p7F+A7+wjHb17nJqsULhBZMs2P64s9gDOk2Oh4dc/lQ=";
+    sha256 = "sha256-dYkeAQBpnETbJiXZSejFPJVhXt3kJBBv6qBKPb7t9fU=";
   };
 
   CXXFLAGS = [

pkgs/misc/lilypond/unstable.nix

···
 { lib, fetchurl, lilypond }:
 
 lilypond.overrideAttrs (oldAttrs: rec {
-  version = "2.25.4";
+  version = "2.25.5";
   src = fetchurl {
     url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
-    sha256 = "sha256-O7YQc00774Nz6KIGC1Za1HBvKaHmUjXeKkZs0YR1HUA=";
+    sha256 = "sha256-QgFGiNKqfC7Q7E0/yhsXFwKZoj+/07c0GwTPWiDz/u4=";
   };
 
   passthru.updateScript = {

pkgs/servers/http/jetty/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "jetty";
-  version = "11.0.14";
+  version = "11.0.15";
   src = fetchurl {
     url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz";
-    sha256 = "sha256-lmS9B5dXJAc9j/RVs2sqMRaj1C5CN2trTszUXfPfHI4=";
+    sha256 = "sha256-bDg3CYPAGryqRv/gcPdeZKucXx6YTkkNd0Cu1+zIjto=";
   };
 
   dontBuild = true;

pkgs/servers/imgproxy/default.nix

···
 
 buildGoModule rec {
   pname = "imgproxy";
-  version = "3.17.0";
+  version = "3.18.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    sha256 = "sha256-7kNBXMjkOs8fLDUBdQJHOjwJhYYAbGPZZDA0NLFirH8=";
+    sha256 = "sha256-c85G76u0qLyRbiXEWpYKZerrkZmHkq+VmCdHJk6pH9M=";
     rev = "v${version}";
   };
 

pkgs/servers/mail/public-inbox/default.nix

···
 , gnumake
 , highlight
 , libgit2
+, libxcrypt
 , man
 , openssl
 , pkg-config
···
 , EmailAddressXS
 , EmailMIME
 , IOSocketSSL
+# FIXME: to be packaged
+#, IOSocketSocks
 , IPCRun
 , Inline
 , InlineC
 , LinuxInotify2
 , MailIMAPClient
+# FIXME: to be packaged
+#, NetNetrc
+# FIXME: to be packaged
+#, NetNNTP
 , ParseRecDescent
 , Plack
 , PlackMiddlewareReverseProxy
+, PlackTestExternalServer
 , SearchXapian
+, TestSimple13
 , TimeDate
 , URI
+, XMLTreePP
 }:
 
 let
 
   skippedTests = [
-    # These tests would fail, and produce "Operation not permitted"
-    # errors from git, because they use git init --shared.  This tries
-    # to set the setgid bit, which isn't permitted inside build
-    # sandboxes.
-    #
-    # These tests were indentified with
-    #     grep -r shared t/
-    "convert-compact" "search" "v2writable" "www_listing"
+    # fatal: Could not make /tmp/pi-search-9188-DGZM/a.git/branches/ writable by group
+    "search"
     # perl5.32.0-public-inbox> t/eml.t ...................... 1/? Cannot parse parameter '=?ISO-8859-1?Q?=20charset=3D=1BOF?=' at t/eml.t line 270.
     # perl5.32.0-public-inbox> #   Failed test 'got wide character by assuming utf-8'
     # perl5.32.0-public-inbox> #   at t/eml.t line 272.
···
     #   expected: anything else
     # waiting for child to reap grandchild...
     "spawn"
+    # Failed to connect to 127.0.0.1
+    "v2mirror"
   ];
 
   testConditions = with lib;
···
 
 buildPerlPackage rec {
   pname = "public-inbox";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchurl {
     url = "https://public-inbox.org/public-inbox.git/snapshot/public-inbox-${version}.tar.gz";
-    sha256 = "sha256-laJOOCk5NecIGWesv4D30cLGfijQHVkeo55eNqNKzew=";
+    sha256 = "sha256-ENnT2YK7rpODII9TqiEYSCp5mpWOnxskeSuAf8Ilqro=";
   };
 
   outputs = [ "out" "devdoc" "sa_config" ];
···
     DBDSQLite
     DBI
     EmailAddressXS
-    EmailMIME
     highlight
     IOSocketSSL
+    #IOSocketSocks
     IPCRun
     Inline
     InlineC
+    MailIMAPClient
+    #NetNetrc
+    #NetNNTP
     ParseRecDescent
     Plack
     PlackMiddlewareReverseProxy
···
 
   doCheck = !stdenv.isDarwin;
   nativeCheckInputs = [
-    MailIMAPClient
     curl
     git
     openssl
     pkg-config
     sqlite
     xapian
+    EmailMIME
+    PlackTestExternalServer
+    TestSimple13
+    XMLTreePP
   ] ++ lib.optionals stdenv.isLinux [
     LinuxInotify2
   ];
···
   installTargets = [ "install" ];
   postInstall = ''
     for prog in $out/bin/*; do
-        wrapProgram $prog --prefix PATH : ${lib.makeBinPath [
-          git
-          /* for InlineC */
-          gnumake
-          stdenv.cc.cc
-        ]}
+        wrapProgram $prog \
+            --set NIX_CFLAGS_COMPILE_${stdenv.cc.suffixSalt} -I${lib.getDev libxcrypt}/include \
+            --prefix PATH : ${lib.makeBinPath [
+              git
+              /* for InlineC */
+              gnumake
+              stdenv.cc
+            ]}
     done
 
     mv sa_config $sa_config

pkgs/tools/admin/realvnc-vnc-viewer/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "realvnc-vnc-viewer";
-  version = "7.1.0";
+  version = "7.5.0";
 
   src = {
     "x86_64-linux" = fetchurl {
       url = "https://downloads.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm";
-      sha256 = "sha256-Mn4K2HICK7owHcXH85IJUncnpPZ56zNybkHZNiqYkHY=";
+      sha256 = "sha256-XemifIWeoi3Qdjv8HfEjtTYJvfi0eCXeQUXVld6aR9A=";
     };
   }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 

pkgs/tools/filesystems/envfs/default.nix

···
 { rustPlatform, lib, fetchFromGitHub, nixosTests }:
 rustPlatform.buildRustPackage rec {
   pname = "envfs";
-  version = "1.0.0";
+  version = "1.0.1";
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "envfs";
     rev = version;
-    hash = "sha256-aF8V1LwPGifFWoVxM0ydOnTX1pDVJ6HXevTxADJ/rsw=";
+    hash = "sha256-ttW1NUCtwnjAoiu7QgLGrlAB2PyY4oXm91LpWhbz8qk=";
   };
-  cargoHash = "sha256-kw56tbe5zvWY5bI//dUqR1Rlumz8kOG4HeXiyEyL0I0=";
+  cargoHash = "sha256-BgXKwKD6w/GraBQEq61D7S7m2Q9TnkXNFJEIgDYo9L4=";
 
   passthru.tests = {
     envfs = nixosTests.envfs;

pkgs/tools/misc/eludris/default.nix

···
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, openssl
+, pkg-config
+, stdenv
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "eludris";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    owner = "eludris";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-TVYgimkGUSITB3IaMlMd10PWomqyJRvONvJwiW85U4M=";
+  };
+
+  cargoHash = "sha256-5B9D19jFh5+eNTjiho22CFsn51nmwLry08zSDWvs1OU=";
+
+  cargoBuildFlags = [ "-p eludris" ];
+  cargoTestFlags = [ "-p eludris" ];
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
+  nativeBuildInputs = [ pkg-config ];
+
+  meta = with lib; {
+    description = "A simple CLI to help you with setting up and managing your Eludris instance";
+    homepage = "https://github.com/eludris/eludris/tree/main/cli";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ooliver1 ];
+  };
+}

pkgs/tools/misc/hyperfine/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "hyperfine";
-  version = "0.17.0";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
···
     hash = "sha256-IUjOklkEiy/U2HjjMt1X1uSpIkTAYOPiPQ+70xvvxKA=";
   };
 
-  cargoHash = "sha256-cm6opZrdSEY4qsYQzgCJ8wx6iIIuytySWh3F3Roo/JQ=";
+  cargoHash = "sha256-VjkcQueBODEADHdWOts2f3Zjar43hi0UXzVhvkK4o8I=";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = lib.optional stdenv.isDarwin Security;

pkgs/tools/system/epilys-bb/default.nix

···
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "epilys-bb";
+  version = "unstable-2020-12-04";
+
+  src = fetchFromGitHub {
+    owner = "epilys";
+    repo = "bb";
+    rev = "c903d4c2975509299fd3d2600a0c4c2102f445d0";
+    hash = "sha256-KOXK+1arUWtu/QU7dwXhojIM0faMtwNN3AqVbofq1lY=";
+  };
+
+  cargoHash = "sha256-+aCMwKOg+3HDntG14gjJLec8XD51wuTyYyzLjuW6lbY=";
+
+  meta = with lib; {
+    description = "A clean, simple, and fast process viewer";
+    homepage = "https://nessuent.xyz/bb.html";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ cafkafk ];
+    platforms = platforms.linux;
+  };
+}

pkgs/tools/text/dos2unix/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "dos2unix";
-  version = "7.4.4";
+  version = "7.5.0";
 
   src = fetchurl {
     url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz";
-    sha256 = "sha256-KKhB2wvVgn1kXKup2AFeOnGYPcbjmAcLUofuE3rkQ24=";
+    sha256 = "sha256-ejsB0B4hTWLCs+BMOpLg3ccoo4VWbkwDVu+mb9brla8=";
   };
 
   nativeBuildInputs = [ perl gettext ];

pkgs/top-level/all-packages.nix

···
 
   efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { };
 
+  eludris = callPackage ../tools/misc/eludris {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   enumer = callPackage ../tools/misc/enumer { };
 
   evans = callPackage ../development/tools/evans { };
···
   b43Firmware_6_30_163_46 = callPackage ../os-specific/linux/firmware/b43-firmware/6.30.163.46.nix { };
 
   b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { };
+
+  epilys-bb = callPackage ../tools/system/epilys-bb { };
 
   below = callPackage ../os-specific/linux/below { };
 

pkgs/top-level/perl-packages.nix

···
       url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Hash-SharedMem-0.005.tar.gz";
       hash = "sha256-Mkd2gIYC973EStqpN4lTZUVAKakm+mEfMhyb9rlAu14=";
     };
+    env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-mno-outline-atomics";
     buildInputs = [ ScalarString ];
     meta = {
       description = "Efficient shared mutable hash";