Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-08-04 18:01:04 +00:00
committed by GitHub
67 changed files with 7454 additions and 1475 deletions
@@ -13,6 +13,8 @@
- `authelia` has been upgraded to version 4.38. This version brings several features and improvements which are detailed in the [release blog post](https://www.authelia.com/blog/4.38-release-notes/).
This release also deprecates some configuration keys, which are likely to be removed in future version 5.0, but they are still supported and expected to be working in the current version.
- `compressDrv` can compress selected files in a derivation. `compressDrvWeb` compresses files for common web server usage (`.gz` with `zopfli`, `.br` with `brotli`).
- `hardware.display` is a new module implementing workarounds for misbehaving monitors
through setting up custom EDID files and forcing kernel/framebuffer modes.
+3 -3
View File
@@ -26,9 +26,9 @@ in
config = mkIf cfg.enable {
boot.extraModulePackages = with config.boot.kernelPackages; [
ipu6-drivers
];
# Module is upstream as of 6.10
boot.extraModulePackages = with config.boot.kernelPackages;
optional (kernelOlder "6.10") ipu6-drivers;
hardware.firmware = with pkgs; [
ipu6-camera-bins
+1
View File
@@ -1466,6 +1466,7 @@
./services/web-apps/pretix.nix
./services/web-apps/prosody-filer.nix
./services/web-apps/rimgo.nix
./services/web-apps/screego.nix
./services/web-apps/sftpgo.nix
./services/web-apps/suwayomi-server.nix
./services/web-apps/rss-bridge.nix
@@ -0,0 +1,96 @@
{
config,
lib,
pkgs,
...
}:
let
inherit (lib) mkOption types mkIf;
cfg = config.services.screego;
defaultSettings = {
SCREEGO_SERVER_ADDRESS = "127.0.0.1:5050";
SCREEGO_TURN_ADDRESS = "0.0.0.0:3478";
SCREEGO_TURN_PORT_RANGE = "50000:55000";
SCREEGO_SESSION_TIMEOUT_SECONDS = "0";
SCREEGO_CLOSE_ROOM_WHEN_OWNER_LEAVES = "true";
SCREEGO_AUTH_MODE = "turn";
SCREEGO_LOG_LEVEL = "info";
};
in
{
meta.maintainers = with lib.maintainers; [ pinpox ];
options.services.screego = {
enable = lib.mkEnableOption "screego screen-sharing server for developers";
openFirewall = mkOption {
type = types.bool;
default = false;
description = ''
Open the firewall port(s).
'';
};
environmentFile = mkOption {
default = null;
description = ''
Environment file (see {manpage}`systemd.exec(5)` "EnvironmentFile="
section for the syntax) passed to the service. This option can be
used to safely include secrets in the configuration.
'';
example = "/run/secrets/screego-envfile";
type = with types; nullOr path;
};
settings = lib.mkOption {
type = types.attrsOf types.str;
description = ''
Screego settings passed as Nix attribute set, they will be merged with
the defaults. Settings will be passed as environment variables.
See https://screego.net/#/config for possible values
'';
default = defaultSettings;
example = {
SCREEGO_EXTERNAL_IP = "dns:example.com";
};
};
};
config =
let
# User-provided settings should be merged with default settings,
# overwriting where necessary
mergedConfig = defaultSettings // cfg.settings;
turnUDPPorts = lib.splitString ":" mergedConfig.SCREEGO_TURN_PORT_RANGE;
turnPort = lib.toInt (builtins.elemAt (lib.splitString ":" mergedConfig.SCREEGO_TURN_ADDRESS) 1);
in
mkIf (cfg.enable) {
networking.firewall = lib.mkIf cfg.openFirewall {
allowedTCPPorts = [ turnPort ];
allowedUDPPorts = [ turnPort ];
allowedUDPPortRanges = [
{
from = lib.toInt (builtins.elemAt turnUDPPorts 0);
to = lib.toInt (builtins.elemAt turnUDPPorts 1);
}
];
};
systemd.services.screego = {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
description = "screego screen-sharing for developers";
environment = mergedConfig;
serviceConfig = {
DynamicUser = true;
ExecStart = "${lib.getExe pkgs.screego} serve";
Restart = "on-failure";
RestartSec = "5s";
} // lib.optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; };
};
};
}
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
version = "5.0.21";
version = "5.0.22";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
sha256 = "sha256-WtBsChSHnYbRBojxRUGdMnXlG+45hp4ZSd8GLx5n/88=";
sha256 = "sha256-fuea76l6kIjk9n/LlktZmJ1B8wiwSfEeHUkTr+I1a2c=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -2,11 +2,11 @@
let
pname = "ledger-live-desktop";
version = "2.84.0";
version = "2.84.1";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-VqPiFcquR1AbtH3oZJ5l+/KmvFUGCdBrwZuPAJ+26nw=";
hash = "sha256-V/bOCddc7UhmN8zlHmKj+H4v+ZZ/qn8jRj0jH4EtwMI=";
};
appimageContents = appimageTools.extractType2 {
File diff suppressed because it is too large Load Diff
@@ -17,13 +17,13 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "1.14.0";
version = "stable2407";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot-sdk";
rev = "polkadot-v${version}";
hash = "sha256-IKKhGjWHyHUrDVGJo1d1JXzagkydgdfd/u6jk76qxHU=";
rev = "polkadot-${version}";
hash = "sha256-g+jReHOAkaWjr1yJILFL4mSYGEfRBlSCrUHp8ro22SA=";
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
@@ -47,12 +47,7 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"ark-secret-scalar-0.0.2" = "sha256-91sODxaj0psMw0WqigMCGO5a7+NenAsRj5ZmW6C7lvc=";
"common-0.1.0" = "sha256-LHz2dK1p8GwyMimlR7AxHLz1tjTYolPwdjP7pxork1o=";
"fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo=";
"simple-mermaid-0.1.0" = "sha256-IekTldxYq+uoXwGvbpkVTXv2xrcZ0TQfyyE2i2zH+6w=";
"sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8=";
"sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI=";
};
};
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "gnmic";
version = "0.38.0";
version = "0.38.1";
src = fetchFromGitHub {
owner = "openconfig";
repo = pname;
rev = "v${version}";
hash = "sha256-sFjr43rHFnhTpOutwgt7yg5wJtpSe2+ShUggb1QVCWE=";
hash = "sha256-Js5l6bVZtnR6uOo2+3L2CAvFj/i0O2FFGEiGOkc2qDQ=";
};
vendorHash = "sha256-+TrSvGbpQSTanf5rm955WE8jj/RlZGtacbBo6JsOW4Y=";
vendorHash = "sha256-4TTxhcP06YuhWWufVTAVK2wTf8mCc3WLAjzFe5wKChY=";
ldflags = [
"-s" "-w"
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "juju";
version = "3.5.2";
version = "3.5.3";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "v${version}";
hash = "sha256-HdV6bRAMQ7LynEGjrFOX36g7+1Zb9AiFtF6O4yu7+NU=";
hash = "sha256-PdNUmPfPYqOYEphY0ZlwEikUV/bKSPOGQuAJsi8+g/E=";
};
vendorHash = "sha256-FCN+0Wx2fYQcj5CRgPubAWbGGyVQcSSfu/Om6SUB6TQ=";
@@ -10,14 +10,14 @@
python3Packages.buildPythonApplication rec {
pname = "git-cola";
version = "4.8.0";
version = "4.8.1";
pyproject = true;
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
hash = "sha256-sm/a790PiSqGYbftxvLiLMifKbMyi3a5Rvlhr9plyrU=";
hash = "sha256-3SCfsLYB4qhvsVo0Ji4WPwIDGcMwQ4M4zKnCOsXGTS0=";
};
buildInputs = lib.optionals stdenv.isLinux [
@@ -10,13 +10,13 @@
buildPythonApplication rec {
pname = "git-machete";
version = "3.26.2";
version = "3.26.3";
src = fetchFromGitHub {
owner = "virtuslab";
repo = pname;
rev = "v${version}";
hash = "sha256-AvHRl+xP4VSBP9p2BoRr/z/BT6c7zlOWUlWmfp5VvfA=";
hash = "sha256-UCaJiYLYeHI4R8IJfhgmT4Ji++CtQgvIJrKH1EXl83o=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -0,0 +1,63 @@
{
lib,
xorg,
runCommand,
}:
/**
# compressDrv compresses files in a given derivation.
## Inputs:
`formats` ([String])
: List of file extensions to compress. Example: `["txt" "svg" "xml"]`.
`compressors` (String -> String)
: Map a desired extension (e.g. `gz`) to a compress program.
The compressor program that will be executed to get the `COMPRESSOR` extension.
The program should have a single " {}", which will be the replaced with the
target filename.
Compressor must:
- read symlinks (thus --force is needed to gzip, zstd, xz).
- keep the original file in place (--keep).
Example:
```
{
xz = "${xz}/bin/xz --force --keep {}";
}
```
See compressDrvWeb, which is a wrapper on top of compressDrv, for broader use
examples.
*/
drv:
{ formats, compressors, ... }:
let
validProg =
ext: prog:
let
matches = (builtins.length (builtins.split "\\{}" prog) - 1) / 2;
in
lib.assertMsg (
matches == 1
) "compressor ${ext} needs to have exactly one '{}', found ${builtins.toString matches}";
mkCmd =
ext: prog:
assert validProg ext prog;
''
find -L $out -type f -regextype posix-extended -iregex '.*\.(${formatsPipe})' -print0 \
| xargs -0 -P$NIX_BUILD_CORES -I{} ${prog}
'';
formatsPipe = builtins.concatStringsSep "|" formats;
in
runCommand "${drv.name}-compressed" { } ''
mkdir $out
(cd $out; ${xorg.lndir}/bin/lndir ${drv})
${lib.concatStringsSep "\n\n" (lib.mapAttrsToList mkCmd compressors)}
''
+42
View File
@@ -0,0 +1,42 @@
{
gzip,
runCommand,
compressDrv,
}:
let
example = runCommand "sample-drv" { } ''
mkdir $out
echo 42 > $out/1.txt
echo 43 > $out/1.md
touch $out/2.png
'';
drv = compressDrv example {
formats = [ "txt" ];
compressors.gz = "${gzip}/bin/gzip --force --keep --fast {}";
};
wrapped = compressDrv drv {
formats = [ "md" ];
compressors.gz = "${gzip}/bin/gzip --force --keep --fast {}";
};
in
runCommand "test-compressDrv" { } ''
set -ex
ls -l ${drv}
test -h ${drv}/1.txt
test -f ${drv}/1.txt.gz
cmp ${drv}/1.txt <(${gzip}/bin/zcat ${drv}/1.txt.gz)
test -h ${drv}/2.png
test ! -a ${drv}/2.png.gz
# compressDrv always points to the final file, no matter how many times
# it's been wrapped
cmp <(readlink -e ${drv}/1.txt) <(readlink -e ${wrapped}/1.txt)
test -f ${wrapped}/1.txt.gz
test -f ${wrapped}/1.md.gz
test ! -f ${drv}/1.md.gz
mkdir $out
''
+103
View File
@@ -0,0 +1,103 @@
{
zopfli,
brotli,
compressDrv,
}:
/**
# compressDrvWeb compresses a derivation for common web server use.
Useful when one wants to pre-compress certain static assets and pass them to
the web server. For example, `pkgs.gamja` creates this derivation:
/nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/
index.2fd01148.js
index.2fd01148.js.map
index.37aa9a8a.css
index.37aa9a8a.css.map
index.html
manifest.webmanifest
`pkgs.compressDrvWeb pkgs.gamja`:
/nix/store/f5ryid7zrw2hid7h9kil5g5j29q5r2f7-gamja-1.0.0-beta.9-compressed
index.2fd01148.js -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.2fd01148.js
index.2fd01148.js.br
index.2fd01148.js.gz
index.2fd01148.js.map -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.2fd01148.js.map
index.2fd01148.js.map.br
index.2fd01148.js.map.gz
index.37aa9a8a.css -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.37aa9a8a.css
index.37aa9a8a.css.br
index.37aa9a8a.css.gz
index.37aa9a8a.css.map -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.37aa9a8a.css.map
index.37aa9a8a.css.map.br
index.37aa9a8a.css.map.gz
index.html -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.html
index.html.br
index.html.gz
manifest.webmanifest -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/manifest.webmanifest
manifest.webmanifest.br
manifest.webmanifest.gz
When this `-compressed` directory is passed to a properly configured web
server, it will serve those pre-compressed files:
$ curl -I -H 'Accept-Encoding: br' https://irc.example.org/
<...>
content-encoding: br
<...>
For example, a caddy configuration snippet for gamja to serve
the static assets (JS, CSS files) pre-compressed:
virtualHosts."irc.example.org".extraConfig = ''
root * ${pkgs.compressDrvWeb pkgs.gamja {}}
file_server browse {
precompressed br gzip
}
'';
This feature is also available in nginx via `ngx_brotli` and
`ngx_http_gzip_static_module`.
## Inputs
`formats` ([String])
: List of file extensions to compress. Default is common formats that compress
well. The list may be expanded.
`extraFormats` ([String])
: Extra extensions to compress in addition to `formats`.
`compressors` (String -> String)
: See parameter `compressors` of compressDrv.
*/
drv:
{
formats ? [
"css"
"js"
"svg"
"ttf"
"eot"
"txt"
"xml"
"map"
"html"
"json"
"webmanifest"
],
extraFormats ? [ ],
compressors ? {
"gz" = "${zopfli}/bin/zopfli --keep {}";
"br" = "${brotli}/bin/brotli --keep --no-copy-stat {}";
},
...
}:
compressDrv drv {
formats = formats ++ extraFormats;
compressors = compressors;
}
+3 -3
View File
@@ -6,7 +6,7 @@
}:
let
pname = "asm-lsp";
version = "0.7.3";
version = "0.7.4";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
owner = "bergercookie";
repo = "asm-lsp";
rev = "v${version}";
hash = "sha256-LWsawBh1czS7LUX70IXrJHUonIt2XEN8L26iP5cVyRk=";
hash = "sha256-tgwiCAlHuFdeMr1GA4vPg8i94zfRj+uyPMAXYh+Smo4=";
};
nativeBuildInputs = [
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
openssl
];
cargoHash = "sha256-pIjOelOQ5X8jl/ZtE8IzXPtcLmANDtWsJaNXno8CT6Y=";
cargoHash = "sha256-UBYD0rs7bEtVZatu/kRgyCwKHvcgYJWRgyfBi3ooPGQ=";
# tests expect ~/.cache/asm-lsp to be writable
preCheck = ''
+2 -2
View File
@@ -2,13 +2,13 @@
buildDotnetModule rec {
pname = "Boogie";
version = "3.2.1";
version = "3.2.3";
src = fetchFromGitHub {
owner = "boogie-org";
repo = "boogie";
rev = "v${version}";
sha256 = "sha256-89S3yBjEUHbQbuWWLe/pTMaDOCqDR04hNJwIRzh5xaI=";
sha256 = "sha256-dMJ6A2ggBb20vuHL1g/Zx3pl9tXE8oayMGOqpChcg2U=";
};
projectFile = [ "Source/Boogie.sln" ];
+2 -16
View File
@@ -6,15 +6,13 @@
, git
, bash
, coreutils
, compressDrvWeb
, gitea
, gzip
, openssh
, pam
, sqliteSupport ? true
, pamSupport ? stdenv.hostPlatform.isLinux
, runCommand
, brotli
, xorg
, nixosTests
, buildNpmPackage
}:
@@ -90,19 +88,7 @@ in buildGoModule rec {
'';
passthru = {
data-compressed = runCommand "gitea-data-compressed" {
nativeBuildInputs = [ brotli xorg.lndir ];
} ''
mkdir -p $out/{options,public,templates}
lndir ${frontend}/public $out/public
lndir ${gitea.data}/options $out/options
lndir ${gitea.data}/templates $out/templates
# Create static gzip and brotli files
find -L $out -type f -regextype posix-extended -iregex '.*\.(css|html|js|svg|ttf|txt)' \
-exec gzip --best --keep --force {} ';' \
-exec brotli --best --keep --no-copy-stat {} ';'
'';
data-compressed = lib.warn "gitea.passthru.data-compressed is deprecated. Use \"compressDrvWeb gitea.data\"." (compressDrvWeb gitea.data);
tests = nixosTests.gitea;
};
+3 -3
View File
@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "gitlab-ci-local";
version = "4.52.1";
version = "4.52.2";
src = fetchFromGitHub {
owner = "firecow";
repo = "gitlab-ci-local";
rev = version;
hash = "sha256-yNOlcb1I8BiR9rbqxeE7PEshEAudw62M77QBgTCBETg=";
hash = "sha256-x63am8FIfczA4CkoBkDeZTkp2sqc7nN5CV1hiq+vvjU=";
};
npmDepsHash = "sha256-8Fxkd3JPyspcZeENpvvuguPNXbnWL1WrcYL9c77+Gok=";
npmDepsHash = "sha256-t26QoIBw5XGqHn8FHSL2MSfFV2wGuQWf3GH2GvSYByg=";
postPatch = ''
# remove cleanup which runs git commands
+2 -2
View File
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "junest";
version = "7.4.8";
version = "7.4.9";
src = fetchFromGitHub {
owner = "fsquillace";
repo = "junest";
rev = "refs/tags/${version}";
hash = "sha256-9yrQ721fHUxXEZ0mh27SB8yoUH67ltOktUq3kr4qrBc=";
hash = "sha256-iPZN4zPHRsOh5GjRUbeEQj7BYO2Ng93mNn8TvxpDN3Q=";
};
dontBuild = true;
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "kyverno-chainsaw";
version = "0.2.7";
version = "0.2.8";
src = fetchFromGitHub {
owner = "kyverno";
repo = "chainsaw";
rev = "v${version}";
hash = "sha256-Ft3xWXUu57DHKTDyvtIvYExauP/La0xWu2rjbpcvxzM=";
hash = "sha256-elszVinOGL4IbMNK3RTtzJPRRqs7qgqITQqj0g/wyk8=";
};
vendorHash = "sha256-ilQOf1GMVmf9FhwfMuK+eGFOnqmL+kW/ma+/KaTWqc4=";
vendorHash = "sha256-HDmnI+WVv4cUia+IXrBdFBFnrxKMSFjKD6LUZ393sqs=";
ldflags = [
"-s"
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "lazysql";
version = "0.2.3";
version = "0.2.4";
src = fetchFromGitHub {
owner = "jorgerojas26";
repo = "lazysql";
rev = "v${version}";
hash = "sha256-7aHzqgRtJvGueCmB87uJkFgkphfPj/owAz0Q2o3OU88=";
hash = "sha256-Pzx9wjuPv7k0q+ads/uKrRTEAZbktf4ciyD7KZjYGwQ=";
};
vendorHash = "sha256-tgD6qoCVC1ox15VPJWVvhe4yg3R81ktMuW2dsaU69rY=";
vendorHash = "sha256-hYkSdFmzljhjsh2stXWGDLHwB4NXeKQyjiN2DqG0GRg=";
buildInputs = lib.optionals stdenv.isLinux [ xorg.libX11 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
+4 -4
View File
@@ -10,12 +10,12 @@
}:
rustPlatform.buildRustPackage rec {
pname = "r0vm";
version = "1.0.3";
version = "1.0.5";
src = fetchFromGitHub {
owner = "risc0";
repo = "risc0";
rev = "v${version}";
sha256 = "sha256-shlu6X2JzFU8xCo6yXSHZUxe+XAvzfwuQrWv/ck1a3E=";
sha256 = "sha256-jtROtI5/4W2pNvn1ZYR/wQAZmECTr7YxuZGu2Ns9paw=";
};
buildAndTestSubdir = "risc0/r0vm";
@@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec {
doCheck = false;
cargoHash = "sha256-xFiCNskX2zsAmqM604rg5oko4owWZYMY6jNNrJH5kJ8=";
cargoHash = "sha256-WLd/cUiaIR04CIOaf9JwFmAY4fU9yH2QHDuT3Q54Gvg=";
postPatch =
let
# see https://github.com/risc0/risc0/blob/v1.0.3/risc0/circuit/recursion/build.rs
# see https://github.com/risc0/risc0/blob/v1.0.5/risc0/circuit/recursion/build.rs
sha256Hash = "4e8496469e1efa00efb3630d261abf345e6b2905fb64b4f3a297be88ebdf83d2";
recursionZkr = fetchurl {
name = "recursion_zkr.zip";
File diff suppressed because it is too large Load Diff
+88
View File
@@ -0,0 +1,88 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
dbus,
ffmpeg,
oniguruma,
openssl,
sqlite,
stdenv,
darwin,
alsa-lib,
xorg,
}:
rustPlatform.buildRustPackage rec {
pname = "screen-pipe";
version = "0.1.48";
src = fetchFromGitHub {
owner = "louis030195";
repo = "screen-pipe";
rev = "v${version}";
hash = "sha256-rWKRCqWFuPO84C52mMrrS4euD6XdJU8kqZsAz28+vWE=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"cpal-0.15.3" = "sha256-eKn3tS5QuqbMTwnRAEybvbPZOiKiid7ghGztAmrs9fw=";
"rusty-tesseract-1.1.10" = "sha256-XT74zGn+DetEBUujHm4Soe2iorQcIoUeZbscTv+64hw=";
};
};
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
nativeBuildInputs = [
pkg-config
rustPlatform.bindgenHook
];
buildInputs =
[
dbus
ffmpeg
oniguruma
openssl
sqlite
]
++ lib.optionals stdenv.isDarwin (
with darwin.apple_sdk_12_3.frameworks;
[
CoreAudio
AudioUnit
CoreFoundation
CoreGraphics
CoreMedia
IOKit
Metal
MetalPerformanceShaders
Security
ScreenCaptureKit
SystemConfiguration
]
)
++ lib.optionals stdenv.isLinux [
alsa-lib
xorg.libxcb
];
buildFeatures = lib.optional stdenv.isDarwin "metal";
env = {
RUSTONIG_SYSTEM_LIBONIG = true;
};
doCheck = false; # Tests fail to build
meta = with lib; {
description = "Personalized AI powered by what you've seen, said, or heard";
homepage = "https://github.com/louis030195/screen-pipe";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
mainProgram = "screen-pipe";
};
}
+3 -3
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "syshud";
version = "0-unstable-2024-07-16";
version = "0-unstable-2024-07-29";
src = fetchFromGitHub {
owner = "System64fumo";
repo = "syshud";
rev = "d60c3bb6c8eefba743478fe7c183055fa057e69e";
hash = "sha256-2aVqCXUZYGtv6xIqbZ1yk3SZK45igZVgPl0byxTXu8E=";
rev = "f245db6bcd2278cfae6d296c152bfc526f1f7601";
hash = "sha256-XxyYLRPIWNsCJFTI7ZoIEvJ0gt2Ok9EgK2fhRf2VWZQ=";
};
postPatch = ''
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "zfind";
version = "0.4.4";
version = "0.4.5";
src = fetchFromGitHub {
owner = "laktak";
repo = "zfind";
rev = "v${version}";
hash = "sha256-CHudSfvl+YnKjvvuSH0RgIqF2bDEO1KW3oAiNN2mLro=";
hash = "sha256-sRZAsmh193K5HX7oC1UdCQccNpSc5QHtec+UpvpntKU=";
};
vendorHash = "sha256-blq0/pRppdf2jcuhIqYeNhcazFNZOGeEjPTSLgHqhrU=";
@@ -4,12 +4,12 @@
let
pname = "elixir-ls";
version = "0.21.3";
version = "0.23.0";
src = fetchFromGitHub {
owner = "elixir-lsp";
repo = "elixir-ls";
rev = "v${version}";
hash = "sha256-IzHvJQ7UdGXFeSyNYKeHlDuY/o1y/E4fM+lG3t9J2HM=";
hash = "sha256-X5BJuqr3TVwpv731ym+Ac3+goA0LH9f3H5wWFwQsAB8=";
};
in
mixRelease {
@@ -20,7 +20,7 @@ mixRelease {
mixFodDeps = fetchMixDeps {
pname = "mix-deps-${pname}";
inherit src version elixir;
hash = "sha256-3PVMembw3CpYUQ/ynoPKmu0N5iZwoFu9uNjRS+kS4BY=";
hash = "sha256-2b5XJnS4ipSjppUniXr1ep8Ymv3yd6COYM/W1QNM/zc=";
};
# elixir-ls is an umbrella app
+3 -3
View File
@@ -12,13 +12,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "1.3.2";
version = "1.4.0";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ncb95NjBH/Nk4XP2QIq66TgY1F7UaOaRIEvZchdo5Kw=";
hash = "sha256-Wo8J8cv53kNWypb5VqUlKJas+zkCHZS6mICnpn0aZoc=";
};
nativeBuildInputs = [ git pkg-config ];
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
cargoHash = "sha256-6fbQOvmXWsU+6QiEHMNsbwuaIH9j0wzp0sNR7W8sBAE=";
cargoHash = "sha256-ehQLNBDERLIZrqQfsS+epzZAIjap7HnBs18SsjdWuS4=";
passthru.updateScript = nix-update-script { };
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "inform6";
version = "6.42-r2";
version = "6.42-r4";
src = fetchurl {
url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz";
sha256 = "sha256-zNm7z2nJlxaHRcZ7Ad8t1jZW999o9WFHrEnqlOJLdk0=";
sha256 = "sha256-R/GzexNpHCmAmiXzCZwEv117Ka4p2R+P7eQPW9C1NXU=";
};
buildInputs = [ perl ];
@@ -471,10 +471,12 @@ let
&& stdenv.targetPlatform.useLLVM or false
) "-lunwind"
++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
nixSupport.cc-ldflags = lib.optionals (
!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
) [ "-L${targetLlvmLibraries.libunwind}/lib" ]
++ lib.optional (lib.versionAtLeast metadata.release_version "17") "--undefined-version";
nixSupport.cc-ldflags =
lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD)
(
[ "-L${targetLlvmLibraries.libunwind}/lib" ]
++ lib.optional (lib.versionAtLeast metadata.release_version "17") "--undefined-version"
);
}
);
@@ -695,13 +697,11 @@ let
./compiler-rt/armv6-scudo-no-yield.patch
./compiler-rt/armv6-scudo-libatomic.patch
]
++ lib.optional (lib.versionAtLeast metadata.release_version "19") (
fetchpatch {
url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";
hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";
relative = "compiler-rt";
}
);
++ lib.optional (lib.versionAtLeast metadata.release_version "19") (fetchpatch {
url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";
hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";
relative = "compiler-rt";
});
in
{
compiler-rt-libc = callPackage ./compiler-rt (
+2 -2
View File
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.2.21";
hash = "sha256-+Ydv59TZbUGs7RmbWKH3rntmVd3JJnMTX+3tf2k5138=";
version = "8.2.22";
hash = "sha256-Wq5ZZMYFMxhfm+koz315oTOTzFVgzt8fS5d5RMx2pYU=";
});
in
base.withExtensions ({ all, ... }: with all; ([
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libgpiod";
version = "2.1.2";
version = "2.1.3";
src = fetchurl {
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
hash = "sha256-sb3x4/dSOGlfk+RCBiuvwGkXDyv08M1LjgScpnExofA=";
hash = "sha256-jYDqAirngSKqUlMI50I7gwZL/yePzZzQRblLT4H4BX0=";
};
nativeBuildInputs = [
@@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "libserdes";
version = "7.6.2";
version = "7.7.0";
src = fetchFromGitHub {
owner = "confluentinc";
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "grpcio-channelz";
version = "1.65.1";
version = "1.65.4";
pyproject = true;
src = fetchPypi {
pname = "grpcio_channelz";
inherit version;
hash = "sha256-LAAFFlzWYPooRJeoDD4izW+0TscLq9FAQUM+vhXu/Ag=";
hash = "sha256-Ia92P8FT3+bv18k402znrt3QTDovPBCgCJ/Eqm8WDic=";
};
build-system = [ setuptools ];
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "grpcio-health-checking";
version = "1.65.1";
version = "1.65.4";
format = "setuptools";
src = fetchPypi {
pname = "grpcio_health_checking";
inherit version;
hash = "sha256-rl8gkRDLLdOFMxqYmrY1SO/AvfhGjNj1Z3+9gCKXOHY=";
hash = "sha256-HoQfbbBaAFGmLMSNQN0tzJ5xdYS7GQSa1R+2cygbnEo=";
};
propagatedBuildInputs = [
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "grpcio-reflection";
version = "1.65.1";
version = "1.65.4";
pyproject = true;
src = fetchPypi {
pname = "grpcio_reflection";
inherit version;
hash = "sha256-5q5ZAPnYAdyXApglUEL7xCaBVG904IwjNt/9Brl2Wr8=";
hash = "sha256-jGuWDD9DBoHoivWfafq1pXW3eyn1xqHXFuqsXPHBpJ0=";
};
build-system = [ setuptools ];
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "htmltools";
version = "0.5.2";
version = "0.5.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "posit-dev";
repo = "py-htmltools";
rev = "refs/tags/v${version}";
hash = "sha256-H0M9dY8CNQAMEGEGHhPIWEYRmk4omCuVFgJUg8ef8Zw=";
hash = "sha256-+BSbJdWmqoEQGEJWBgoTVe4bbvlGJiMyfvvj0lAy9ZA=";
};
build-system = [
@@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "pyemvue";
version = "0.18.5";
version = "0.18.6";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-cgQARaGM6Jb2kEcG7HqPStRPkhHldJ7UbxQpxN6JbZE=";
hash = "sha256-FQ34pKRK1HDLoupMDfVaNxAhn1HbZHYi6se4ewlUWGA=";
};
nativeBuildInputs = [ hatchling ];
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "buildkit";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "moby";
repo = "buildkit";
rev = "v${version}";
hash = "sha256-xJimqvNkz9od5XjpzyKCNUciw8GbfydBDl0Oa45xoME=";
hash = "sha256-RIFRfzvVUI52LK45noaiZQfUjwKEOf04dTaSRsKmHbs=";
};
vendorHash = null;
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "pscale";
version = "0.205.0";
version = "0.207.0";
src = fetchFromGitHub {
owner = "planetscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-CRSwB2r0be8K2c5W9dzxuBHL5cELtpl4jmxngoi4nvo=";
sha256 = "sha256-T01Vo8W21Gu2e7W87LFM/7NGsqHgWt+L4mXmPAEyB70=";
};
vendorHash = "sha256-5Uul5c8Lwu6SJ7DlLU8+k2Pxa3V/DhqdvK5xY2g6S40=";
+2 -2
View File
@@ -11,14 +11,14 @@ let bins = [ "regbot" "regctl" "regsync" ]; in
buildGoModule rec {
pname = "regclient";
version = "0.7.0";
version = "0.7.1";
tag = "v${version}";
src = fetchFromGitHub {
owner = "regclient";
repo = "regclient";
rev = tag;
sha256 = "sha256-MumOum8mG2KOSKz2wRZlbTFvgSOEpJ/qMz7+hYooPgk=";
sha256 = "sha256-QG0qwilYqsueyI3rzpNj9z8gYYRzIorlOID+baORgJU=";
};
vendorHash = "sha256-gqnE3kfBLjV8CroYcJwa9QWCFOL/dBIblPQJZR2DW+4=";
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "skaffold";
version = "2.13.0";
version = "2.13.1";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
hash = "sha256-zcGMKxC2BIg2KPxmGG9UUJzpMdAQbZ8zDGtYyF1T7ZQ=";
hash = "sha256-/+19w3/jn3EjIX5SsCmMkJKdplRvgiduhTAbgaDz9b4=";
};
vendorHash = null;
+10
View File
@@ -299,6 +299,16 @@ let
};
});
pyopenweathermap = super.pyopenweathermap.overridePythonAttrs (oldAttrs: rec {
version = "0.0.10";
src = fetchFromGitHub {
owner = "freekode";
repo = "pyopenweathermap";
rev = "refs/tags/v${version}";
hash = "sha256-wEcE4IYVvxEwW5Hhz+DqDIqbjd5/O1hEr7dGgiuMI00=";
};
});
pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec {
version = "0.8.6";
src = fetchFromGitHub {
+2
View File
@@ -106,6 +106,8 @@ with pkgs;
cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
compress-drv = callPackage ../build-support/compress-drv/test.nix { };
fetchurl = callPackages ../build-support/fetchurl/tests.nix { };
fetchtorrent = callPackages ../build-support/fetchtorrent/tests.nix { };
fetchpatch = callPackages ../build-support/fetchpatch/tests.nix { };
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "gping";
version = "1.17.1";
version = "1.17.3";
src = fetchFromGitHub {
owner = "orf";
repo = "gping";
rev = "gping-v${version}";
hash = "sha256-mdOzUiymXyiYspmH28O/p0y+gzTobA9jg2PlDEvkVzo=";
hash = "sha256-DJ+5WoizFF3K9drFc955bDMXnlW+okYrZos/+dRVtjw=";
};
cargoHash = "sha256-jan+sxD2wCsoM3kmm5a1uZUCihOD+OtQxzR4KqH2zNg=";
cargoHash = "sha256-pQ95sS2dGVzZUOyuUpJPamW7RLiUTGu9KgpWLg4wn/w=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
+4 -4
View File
@@ -31,16 +31,16 @@ let
in
buildGoModule rec {
pname = "netbird";
version = "0.28.4";
version = "0.28.7";
src = fetchFromGitHub {
owner = "netbirdio";
repo = pname;
repo = "netbird";
rev = "v${version}";
hash = "sha256-U5WCJvy8hM4v+gXYnHd9ilD5cbKkJ0agOdSkUh3snbE=";
hash = "sha256-QeFRkUSf0KsjUHcI8cejt/q05oG+ru3aHn5feFSF5Zs=";
};
vendorHash = "sha256-PrNbmExGuvZQvZBQj8+aIAjCztvV9RZt6b0Q/mdyWDk=";
vendorHash = "sha256-swX3Q+pLOa3D321oHcspDHUWcxt/IT8H2Mrqx3C/MY0=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
+2 -2
View File
@@ -18,14 +18,14 @@
}:
stdenv.mkDerivation rec {
version = "1.7.8";
version = "1.7.9";
pname = "pmacct";
src = fetchFromGitHub {
owner = "pmacct";
repo = "pmacct";
rev = "v${version}";
hash = "sha256-AcgZ5/8d1U/zGs4QeOkgkZS7ttCW6gtUv/Xuf4O4VE0=";
hash = "sha256-3gV6GUhTQnH09NRIJQI0xBn05Bgo3AJsE2cSxNPXITo=";
};
nativeBuildInputs = [
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "shadowsocks-rust";
version = "1.20.2";
version = "1.20.3";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shadowsocks";
repo = pname;
hash = "sha256-sfGt68XpezLKTRlnhjUTive83SA3aXF6uNLwmTCG3tU=";
hash = "sha256-TVD6yI/I6R2sZGdyE0JsbuN9u5e23MRQCsKpi85JEGM=";
};
cargoHash = "sha256-p1mPLJIEc3wSfweQfRrlnvAN0t7Ag7d+dxkGUP886Rs=";
cargoHash = "sha256-4OXue0KsGxc0EOLRTdr9uTA5t1dl09YJKvavezJ/mxM=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "age-plugin-yubikey";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "str4d";
repo = pname;
rev = "v${version}";
hash = "sha256-V3NzZyCfslUBsARO5UC8N+cuptLxg2euM87DGqtLpPk=";
hash = "sha256-9ghnPe83K+qixaFKCdM2FCPoENTNJnZA+OmmpD0E5LE=";
};
cargoHash = "sha256-5qmwCcrhDkJlyeTS+waMiTxro1HjMHiQE5Ds/4sVpx4=";
cargoHash = "sha256-8petNuCJ1qS6XKt+24Lg/bZh96yj9oO6fu/z65Xhi4k=";
nativeBuildInputs = [
pkg-config
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "evtx";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitHub {
owner = "omerbenamram";
repo = "evtx";
rev = "refs/tags/v${version}";
hash = "sha256-uuoHDIZ76BfRSb1XXHDwsSQ3ium22FPv1fjrB35liXw=";
hash = "sha256-q2IpWWL/wmjVKSwupAa43zpXF+8/a1Cm/lKOmpwcsLA=";
};
cargoHash = "sha256-OmwfI86Rj0Ph5cXpGzAycEw+A4liki7+gc1iokDBwhU=";
cargoHash = "sha256-O6XnBvLLoTvYA3G5Ws/aaYWJvEmDT7nnz+mc4QVkftg=";
postPatch = ''
# CLI tests will fail in the sandbox
+3 -3
View File
@@ -13,7 +13,7 @@
buildGoModule rec {
pname = "gopass";
version = "1.15.13";
version = "1.15.14";
nativeBuildInputs = [ installShellFiles makeWrapper ];
@@ -21,10 +21,10 @@ buildGoModule rec {
owner = "gopasspw";
repo = "gopass";
rev = "v${version}";
hash = "sha256-FoDb4+9x8waLWBk4d0TclpReu60vzNGE+8GQmKMmcMQ=";
hash = "sha256-3oXdHjW3svGfOEoikEeGm4oU9j+7IBOHw5KH7CCV/uw=";
};
vendorHash = "sha256-Om4ne8oyZBr6a4dgBIvd0NZaDwmmC68pg8D+1UApzLw=";
vendorHash = "sha256-GeppWyIWE8kYIqhRf1iHksWksdjbIzy96rRpx+qQ3L0=";
subPackages = [ "." ];
+8 -8
View File
@@ -13,20 +13,20 @@
rustPlatform.buildRustPackage rec {
pname = "mdcat";
version = "2.1.2";
version = "2.3.0";
src = fetchFromGitHub {
owner = "swsnr";
repo = "mdcat";
rev = "mdcat-${version}";
hash = "sha256-qdNORp9THxHWR95uVcYtCy59OQqdop1012thZN5i64w=";
hash = "sha256-OgqWlWORLbohok9gJWiVUf0EdFP7Duk0Iw1PiSl4350=";
};
nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
cargoHash = "sha256-/avxRvT35LxCBWkTYJDCtdd95VC67epZIPCMv994uBo=";
cargoHash = "sha256-jLKqJQ+T2KaS1bZ6MSQ6l/1iXvfLoyeI68WvO5smuwU=";
nativeCheckInputs = [ ansi2html ];
# Skip tests that use the network and that include files.
@@ -44,12 +44,12 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
installManPage $releaseDir/build/mdcat-*/out/mdcat.1
ln -sr $out/bin/{mdcat,mdless}
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
for bin in mdcat mdless; do
installShellCompletion \
--bash $releaseDir/build/mdcat-*/out/completions/$bin.bash \
--fish $releaseDir/build/mdcat-*/out/completions/$bin.fish \
--zsh $releaseDir/build/mdcat-*/out/completions/_$bin
installShellCompletion --cmd $bin \
--bash <($out/bin/$bin --completions bash) \
--fish <($out/bin/$bin --completions fish) \
--zsh <($out/bin/$bin --completions zsh)
done
'';
+4 -16
View File
@@ -334,8 +334,6 @@ with pkgs;
bakelite = callPackage ../tools/backup/bakelite { };
bazecor = callPackage ../applications/misc/bazecor { };
bearer = callPackage ../development/tools/bearer { };
benthos = callPackage ../development/tools/benthos { };
@@ -1785,16 +1783,10 @@ with pkgs;
gfshare = callPackage ../tools/security/gfshare { };
gh-actions-cache = callPackage ../tools/misc/gh-actions-cache { };
gh-cal = callPackage ../tools/misc/gh-cal {
inherit (darwin.apple_sdk.frameworks) Security;
};
gh-dash = callPackage ../tools/misc/gh-dash { };
gh-markdown-preview = callPackage ../tools/misc/gh-markdown-preview { };
ghostie = callPackage ../tools/misc/ghostie { };
glooctl = callPackage ../applications/networking/cluster/glooctl { };
@@ -2991,8 +2983,6 @@ with pkgs;
sakura = callPackage ../applications/terminal-emulators/sakura { };
scriv = callPackage ../applications/version-management/scriv { };
st = callPackage ../applications/terminal-emulators/st {
conf = config.st.conf or null;
patches = config.st.patches or [];
@@ -4462,8 +4452,6 @@ with pkgs;
cbftp = callPackage ../tools/networking/cbftp { };
cddl = callPackage ../development/tools/cddl { };
cedille = callPackage ../applications/science/logic/cedille
{ inherit (haskellPackages) alex happy Agda ghcWithPackages;
};
@@ -37278,8 +37266,6 @@ with pkgs;
svaba = callPackage ../applications/science/biology/svaba { };
tandem-aligner = callPackage ../applications/science/biology/tandem-aligner { };
tebreak = callPackage ../applications/science/biology/tebreak { };
treemix = callPackage ../applications/science/biology/treemix { };
@@ -37414,8 +37400,6 @@ with pkgs;
rankwidth = callPackage ../development/libraries/science/math/rankwidth { };
latte-integrale = callPackage ../development/libraries/science/math/latte-integrale { };
lcalc = callPackage ../development/libraries/science/math/lcalc { };
lrcalc = callPackage ../applications/science/math/lrcalc { };
@@ -39883,6 +39867,10 @@ with pkgs;
};
};
compressDrv = callPackage ../build-support/compress-drv { };
compressDrvWeb = callPackage ../build-support/compress-drv/web.nix { };
duti = callPackage ../os-specific/darwin/duti {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
+4 -1
View File
@@ -377,7 +377,10 @@ in {
intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null;
ipu6-drivers = callPackage ../os-specific/linux/ipu6-drivers {};
ipu6-drivers =
if kernelOlder "6.10"
then callPackage ../os-specific/linux/ipu6-drivers {}
else null;
ivsc-driver = callPackage ../os-specific/linux/ivsc-driver {};