movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2024-09-01 00:16:33 +00:00 • committed by GitHub
commit 1fdf4b61a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 127 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

135
nixos/modules/config/fonts/fontconfig.nix
View file

@ -23,13 +23,10 @@ And do not repeat our mistakes.
*/ */
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
with lib;
let let
cfg = config.fonts.fontconfig; cfg = config.fonts.fontconfig;
fcBool = x: "<bool>" + (boolToString x) + "</bool>"; fcBool = x: "<bool>" + (lib.boolToString x) + "</bool>";
pkg = pkgs.fontconfig; pkg = pkgs.fontconfig;
# configuration file to read fontconfig cache # configuration file to read fontconfig cache
@ -51,11 +48,11 @@ let
<!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'> <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
<fontconfig> <fontconfig>
<!-- Font directories --> <!-- Font directories -->
${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.packages)} ${lib.concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.packages)}
${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' ${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''
<!-- Pre-generated font caches --> <!-- Pre-generated font caches -->
<cachedir>${cache}</cachedir> <cachedir>${cache}</cachedir>
${optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) '' ${lib.optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) ''
<cachedir>${cache32}</cachedir> <cachedir>${cache32}</cachedir>
''} ''}
''} ''}
@ -89,11 +86,11 @@ let
# priority 52 # priority 52
defaultFontsConf = defaultFontsConf =
let genDefault = fonts: name: let genDefault = fonts: name:
optionalString (fonts != []) '' lib.optionalString (fonts != []) ''
<alias binding="same"> <alias binding="same">
<family>${name}</family> <family>${name}</family>
<prefer> <prefer>
${concatStringsSep "" ${lib.concatStringsSep ""
(map (font: '' (map (font: ''
<family>${font}</family> <family>${font}</family>
'') fonts)} '') fonts)}
@ -125,7 +122,7 @@ let
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig> <fontconfig>
${optionalString (!cfg.allowBitmaps) '' ${lib.optionalString (!cfg.allowBitmaps) ''
<!-- Reject bitmap fonts --> <!-- Reject bitmap fonts -->
<selectfont> <selectfont>
<rejectfont> <rejectfont>
@ -191,22 +188,22 @@ let
ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \ ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \
$dst/ $dst/
${optionalString (!cfg.antialias) ${lib.optionalString (!cfg.antialias)
(replaceDefaultConfig "10-yes-antialias.conf" (replaceDefaultConfig "10-yes-antialias.conf"
"10-no-antialias.conf") "10-no-antialias.conf")
} }
${optionalString (cfg.hinting.style != "slight") ${lib.optionalString (cfg.hinting.style != "slight")
(replaceDefaultConfig "10-hinting-slight.conf" (replaceDefaultConfig "10-hinting-slight.conf"
"10-hinting-${cfg.hinting.style}.conf") "10-hinting-${cfg.hinting.style}.conf")
} }
${optionalString (cfg.subpixel.rgba != "none") ${lib.optionalString (cfg.subpixel.rgba != "none")
(replaceDefaultConfig "10-sub-pixel-none.conf" (replaceDefaultConfig "10-sub-pixel-none.conf"
"10-sub-pixel-${cfg.subpixel.rgba}.conf") "10-sub-pixel-${cfg.subpixel.rgba}.conf")
} }
${optionalString (cfg.subpixel.lcdfilter != "default") ${lib.optionalString (cfg.subpixel.lcdfilter != "default")
(replaceDefaultConfig "11-lcdfilter-default.conf" (replaceDefaultConfig "11-lcdfilter-default.conf"
"11-lcdfilter-${cfg.subpixel.lcdfilter}.conf") "11-lcdfilter-${cfg.subpixel.lcdfilter}.conf")
} }
@ -218,12 +215,12 @@ let
ln -s ${renderConf} $dst/10-nixos-rendering.conf ln -s ${renderConf} $dst/10-nixos-rendering.conf
# 50-user.conf # 50-user.conf
${optionalString (!cfg.includeUserConf) '' ${lib.optionalString (!cfg.includeUserConf) ''
rm $dst/50-user.conf rm $dst/50-user.conf
''} ''}
# local.conf (indirect priority 51) # local.conf (indirect priority 51)
${optionalString (cfg.localConf != "") '' ${lib.optionalString (cfg.localConf != "") ''
ln -s ${localConf} $dst/../local.conf ln -s ${localConf} $dst/../local.conf
''} ''}
@ -233,7 +230,7 @@ let
# 53-no-bitmaps.conf # 53-no-bitmaps.conf
ln -s ${rejectBitmaps} $dst/53-no-bitmaps.conf ln -s ${rejectBitmaps} $dst/53-no-bitmaps.conf
${optionalString (!cfg.allowType1) '' ${lib.optionalString (!cfg.allowType1) ''
# 53-nixos-reject-type1.conf # 53-nixos-reject-type1.conf
ln -s ${rejectType1} $dst/53-nixos-reject-type1.conf ln -s ${rejectType1} $dst/53-nixos-reject-type1.conf
''} ''}
@ -251,16 +248,16 @@ let
in in
{ {
imports = [ imports = [
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "fonts" "fontconfig" "allowBitmaps" ]) (lib.mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "fonts" "fontconfig" "allowBitmaps" ])
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowType1" ] [ "fonts" "fontconfig" "allowType1" ]) (lib.mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowType1" ] [ "fonts" "fontconfig" "allowType1" ])
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ]) (lib.mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ])
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ]) (lib.mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ])
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) (lib.mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])
(mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (lib.mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") (lib.mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "dpi" ] "Use display server-specific options") (lib.mkRemovedOptionModule [ "fonts" "fontconfig" "dpi" ] "Use display server-specific options")
(mkRemovedOptionModule [ "hardware" "video" "hidpi" "enable" ] fontconfigNote) (lib.mkRemovedOptionModule [ "hardware" "video" "hidpi" "enable" ] fontconfigNote)
(mkRemovedOptionModule [ "fonts" "optimizeForVeryHighDPI" ] fontconfigNote) (lib.mkRemovedOptionModule [ "fonts" "optimizeForVeryHighDPI" ] fontconfigNote)
] ++ lib.forEach [ "enable" "substitutions" "preset" ] ] ++ lib.forEach [ "enable" "substitutions" "preset" ]
(opt: lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] '' (opt: lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] ''
The fonts.fontconfig.ultimate module and configuration is obsolete. The fonts.fontconfig.ultimate module and configuration is obsolete.
@ -275,8 +272,8 @@ in
fonts = { fonts = {
fontconfig = { fontconfig = {
enable = mkOption { enable = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = true; default = true;
description = '' description = ''
If enabled, a Fontconfig configuration file will be built If enabled, a Fontconfig configuration file will be built
@ -287,17 +284,17 @@ in
''; '';
}; };
confPackages = mkOption { confPackages = lib.mkOption {
internal = true; internal = true;
type = with types; listOf path; type = with lib.types; listOf path;
default = [ ]; default = [ ];
description = '' description = ''
Fontconfig configuration packages. Fontconfig configuration packages.
''; '';
}; };
antialias = mkOption { antialias = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = true; default = true;
description = '' description = ''
Enable font antialiasing. At high resolution (> 200 DPI), Enable font antialiasing. At high resolution (> 200 DPI),
@ -306,8 +303,8 @@ in
''; '';
}; };
localConf = mkOption { localConf = lib.mkOption {
type = types.lines; type = lib.types.lines;
default = ""; default = "";
description = '' description = ''
System-wide customization file contents, has higher priority than System-wide customization file contents, has higher priority than
@ -316,8 +313,8 @@ in
}; };
defaultFonts = { defaultFonts = {
monospace = mkOption { monospace = lib.mkOption {
type = types.listOf types.str; type = lib.types.listOf lib.types.str;
default = ["DejaVu Sans Mono"]; default = ["DejaVu Sans Mono"];
description = '' description = ''
System-wide default monospace font(s). Multiple fonts may be System-wide default monospace font(s). Multiple fonts may be
@ -325,8 +322,8 @@ in
''; '';
}; };
sansSerif = mkOption { sansSerif = lib.mkOption {
type = types.listOf types.str; type = lib.types.listOf lib.types.str;
default = ["DejaVu Sans"]; default = ["DejaVu Sans"];
description = '' description = ''
System-wide default sans serif font(s). Multiple fonts may be System-wide default sans serif font(s). Multiple fonts may be
@ -334,8 +331,8 @@ in
''; '';
}; };
serif = mkOption { serif = lib.mkOption {
type = types.listOf types.str; type = lib.types.listOf lib.types.str;
default = ["DejaVu Serif"]; default = ["DejaVu Serif"];
description = '' description = ''
System-wide default serif font(s). Multiple fonts may be listed System-wide default serif font(s). Multiple fonts may be listed
@ -343,8 +340,8 @@ in
''; '';
}; };
emoji = mkOption { emoji = lib.mkOption {
type = types.listOf types.str; type = lib.types.listOf lib.types.str;
default = ["Noto Color Emoji"]; default = ["Noto Color Emoji"];
description = '' description = ''
System-wide default emoji font(s). Multiple fonts may be listed System-wide default emoji font(s). Multiple fonts may be listed
@ -360,8 +357,8 @@ in
}; };
hinting = { hinting = {
enable = mkOption { enable = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = true; default = true;
description = '' description = ''
Enable font hinting. Hinting aligns glyphs to pixel boundaries to Enable font hinting. Hinting aligns glyphs to pixel boundaries to
@ -371,8 +368,8 @@ in
''; '';
}; };
autohint = mkOption { autohint = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = false; default = false;
description = '' description = ''
Enable the autohinter in place of the default interpreter. Enable the autohinter in place of the default interpreter.
@ -381,8 +378,8 @@ in
''; '';
}; };
style = mkOption { style = lib.mkOption {
type = types.enum ["none" "slight" "medium" "full"]; type = lib.types.enum ["none" "slight" "medium" "full"];
default = "slight"; default = "slight";
description = '' description = ''
Hintstyle is the amount of font reshaping done to line up Hintstyle is the amount of font reshaping done to line up
@ -404,8 +401,8 @@ in
}; };
}; };
includeUserConf = mkOption { includeUserConf = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = true; default = true;
description = '' description = ''
Include the user configuration from Include the user configuration from
@ -416,9 +413,9 @@ in
subpixel = { subpixel = {
rgba = mkOption { rgba = lib.mkOption {
default = "none"; default = "none";
type = types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"]; type = lib.types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"];
description = '' description = ''
Subpixel order. The overwhelming majority of displays are Subpixel order. The overwhelming majority of displays are
`rgb` in their normal orientation. Select `rgb` in their normal orientation. Select
@ -432,9 +429,9 @@ in
''; '';
}; };
lcdfilter = mkOption { lcdfilter = lib.mkOption {
default = "default"; default = "default";
type = types.enum ["none" "default" "light" "legacy"]; type = lib.types.enum ["none" "default" "light" "legacy"];
description = '' description = ''
FreeType LCD filter. At high resolution (> 200 DPI), LCD filtering FreeType LCD filter. At high resolution (> 200 DPI), LCD filtering
has no visible effect; users of such displays may want to select has no visible effect; users of such displays may want to select
@ -444,16 +441,16 @@ in
}; };
cache32Bit = mkOption { cache32Bit = lib.mkOption {
default = false; default = false;
type = types.bool; type = lib.types.bool;
description = '' description = ''
Generate system fonts cache for 32-bit applications. Generate system fonts cache for 32-bit applications.
''; '';
}; };
allowBitmaps = mkOption { allowBitmaps = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = true; default = true;
description = '' description = ''
Allow bitmap fonts. Set to `false` to ban all Allow bitmap fonts. Set to `false` to ban all
@ -461,8 +458,8 @@ in
''; '';
}; };
allowType1 = mkOption { allowType1 = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = false; default = false;
description = '' description = ''
Allow Type-1 fonts. Default is `false` because of Allow Type-1 fonts. Default is `false` because of
@ -470,8 +467,8 @@ in
''; '';
}; };
useEmbeddedBitmaps = mkOption { useEmbeddedBitmaps = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = false; default = false;
description = "Use embedded bitmaps in fonts like Calibri."; description = "Use embedded bitmaps in fonts like Calibri.";
}; };
@ -481,8 +478,8 @@ in
}; };
}; };
config = mkMerge [ config = lib.mkMerge [
(mkIf cfg.enable { (lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.fontconfig ]; environment.systemPackages = [ pkgs.fontconfig ];
environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/"; environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/";
security.apparmor.includes."abstractions/fonts" = '' security.apparmor.includes."abstractions/fonts" = ''
@ -499,12 +496,12 @@ in
r ${renderConf}, r ${renderConf},
# 50-user.conf # 50-user.conf
${optionalString cfg.includeUserConf '' ${lib.optionalString cfg.includeUserConf ''
r ${pkg.out}/etc/fonts/conf.d.bak/50-user.conf, r ${pkg.out}/etc/fonts/conf.d.bak/50-user.conf,
''} ''}
# local.conf (indirect priority 51) # local.conf (indirect priority 51)
${optionalString (cfg.localConf != "") '' ${lib.optionalString (cfg.localConf != "") ''
r ${localConf}, r ${localConf},
''} ''}
@ -514,13 +511,13 @@ in
# 53-no-bitmaps.conf # 53-no-bitmaps.conf
r ${rejectBitmaps}, r ${rejectBitmaps},
${optionalString (!cfg.allowType1) '' ${lib.optionalString (!cfg.allowType1) ''
# 53-nixos-reject-type1.conf # 53-nixos-reject-type1.conf
r ${rejectType1}, r ${rejectType1},
''} ''}
''; '';
}) })
(mkIf cfg.enable { (lib.mkIf cfg.enable {
fonts.fontconfig.confPackages = [ confPkg ]; fonts.fontconfig.confPackages = [ confPkg ];
}) })
]; ];

