Merge remote-tracking branch 'origin/master' into staging-next

NixOS · Dec 22, 2024 · 9071e4c · 9071e4c
2 parents b3ce3af + c09c373
commit 9071e4c
Show file tree

Hide file tree

Showing 59 changed files with 499 additions and 217 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -22495,6 +22495,12 @@
     githubId = 71843723;
     keys = [ { fingerprint = "EEFB CC3A C529 CFD1 943D  A75C BDD5 7BE9 9D55 5965"; } ];
   };
+  theoparis = {
+    email = "[email protected]";
+    github = "theoparis";
+    githubId = 11761863;
+    name = "Theo Paris";
+  };
   thepuzzlemaker = {
     name = "ThePuzzlemaker";
     email = "[email protected]";

diff --git a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
@@ -7,20 +7,20 @@
   nix-update-script,
 }:
 let
-  version = "0.8.0";
+  version = "0.8.1";
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.cmp";
     tag = "v${version}";
-    hash = "sha256-YUADpn3kImYqlc96R3qMKC2V+ZD3+Na0WDP63dxKKbU=";
+    hash = "sha256-hlz1t9W9CEdUw6Fgs+sDLbzX+hdkPyqbOhXKPd8NBDY=";
   };
   libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
   blink-fuzzy-lib = rustPlatform.buildRustPackage {
     inherit version src;
     pname = "blink-fuzzy-lib";
 
     useFetchCargoVendor = true;
-    cargoHash = "sha256-XXI2jEoD6XbFNk3O8B6+aLzl1ZcJq1VinQXb+AOw8Rw=";
+    cargoHash = "sha256-t84hokb2loZ6FPPt4eN8HzgNQJrQUdiG5//ZbmlasWY=";
 
     env = {
       # TODO: remove this if plugin stops using nightly rust

diff --git a/pkgs/by-name/as/asak/package.nix b/pkgs/by-name/as/asak/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "asak";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "chaosprint";
     repo = "asak";
     rev = "v${version}";
-    hash = "sha256-yhR8xLCFSmTG2yqsbiP3w8vcvLz4dsn4cbMPFedzUFI=";
+    hash = "sha256-Kq1WdVcTRdz6vJxUDd0bqb2bfrNGCl611upwYploR7w=";
   };
 
-  cargoHash = "sha256-ssHYQhx5rNkTH6KJuJh2wPcptIcIxP8BcDNriGj3btk=";
+  cargoHash = "sha256-SS4BDhORiTV/HZhL3F9zwF8oBu/VFVYhF5Jzp2j0QFI=";
 
   nativeBuildInputs = [ pkg-config ];
 

diff --git a/pkgs/by-name/aw/aws-lc/package.nix b/pkgs/by-name/aw/aws-lc/package.nix
@@ -0,0 +1,93 @@
+{
+  lib,
+  stdenv,
+  overrideSDK,
+  cmakeMinimal,
+  fetchFromGitHub,
+  ninja,
+  testers,
+  aws-lc,
+  useSharedLibraries ? !stdenv.hostPlatform.isStatic,
+}:
+let
+  awsStdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
+in
+awsStdenv.mkDerivation (finalAttrs: {
+  pname = "aws-lc";
+  version = "1.39.0";
+
+  src = fetchFromGitHub {
+    owner = "aws";
+    repo = "aws-lc";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-LbhSnIjZWBtbU++puuZW2hgswO1lArrD5+uhBZNItNM=";
+  };
+
+  outputs = [
+    "out"
+    "bin"
+    "dev"
+  ];
+
+  nativeBuildInputs = [
+    cmakeMinimal
+    ninja
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" useSharedLibraries)
+    "-GNinja"
+    "-DDISABLE_GO=ON"
+    "-DDISABLE_PERL=ON"
+    "-DBUILD_TESTING=ON"
+  ];
+
+  doCheck = true;
+
+  checkPhase = ''
+    runHook preCheck
+    ninja run_minimal_tests
+    runHook postCheck
+  '';
+
+  env.NIX_CFLAGS_COMPILE = toString (
+    lib.optionals stdenv.cc.isGNU [
+      # Needed with GCC 12 but breaks on darwin (with clang)
+      "-Wno-error=stringop-overflow"
+    ]
+  );
+
+  postFixup = ''
+    for f in $out/lib/crypto/cmake/*/crypto-targets.cmake; do
+      substituteInPlace "$f" \
+        --replace-fail 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""'
+    done
+  '';
+
+  passthru.tests = {
+    version = testers.testVersion {
+      package = aws-lc;
+      command = "bssl version";
+    };
+    pkg-config = testers.hasPkgConfigModules {
+      package = aws-lc;
+      moduleNames = [
+        "libcrypto"
+        "libssl"
+        "openssl"
+      ];
+    };
+  };
+
+  meta = {
+    description = "General-purpose cryptographic library maintained by the AWS Cryptography team for AWS and their customers";
+    homepage = "https://github.com/aws/aws-lc";
+    license = [
+      lib.licenses.asl20 # or
+      lib.licenses.isc
+    ];
+    maintainers = [ lib.maintainers.theoparis ];
+    platforms = lib.platforms.unix;
+    mainProgram = "bssl";
+  };
+})
diff --git a/pkgs/by-name/bi/bilibili/package.nix b/pkgs/by-name/bi/bilibili/package.nix
@@ -8,15 +8,16 @@
   commandLineArgs ? "",
 }:
 let
-  version = "1.15.2-2";
+  sources = import ./sources.nix;
+  version = sources.version;
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
-      hash = "sha256-juAhvdeLzjHDs59eS+wwUn3OmnDecC17Vclp0Q0LtJw=";
+      hash = sources.x86_64-hash;
     };
     aarch64-linux = fetchurl {
       url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_arm64.deb";
-      hash = "sha256-8o0MX0Ih07KQ9wE+nonSZaupSOuUVyuoIbdHYmR29mc=";
+      hash = sources.arm64-hash;
     };
   };
   src =
@@ -46,6 +47,8 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "Electron-based bilibili desktop client";
     homepage = "https://github.com/msojocs/bilibili-linux";

diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix
@@ -0,0 +1,6 @@
+# Generated by ./update.sh - do not update manually!
+{
+  version = "1.16.1-1";
+  arm64-hash = "sha256-2pdrzOkF3Ni8Cjwrkevv8QmXioGFtNIHkUF/x+NoZIo=";
+  x86_64-hash = "sha256-yAC1CZEOjip80fBbmor4bCOlEtyXMA1R3Hnxvmj56IQ=";
+}
diff --git a/pkgs/by-name/bi/bilibili/update.sh b/pkgs/by-name/bi/bilibili/update.sh
@@ -0,0 +1,27 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix git curl cacert nix-prefetch-git jq
+
+set -euo pipefail
+
+cd $(readlink -e $(dirname "${BASH_SOURCE[0]}"))
+
+payload=$(curl https://api.github.com/repos/msojocs/bilibili-linux/releases/latest)
+version=$(jq -r .tag_name <<< "$payload" | cut -c 2-)
+amd64_url=https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb
+arm64_url=https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_arm64.deb
+
+amd64_hash=$(nix-prefetch-url $amd64_url)
+arm64_hash=$(nix-prefetch-url $arm64_url)
+
+# use friendlier hashes
+amd64_hash=$(nix hash convert --to sri --hash-algo sha256 "$amd64_hash")
+arm64_hash=$(nix hash convert --to sri --hash-algo sha256 "$arm64_hash")
+
+cat >sources.nix <<EOF
+# Generated by ./update.sh - do not update manually!
+{
+  version = "$version";
+  arm64-hash = "$arm64_hash";
+  x86_64-hash = "$amd64_hash";
+}
+EOF
diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "bitrise";
-  version = "2.24.3";
+  version = "2.25.0";
 
   src = fetchFromGitHub {
     owner = "bitrise-io";
     repo = "bitrise";
     rev = version;
-    hash = "sha256-+0O2s1FMGs1xO0trvvxDed4Y4gPBnY+PlgRlsEF0JvA=";
+    hash = "sha256-ejAwUHBx+HwYEQxT+lrXxoiD6hkIIRhBPTPBlqugOrM=";
   };
 
   # many tests rely on writable $HOME/.bitrise and require network access

diff --git a/pkgs/by-name/bl/bluetui/package.nix b/pkgs/by-name/bl/bluetui/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bluetui";
-  version = "0.5.1";
+  version = "0.6";
 
   src = fetchFromGitHub {
     owner = "pythops";
     repo = "bluetui";
     rev = "v${version}";
-    hash = "sha256-9svPIZzKuI4XBlxBsKucGLdX2dkfAy9ERT5oj8Su9TM=";
+    hash = "sha256-JgxzpFpz/fyFZwyxTtAkG9XB5qkxj46lUnZ3mM44dHk=";
   };
 
-  cargoHash = "sha256-w6rrZQNu5kLKEWSXFa/vSqwm76zWZug/ZqztMDY7buE=";
+  cargoHash = "sha256-5BBh0nkJB8Z/WkmJqi0Kb72HDPdAtjdjIprw9OEKNgo=";
 
   nativeBuildInputs = [
     pkg-config

diff --git a/pkgs/by-name/br/brltty/package.nix b/pkgs/by-name/br/brltty/package.nix
@@ -15,15 +15,16 @@
   alsa-lib,
   systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
   systemd,
+  ncurses,
 }:
 
 stdenv.mkDerivation rec {
   pname = "brltty";
-  version = "6.6";
+  version = "6.7";
 
   src = fetchurl {
     url = "https://brltty.app/archive/brltty-${version}.tar.gz";
-    sha256 = "E+j2mb8UTuGx6PkAOt03hQkvf1XvEHxJEuPBT2zMpPw=";
+    sha256 = "sha256-FsM9AeL1lnBziJlmB7EZAIgDKylT8D4Il81Fe1y9Yjg=";
   };
 
   nativeBuildInputs = [
@@ -32,7 +33,13 @@ stdenv.mkDerivation rec {
     python3.pkgs.setuptools
     tcl
   ];
-  buildInputs = [ bluez ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional systemdSupport systemd;
+  buildInputs =
+    [
+      bluez
+      ncurses.dev
+    ]
+    ++ lib.optional alsaSupport alsa-lib
+    ++ lib.optional systemdSupport systemd;
 
   meta = {
     description = "Access software for a blind person using a braille display";

diff --git a/pkgs/by-name/dr/drm_info/package.nix b/pkgs/by-name/dr/drm_info/package.nix
@@ -24,6 +24,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-pgYhZtmyhuhxBiiTRdrEp/YsuwrD6KK/ahfO2L3mfM8=";
   };
 
+  strictDeps = true;
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
   nativeBuildInputs = [
     meson
     ninja

diff --git a/pkgs/by-name/ed/edir/package.nix b/pkgs/by-name/ed/edir/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "edir";
-  version = "2.29";
+  version = "2.30";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5b86/M8xqzwWMCRtsH1qwmooyfOhORgXgctRjzQEmlU=";
+    hash = "sha256-kqFJhPIdinqPBKfNY3lHeMXpzrcnSkFODGBiqGt/whM=";
   };
 
   nativeBuildInputs = with python3Packages; [

diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix
@@ -177,7 +177,6 @@ stdenv.mkDerivation (finalAttrs: {
       pkg-config
       gettext
       shared-mime-info
-      valgrind
       protobufc # for protoc
       wrapGAppsNoGuiHook
       vala
@@ -212,6 +211,7 @@ stdenv.mkDerivation (finalAttrs: {
       libcbor
       libqmi
       xz # for liblzma
+      valgrind
     ]
     ++ lib.optionals haveFlashrom [
       flashrom

diff --git a/pkgs/by-name/ge/geary/package.nix b/pkgs/by-name/ge/geary/package.nix
@@ -39,7 +39,6 @@
   glib-networking,
   gobject-introspection,
   gspell,
-  appstream-glib,
   libstemmer,
   libytnef,
   libhandy,
@@ -60,6 +59,7 @@ stdenv.mkDerivation rec {
     gettext
     gobject-introspection
     itstool
+    libxml2 # for xmllint for xml-stripblanks preprocessing
     meson
     ninja
     pkg-config
@@ -70,7 +70,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     adwaita-icon-theme
-    appstream-glib
     enchant2
     folks
     gcr
@@ -111,13 +110,16 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see:
-  # https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa
   postPatch = ''
     chmod +x build-aux/git_version.py
 
     patchShebangs build-aux/git_version.py
 
+    # Only used for generating .pot file
+    # https://gitlab.gnome.org/GNOME/geary/-/merge_requests/856
+    substituteInPlace meson.build \
+      --replace-fail "appstream_glib = dependency('appstream-glib', version: '>=0.7.10')" ""
+
     chmod +x desktop/geary-attach
   '';
 

diff --git a/pkgs/by-name/ge/gepetto-viewer-corba/package.nix b/pkgs/by-name/ge/gepetto-viewer-corba/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gepetto-viewer-corba";
-  version = "5.8.1";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "gepetto";
     repo = "gepetto-viewer-corba";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-C7xrODoKCcyLPZr0+zZSZ/o5i5EeNsxCPXp2WrP28A4=";
+    hash = "sha256-+rt6eDlNk3CEC5AsOBJgFEAIqKnM7wxRofyd44H6TUw=";
   };
 
   outputs = [