Merge staging-next into staging

nixos/modules/system/boot/systemd.nix

@@ -587,7 +587,7 @@ in
     # Some overrides to upstream units.
     systemd.services."systemd-backlight@".restartIfChanged = false;
     systemd.services."systemd-fsck@".restartIfChanged = false;
-    systemd.services."systemd-fsck@".path = [ config.system.path ];
+    systemd.services."systemd-fsck@".path = [ pkgs.util-linux ] ++ config.system.fsPackages;
     systemd.services."systemd-makefs@" = {
       restartIfChanged = false;
       path = [ pkgs.util-linux ] ++ config.system.fsPackages;

pkgs/applications/display-managers/ly/default.nix

@@ -1,19 +1,20 @@
-{ stdenv, lib, fetchFromGitHub, linux-pam }:
+{ stdenv, lib, fetchFromGitHub, git, linux-pam, libxcb }:
 
 stdenv.mkDerivation rec {
   pname = "ly";
-  version = "0.2.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
-    owner = "cylgom";
+    owner = "fairyglade";
     repo = "ly";
-    rev = version;
+    rev = "v${version}";
-    sha256 = "16gjcrd4a6i4x8q8iwlgdildm7cpdsja8z22pf2izdm6rwfki97d";
+    hash = "sha256-78XD6DK9aQi8hITWJWnFZ3U9zWTcuw3vtRiU3Lhu7O4=";
     fetchSubmodules = true;
   };
 
-  buildInputs = [ linux-pam ];
+  hardeningDisable = [ "all" ];
-  makeFlags = [ "FLAGS=-Wno-error" ];
+  nativeBuildInputs = [ git ];
+  buildInputs = [ libxcb linux-pam ];
 
   installPhase = ''
     mkdir -p $out/bin
@@ -23,7 +24,8 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "TUI display manager";
     license = licenses.wtfpl;
-    homepage = "https://github.com/cylgom/ly";
+    homepage = "https://github.com/fairyglade/ly";
     maintainers = [ maintainers.vidister ];
+    platforms = platforms.linux;
   };
 }

pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix

@@ -2,11 +2,11 @@
 
 trivialBuild rec {
   pname = "ebuild-mode";
-  version = "1.63";
+  version = "1.64";
 
   src = fetchurl {
     url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz";
-    sha256 = "sha256-Ar11zz0IVMu0g9+PN9dXvj8yeKnUGi8M+CTJfGP3bd4=";
+    sha256 = "sha256-ewn8pFuuXrNzkh7UKWa71Tc3hGM11iqjU9AVNOKSHKA=";
   };
 
   meta = with lib; {

pkgs/data/fonts/linearicons-free/default.nix

@@ -0,0 +1,30 @@
+{ lib, fetchzip, stdenvNoCC }:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "linearicons-free";
+  version = "1.0.0";
+
+  src = fetchzip {
+    url = "https://cdn.linearicons.com/free/${finalAttrs.version}/Linearicons-Free-v${finalAttrs.version}.zip";
+    hash = "sha256-0Gb0CRdgzSnpeN+x8TrH5TCrAA57+jsBWZ4FgJ8cm08=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D -m444 -t $out/share/fonts/truetype $src/Desktop\ Font/Linearicons-Free.ttf
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Crisp Line Icons by Perxis";
+    longDescription = ''
+      See cheat sheet here: https://linearicons.com/free#cheat-sheet
+    '';
+    homepage = "https://linearicons.com/free";
+    license = lib.licenses.cc-by-sa-40;
+    maintainers = [ lib.maintainers.CardboardTurkey ];
+    platforms = lib.platforms.all;
+  };
+})

pkgs/development/libraries/duckdb/default.nix

@@ -15,13 +15,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "duckdb";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-w01QB3mufeKdo4d0BBm6xiidnnyo9CLpmntT6690leM=";
+    hash = "sha256-LEv9yURkYvONObTbIA4CS+umwCRMH8gRQaDtzbCzID4=";
   };
 
   patches = [ ./version.patch ];

pkgs/development/libraries/libnut/default.nix