7
nixos/modules/installer/cd-dvd/iso-image.nix
View file

@ -506,12 +506,7 @@ in
}; };
isoImage.squashfsCompression = mkOption { isoImage.squashfsCompression = mkOption {
default = with pkgs.stdenv.hostPlatform; "xz -Xdict-size 100% " default = "zstd -Xcompression-level 19";
+ lib.optionalString isx86 "-Xbcj x86"
# Untested but should also reduce size for these platforms
+ lib.optionalString isAarch "-Xbcj arm"
+ lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"
+ lib.optionalString (isSparc) "-Xbcj sparc";
type = lib.types.nullOr lib.types.str; type = lib.types.nullOr lib.types.str;
description = '' description = ''
Compression settings to use for the squashfs nix store. Compression settings to use for the squashfs nix store.

3
nixos/modules/services/monitoring/telegraf.nix
View file

@ -61,7 +61,8 @@ in {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
after = [ "network-online.target" ]; after = [ "network-online.target" ];
path = lib.optional (config.services.telegraf.extraConfig.inputs ? procstat) pkgs.procps; path = lib.optional (config.services.telegraf.extraConfig.inputs ? procstat) pkgs.procps
++ lib.optional (config.services.telegraf.extraConfig.inputs ? ping) pkgs.iputils;
serviceConfig = { serviceConfig = {
EnvironmentFile = config.services.telegraf.environmentFiles; EnvironmentFile = config.services.telegraf.environmentFiles;
ExecStartPre = lib.optional (config.services.telegraf.environmentFiles != []) ExecStartPre = lib.optional (config.services.telegraf.environmentFiles != [])

7
nixos/tests/telegraf.nix
View file

@ -19,6 +19,12 @@ import ./make-test-python.nix ({ pkgs, ...} : {
timeout = "5s"; timeout = "5s";
data_format = "influx"; data_format = "influx";
}; };
inputs.ping = {
urls = ["127.0.0.1"];
count = 4;
interval = "10s";
timeout = 1.0;
};
outputs.file.files = ["/tmp/metrics.out"]; outputs.file.files = ["/tmp/metrics.out"];
outputs.file.data_format = "influx"; outputs.file.data_format = "influx";
}; };
@ -29,5 +35,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
machine.wait_for_unit("telegraf.service") machine.wait_for_unit("telegraf.service")
machine.wait_until_succeeds("grep -q example /tmp/metrics.out") machine.wait_until_succeeds("grep -q example /tmp/metrics.out")
machine.wait_until_succeeds("grep -q ping /tmp/metrics.out")
''; '';
}) })

