Merge staging-next into staging

2022-11-12 00:03:00 +00:00
parent d3c8e3965d 309fab4139
commit 5f1a96d049
16 changed files with 4350 additions and 3041 deletions
@@ -514,6 +514,8 @@ rec {
          in
            [r] ++ go q;
    in
+      assert (isInt base);
+      assert (isInt i);
      assert (base >= 2);
      assert (i >= 0);
      lib.reverseList (go i);
@@ -62,7 +62,12 @@ in

    environment.systemPackages = [ pkgs.udisks2 ];

-    environment.etc = mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles;
+    environment.etc = (mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // {
+      # We need to make sure /etc/libblockdev/conf.d is populated to avoid
+      # warnings
+      "libblockdev/conf.d/00-default.cfg".source = "${pkgs.libblockdev}/etc/libblockdev/conf.d/00-default.cfg";
+      "libblockdev/conf.d/10-lvm-dbus.cfg".source = "${pkgs.libblockdev}/etc/libblockdev/conf.d/10-lvm-dbus.cfg";
+    };

    security.polkit.enable = true;

@@ -40,7 +40,7 @@ assert gtk2Support || gtk3Support;
 let
  inherit (lib) optionals;

-  version = "1.9.2";
+  version = "1.9.3";
 in clangStdenv.mkDerivation {
  pname = "deadbeef";
  inherit version;
@@ -50,7 +50,7 @@ in clangStdenv.mkDerivation {
    repo = "deadbeef";
    fetchSubmodules = true;
    rev = version;
-    sha256 = "sha256-rlw7s5OUQ9DT6Ru9WieOKUDBqtOvaPE05pg3bN1NQCU=";
+    sha256 = "sha256-Vt5JHrkNyxerqlShIBVbzZaunG0ZbHm5qf3fq9kMMXc=";
  };

  buildInputs = [
@@ -37,6 +37,9 @@ stdenv.mkDerivation {
      url = "https://raw.githubusercontent.com/void-linux/void-packages/4b97cd2fb4ec38712544438c2491b6d7d5ab334a/srcpkgs/sane/patches/sane-desc-cross.patch";
      sha256 = "sha256-y6BOXnOJBSTqvRp6LwAucqaqv+OLLyhCS/tXfLpnAPI=";
    })
+    # generate hwdb entries for scanners handled by other backends like epkowa
+    # https://gitlab.com/sane-project/backends/-/issues/619
+    ./sane-desc-generate-entries-unsupported-scanners.patch
  ];

  postPatch = ''
@@ -0,0 +1,19 @@
+sane-desc does not include unsupported .desc entries like EPSON V300 PHOTO,
+which can be supported by the (unfree) epkowa driver.
+But we need those entries so that unprivileged users which have installed epkowa
+can use the scanner.
+diff --git a/tools/sane-desc.c b/tools/sane-desc.c
+index 7a8645dea..9c9719fef 100644
+--- a/tools/sane-desc.c
+++ b/tools/sane-desc.c
+@@ -3243,10 +3243,6 @@ create_usbids_table (void)
+ 
+ 	      for (model = mfg->model; model; model = model->next)
+ 		{
+-		  if ((model->status == status_unsupported)
+-		      || (model->status == status_unknown))
+-		    continue;
+-
+ 		  if (model->usb_vendor_id && model->usb_product_id)
+ 		    {
+ 		      first_usbid = add_usbid (first_usbid, mfg->name,
@@ -5,13 +5,13 @@

 mkDerivation rec {
  pname = "yacreader";
-  version = "9.9.2";
+  version = "9.10.0";

  src = fetchFromGitHub {
    owner = "YACReader";
    repo = pname;
    rev = version;
-    sha256 = "sha256-rurJkCIuHTWxIGb+TTHp8sQS26/5W/sdtWFxyeqVx54=";
+    sha256 = "sha256-77+lsEvmwQ34maW+HA/IpPsEezlzYEYipc74yR6inwU=";
  };

  nativeBuildInputs = [ qmake pkg-config ];
@@ -0,0 +1,43 @@
+{ stdenv
+, lib
+, buildGoModule
+, fetchFromGitea
+}:
+
+buildGoModule rec {
+  pname = "itd";
+  version = "0.0.9";
+
+  # https://gitea.arsenm.dev/Arsen6331/itd/tags
+  src = fetchFromGitea {
+    domain = "gitea.arsenm.dev";
+    owner = "Arsen6331";
+    repo = "itd";
+    rev = "v${version}";
+    hash = "sha256-FefffF8YIEcB+eglifNWuuK7H5A1YXyxxZOXz1a8HfY=";
+  };
+
+  vendorHash = "sha256-LFzrpKQQ4nFoK4vVTzJDQ5OGDe1y5BSfXPX+FRVunjQ=";
+
+  preBuild = ''
+    echo r${version} > version.txt
+  '';
+
+  subPackages = [
+    "."
+    "cmd/itctl"
+  ];
+
+  postInstall = ''
+    install -Dm644 itd.toml $out/etc/itd.toml
+  '';
+
+  meta = with lib; {
+    description = "itd is a daemon to interact with the PineTime running InfiniTime";
+    homepage = "https://gitea.arsenm.dev/Arsen6331/itd";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ mindavi raphaelr ];
+  };
+}
+
@@ -22,7 +22,7 @@
  (make-instance
   'quicklisp-repository
   :dist-url
-   "https://beta.quicklisp.org/dist/quicklisp/2022-07-08/"))
+   "https://beta.quicklisp.org/dist/quicklisp/2022-11-07/"))

 (defun run-importers ()
  (import-lisp-packages *quicklisp* *sqlite*)
@@ -18,13 +18,13 @@ let

 in stdenv.mkDerivation rec {
  pname = "eduke32";
-  version = "20210910";
-  rev = "9603";
-  revExtra = "6c289cce4";
+  version = "20221026";
+  rev = "10165";
+  revExtra = "a9c797dcb";

  src = fetchurl {
    url = "https://dukeworld.com/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz";
-    sha256 = "sha256-/NQMsmT9z2N3KWBrP8hlGngQKJUgSP+vrNoFqJscRCk=";
+    sha256 = "sha256-8xvIe+kVOu2VIZACHis04tvyrl1IRrt0tY8D04n6ZjU=";
  };

  buildInputs = [
@@ -56,6 +56,11 @@ in stdenv.mkDerivation rec {
      substituteInPlace source/glad/src/$f \
        --replace libGL.so ${libGL}/lib/libGL.so
    done
+
+    substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \
+      --replace '#include <SDL.h>' '#include <SDL2/SDL.h>' \
+      --replace '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \
+      --replace '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>'
  '';

  makeFlags = [
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
    rev = "eb5efb1f304c2b7bc2e0389ba06c9bf2ac4b932c";
    sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x";
  };
+  patches = [
+    # Drop unused pthread library. pthread_yield()
+    # fails the configure.
+    ./no-pthread.patch
+  ];

  nativeBuildInputs = [ pkg-config makeWrapper autoconf automake ];
  buildInputs = [ fuse ];
@@ -0,0 +1,11 @@
+pthread_yield() is not used by fuse-7z-ng, fails configure.
+--- a/configure.ac
+++ b/configure.ac
+@@ -25,7 +25,6 @@ AC_CHECK_HEADERS([fcntl.h stddef.h string.h unistd.h dlfcn.h dirent.h])
+ AC_CHECK_FUNCS([memset memmove])
+ AC_CHECK_FUNCS([sqrt])
+ 
+-AC_CHECK_LIB([pthread], [pthread_yield],,AC_MSG_ERROR([pthread library not found.]))
+ AC_CHECK_LIB([dl], [dlclose])
+ 
+ PKG_CHECK_MODULES([fuse], [fuse >= 2.8])
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "fzf";
-  version = "0.34.0";
+  version = "0.35.0";

  src = fetchFromGitHub {
    owner = "junegunn";
    repo = pname;
    rev = version;
-    sha256 = "sha256-xM2X+X4qR5H1MqtsQK34Omyt35kEUntn3TqlJ2vWcwg=";
+    sha256 = "sha256-Wa0mMsogVWCY1Z0+bVcS4k56vTCfJ3h+wFpT3P3iEjU=";
  };

  vendorSha256 = "sha256-EjcOcrADHdwTCGimv2BRvbjqSZxz4isWhGmPbWQ7YDE=";
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, stdenv }:

 buildGoModule rec {
  pname = "livedl";
@@ -11,9 +11,10 @@ buildGoModule rec {
    sha256 = "1zax215jp6sl47m8ahssyyrbzn96dh74srq9g61jc76sq10xg329";
  };

-  sourceRoot = "source/src";
+  modRoot = "src";

-  vendorSha256 = "g5Y1IH1U1zOOHygTzAJuBnUj+MyPe64KHTYikipt3TY=";
+  proxyVendor = true;
+  vendorSha256 = "sha256-C7lUusq/cWBCnA2wP9fzQglJCXvQyvFG4JY13H0cP6g=";

  meta = with lib; {
    description = "Command-line tool to download nicovideo.jp livestreams";
@@ -21,5 +22,6 @@ buildGoModule rec {
    license = licenses.mit;
    maintainers = with maintainers; [ wakira ];
    platforms = platforms.linux ++ platforms.darwin;
+    broken = stdenv.isDarwin; # build fails with go > 1.17
  };
 }
@@ -45,8 +45,5 @@ stdenv.mkDerivation rec {
    license = licenses.asl20;
    maintainers = with maintainers; [ aw ];
    platforms = with platforms; linux ++ freebsd ++ darwin;
-
-    # https://github.com/NixOS/nixpkgs/pull/94625#issuecomment-668509399
-    broken = stdenv.isDarwin && stdenv.isx86_64;
  };
 }
@@ -2781,6 +2781,8 @@ with pkgs;

  itch = callPackage ../games/itch {};

+  itd = callPackage ../applications/misc/itd { };
+
  lastpass-cli = callPackage ../tools/security/lastpass-cli { };

  leetcode-cli = callPackage ../applications/misc/leetcode-cli { };
@@ -33634,10 +33636,7 @@ with pkgs;
  };
  litecoind = litecoin.override { withGui = false; };

-  livedl = callPackage ../tools/misc/livedl {
-    # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
-    buildGoModule = buildGo117Module;
-  };
+  livedl = callPackage ../tools/misc/livedl { };

  lnd = callPackage ../applications/blockchains/lnd { };