From 9c35b362fe63cde17ffe3c4a9a765701f2c3bf15 Mon Sep 17 00:00:00 2001 From: Sven Woelfel Date: Thu, 6 Mar 2025 21:00:02 +0100 Subject: [PATCH 01/15] maintainers: add kagehisa --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7b4ce772050a..a9c443659c61 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12019,6 +12019,12 @@ github = "kaeeraa"; githubId = 99148867; }; + kagehisa = { + name = "Sven Woelfel"; + email = "woelfel.pub@gmail.com"; + github = "kagehisa"; + githubId = 37015428; + }; kaiha = { email = "kai.harries@gmail.com"; github = "KaiHa"; From 2773177fdfa696eb03a320a895d6b101c30cea5d Mon Sep 17 00:00:00 2001 From: Sven Woelfel Date: Sat, 8 Mar 2025 22:48:32 +0100 Subject: [PATCH 02/15] usbip-ssh: init at 0-unstable-2024-10-09 --- pkgs/by-name/us/usbip-ssh/package.nix | 54 +++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pkgs/by-name/us/usbip-ssh/package.nix diff --git a/pkgs/by-name/us/usbip-ssh/package.nix b/pkgs/by-name/us/usbip-ssh/package.nix new file mode 100644 index 000000000000..9a7009c062d2 --- /dev/null +++ b/pkgs/by-name/us/usbip-ssh/package.nix @@ -0,0 +1,54 @@ +{ + stdenv, + lib, + fetchFromGitHub, + perl, + openssh, + kmod, + makeWrapper, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "usbip-ssh"; + version = "0-unstable-2024-10-09"; + + src = fetchFromGitHub { + owner = "turistu"; + repo = "usbip-ssh"; + rev = "1b38f2d7854048bf6129ffe992f3c9caa630e377"; + hash = "sha256-3kGGMlIMTXnBVLgsZijc0yLbyaZZSDf7lr46mg0viWw="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + perl + ]; + + installPhase = '' + runHook preInstall + install -Dm755 usbip-ssh -t $out/bin + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/usbip-ssh --prefix PATH : ${ + lib.makeBinPath [ + perl + openssh + kmod + ] + } + ''; + + meta = { + homepage = "https://github.com/turistu/usbip-ssh"; + description = "Import usb devices from another linux machine with ssh's connection forwarding mechanism"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ kagehisa ]; + mainProgram = "usbip-ssh"; + platforms = lib.platforms.linux; + }; +}) From 2b2a13782b6842091e943a62f6d7f7116d89cc12 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Wed, 22 Jan 2025 10:22:28 +0100 Subject: [PATCH 03/15] opencv: switch to openexr_3 --- pkgs/development/libraries/opencv/4.x.nix | 4 ---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 5 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 0b57a0bbf336..bd90e228fc3b 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -29,7 +29,6 @@ libwebp, enableEXR ? !stdenv.hostPlatform.isDarwin, openexr, - ilmbase, enableJPEG2000 ? true, openjpeg, enableEigen ? true, @@ -370,7 +369,6 @@ effectiveStdenv.mkDerivation { ] ++ optionals enableEXR [ openexr - ilmbase ] ++ optionals enableJPEG2000 [ openjpeg @@ -464,8 +462,6 @@ effectiveStdenv.mkDerivation { cudaPackages.cuda_nvcc ]; - env.NIX_CFLAGS_COMPILE = optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; - # Configure can't find the library without this. OpenBLAS_HOME = optionalString withOpenblas openblas_.dev; OpenBLAS = optionalString withOpenblas openblas_; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44c912ee8e48..818ad8d02790 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10703,7 +10703,6 @@ with pkgs; # TODO: LTO does not work. # https://github.com/NixOS/nixpkgs/issues/343123 enableLto = false; - openexr = openexr_2; }; opencv4WithoutCuda = opencv4.override { From c312f6f8187eefb9c860bc54d1e508490f20c94a Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sun, 2 Mar 2025 12:45:30 +0100 Subject: [PATCH 04/15] opencv: fix protobuf support See https://github.com/opencv/opencv/blob/4.11.0/cmake/OpenCVFindProtobuf.cmake#L81 Only protobuf <= 22 will work with the current CXX standard version. --- pkgs/development/libraries/opencv/4.x.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index bd90e228fc3b..67658bb843a0 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -13,7 +13,7 @@ glib, glog, gflags, - protobuf_29, + protobuf_21, config, ocl-icd, qimgv, @@ -337,7 +337,7 @@ effectiveStdenv.mkDerivation { glib glog pcre2 - protobuf_29 + protobuf_21 zlib ] ++ optionals enablePython [ @@ -471,6 +471,7 @@ effectiveStdenv.mkDerivation { (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true) (cmakeBool "WITH_OPENMP" true) (cmakeBool "BUILD_PROTOBUF" false) + (cmakeBool "WITH_PROTOBUF" true) (cmakeBool "PROTOBUF_UPDATE_FILES" true) (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree) (cmakeBool "BUILD_TESTS" runAccuracyTests) From 139bfb5b5e8bb345e908a00c31a6d79a73243dee Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Thu, 24 Apr 2025 17:57:05 +0200 Subject: [PATCH 05/15] nixos/system/activation/bootspec: generalize the bootspec tooling package After RFC-0125 implementation, Determinate Systems was pinged multiple times to transfer the repository ownership of the tooling to a vendor-neutral repository. Unfortunately, this never manifested. Additionally, the leadership of the NixOS project was too dysfunctional to deal with this sort of problem. It might even still be the case up to this day. Nonetheless, nixpkgs is about enabling end users to enact their own policies. It would be better to live in a world where there is one obvious choice of bootspec tooling, in the meantime, we can live in a world where people can choose their bootspec tooling. The Lix forge possess one fork of the Bootspec tooling: https://git.lix.systems/lix-community/bootspec which will live its own life from now on. Change-Id: I00c4dd64e00b4c24f6641472902e7df60ed13b55 Signed-off-by: Raito Bezarius --- nixos/modules/system/activation/bootspec.nix | 2 + .../boot/loader/systemd-boot/systemd-boot.nix | 2 +- nixos/tests/installer.nix | 164 +++++++++--------- 3 files changed, 86 insertions(+), 82 deletions(-) diff --git a/nixos/modules/system/activation/bootspec.nix b/nixos/modules/system/activation/bootspec.nix index 4f534b240e67..99a859f91829 100644 --- a/nixos/modules/system/activation/bootspec.nix +++ b/nixos/modules/system/activation/bootspec.nix @@ -111,6 +111,8 @@ in Enable this option if you want to ascertain that your documents are correct ''; + package = lib.mkPackageOption pkgs "bootspec" { }; + extensions = lib.mkOption { # NOTE(RaitoBezarius): this is not enough to validate: extensions."osRelease" = drv; those are picked up by cue validation. type = lib.types.attrsOf lib.types.anything; # : { ...namespace-specific fields } diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index e5080bd8d191..f0afb3b8f575 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -47,7 +47,7 @@ let systemd = config.systemd.package; - bootspecTools = pkgs.bootspec; + bootspecTools = config.boot.bootspec.package; nix = config.nix.package.out; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index db9fccaa2bb4..3a7fe2d16d61 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -680,95 +680,97 @@ let in { # The configuration of the system used to run "nixos-install". - installer = { - imports = [ - commonConfig - ../modules/profiles/installation-device.nix - ../modules/profiles/base.nix - extraInstallerConfig - ./common/auto-format-root-device.nix - ]; + installer = + { config, ... }: + { + imports = [ + commonConfig + ../modules/profiles/installation-device.nix + ../modules/profiles/base.nix + extraInstallerConfig + ./common/auto-format-root-device.nix + ]; - # In systemdStage1, also automatically format the device backing the - # root filesystem. - virtualisation.fileSystems."/".autoFormat = systemdStage1; + # In systemdStage1, also automatically format the device backing the + # root filesystem. + virtualisation.fileSystems."/".autoFormat = systemdStage1; - boot.initrd.systemd.enable = systemdStage1; + boot.initrd.systemd.enable = systemdStage1; - # Use a small /dev/vdb as the root disk for the - # installer. This ensures the target disk (/dev/vda) is - # the same during and after installation. - virtualisation.emptyDiskImages = [ 512 ]; - virtualisation.rootDevice = "/dev/vdb"; + # Use a small /dev/vdb as the root disk for the + # installer. This ensures the target disk (/dev/vda) is + # the same during and after installation. + virtualisation.emptyDiskImages = [ 512 ]; + virtualisation.rootDevice = "/dev/vdb"; - hardware.enableAllFirmware = mkForce false; - nix.package = selectNixPackage pkgs; + nix.package = selectNixPackage pkgs; + hardware.enableAllFirmware = mkForce false; - # The test cannot access the network, so any packages we - # need must be included in the VM. - system.extraDependencies = - with pkgs; - [ - bintools - brotli - brotli.dev - brotli.lib - desktop-file-utils - docbook5 - docbook_xsl_ns - kbd.dev - kmod.dev - libarchive.dev - libxml2.bin - libxslt.bin - nixos-artwork.wallpapers.simple-dark-gray-bottom - ntp - perlPackages.ConfigIniFiles - perlPackages.FileSlurp - perlPackages.JSON - perlPackages.ListCompare - perlPackages.XMLLibXML - # make-options-doc/default.nix - (python3.withPackages (p: [ p.mistune ])) - shared-mime-info - sudo - switch-to-configuration-ng - texinfo - unionfs-fuse - xorg.lndir - shellcheck-minimal - - # add curl so that rather than seeing the test attempt to download - # curl's tarball, we see what it's trying to download - curl - ] - ++ optionals (bootLoader == "grub") ( - let - zfsSupport = extraInstallerConfig.boot.supportedFilesystems.zfs or false; - in + # The test cannot access the network, so any packages we + # need must be included in the VM. + system.extraDependencies = + with pkgs; [ - (pkgs.grub2.override { inherit zfsSupport; }) - (pkgs.grub2_efi.override { inherit zfsSupport; }) - pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader - pkgs.perlPackages.FileCopyRecursive - pkgs.perlPackages.XMLSAX - pkgs.perlPackages.XMLSAXBase - ] - ) - ++ optionals (bootLoader == "systemd-boot") [ - pkgs.zstd.bin - pkgs.mypy - pkgs.bootspec - ] - ++ optionals clevisTest [ pkgs.klibc ] - ++ optional systemdStage1 pkgs.chroot-realpath; + bintools + brotli + brotli.dev + brotli.lib + desktop-file-utils + docbook5 + docbook_xsl_ns + kbd.dev + kmod.dev + libarchive.dev + libxml2.bin + libxslt.bin + nixos-artwork.wallpapers.simple-dark-gray-bottom + ntp + perlPackages.ConfigIniFiles + perlPackages.FileSlurp + perlPackages.JSON + perlPackages.ListCompare + perlPackages.XMLLibXML + # make-options-doc/default.nix + (python3.withPackages (p: [ p.mistune ])) + shared-mime-info + sudo + switch-to-configuration-ng + texinfo + unionfs-fuse + xorg.lndir + shellcheck-minimal - nix.settings = { - substituters = mkForce [ ]; - hashed-mirrors = null; - connect-timeout = 1; + # add curl so that rather than seeing the test attempt to download + # curl's tarball, we see what it's trying to download + curl + ] + ++ optionals (bootLoader == "grub") ( + let + zfsSupport = extraInstallerConfig.boot.supportedFilesystems.zfs or false; + in + [ + (pkgs.grub2.override { inherit zfsSupport; }) + (pkgs.grub2_efi.override { inherit zfsSupport; }) + pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader + pkgs.perlPackages.FileCopyRecursive + pkgs.perlPackages.XMLSAX + pkgs.perlPackages.XMLSAXBase + ] + ) + ++ optionals (bootLoader == "systemd-boot") [ + pkgs.zstd.bin + pkgs.mypy + config.boot.bootspec.package + ] + ++ optionals clevisTest [ pkgs.klibc ] + ++ optional systemdStage1 pkgs.chroot-realpath; + + nix.settings = { + substituters = mkForce [ ]; + hashed-mirrors = null; + connect-timeout = 1; + }; }; - }; target = { imports = [ commonConfig ]; From e9c6d76072075f0df17800a9160e8d448c856404 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Thu, 24 Apr 2025 17:57:51 +0200 Subject: [PATCH 06/15] bootspec-lix: init at 1.0.0 A fork of DeterminateSystems/bootspec moved in a vendor-neutral location. Multiple attempts were done to move into NixOS/bootspec to no avail. I am not interested into working towards that goal under the current leadership structures. Change-Id: I06cbc2272003a1b813ab3a50ebeb9acf90e72f10 Signed-off-by: Raito Bezarius --- pkgs/by-name/bo/bootspec-lix/package.nix | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/bo/bootspec-lix/package.nix diff --git a/pkgs/by-name/bo/bootspec-lix/package.nix b/pkgs/by-name/bo/bootspec-lix/package.nix new file mode 100644 index 000000000000..411c3e0f1e85 --- /dev/null +++ b/pkgs/by-name/bo/bootspec-lix/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + fetchFromGitea, + fetchpatch, +}: +rustPlatform.buildRustPackage rec { + pname = "bootspec-lix"; + version = "1.0.0"; + + src = fetchFromGitea { + domain = "git.lix.systems"; + owner = "lix-community"; + repo = "bootspec"; + rev = "v${version}"; + hash = "sha256-5IGSMHeL0eKfl7teDejAckYQjc8aeLwfwIQSzQ8YaAg="; + }; + + patches = [ + # https://github.com/DeterminateSystems/bootspec/pull/127 + # Fixes the synthesize tool for aarch64-linux + (fetchpatch { + name = "aarch64-support.patch"; + url = "https://github.com/DeterminateSystems/bootspec/commit/1d0e925f360f0199f13422fb7541225fd162fd4f.patch"; + sha256 = "sha256-wU/jWnOqVBrU2swANdXbQfzRpNd/JIS4cxSyCvixZM0="; + }) + ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-65jk8UlXZgQoxuwRcGlMnI4e+LpCJuP2TaqK+Kn4GnQ="; + + meta = with lib; { + description = "Vendor-neutral implementation of RFC-0125's datatype and synthesis tooling"; + homepage = "https://git.lix.systems/lix-community/bootspec"; + license = licenses.mit; + maintainers = [ lib.maintainers.raitobezarius ]; + platforms = platforms.unix; + }; +} From f93482e3c603ce2668a4a3b8f0656f1123d85cdf Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Thu, 24 Apr 2025 17:10:45 -0400 Subject: [PATCH 07/15] paperless-ngx: 2.15.2 -> 2.15.3 changelog: https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.15.3 --- pkgs/by-name/pa/paperless-ngx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index d6011a8caa02..c4abb4bd887e 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -27,13 +27,13 @@ xorg, }: let - version = "2.15.2"; + version = "2.15.3"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-3IGXjMVMSbpcdwEvJcMbFuQI9GYy1TY9NWAvum14UK4="; + hash = "sha256-zkOOUMyAvYYJnYn4s7D4tsYhodVX5kvPdXBBknBsusY="; }; python = python3.override { From 4f93644561213030f8fa43d198aa616999bfcfcb Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Fri, 25 Apr 2025 11:31:27 +0200 Subject: [PATCH 08/15] dosbox: fix cross --- pkgs/applications/emulators/dosbox/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index f27d3e06adb5..5f22f277952a 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -13,6 +13,7 @@ libGLU, OpenGL, libpng, + binutils, makeDesktopItem, }: @@ -33,10 +34,17 @@ stdenv.mkDerivation rec { }) ]; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook copyDesktopItems graphicsmagick + SDL # for sdl-config during build time + ]; + + depsBuildBuild = [ + binutils # build calls `ar` ]; buildInputs = From 129f88a7d5d89a11eed5ce9030fce74a56526118 Mon Sep 17 00:00:00 2001 From: DataHearth Date: Thu, 24 Apr 2025 15:13:20 +0200 Subject: [PATCH 09/15] python3Packages.scenedetect: init at 0.6.6 --- .../python-modules/scenedetect/default.nix | 70 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/scenedetect/default.nix diff --git a/pkgs/development/python-modules/scenedetect/default.nix b/pkgs/development/python-modules/scenedetect/default.nix new file mode 100644 index 000000000000..e3f66fa3e6a3 --- /dev/null +++ b/pkgs/development/python-modules/scenedetect/default.nix @@ -0,0 +1,70 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + av, + click, + numpy, + pytestCheckHook, + opencv-python, + platformdirs, + tqdm, + versionCheckHook, +}: +let + testsResources = fetchFromGitHub { + owner = "Breakthrough"; + repo = "PySceneDetect"; + rev = "94389267a344785643980a2e0bb18179dcca01d3"; + hash = "sha256-7ws7F7CkEJAa0PgfMEOwnpF4Xl2BQCn9+qFQb5MMlZ0="; + }; +in +buildPythonPackage rec { + pname = "scenedetect"; + version = "0.6.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Breakthrough"; + repo = "PySceneDetect"; + tag = "v${version}-release"; + hash = "sha256-G5NLk6eOpclfrzzHad2KT3uZqydSJU0oF/4L2NIdZe0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + av + click + numpy + opencv-python + platformdirs + tqdm + ]; + + pythonImportsCheck = [ + "scenedetect" + ]; + + preCheck = '' + cp -r ${testsResources}/tests/resources tests/ + chmod -R +w tests/resources + ''; + + nativeCheckInputs = [ + pytestCheckHook + versionCheckHook + ]; + + versionCheckProgramArg = "version"; + + meta = { + description = "Python and OpenCV-based scene cut/transition detection program & library"; + homepage = "https://www.scenedetect.com"; + changelog = "https://github.com/Breakthrough/PySceneDetect/releases/tag/v${version}-release"; + mainProgram = "scenedetect"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ DataHearth ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a475f5d8798c..30c21cc85f56 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15399,6 +15399,8 @@ self: super: with self; { inherit (pkgs) libpcap; # Avoid confusion with python package of the same name }; + scenedetect = callPackage ../development/python-modules/scenedetect { }; + schedule = callPackage ../development/python-modules/schedule { }; schema = callPackage ../development/python-modules/schema { }; From b610aff471254a3d8bc0d3c6c1b223854572113e Mon Sep 17 00:00:00 2001 From: phaer Date: Fri, 25 Apr 2025 14:03:06 +0200 Subject: [PATCH 10/15] nixos-rebuild: fix typo in build-image with -A given --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 55759722fec5..74ca23a8b6ca 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -863,7 +863,7 @@ if [ -z "$rollback" ]; then "let value = import \"$(realpath $buildFile)\"; set = if builtins.isFunction value then value {} else value; - in set.${attr:+$attr.}config.system.build.images.$imageVariant.v.passthru.filePath" \ + in set.${attr:+$attr.}config.system.build.images.$imageVariant.passthru.filePath" \ "${extraBuildFlags[@]}" \ | jq -r . )" From f8588e8d867843924a1b1aa8e2b2efe4018f5cef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Apr 2025 13:00:42 +0000 Subject: [PATCH 11/15] simpleDBus: 0.9.0 -> 0.9.1 --- pkgs/by-name/si/simpleDBus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simpleDBus/package.nix b/pkgs/by-name/si/simpleDBus/package.nix index 6adc64739811..0fb081962d25 100644 --- a/pkgs/by-name/si/simpleDBus/package.nix +++ b/pkgs/by-name/si/simpleDBus/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simpleDBus"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "OpenBluetoothToolbox"; repo = "SimpleBLE"; rev = "v${finalAttrs.version}"; - hash = "sha256-suVaiFE60g2OlIF4DLGoHKr7ehUtThLcB/GoVCOfxJg="; + hash = "sha256-VaaDk+pLRUlVjGKFzi22QhYxk1b2bo6rX9TVeJsJdh8="; }; outputs = [ From df948434d7a92a91908ffbaf29a94e02cac1b160 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Apr 2025 18:20:58 +0200 Subject: [PATCH 12/15] sarif-converter: init at 0.9.4 --- pkgs/by-name/sa/sarif-converter/package.nix | 47 +++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/sa/sarif-converter/package.nix diff --git a/pkgs/by-name/sa/sarif-converter/package.nix b/pkgs/by-name/sa/sarif-converter/package.nix new file mode 100644 index 000000000000..19e6a50802d8 --- /dev/null +++ b/pkgs/by-name/sa/sarif-converter/package.nix @@ -0,0 +1,47 @@ +{ + lib, + buildGoModule, + fetchFromGitLab, + nix-update-script, + sarif-converter, + testers, +}: + +buildGoModule (finalAttrs: { + pname = "sarif-converter"; + version = "0.9.4"; + + src = fetchFromGitLab { + owner = "ignis-build"; + repo = "sarif-converter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q8L4C4mTJEfxASqrUAZlMoLx71/+nmP6mwW/vNFStTs="; + }; + + vendorHash = "sha256-vK+HhHlFWoWIrDEZzfRoqtJ3vKp0f4b8l8+LBlZuBJU="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${finalAttrs.version}" + ]; + + postInstall = '' + mv $out/bin/main $out/bin/sarif-converter + ''; + + passthru = { + tests.version = testers.testVersion { + package = sarif-converter; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Convert from [SARIF](https://sarifweb.azurewebsites.net/) to GitLab Code Quality and SAST report"; + homepage = "https://gitlab.com/ignis-build/sarif-converter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + mainProgram = "sarif-converter"; + }; +}) From dad2742590d6f8cdd81cb65f239238a694954f9d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 25 Apr 2025 15:13:08 +0200 Subject: [PATCH 13/15] presenterm: 0.12.0 -> 0.13.0 Diff: https://github.com/mfontanini/presenterm/compare/refs/tags/v0.12.0...refs/tags/v0.13.0 Changelog: https://github.com/mfontanini/presenterm/releases/tag/v0.13.0 --- pkgs/by-name/pr/presenterm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index 84765cad4394..bd6c01303a95 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "presenterm"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "mfontanini"; repo = "presenterm"; tag = "v${finalAttrs.version}"; - hash = "sha256-2k1YCzRoXt5Nmn+HH2qkdpP3S3+PJ5OVSVx29nYSdF8="; + hash = "sha256-5eDGoY4Yb27ATgBhNjlee6tSgwAKiLuuDMrL96cBpko="; }; buildInputs = [ @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; useFetchCargoVendor = true; - cargoHash = "sha256-M9VcwfG6NwUIvOkZKdoh97GVJEivkEmXhlApGQ1Hqds="; + cargoHash = "sha256-MOX5QWxN7uEnvm9JU9jRW8Z2D2LMle+H1rOmfMxz100="; checkFlags = [ # failed to load .tmpEeeeaQ: No such file or directory (os error 2) From b3f32fe840f5f96ff003dec8bf961dd01d153c89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Apr 2025 13:24:50 +0000 Subject: [PATCH 14/15] namespace-cli: 0.0.408 -> 0.0.409 --- pkgs/by-name/na/namespace-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 1cb219e6a459..04588a83e051 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.408"; + version = "0.0.409"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-Cjxoh+fWI20KRTOgTCJ2KOtS3e7GuitreS85S2BbtNU="; + hash = "sha256-1AS2N/IFPxrcDGQqbWFvznnVQ50Preqp/f/cOGJ15CM="; }; vendorHash = "sha256-OBFzi8n29gnyMvwLYsmJz8oLLvR2i6YRNrfWxkRwC/s="; From ed850f9a2092d68563a1482a2c1d9b98a683c5e0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 25 Apr 2025 21:37:32 +0800 Subject: [PATCH 15/15] pantheon.elementary-greeter: Explicitly add gala This is for the io.elementary.desktop.background schema, so this in-theory works without the Pantheon desktop. Fixes https://github.com/NixOS/nixpkgs/issues/399648. --- pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index c76592c322c6..7297f513c8e6 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -15,6 +15,7 @@ granite, libgee, libhandy, + gala, gnome-desktop, gnome-settings-daemon, mutter, @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { buildInputs = [ accountsservice elementary-icon-theme + gala # for io.elementary.desktop.background gnome-desktop gnome-settings-daemon gdk-pixbuf