3
nixos/tests/wireguard/default.nix
View file

@ -1,7 +1,8 @@
{ system ? builtins.currentSystem { system ? builtins.currentSystem
, config ? { } , config ? { }
, pkgs ? import ../../.. { inherit system config; } , pkgs ? import ../../.. { inherit system config; }
, kernelVersionsToTest ? [ "5.4" "latest" ] # Test current default (LTS) and latest kernel
, kernelVersionsToTest ? [ (pkgs.lib.versions.majorMinor pkgs.linuxPackages.kernel.version) "latest" ]
}: }:
with pkgs.lib; with pkgs.lib;

4
pkgs/applications/audio/picard/default.nix
View file

@ -21,14 +21,14 @@ in
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "picard"; pname = "picard";
# nix-update --commit picard --version-regex 'release-(.*)' # nix-update --commit picard --version-regex 'release-(.*)'
version = "2.12.1"; version = "2.12.2";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "metabrainz"; owner = "metabrainz";
repo = "picard"; repo = "picard";
rev = "refs/tags/release-${version}"; rev = "refs/tags/release-${version}";
hash = "sha256-wKPE4lj3DIlY+X5A/MqhnwyrhPTXGjmUnLK1VWXUOas="; hash = "sha256-m0cFJKkYNH01YzcRrbKgkXpjlZ9ZEymwGDnOFQfZKv0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/applications/graphics/pdfcpu/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "pdfcpu"; pname = "pdfcpu";
version = "0.8.0"; version = "0.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pdfcpu"; owner = "pdfcpu";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-E1D2DvwwrtlY06kvCZkoAO5VcdtkBJYLcxuqGsulFUA="; hash = "sha256-NrR7qjVlac4on3pUde6Au8xlnU0wxWrRRh4QdviNPt4=";
# Apparently upstream requires that the compiled executable will know the # Apparently upstream requires that the compiled executable will know the
# commit hash and the date of the commit. This information is also presented # commit hash and the date of the commit. This information is also presented
# in the output of `pdfcpu version` which we use as a sanity check in the # in the output of `pdfcpu version` which we use as a sanity check in the
@ -31,7 +31,7 @@ buildGoModule rec {
''; '';
}; };
vendorHash = "sha256-4k4aZnQ9SjcGr/ziCacfcVfVk7w4Qhli2rOeYE76Qs0="; vendorHash = "sha256-EGQd2hMf3eWswQ6a2GMqbkf7bE8HVMEqjY6fmWNHmBo=";
ldflags = [ ldflags = [
"-s" "-s"

4
pkgs/applications/radio/qlog/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "qlog"; pname = "qlog";
version = "0.37.2"; version = "0.38.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "foldynl"; owner = "foldynl";
repo = "QLog"; repo = "QLog";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-cphbM9dl+Ls2i3H5QjOugW0nXqa9bp5LpcnE9ACjqWM="; hash = "sha256-C9kXntcCUaEl/S1ypZrU0ZPfaJbzg6/aXJSC+TREmhc=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

4
pkgs/by-name/ar/arc-browser/package.nix
View file

@ -9,11 +9,11 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "arc-browser"; pname = "arc-browser";
version = "1.55.0-52417"; version = "1.58.1-53264";
src = fetchurl { src = fetchurl {
url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
hash = "sha256-8r5SAnk1iPqqad1RKVDXkqd6tHUQCRRYnkWrQdyub+o="; hash = "sha256-xX2Wn0bhPeTn/flz5GiDJ8pnQj3HREc8wqJDlsjI+hs=";
}; };
nativeBuildInputs = [ undmg ]; nativeBuildInputs = [ undmg ];

4
pkgs/by-name/cp/cppcheck/package.nix
View file

@ -15,7 +15,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "cppcheck"; pname = "cppcheck";
version = "2.14.2"; version = "2.15.0";
outputs = [ outputs = [
"out" "out"
@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "danmar"; owner = "danmar";
repo = "cppcheck"; repo = "cppcheck";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-aVjQqwsTw6TCLxs2oQif3hX5kfXHua7ekBpO/PyneAQ="; hash = "sha256-6AI3sy4D+YhUOpy02UHJWyhelbqcoEW+Tw/ADCPEbuM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/by-name/cp/cpuinfo/package.nix
View file

@ -10,13 +10,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "cpuinfo"; pname = "cpuinfo";
version = "0-unstable-2024-08-07"; version = "0-unstable-2024-08-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pytorch"; owner = "pytorch";
repo = "cpuinfo"; repo = "cpuinfo";
rev = "16bfc1622c6902d6f91d316ec54894910c620325"; rev = "fa1c679da8d19e1d87f20175ae1ec10995cd3dd3";
hash = "sha256-LDqBH2O64PaVaqNvvjy/17kNpvfa60oP8VZ0GLeAAag="; hash = "sha256-yaeiBXqI17oIp7f30PGy7LYAjiWh/8vrnBj6aiKpdO4=";
}; };
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };

4
pkgs/by-name/gg/gg/package.nix
View file

@ -5,13 +5,13 @@
}: }:
buildGoModule rec{ buildGoModule rec{
pname = "gg"; pname = "gg";
version = "0.2.18"; version = "0.2.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mzz2017"; owner = "mzz2017";
repo = "gg"; repo = "gg";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-07fP3dVFs4MZrFOH/8/4e3LHjFGZd7pNu6J3LBOWAd8="; hash = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU=";
}; };
vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14="; vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14=";

6
pkgs/by-name/ho/home-manager/package.nix
View file

@ -16,14 +16,14 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager"; pname = "home-manager";
version = "0-unstable-2024-08-18"; version = "0-unstable-2024-08-23";
src = fetchFromGitHub { src = fetchFromGitHub {
name = "home-manager-source"; name = "home-manager-source";
owner = "nix-community"; owner = "nix-community";
repo = "home-manager"; repo = "home-manager";
rev = "2598861031b78aadb4da7269df7ca9ddfc3e1671"; rev = "c2cd2a52e02f1dfa1c88f95abeb89298d46023be";
hash = "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY="; hash = "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/by-name/li/libtorrent/package.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "rakshasa-libtorrent"; pname = "rakshasa-libtorrent";
version = "0.13.8-unstable-2024-08-20"; version = "0.13.8-unstable-2024-08-21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rakshasa"; owner = "rakshasa";
repo = "libtorrent"; repo = "libtorrent";
rev = "71a487c66b136524bce5519cb1f9e855621a9101"; rev = "96cb7e53f4b9f1bccf722627b9736fab85424082";
hash = "sha256-DRdztKBp16aWYfIpGR7KIjSbveqPTx/CVz5KxT73u7k="; hash = "sha256-IxQ9YA6i7FBu92oswIcHk4G6lI+uduUzVzCs9v+b5NI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/by-name/me/metacubexd/package.nix
View file

@ -8,13 +8,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "metacubexd"; pname = "metacubexd";
version = "1.146.1"; version = "1.147.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MetaCubeX"; owner = "MetaCubeX";
repo = "metacubexd"; repo = "metacubexd";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-Vm2DPdfHx0WtB8RFq0wfCvBVdGVaX6PXrN/nAtNKv1E="; hash = "sha256-Lj+w+u8xrjYYcINgFMVg8AoLonqRoHNRCyXdeDcXWDg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm.fetchDeps { pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
hash = "sha256-G95Iu268vnYwFsbD/kTy8n/Fu5Da9qXdy3LadbrsUHc="; hash = "sha256-kb+CtX4Jn3UIwXdRcyyrWnUhGaldrJQUl+F7RSWzmoI=";
}; };
buildPhase = '' buildPhase = ''

4
pkgs/development/interpreters/php/8.2.nix
View file

@ -2,8 +2,8 @@
let let
base = callPackage ./generic.nix (_args // { base = callPackage ./generic.nix (_args // {
version = "8.2.22"; version = "8.2.23";
hash = "sha256-Wq5ZZMYFMxhfm+koz315oTOTzFVgzt8fS5d5RMx2pYU="; hash = "sha256-98kM2no8HeAfO/t7Rp1S3snrovO4MyCDYAT5wu7K4ms=";
}); });
in in
base.withExtensions ({ all, ... }: with all; ([ base.withExtensions ({ all, ... }: with all; ([

11
pkgs/development/libraries/arrayfire/default.nix
View file

@ -49,6 +49,7 @@
# { libsOnly = true; }; # { libsOnly = true; };
# } # }
, nvidiaComputeDrivers ? null , nvidiaComputeDrivers ? null
, fetchpatch
}: }:
# ArrayFire compiles with 64-bit BLAS, but some tests segfault or throw # ArrayFire compiles with 64-bit BLAS, but some tests segfault or throw
@ -130,7 +131,15 @@ stdenv.mkDerivation rec {
# ArrayFire have a repo with assets for the examples. Since we don't build # ArrayFire have a repo with assets for the examples. Since we don't build
# the examples anyway, remove the dependency on assets. # the examples anyway, remove the dependency on assets.
patches = [ ./no-assets.patch ./no-download.patch ]; patches = [
./no-assets.patch
./no-download.patch
# Fix for newer opencl-clhpp. Remove with the next release.
(fetchpatch {
url = "https://github.com/arrayfire/arrayfire/pull/3562.patch";
hash = "sha256-AdWlpcRTn9waNAaVpZfK6sJ/xBQLiBC4nBeEYiGNN50";
})
];
postPatch = '' postPatch = ''
mkdir -p ./extern/af_glad-src mkdir -p ./extern/af_glad-src

4
pkgs/development/libraries/opencl-clhpp/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "opencl-clhpp"; pname = "opencl-clhpp";
version = "2.0.15"; version = "2024.05.08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "OpenCL-CLHPP"; repo = "OpenCL-CLHPP";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-A12GdevbMaO2QkGAk3VsXzwcDkF+6dEapse2xfdqzPM="; sha256 = "sha256-bIm4tGqwWX0IPKH3BwLgkf0T7YFrkN6vemYvdPrqUpw=";
}; };
nativeBuildInputs = [ cmake python3 ]; nativeBuildInputs = [ cmake python3 ];

1
pkgs/development/node-packages/aliases.nix
View file

@ -138,6 +138,7 @@ mapAliases {
inherit (pkgs) pm2; # added 2024-01-22 inherit (pkgs) pm2; # added 2024-01-22
inherit (pkgs) pnpm; # added 2024-06-26 inherit (pkgs) pnpm; # added 2024-06-26
prettier_d_slim = pkgs.prettier-d-slim; # added 2023-09-14 prettier_d_slim = pkgs.prettier-d-slim; # added 2023-09-14
inherit (pkgs) prisma; # added 2024-08-31
inherit (pkgs) pxder; # added 2023-09-26 inherit (pkgs) pxder; # added 2023-09-26
inherit (pkgs) quicktype; # added 2023-09-09 inherit (pkgs) quicktype; # added 2023-09-09
react-native-cli = throw "react-native-cli was removed because it was deprecated"; # added 2023-09-25 react-native-cli = throw "react-native-cli was removed because it was deprecated"; # added 2023-09-25

4
pkgs/development/python-modules/aioshelly/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioshelly"; pname = "aioshelly";
version = "11.2.4"; version = "11.4.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.10"; disabled = pythonOlder "3.10";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs"; owner = "home-assistant-libs";
repo = "aioshelly"; repo = "aioshelly";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-a2hjK1YA/L5w2fYgWYgyyqTMZ4cOzTRzGzMCu5X35/o="; hash = "sha256-qT5THlz1bd222NnY9EyJ9d0IX3CmXwUKvBntsl/yV90=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

4
pkgs/development/python-modules/pyee/default.nix
View file

@ -16,14 +16,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyee"; pname = "pyee";
version = "11.1.0"; version = "12.0.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-tTr5j2mQyBDt2bVrh3kQIaj1T9E9tO3RFCQ41EuiJj8="; hash = "sha256-xIBgP0qikn1HZutB+oJ5P+YKgsv9uNaI4NCMVaU04UU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/scikit-rf/default.nix
View file

@ -26,7 +26,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "scikit-rf"; pname = "scikit-rf";
version = "1.2.0"; version = "1.3.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "scikit-rf"; owner = "scikit-rf";
repo = "scikit-rf"; repo = "scikit-rf";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-K+iOpgEKwYtv8be/dLeDHYUDI8xZsoqB7mYDkVeCA10="; hash = "sha256-cYQDoEX33fjxekTA2COHMvcLxCFCD7g9bp3y9sE4uUU=";
}; };
postPatch = '' postPatch = ''

6
pkgs/tools/system/acpica-tools/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "acpica-tools"; pname = "acpica-tools";
version = "20240322"; version = "20240827";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "acpica"; owner = "acpica";
repo = "acpica"; repo = "acpica";
rev = "refs/tags/G${version}"; rev = "refs/tags/version-${version}";
hash = "sha256-k5rDaRKYPwdP4SmEXlrqsA2NLZDlqXBclz1Lwmufa2M="; hash = "sha256-RlhKBvydesUdBaFUHk3sSM6SRIZ7q5IqnibX+hps+Tc=";
}; };
nativeBuildInputs = [ bison flex ]; nativeBuildInputs = [ bison flex ];