@@ -0,0 +1,29 @@
+{ stdenv
+, lib
+, fetchgit
+}:
+stdenv.mkDerivation rec {
+  pname = "libnut";
+  version = "unstable-2020-11-06";
+
+  src = fetchgit {
+    url = "https://git.ffmpeg.org/nut.git";
+    rev = "12f6a7af3e0f34fd957cf078b66f072d3dc695b3";
+    sha256 = "1wgl2mb9482c1j3yac0v2ilfjs7gb9mhw9kjnrmlj9kp0whm4l1j";
+  };
+
+  sourceRoot = "${src.name}/src/trunk";
+  makeFlags = ["prefix=$(out)"];
+  installTargets = [
+    "install-libnut"
+    "install-nututils"
+  ];
+
+  meta = with lib; {
+    description = "A library to read/write the NUT video container format";
+    homepage = "https://git.ffmpeg.org/gitweb/nut.git";
+    license = licenses.mit;
+    maintainers = with maintainers; [quag];
+    platforms = platforms.linux;
+  };
+}

pkgs/development/libraries/openssl/default.nix

@@ -220,7 +220,9 @@ let
 
 in {
 
-
+  # If you do upgrade here, please update in pkgs/top-level/release.nix
+  # the permitted insecure version to ensure it gets cached for our users
+  # and backport this to stable release (23.05).
   openssl_1_1 = common {
     version = "1.1.1u";
     sha256 = "sha256-4vjYS1I+7NBse+diaDA3AwD7zBU4a/UULXJ1j2lj68Y=";

pkgs/development/lua-modules/overrides.nix

@@ -541,7 +541,7 @@ with prev;
   });
 
   vstruct = prev.vstruct.overrideAttrs (_: {
-    meta.broken = (luaOlder "5.1" || luaAtLeast "5.3");
+    meta.broken = (luaOlder "5.1" || luaAtLeast "5.4");
   });
 
   vusted = prev.vusted.overrideAttrs (_: {

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

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "bytecode";
-  version = "0.14.1";
+  version = "0.14.2";
   format = "pyproject";
   disabled = pythonOlder "3.6";
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "vstinner";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-vSuGjNTQw7prFxmVyiq7s8cnl+VGbRArC2sp7GVP0XA=";
+    hash = "sha256-HBXtpUl8Lcx3yCVnk9kVU0+AUVdgy1HQBV4rHEndiek=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@@ -9,7 +9,7 @@
 }:
 buildPythonPackage rec {
   pname = "sqlglot";
-  version = "15.0.0";
+  version = "16.3.1";
 
   disabled = pythonOlder "3.8";
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     repo = "sqlglot";
     owner = "tobymao";
     rev = "v${version}";
-    hash = "sha256-F95JUYUgimWMyfPAV55e+bOcvWy5A95djKcJuSQ8RRs=";
+    hash = "sha256-EN5ocyXCZaWE1BaC2eDg41+o5BoHAog1372b9rc2IDM=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/tools/misc/debian-devscripts/default.nix

@@ -11,12 +11,12 @@ let
     exec ''${EDITOR-${nano}/bin/nano} "$@"
   '';
 in stdenv.mkDerivation rec {
-  version = "2.22.2";
+  version = "2.23.5";
   pname = "debian-devscripts";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
-    hash = "sha256-Fflalt2JxqLS0gq0wy88pXCqiNvHj7sfP7fLwdSmUCs=";
+    hash = "sha256-j0fUVTS/lPKFdgeMhksiJz2+E5koB07IK2uEj55EWG0=";
   };
 
   postPatch = ''

pkgs/top-level/all-packages.nix

@@ -22498,6 +22498,8 @@ with pkgs;
 
   libmkv = callPackage ../development/libraries/libmkv { };
 
+  libnut = callPackage ../development/libraries/libnut { };
+
   libmms = callPackage ../development/libraries/libmms { };
 
   libmowgli = callPackage ../development/libraries/libmowgli { };
@@ -28698,6 +28700,8 @@ with pkgs;
 
   line-awesome = callPackage ../data/fonts/line-awesome { };
 
+  linearicons-free = callPackage ../data/fonts/linearicons-free { };
+
   linja-pi-pu-lukin = callPackage ../data/fonts/linja-pi-pu-lukin { };
 
   linja-sike = callPackage ../data/fonts/linja-sike { };

pkgs/top-level/release.nix

@@ -26,7 +26,7 @@
       # for no real reason.
       # Remove them for 23.11.
       "nodejs-16.20.0"
-      "openssl-1.1.1t"
+      "openssl-1.1.1u"
     ];
   }; }
 }: