Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -43,7 +43,7 @@
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
concatStringsSep
|
||||
concatMapStringsSep
|
||||
head
|
||||
isAttrs
|
||||
listToAttrs
|
||||
@@ -166,7 +166,7 @@ rec {
|
||||
|
||||
textClosureMap =
|
||||
f: predefined: names:
|
||||
concatStringsSep "\n" (map f (textClosureList predefined names));
|
||||
concatMapStringsSep "\n" f (textClosureList predefined names);
|
||||
|
||||
noDepEntry = text: {
|
||||
inherit text;
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
{ lib, config, ... }:
|
||||
{
|
||||
options.hardware.facter.detected.bluetooth.enable =
|
||||
lib.mkEnableOption "Enable the Facter bluetooth module"
|
||||
// {
|
||||
default = builtins.length (config.hardware.facter.report.hardware.bluetooth or [ ]) > 0;
|
||||
defaultText = "hardware dependent";
|
||||
};
|
||||
|
||||
config.hardware.bluetooth.enable = lib.mkIf config.hardware.facter.detected.bluetooth.enable (
|
||||
lib.mkDefault true
|
||||
);
|
||||
}
|
||||
@@ -5,7 +5,9 @@
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
./bluetooth.nix
|
||||
./disk.nix
|
||||
./fingerprint
|
||||
./firmware.nix
|
||||
./graphics
|
||||
./keyboard.nix
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
# To update devices.json, run:
|
||||
# $(nix-build nixos/modules/hardware/facter/fingerprint/update.nix)/bin/update-fprint-devices
|
||||
{ lib, config, ... }:
|
||||
let
|
||||
facterLib = import ../lib.nix lib;
|
||||
|
||||
devices = builtins.fromJSON (builtins.readFile ./devices.json);
|
||||
default = {
|
||||
value = 0;
|
||||
};
|
||||
|
||||
isSupported = lib.any (
|
||||
{
|
||||
vendor ? default,
|
||||
device ? default,
|
||||
bus_type ? {
|
||||
name = "";
|
||||
},
|
||||
...
|
||||
}:
|
||||
bus_type.name == "USB"
|
||||
&& devices ? "${facterLib.toZeroPaddedHex vendor.value}:${facterLib.toZeroPaddedHex device.value}"
|
||||
);
|
||||
in
|
||||
{
|
||||
options.hardware.facter.detected.fingerprint.enable = lib.mkEnableOption "Fingerprint devices" // {
|
||||
default =
|
||||
isSupported (config.hardware.facter.report.hardware.unknown or [ ])
|
||||
|| isSupported (config.hardware.facter.report.hardware.fingerprint or [ ])
|
||||
|| isSupported (config.hardware.facter.report.hardware.usb or [ ]);
|
||||
defaultText = "hardware dependent";
|
||||
};
|
||||
|
||||
config.services.fprintd.enable = lib.mkIf config.hardware.facter.detected.fingerprint.enable (
|
||||
lib.mkDefault true
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,233 @@
|
||||
{
|
||||
"045E:00BB": true,
|
||||
"045E:00BC": true,
|
||||
"045E:00BD": true,
|
||||
"045E:00CA": true,
|
||||
"0483:2015": true,
|
||||
"0483:2016": true,
|
||||
"0483:2017": true,
|
||||
"04F3:0903": true,
|
||||
"04F3:0907": true,
|
||||
"04F3:0C01": true,
|
||||
"04F3:0C02": true,
|
||||
"04F3:0C03": true,
|
||||
"04F3:0C04": true,
|
||||
"04F3:0C05": true,
|
||||
"04F3:0C06": true,
|
||||
"04F3:0C07": true,
|
||||
"04F3:0C08": true,
|
||||
"04F3:0C09": true,
|
||||
"04F3:0C0A": true,
|
||||
"04F3:0C0B": true,
|
||||
"04F3:0C0C": true,
|
||||
"04F3:0C0D": true,
|
||||
"04F3:0C0E": true,
|
||||
"04F3:0C0F": true,
|
||||
"04F3:0C10": true,
|
||||
"04F3:0C11": true,
|
||||
"04F3:0C12": true,
|
||||
"04F3:0C13": true,
|
||||
"04F3:0C14": true,
|
||||
"04F3:0C15": true,
|
||||
"04F3:0C16": true,
|
||||
"04F3:0C17": true,
|
||||
"04F3:0C18": true,
|
||||
"04F3:0C19": true,
|
||||
"04F3:0C1A": true,
|
||||
"04F3:0C1B": true,
|
||||
"04F3:0C1C": true,
|
||||
"04F3:0C1D": true,
|
||||
"04F3:0C1E": true,
|
||||
"04F3:0C1F": true,
|
||||
"04F3:0C20": true,
|
||||
"04F3:0C21": true,
|
||||
"04F3:0C22": true,
|
||||
"04F3:0C23": true,
|
||||
"04F3:0C24": true,
|
||||
"04F3:0C25": true,
|
||||
"04F3:0C26": true,
|
||||
"04F3:0C27": true,
|
||||
"04F3:0C28": true,
|
||||
"04F3:0C29": true,
|
||||
"04F3:0C2A": true,
|
||||
"04F3:0C2B": true,
|
||||
"04F3:0C2C": true,
|
||||
"04F3:0C2D": true,
|
||||
"04F3:0C2E": true,
|
||||
"04F3:0C2F": true,
|
||||
"04F3:0C30": true,
|
||||
"04F3:0C31": true,
|
||||
"04F3:0C32": true,
|
||||
"04F3:0C33": true,
|
||||
"04F3:0C3D": true,
|
||||
"04F3:0C42": true,
|
||||
"04F3:0C4B": true,
|
||||
"04F3:0C4D": true,
|
||||
"04F3:0C4F": true,
|
||||
"04F3:0C58": true,
|
||||
"04F3:0C63": true,
|
||||
"04F3:0C6E": true,
|
||||
"04F3:0C7D": true,
|
||||
"04F3:0C7E": true,
|
||||
"04F3:0C82": true,
|
||||
"04F3:0C88": true,
|
||||
"04F3:0C8C": true,
|
||||
"04F3:0C8D": true,
|
||||
"04F3:0C98": true,
|
||||
"04F3:0C99": true,
|
||||
"04F3:0C9D": true,
|
||||
"04F3:0C9F": true,
|
||||
"04F3:0CA3": true,
|
||||
"04F3:241F": true,
|
||||
"04F3:2766": true,
|
||||
"04F3:3057": true,
|
||||
"04F3:3087": true,
|
||||
"04F3:309F": true,
|
||||
"04F3:30B2": true,
|
||||
"04F3:30C6": true,
|
||||
"04F3:3128": true,
|
||||
"04F3:3134": true,
|
||||
"04F3:3148": true,
|
||||
"05BA:0007": true,
|
||||
"05BA:0008": true,
|
||||
"05BA:000A": true,
|
||||
"061A:0110": true,
|
||||
"06CB:00BD": true,
|
||||
"06CB:00C2": true,
|
||||
"06CB:00C4": true,
|
||||
"06CB:00C6": true,
|
||||
"06CB:00DF": true,
|
||||
"06CB:00F0": true,
|
||||
"06CB:00F9": true,
|
||||
"06CB:00FC": true,
|
||||
"06CB:0100": true,
|
||||
"06CB:0103": true,
|
||||
"06CB:0104": true,
|
||||
"06CB:0106": true,
|
||||
"06CB:0107": true,
|
||||
"06CB:0108": true,
|
||||
"06CB:0123": true,
|
||||
"06CB:0124": true,
|
||||
"06CB:0126": true,
|
||||
"06CB:0129": true,
|
||||
"06CB:015F": true,
|
||||
"06CB:0168": true,
|
||||
"06CB:016C": true,
|
||||
"06CB:0173": true,
|
||||
"06CB:0174": true,
|
||||
"06CB:019D": true,
|
||||
"08FF:1600": true,
|
||||
"08FF:1660": true,
|
||||
"08FF:1680": true,
|
||||
"08FF:1681": true,
|
||||
"08FF:1682": true,
|
||||
"08FF:1683": true,
|
||||
"08FF:1684": true,
|
||||
"08FF:1685": true,
|
||||
"08FF:1686": true,
|
||||
"08FF:1687": true,
|
||||
"08FF:1688": true,
|
||||
"08FF:1689": true,
|
||||
"08FF:168A": true,
|
||||
"08FF:168B": true,
|
||||
"08FF:168C": true,
|
||||
"08FF:168D": true,
|
||||
"08FF:168E": true,
|
||||
"08FF:168F": true,
|
||||
"08FF:2500": true,
|
||||
"08FF:2550": true,
|
||||
"08FF:2580": true,
|
||||
"08FF:2660": true,
|
||||
"08FF:2680": true,
|
||||
"08FF:2681": true,
|
||||
"08FF:2682": true,
|
||||
"08FF:2683": true,
|
||||
"08FF:2684": true,
|
||||
"08FF:2685": true,
|
||||
"08FF:2686": true,
|
||||
"08FF:2687": true,
|
||||
"08FF:2688": true,
|
||||
"08FF:2689": true,
|
||||
"08FF:268A": true,
|
||||
"08FF:268B": true,
|
||||
"08FF:268C": true,
|
||||
"08FF:268D": true,
|
||||
"08FF:268E": true,
|
||||
"08FF:268F": true,
|
||||
"08FF:2691": true,
|
||||
"08FF:2810": true,
|
||||
"08FF:5501": true,
|
||||
"08FF:5731": true,
|
||||
"0BDA:5813": true,
|
||||
"0BDA:5816": true,
|
||||
"10A5:9524": true,
|
||||
"10A5:9544": true,
|
||||
"10A5:A305": true,
|
||||
"10A5:C844": true,
|
||||
"10A5:D205": true,
|
||||
"10A5:D805": true,
|
||||
"10A5:DA04": true,
|
||||
"10A5:FFE0": true,
|
||||
"138A:0001": true,
|
||||
"138A:0005": true,
|
||||
"138A:0008": true,
|
||||
"138A:0010": true,
|
||||
"138A:0011": true,
|
||||
"138A:0015": true,
|
||||
"138A:0017": true,
|
||||
"138A:0018": true,
|
||||
"138A:0050": true,
|
||||
"138A:0091": true,
|
||||
"147E:1000": true,
|
||||
"147E:1001": true,
|
||||
"147E:2016": true,
|
||||
"147E:2020": true,
|
||||
"147E:3001": true,
|
||||
"1C7A:0570": true,
|
||||
"1C7A:0571": true,
|
||||
"1C7A:0582": true,
|
||||
"1C7A:0583": true,
|
||||
"1C7A:0586": true,
|
||||
"1C7A:0587": true,
|
||||
"1C7A:05A1": true,
|
||||
"1C7A:0603": true,
|
||||
"27C6:5840": true,
|
||||
"27C6:6014": true,
|
||||
"27C6:6092": true,
|
||||
"27C6:6094": true,
|
||||
"27C6:609A": true,
|
||||
"27C6:609C": true,
|
||||
"27C6:60A2": true,
|
||||
"27C6:60A4": true,
|
||||
"27C6:60BC": true,
|
||||
"27C6:60C2": true,
|
||||
"27C6:6304": true,
|
||||
"27C6:631C": true,
|
||||
"27C6:633C": true,
|
||||
"27C6:634C": true,
|
||||
"27C6:6384": true,
|
||||
"27C6:639C": true,
|
||||
"27C6:63AC": true,
|
||||
"27C6:63BC": true,
|
||||
"27C6:63CC": true,
|
||||
"27C6:6496": true,
|
||||
"27C6:650A": true,
|
||||
"27C6:650C": true,
|
||||
"27C6:6512": true,
|
||||
"27C6:6582": true,
|
||||
"27C6:6584": true,
|
||||
"27C6:658C": true,
|
||||
"27C6:6592": true,
|
||||
"27C6:6594": true,
|
||||
"27C6:659A": true,
|
||||
"27C6:659C": true,
|
||||
"27C6:689A": true,
|
||||
"27C6:6A94": true,
|
||||
"2808:9E48": true,
|
||||
"2808:A57A": true,
|
||||
"2808:A78A": true,
|
||||
"2808:A959": true,
|
||||
"2808:A99A": true,
|
||||
"2808:D979": true,
|
||||
"298D:1010": true
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
# Run: $(nix-build nixos/modules/hardware/facter/fingerprint/update.nix)/bin/update-fprint-devices
|
||||
{
|
||||
pkgs ? import ../../../../.. { },
|
||||
}:
|
||||
let
|
||||
fprint-supported-devices = pkgs.libfprint.overrideAttrs (old: {
|
||||
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
|
||||
pkgs.jq
|
||||
pkgs.gawk
|
||||
];
|
||||
buildPhase = ''
|
||||
ninja libfprint/fprint-list-supported-devices
|
||||
'';
|
||||
outputs = [ "out" ];
|
||||
installPhase = ''
|
||||
./libfprint/fprint-list-supported-devices | \
|
||||
grep -o -E '(\b[0-9a-fA-F]{4}:[0-9a-fA-F]{4}\b)' | \
|
||||
awk '{print toupper($0)}' | \
|
||||
jq -S -R -s 'split("\n") | map(select(. != "")) | map({key: ., value: true}) | from_entries' > $out
|
||||
'';
|
||||
# we cannot disable doInstallcheck because than we are missing nativeCheckInputs dependencies
|
||||
installCheckPhase = "";
|
||||
});
|
||||
in
|
||||
pkgs.writeShellApplication {
|
||||
name = "update-fprint-devices";
|
||||
runtimeInputs = with pkgs; [
|
||||
coreutils
|
||||
git
|
||||
];
|
||||
text = ''
|
||||
root="$(git rev-parse --show-toplevel)"
|
||||
target="$root/nixos/modules/hardware/facter/fingerprint/devices.json"
|
||||
cp ${fprint-supported-devices} "$target"
|
||||
echo "Updated $target"
|
||||
'';
|
||||
}
|
||||
@@ -141,9 +141,6 @@ in
|
||||
loginShellInit = cfge.loginShellInit;
|
||||
|
||||
interactiveShellInit = ''
|
||||
# Check the window size after every command.
|
||||
shopt -s checkwinsize
|
||||
|
||||
# Disable hashing (i.e. caching) of command lookups.
|
||||
set +h
|
||||
|
||||
|
||||
@@ -711,6 +711,7 @@ in
|
||||
"org.freedesktop.resolve1.set-default-route",
|
||||
"org.freedesktop.resolve1.set-dns-servers",
|
||||
"org.freedesktop.resolve1.set-domains",
|
||||
"org.freedesktop.resolve1.set-dnssec",
|
||||
];
|
||||
var users = ${builtins.toJSON (toHardenedClientList (client: client.user.name))};
|
||||
|
||||
|
||||
@@ -13,17 +13,16 @@ let
|
||||
addAttributeName = mapAttrs (
|
||||
a: v:
|
||||
v
|
||||
// {
|
||||
// (lib.optionalAttrs (v.text != "") {
|
||||
text = ''
|
||||
#### Activation script snippet ${a}:
|
||||
_localstatus=0
|
||||
${v.text}
|
||||
|
||||
if (( _localstatus > 0 )); then
|
||||
printf "Activation script snippet '%s' failed (%s)\n" "${a}" "$_localstatus"
|
||||
fi
|
||||
'';
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
systemActivationScript =
|
||||
@@ -68,8 +67,11 @@ let
|
||||
# Ensure a consistent umask.
|
||||
umask 0022
|
||||
|
||||
${textClosureMap id withDrySnippets (attrNames withDrySnippets)}
|
||||
|
||||
${lib.concatStringsSep "\n" (
|
||||
lib.filter (v: v != "") (
|
||||
textClosureList withDrySnippets (attrNames (lib.filterAttrs (_: v: v.text != "") withDrySnippets))
|
||||
)
|
||||
)}
|
||||
''
|
||||
+ optionalString (!onlyDry) ''
|
||||
# Make this configuration the current configuration.
|
||||
|
||||
@@ -288,7 +288,7 @@ in
|
||||
assertion =
|
||||
!(
|
||||
config.networking.firewall.enable
|
||||
&& !config.networking.nftables.enable
|
||||
&& !(config.networking.nftables.enable || config.networking.firewall.backend == "nftables")
|
||||
&& config.virtualisation.incus.enable
|
||||
);
|
||||
message = "Incus on NixOS is unsupported using iptables. Set `networking.nftables.enable = true;`";
|
||||
|
||||
@@ -549,7 +549,10 @@ let
|
||||
# Telega has a server portion for it's network protocol
|
||||
# elisp error
|
||||
telega = (ignoreCompilationError super.telega).overrideAttrs (old: {
|
||||
buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
|
||||
buildInputs = old.buildInputs ++ [
|
||||
pkgs.tdlib
|
||||
pkgs.zlib
|
||||
];
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -4534,6 +4534,8 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
sysdig.sysdig-vscode-ext = callPackage ./sysdig.sysdig-vscode-ext { };
|
||||
|
||||
tabnine.tabnine-vscode = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "tabnine-vscode";
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "sysdig-vscode-ext";
|
||||
publisher = "sysdig";
|
||||
version = "0.2.12";
|
||||
hash = "sha256-3sn1YQHOZW/SigV6eyubPJoQbTwqNNwlsXIEmevs2zc=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Scan your VS Code projects with Sysdig to investigate misconfigurations in IaC files or track vulnerabilities";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=sysdig.sysdig-vscode-ext";
|
||||
homepage = "https://github.com/sysdiglabs/vscode-extension";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ tembleking ];
|
||||
};
|
||||
}
|
||||
@@ -4,8 +4,8 @@
|
||||
lib,
|
||||
ncurses,
|
||||
openssl,
|
||||
aspell,
|
||||
cjson,
|
||||
enchant,
|
||||
gnutls,
|
||||
gettext,
|
||||
zlib,
|
||||
@@ -21,7 +21,7 @@
|
||||
guileSupport ? true,
|
||||
guile,
|
||||
luaSupport ? true,
|
||||
lua5,
|
||||
lua5_3,
|
||||
perlSupport ? true,
|
||||
perl,
|
||||
pythonSupport ? true,
|
||||
@@ -76,7 +76,7 @@ let
|
||||
name = "lua";
|
||||
enabled = luaSupport;
|
||||
cmakeFlag = "ENABLE_LUA";
|
||||
buildInputs = [ lua5 ];
|
||||
buildInputs = [ lua5_3 ];
|
||||
}
|
||||
{
|
||||
name = "python";
|
||||
@@ -105,11 +105,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "weechat";
|
||||
version = "4.7.2";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
|
||||
hash = "sha256-ZmJL2QWm21igiTv73du4+kF7l6q0qa+MFA4LKc66JWk=";
|
||||
hash = "sha256-7SjcoqsRtBwEHfYVM62LRzw+vzVEoZka1D0Iz6Zv4WU=";
|
||||
};
|
||||
|
||||
# Why is this needed? https://github.com/weechat/weechat/issues/2031
|
||||
@@ -144,8 +144,8 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
ncurses
|
||||
openssl
|
||||
aspell
|
||||
cjson
|
||||
enchant
|
||||
gnutls
|
||||
gettext
|
||||
zlib
|
||||
|
||||
@@ -25,7 +25,9 @@
|
||||
libffi,
|
||||
yaml-cpp,
|
||||
nlohmann_json,
|
||||
openssl,
|
||||
llvmPackages,
|
||||
gtest,
|
||||
ctestCheckHook,
|
||||
mpiCheckPhaseHook,
|
||||
testers,
|
||||
@@ -51,24 +53,24 @@ let
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "2.10.2";
|
||||
version = "2.11.0";
|
||||
pname = "adios2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ornladios";
|
||||
repo = "adios2";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NVyw7xoPutXeUS87jjVv1YxJnwNGZAT4QfkBLzvQbwg=";
|
||||
hash = "sha256-yHPI///17poiCEb7Luu5qfqxTWm9Nh+o9r57mZT26U0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
chmod +x cmake/install/post/adios2-config.pre.sh.in
|
||||
patchShebangs cmake/install/post/{generate-adios2-config,adios2-config.pre}.sh.in
|
||||
''
|
||||
# Dynamic cast to nullptr on darwin platform, switch to unsafe reinterpret cast.
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace bindings/Python/py11{Attribute,Engine,Variable}.cpp \
|
||||
--replace-fail "dynamic_cast" "reinterpret_cast"
|
||||
|
||||
# use upstream GoogleTest.cmake
|
||||
# see https://github.com/ornladios/ADIOS2/issues/4659
|
||||
substituteInPlace cmake/GoogleTest.cmake \
|
||||
--replace-fail 'CMAKE_VERSION VERSION_LESS 4' 'TRUE'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -98,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
zlib
|
||||
yaml-cpp
|
||||
nlohmann_json
|
||||
openssl
|
||||
|
||||
# Todo: add these optional dependencies in nixpkgs.
|
||||
# sz
|
||||
@@ -105,11 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ucx) ucx
|
||||
++ lib.optional (stdenv.hostPlatform.isLoongArch64) libffi
|
||||
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform zfp) zfp
|
||||
# openmp required by zfp
|
||||
++ lib.optional (
|
||||
lib.meta.availableOn stdenv.hostPlatform zfp && stdenv.cc.isClang
|
||||
) llvmPackages.openmp;
|
||||
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform zfp) zfp;
|
||||
|
||||
propagatedBuildInputs =
|
||||
lib.optional mpiSupport mpi
|
||||
@@ -145,11 +144,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "ADIOS2_USE_UCX" (lib.meta.availableOn stdenv.hostPlatform ucx))
|
||||
(lib.cmakeBool "ADIOS2_USE_Sodium" true)
|
||||
(lib.cmakeBool "ADIOS2_USE_Catalyst" true)
|
||||
(lib.cmakeBool "ADIOS2_USE_OpenSSL" true)
|
||||
(lib.cmakeBool "ADIOS2_USE_Campaign" true)
|
||||
(lib.cmakeBool "ADIOS2_USE_AWSSDK" false)
|
||||
|
||||
# use vendored gtest as nixpkgs#gtest does not include <iomanip> in <gtest/gtest.h>
|
||||
(lib.cmakeBool "ADIOS2_USE_EXTERNAL_GTEST" false)
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
# higher MPIEXEC_MAX_NUMPROCS>8 might cause tests failure in
|
||||
# - Engine.BP.BPJoinedArray.MultiBlock.BP4.MPI
|
||||
@@ -175,51 +173,29 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
doCheck = false;
|
||||
dontUseNinjaCheck = true;
|
||||
|
||||
preCheck = ''
|
||||
export adios2_DIR=$PWD
|
||||
'';
|
||||
|
||||
enableParallelChecking = false;
|
||||
|
||||
enabledTestPaths = [
|
||||
"../testing/adios2/python/Test*.py"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = finalAttrs.finalPackage.doCheck && mpiSupport;
|
||||
|
||||
nativeCheckInputs = [
|
||||
python3Packages.python
|
||||
gtest
|
||||
ctestCheckHook
|
||||
mpiCheckPhaseHook
|
||||
];
|
||||
|
||||
# required for finding the generated adios2-config.cmake file
|
||||
preInstall = ''
|
||||
export adios2_DIR=$out/lib/cmake/adios2
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "adios2" ];
|
||||
|
||||
passthru.tests = {
|
||||
withCheck = finalAttrs.finalPackage.overrideAttrs {
|
||||
doCheck = true;
|
||||
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# TypeError: cannot pickle 'TextIOWrapper' instances
|
||||
"Test.Engine.DataMan1xN.Serial"
|
||||
"Test.Engine.DataManSingleValues"
|
||||
# The test assumed to always contain n*64 byte-length records. Right now the length of index buffer is 71 bytes.
|
||||
"Staging.1x1.Local2.BPS.BB.BP4_stream"
|
||||
# Timeout
|
||||
"Staging.3x5LockGeometry.FS.BB.FileStream"
|
||||
"Engine.Staging.TestOnDemandMPI.ADIOS2OnDemandMPI.SST.MPI"
|
||||
];
|
||||
};
|
||||
|
||||
cmake-config = testers.hasCmakeConfigModules {
|
||||
moduleNames = [ "adios2" ];
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
withCheck = finalAttrs.finalPackage.overrideAttrs {
|
||||
doCheck = true;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -44,8 +44,8 @@ let
|
||||
];
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "alacritty";
|
||||
version = if !withGraphics then "0.16.1" else "0.16.1-graphics";
|
||||
pname = "alacritty${lib.optionalString withGraphics "-graphics"}";
|
||||
version = "0.16.1";
|
||||
|
||||
src =
|
||||
# by default we want the official package
|
||||
@@ -61,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
fetchFromGitHub {
|
||||
owner = "ayosec";
|
||||
repo = "alacritty";
|
||||
tag = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}-graphics";
|
||||
hash = "sha256-e+o0GLy05qXEY4T57dCuqhukTKBSm1WIHzPUV8uswRI=";
|
||||
};
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "algia";
|
||||
version = "0.0.87";
|
||||
version = "0.0.91";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "algia";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8E48TLxA+kGObE08NJ3oFsLUY+y1LKQ6f8+kw7EhAzY=";
|
||||
hash = "sha256-VsQBiD8OE2NHwMlYrCG43ukuBHE0bkKFt4BxsNUvLAo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Yt95kSXAIBxHgX+VUefKrumg9thuvh3c+gnSu/2PSQY=";
|
||||
vendorHash = "sha256-kp52vbvE6QY0SEY/2D1f1EbDzqweQkNOepN0We4I9ko=";
|
||||
|
||||
meta = {
|
||||
description = "CLI application for nostr";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "apko";
|
||||
version = "0.30.26";
|
||||
version = "0.30.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chainguard-dev";
|
||||
repo = "apko";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lJV5WyhbMC0L0kNzo/Yv1yWLAFZ69QojRUpamJnbf3U=";
|
||||
hash = "sha256-lter7nuNM62J1+unCgnkG7pU6lvNK3LjXS6FaW8NDjY=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorHash = "sha256-BXWaXdlqaw2SACFGAebnmeQSWdq/htvWVqXVYcUlLP8=";
|
||||
vendorHash = "sha256-1VKvW34w88Xc5/2h3WrutZK1ziGaLLgwf9bTSSIDF/A=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
pkg-config,
|
||||
util-macros,
|
||||
autoreconfHook,
|
||||
wrapWithXFileSearchPathHook,
|
||||
libx11,
|
||||
libxaw,
|
||||
xbitmaps,
|
||||
libxmu,
|
||||
xorgproto,
|
||||
libxt,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bitmap";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
group = "xorg";
|
||||
owner = "app";
|
||||
repo = "bitmap";
|
||||
tag = "bitmap-${finalAttrs.version}";
|
||||
hash = "sha256-UZxPc19jAqvJPwZSMf4seqxJNHeLOXA8bXh4y6D4gRE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
util-macros
|
||||
autoreconfHook
|
||||
wrapWithXFileSearchPathHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libx11
|
||||
libxaw
|
||||
xbitmaps
|
||||
libxmu
|
||||
xorgproto
|
||||
libxt
|
||||
];
|
||||
|
||||
installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=bitmap-(.*)" ]; };
|
||||
meta = {
|
||||
description = "X bitmap (XBM) editor and converter utilities";
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/app/bitmap";
|
||||
license = lib.licenses.mitOpenGroup;
|
||||
mainProgram = "bitmap";
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -15,12 +15,12 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "borgmatic";
|
||||
version = "2.0.11";
|
||||
version = "2.0.12";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-X8IrLAH0rwUOGWMx9tDHIL8DeII35YCOeZyD979x/gk=";
|
||||
hash = "sha256-z2LOj7NW1S1C6hSsaeBKXYnrwS0XskOK9idwIfiA9Do=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
pname = "bun";
|
||||
|
||||
src =
|
||||
@@ -87,19 +87,19 @@ stdenvNoCC.mkDerivation rec {
|
||||
sources = {
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
|
||||
hash = "sha256-2FhHmC21dFGBMKRVgrzxTY4r6WELZstQRsIDSFeLD+I=";
|
||||
hash = "sha256-9Q9cx2fDiCxGZ1++B+C3sd9xpzzlRKrbU3rZJhrwC7E=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
|
||||
hash = "sha256-/jjBO2trRQr05PD7jgSyLspT+c1xBo0dHuv09KRPAvs=";
|
||||
hash = "sha256-Qbn08lJW24l8LBNTIOT5bDc+IK5vBtgBUYfayDWR78g=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip";
|
||||
hash = "sha256-LW3aLD9Xp6m7qFJdUcQAbj2M7MS2rTP/ae4HZgbBN7w=";
|
||||
hash = "sha256-oANEA7/9GLpms1yrL3nuU+2QmNfkbijgjn+2TYL58k4=";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
|
||||
hash = "sha256-DLVqRIS9d2Sj7vm55nq0V4QJgSh7RnlJdNHmYSy/Zwk=";
|
||||
hash = "sha256-9cVGc2+VUUFFneIxFntv33sBQY6L42CfLN6d/kapOj0=";
|
||||
};
|
||||
};
|
||||
updateScript = writeShellScript "update-bun" ''
|
||||
|
||||
@@ -6,39 +6,56 @@
|
||||
stdenv,
|
||||
libxkbcommon,
|
||||
wayland,
|
||||
openssl,
|
||||
squashfsTools,
|
||||
makeWrapper,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-bundle";
|
||||
# the latest stable release fails to build on darwin
|
||||
version = "unstable-2023-08-18";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "burtonageo";
|
||||
repo = "cargo-bundle";
|
||||
rev = "c9f7a182d233f0dc4ad84e10b1ffa0d44522ea43";
|
||||
hash = "sha256-n+c83pmCvFdNRAlcadmcZvYj+IRqUYeE8CJVWWYbWDQ=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8Ulah5NtjQh5dIB/nhTrDstnaub4LS9iH33E1iv1JpY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-g898Oelrk/ok52raTEDhgtQ9psc0PFHd/uNnk1QeXCs=";
|
||||
cargoHash = "sha256-qE0ZDq0UJHfsivvI1W44u/pVjKMDGrghSl7sfau/pIY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libxkbcommon
|
||||
wayland
|
||||
openssl
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/cargo-bundle \
|
||||
--prefix PATH : ${lib.makeBinPath [ squashfsTools ]}
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Wrap rust executables in OS-specific app bundles";
|
||||
mainProgram = "cargo-bundle";
|
||||
homepage = "https://github.com/burtonageo/cargo-bundle";
|
||||
license = with licenses; [
|
||||
license = with lib.licenses; [
|
||||
asl20
|
||||
mit
|
||||
];
|
||||
maintainers = [ ];
|
||||
maintainers = [ lib.maintainers.progrm_jarvis ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -35,6 +35,7 @@ rustPlatform.buildRustPackage rec {
|
||||
checkFlags = [
|
||||
"--skip tests_are_runnable"
|
||||
"--skip default_cargo_project_reports_no_violations"
|
||||
"--skip empty_tests_not_leak_in_release_mode"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
}:
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "cerberus";
|
||||
version = "0-unstable-2025-11-24";
|
||||
version = "0-unstable-2025-11-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rems-project";
|
||||
repo = "cerberus";
|
||||
rev = "3946c7e757f338061c8e29079605424360d41cb3";
|
||||
hash = "sha256-aYWoGugqIBS2jpRkepO54wjitMQoCVeFf3cMpCUyZVU=";
|
||||
rev = "6d60ef25944ebcdab892158c949a8e05501557dc";
|
||||
hash = "sha256-RucW01xuW5b6F9/O1OL99YJn3rSMCP7l7Cwjuv4PNIc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "25.8.11.66-lts";
|
||||
rev = "fa393206741c830da77b8f1bcf18c753161932c8";
|
||||
hash = "sha256-LBAGiYLyo535j2FYTVbcfq20d9VisGXZMPbTpONBpQU=";
|
||||
version = "25.8.12.129-lts";
|
||||
rev = "25db09bd0a09eb1576ae0ba56f6e52d9f2c4651e";
|
||||
hash = "sha256-86wHAzrEoRKH0x4WPXBGnR6iY3rK+pa7Sbent/Xg7Ss=";
|
||||
lts = true;
|
||||
}
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-applets";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-applets";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-4cQ3MFV2l75ZTMkc4lri48hPE21os6xygr3MDP7RSEA=";
|
||||
hash = "sha256-4BH7qEoUf5UtpiQtk3WvgA3p/hAa58RnQ4jUjG8tpd0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XOA5yREoQHGxPI9PVYd2UsaHRCIfbb3Tkr1eovqIIow=";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-applibrary";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-applibrary";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-G8zH66v5YLqF8p1WhCBnXeI2ac3igGCAFJTvgeTTCUE=";
|
||||
hash = "sha256-u2DuATdE5qdOvSISizIQsZWnSKTgya9c42xehTwxl8Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-s+Q8hj8/dqwGpCq87BWTtk/PmAg55cMI/KLL96SaqUo=";
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-bg";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-bg";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-RPVPiMEwMh4DRixaC8A4oK9KzGIbi2CFlVAthICalt0=";
|
||||
hash = "sha256-xChEpJFxilcJW07VgGiy8LNjDdjxbpBtYLEemrxp/2g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -20,17 +20,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-comp";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-comp";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-qE+m/LEe1ky+7A4PAzQrhZyguRsCID7IFwCx/yriYQE=";
|
||||
hash = "sha256-MyE2C7oUMSIkNn03am/ytc1/oJITsAO7Ok3XV231EmA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xaA0qwOxT/RNyUXOazJeO8oVR5pzxW15KFZ+IrWsL5o=";
|
||||
cargoHash = "sha256-qlfCCHqjKX72hVj5Bgh1wKT7pMsy5vG1VEIqJk4prR8=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
|
||||
@@ -16,17 +16,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-edit";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-edit";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-V3O4ktSJ1cLAgtFvHqzX0AanJdir/HfqdvgCiHINyxg=";
|
||||
hash = "sha256-Zk4qo/2ZdlAv2g1gIoMfzRXwndmqtyIqtX/2Z1nmhLM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ELQrRDTNAX5eWWjsmWfg8BCKnaM+tqncS2O4jA3N9W8=";
|
||||
cargoHash = "sha256-6b6m6mZTa3Li74JCm6czR0VBc7H5IRTPr7yic3V1FL4=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "cosmic-ext-applet-external-monitor-brightness";
|
||||
version = "0.0.1-unstable-2025-09-17";
|
||||
version = "0.0.1-unstable-2025-11-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmic-utils";
|
||||
repo = "cosmic-ext-applet-external-monitor-brightness";
|
||||
rev = "1f648171fcc1b187ca6603b78c650ea0f33daa79";
|
||||
hash = "sha256-QXQqHtXYoq2cg2DKL8DHZz2T+MsnCtI5mRJP036UC2U=";
|
||||
rev = "3cfba2bbe5e622f887b8236304823fda67c33b46";
|
||||
hash = "sha256-UNfIH0Itm1fbRGfh8NdSGeOrm+H8t42yawcZmTjQLQ0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ou7iukl1pHMfcJNemwLdZYYxugbJJQ53XpCYowUTj90=";
|
||||
|
||||
@@ -12,17 +12,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-files";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-files";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-6r2HBxp7sZ79MKZoONXmopKea2unqZ91xaq4l6QiE9w=";
|
||||
hash = "sha256-jH88PzgHMbbtGc68v/7Azia+LrB1kfA7QdBJOVAsEs0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-L3a3gtqW5Zjufom8NDeklKe6rOnzd8sEaCPIVGsOqWM=";
|
||||
cargoHash = "sha256-WPBK7/7l+Z69AFrqnDL6XszUcBHuZdKsNZ31HS+Ol4o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
||||
@@ -19,20 +19,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-greeter";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-greeter";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-r/xhJR3xtLxPusMUKzS2PGsS51m1jfoxZByJWcXLaoY=";
|
||||
hash = "sha256-ldB9t+WMN/K5Xk6wO4lZ6+VJIDNI2iAl9240iRsvNCg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc=";
|
||||
|
||||
env = {
|
||||
VERGEN_GIT_COMMIT_DATE = "2025-11-20";
|
||||
VERGEN_GIT_COMMIT_DATE = "2025-11-24";
|
||||
VERGEN_GIT_SHA = finalAttrs.src.tag;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-icons";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-idle";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-initial-setup";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-initial-setup";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-8dnReeMxkbu965x8VgTg3C6IPSK3wcqT1r0rklPksAw=";
|
||||
hash = "sha256-iSxBd/0DsaId7PETZMZbN4uZHiUJmxzm/1KXRXDwpEo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jOPJiKPE3UUD/QHmb+6s6l2RVhtUFls3QRGQ6DmEFSE=";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-launcher";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-launcher";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-lVNvmpiShkdT+VZMxV1bvYyC17edaepwlkmOvNMng8k=";
|
||||
hash = "sha256-+qSh2QaLbUcBbJi5nqyXmzAIZfqQhwQF/QBN8a7nY5U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pHW7kBbEQ8P9Ugkgzn1olSlMCeetuNQ2jMJyEteoeIo=";
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-notifications";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-notifications";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-OK+6qSQuu44t1uMt9ESg2L9h47wQmiCh1iZfXkO1vE0=";
|
||||
hash = "sha256-2j6F2aYm/tqRlIk0i7HINGI1DuXhI3FX71ggXoPoPpY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kLvfZBHJbVSceqKuB9XFshTH4Sl54hKfm8H90RUszKk=";
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
libcosmicAppHook,
|
||||
just,
|
||||
pulseaudio,
|
||||
pipewire,
|
||||
libinput,
|
||||
@@ -13,19 +15,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-osd";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-osd";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-gAmsLScFKgs2bUf0c4NuP2Zuuz+vz8Y7w4uQtKzXSRo=";
|
||||
hash = "sha256-mbsTDxd8vvkY0EQCOI8sXxY80odJgSAuuP2gNzy6HXo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cpNp/by8TU2lbb2d3smxUr48mTSLnoPXseiRZScwSXI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
@@ -37,6 +40,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pipewire
|
||||
];
|
||||
|
||||
dontUseJustBuild = true;
|
||||
dontUseJustCheck = true;
|
||||
|
||||
justFlags = [
|
||||
"--set"
|
||||
"prefix"
|
||||
(placeholder "out")
|
||||
"--set"
|
||||
"cargo-target-dir"
|
||||
"target/${stdenv.hostPlatform.rust.cargoShortTarget}"
|
||||
];
|
||||
|
||||
env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1";
|
||||
|
||||
passthru = {
|
||||
@@ -48,6 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
cosmic-autologin-noxwayland
|
||||
;
|
||||
};
|
||||
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-panel";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -18,17 +18,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-player";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-player";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-RNDc+NCih1bsdqa4DCOrtiKPsdVaQ6fvj9VGQAoNri8=";
|
||||
hash = "sha256-ocnPHk/7/McHPOPsHR3k6fEFAPVlXA729yN+9uQVedo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ST/04USAIHvySOoKvh5EPCDlUOjHxbiRFouLunaleKw=";
|
||||
cargoHash = "sha256-Z0+6jtvJ3z/ptcqrbvSuXgjH2liASNJwBIKiHbrVBT8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
||||
@@ -12,17 +12,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-randr";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-randr";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-daP2YZ7B1LXzqh2n0KoSTJbitdK+hlZO+Ydt9behzmQ=";
|
||||
hash = "sha256-g5s4TIk8nS3qPIAlWQC4D5A936+DYMbEEnU6v8iO9TI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tkmBthh+nM3Mb9WoSjxMbx3t0NTf6lv91TwEwEANS6U=";
|
||||
cargoHash = "sha256-ZStjzRqgCnRy1v2K1upUbioedmDaa1ml1gRNZc32Q00=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-screenshot";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-screenshot";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-LaKopOd7HuDvXfE9zudoudCxGYfMkpru/PISzIrEARo=";
|
||||
hash = "sha256-80PNYY6jiyKDFusF8c1feS6z4Is/6Azj9uEPlm0Ae3I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o=";
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-session";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings-daemon";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -27,14 +27,14 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-settings";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-CIY7SAS6WCn41mM+MpKaCm08cfnVIqFl+/t5u5717Lw=";
|
||||
hash = "sha256-Z+MJMHcyqUnSKSUeYH5PyFFkzUQ33bkFoAd3m/TckrQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Su+yAQLr3Us8YNU8z83XO1UDjjOY3SCGnkmwGaIGFho=";
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-store";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-store";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-6Qn9+kwuiArxTHpN410gy+7bKXBwv87OPPDMatAYr38=";
|
||||
hash = "sha256-rrM0ibnapXv+IYDPqw/dXQJ44cDWPNlz7rREVQw5J1o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nJLowAuWvj5JfmPyExQyfCJ9pqNJ0OdzPPku9z7RDWc=";
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-term";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-term";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-kyswCFnor2tg64BodSwiRYqzjxRN6r7zqm2z/egmX1I=";
|
||||
hash = "sha256-RSW5oy5lYY15PbZaoxEwLy6g1+I0pOFBNR3pN5HuEqE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7+1tvJ/B+YITI5XXr1A+jlRRNRoNZ1ZsGeeAfGPT/00=";
|
||||
cargoHash = "sha256-gLPNX9CEortxDPM9+QYiHlCTPINnoYL1P90HWVPcezY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-wallpapers";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-workspaces-epoch";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-workspaces-epoch";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-7iOiVrMHpE5oG/qIH0DIgBeHEEm0x7HIDLv64FFs300=";
|
||||
hash = "sha256-XsBOT4AUdw9cA1wjHzS0StbSIt4z3tEMnnJdegdsROI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7BdyHz66A+QhJY0haohaQiNkhpmX9rqIW9gD8E4Q7Qg=";
|
||||
|
||||
@@ -72,6 +72,9 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
(lib.cmakeBool "WITH_ACCELERATE" true)
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.gcc.arch or null != null) [
|
||||
(lib.cmakeBool "ENABLE_CPU_DISPATCH" false)
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "docfd";
|
||||
version = "12.1.0";
|
||||
version = "12.2.0";
|
||||
|
||||
minimalOCamlVersion = "5.1";
|
||||
|
||||
@@ -22,7 +22,7 @@ ocamlPackages.buildDunePackage rec {
|
||||
owner = "darrenldl";
|
||||
repo = "docfd";
|
||||
rev = version;
|
||||
hash = "sha256-fDvjnqAH0ALP1im34vxmXtO7kst0G/iPu3VLLBas5YI=";
|
||||
hash = "sha256-0URs7X94/2D0WLpVBXjYZ3zDR3uGXSVG+WLdsAqVKBg=";
|
||||
};
|
||||
|
||||
# Compatibility with nottui ≥ 0.4
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
kahip,
|
||||
adios2,
|
||||
python3Packages,
|
||||
darwinMinVersionHook,
|
||||
catch2_3,
|
||||
withParmetis ? false,
|
||||
}:
|
||||
@@ -26,20 +25,16 @@ let
|
||||
);
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.10.0.post3";
|
||||
version = "0.10.0.post4";
|
||||
pname = "dolfinx";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fenics";
|
||||
repo = "dolfinx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YsFya92lz9Twc1PsSLGj6tJNvKb+MQfpmN/qOFxbe34=";
|
||||
hash = "sha256-vzP5vBZpUR4HW6yJw1wFtbo/TiZ/k02TXV2Zk42b5aQ=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
cd cpp
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@@ -49,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
dolfinxPackages.kahip
|
||||
dolfinxPackages.scotch
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "13.3")
|
||||
++ lib.optional withParmetis dolfinxPackages.parmetis;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -64,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3Packages.fenics-ffcx
|
||||
];
|
||||
|
||||
cmakeDir = "../cpp";
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "DOLFINX_ENABLE_ADIOS2" true)
|
||||
(lib.cmakeBool "DOLFINX_ENABLE_PETSC" true)
|
||||
@@ -81,9 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "${finalAttrs.pname}-unittests";
|
||||
inherit (finalAttrs) version src;
|
||||
|
||||
preConfigure = ''
|
||||
cd cpp/test
|
||||
'';
|
||||
cmakeDir = "../cpp/test";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -1,40 +1,70 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitLab,
|
||||
pkg-config,
|
||||
libXt,
|
||||
libXaw,
|
||||
libXres,
|
||||
utilmacros,
|
||||
util-macros,
|
||||
autoreconfHook,
|
||||
wrapWithXFileSearchPathHook,
|
||||
libx11,
|
||||
libxaw,
|
||||
libxkbfile,
|
||||
libxmu,
|
||||
libxres,
|
||||
libxt,
|
||||
xorgproto,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "editres";
|
||||
version = "1.0.8";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/app/editres-${version}.tar.gz";
|
||||
sha256 = "sha256-LVbWB3vHZ6+n4DD+ssNy/mvok/7EApoj9FodVZ/YRq4=";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
group = "xorg";
|
||||
owner = "app";
|
||||
repo = "editres";
|
||||
tag = "editres-${finalAttrs.version}";
|
||||
hash = "sha256-fdp6j8zS8mtzHpG9js9c8iIt1vsKsqGG9MdkpLh8UB0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libXt
|
||||
libXaw
|
||||
libXres
|
||||
utilmacros
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-appdefaultdir=$(out)/share/X11/app-defaults/editres" ];
|
||||
strictDeps = true;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://cgit.freedesktop.org/xorg/app/editres/";
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
util-macros
|
||||
autoreconfHook
|
||||
wrapWithXFileSearchPathHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libx11
|
||||
libxaw
|
||||
libxkbfile
|
||||
libxmu
|
||||
libxres
|
||||
libxt
|
||||
xorgproto
|
||||
];
|
||||
|
||||
installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=editres-(.*)" ]; };
|
||||
|
||||
meta = {
|
||||
description = "Dynamic resource editor for X Toolkit applications";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
longDescription = ''
|
||||
Editres is a tool that allows users and application developers to view the full widget
|
||||
hierarchy of any Xt Toolkit application that speaks the Editres protocol. In addition, editres
|
||||
will help the user construct resource specifications, allow the user to apply the resource
|
||||
to the application and view the results dynamically. Once the user is happy with a resource
|
||||
specification editres will append the resource string to the user's X Resources file.
|
||||
'';
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/app/editres";
|
||||
license = lib.licenses.mitOpenGroup;
|
||||
mainProgram = "editres";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -33,14 +33,14 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "edk2";
|
||||
version = "202508.01";
|
||||
version = "202511";
|
||||
|
||||
srcWithVendoring = fetchFromGitHub {
|
||||
owner = "tianocore";
|
||||
repo = "edk2";
|
||||
tag = "edk2-stable${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-BgNNKA+YFeaZDm1mLzBN3VA7RAwNT9MXV3JX5ZLrFOo=";
|
||||
hash = "sha256-R/rgz8dWcDYVoiM67K2UGuq0xXbjjJYBPtJ1FmfGIaU=";
|
||||
};
|
||||
|
||||
src = applyPatches {
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "eigenwallet";
|
||||
version = "3.3.7";
|
||||
version = "3.3.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-F0EzdEG9/+LzINOL59wgYSvvzeTC0im8hB8UZxEphZM=";
|
||||
hash = "sha256-Q6KCmLwgk6Z/MhsKWevl9IZmG//Z9zEvawwhj241SrY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.210.2";
|
||||
version = "0.211.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-163giiFxlvu0Jq+59fOM4W2NTKb2ZVZ4rBdT7cY1HyE=";
|
||||
hash = "sha256-nbRXQ+3nAH32J4QegfeeFT+4TqdsTcIhxhAC6e9DyR8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-arrEWH3rspwynRXf43sElliEJ2kBxhikz1ZGS1+gDes=";
|
||||
|
||||
Generated
+1053
-557
File diff suppressed because it is too large
Load Diff
@@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fim-rs";
|
||||
version = "0.5.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Achiefs";
|
||||
repo = "fim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-V9BzgVcDTnYSy7N5fCo38vQmXRDXLjY6wvnSkIpuDGg=";
|
||||
hash = "sha256-xJzglrNB5rqaRQTgRFIl8/AXjeDwFPykIE5LJwJ3cX4=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
};
|
||||
|
||||
# There is a failure while the binary is checked
|
||||
# Relies on /var/lib/fim existing, but /var is not available under nix-build.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
pkg-config,
|
||||
util-macros,
|
||||
autoreconfHook,
|
||||
libfontenc,
|
||||
freetype,
|
||||
xorgproto,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fonttosfnt";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
group = "xorg";
|
||||
owner = "app";
|
||||
repo = "fonttosfnt";
|
||||
tag = "fonttosfnt-${finalAttrs.version}";
|
||||
hash = "sha256-DPPouSLsPurJ7fscxraF9HEYENbuCvZcxZ44bBY7ytU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
util-macros
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libfontenc
|
||||
freetype
|
||||
xorgproto
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=fonttosfnt-(.*)" ]; };
|
||||
|
||||
meta = {
|
||||
description = "Wraps a set of bdf or pcf bitmap fonts in a sfnt (TrueType or OpenType) wrapper";
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/app/fonttosfnt";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "fonttosfnt";
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
# something about missing `gzgetc` `gzopen` and `gzclose`
|
||||
# works on pkgsMusl so definitely a static problem
|
||||
broken = stdenv.hostPlatform.isStatic;
|
||||
};
|
||||
})
|
||||
@@ -16,13 +16,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.06";
|
||||
version = "2.0.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Card-Forge";
|
||||
repo = "forge";
|
||||
rev = "forge-${version}";
|
||||
hash = "sha256-/V8Ce1r68Svf4TQ/zgIqSWjqIFr1uJOmv+aRNLm1qE4=";
|
||||
hash = "sha256-hPE++/wcK0jkhM4LYt09HZPL6tUVajHaKxXxBYhBw2g=";
|
||||
};
|
||||
|
||||
# launch4j downloads and runs a native binary during the package phase.
|
||||
@@ -33,7 +33,7 @@ maven.buildMavenPackage {
|
||||
pname = "forge-mtg";
|
||||
inherit version src patches;
|
||||
|
||||
mvnHash = "sha256-DeYmCmsDdNOVMlD+SwvSB2VdqvCDwKghXlyaDuamHiY=";
|
||||
mvnHash = "sha256-nAhULH7DGO0gkIyHwVmhvyO2lqmBpFWkfiCgtuK9T3A=";
|
||||
|
||||
doCheck = false; # Needs a running Xorg
|
||||
|
||||
|
||||
Generated
+22
-37
@@ -1,18 +1,18 @@
|
||||
[
|
||||
{
|
||||
"pname": "Azure.Core",
|
||||
"version": "1.44.1",
|
||||
"hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk="
|
||||
"version": "1.47.3",
|
||||
"hash": "sha256-fWyfqF1lpnap4cF3l9J0fYtZbxIqm6UFsuJgN+/hwW4="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Storage.Blobs",
|
||||
"version": "12.25.1",
|
||||
"hash": "sha256-OJgmzE7+BJsrqGMErUwG4wmaguYL1zPbhtdQvvqFuHY="
|
||||
"version": "12.26.0",
|
||||
"hash": "sha256-J6774WE6xlrsmhkmE1dapkrhK6dFByYxSHLs1OQPk48="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Storage.Common",
|
||||
"version": "12.24.0",
|
||||
"hash": "sha256-ZjeMv8xaZXkmb1OgZlN9uJelhAcU7KhO/FK02qiz/zA="
|
||||
"version": "12.25.0",
|
||||
"hash": "sha256-4eMv4oOumO6FFx0VMsuIr6sWtouu4f6AajebTQjhj9Q="
|
||||
},
|
||||
{
|
||||
"pname": "Castle.Core",
|
||||
@@ -26,14 +26,24 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeCoverage",
|
||||
"version": "17.14.1",
|
||||
"hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "8.0.2",
|
||||
"hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "8.0.3",
|
||||
"hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NET.Test.Sdk",
|
||||
"version": "17.14.1",
|
||||
@@ -421,8 +431,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.ClientModel",
|
||||
"version": "1.1.0",
|
||||
"hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM="
|
||||
"version": "1.6.1",
|
||||
"hash": "sha256-OMnamkT9Nt5ZSR6xPKFmOQRUjdn0a4nP9jkD2eZxxc0="
|
||||
},
|
||||
{
|
||||
"pname": "System.Collections",
|
||||
@@ -469,11 +479,6 @@
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.DiagnosticSource",
|
||||
"version": "6.0.1",
|
||||
"hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.EventLog",
|
||||
"version": "6.0.0",
|
||||
@@ -596,8 +601,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory.Data",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo="
|
||||
"version": "8.0.1",
|
||||
"hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg="
|
||||
},
|
||||
{
|
||||
"pname": "System.Net.Http",
|
||||
@@ -624,11 +629,6 @@
|
||||
"version": "4.1.0-rc2-24027",
|
||||
"hash": "sha256-GgOSOyyZzXQw6ubXl5iZeQ8Rx3ZTWdlZ5dCeUPdaUxg="
|
||||
},
|
||||
{
|
||||
"pname": "System.Numerics.Vectors",
|
||||
"version": "4.5.0",
|
||||
"hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
|
||||
},
|
||||
{
|
||||
"pname": "System.ObjectModel",
|
||||
"version": "4.0.12-rc2-24027",
|
||||
@@ -704,11 +704,6 @@
|
||||
"version": "4.3.1",
|
||||
"hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.CompilerServices.Unsafe",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.Extensions",
|
||||
"version": "4.1.0-rc2-24027",
|
||||
@@ -864,16 +859,6 @@
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encodings.Web",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "6.0.10",
|
||||
"hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.RegularExpressions",
|
||||
"version": "4.3.1",
|
||||
|
||||
@@ -35,13 +35,13 @@ assert builtins.all (
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "github-runner";
|
||||
version = "2.329.0";
|
||||
version = "2.330.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Lf8l959y5tfvCsLwI8+tziFGm+LUJnhE2PQIz/zZneA=";
|
||||
hash = "sha256-Ft6NCgljzMy5SrRwAdixWpPIrbq7WdW8VzXDUVsiuqo=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git-revision
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/linux-msm/hexagonrpc";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ matthewcroughan ];
|
||||
mainProgram = "hexagonrpc";
|
||||
mainProgram = "hexagonrpcd";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "0-unstable-2025-11-27";
|
||||
version = "0-unstable-2025-11-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "home-manager-source";
|
||||
owner = "nix-community";
|
||||
repo = "home-manager";
|
||||
rev = "86ff0ef506c209bb397849706e85cc3a913cb577";
|
||||
hash = "sha256-bO7FN/bF6gG7TlZpKAZjO3VvfsLaPFkefeUfJJ7F/7w=";
|
||||
rev = "83053e1d337f33e0b48250588006e4b9df2f0d9d";
|
||||
hash = "sha256-hDFkciyjhjMLRC/qXCREWX1dgq8kopiuJdwXdfVlJuQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
pkg-config,
|
||||
util-macros,
|
||||
autoreconfHook,
|
||||
xorgproto,
|
||||
libice,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "iceauth";
|
||||
version = "1.0.10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
group = "xorg";
|
||||
owner = "app";
|
||||
repo = "iceauth";
|
||||
tag = "iceauth-${finalAttrs.version}";
|
||||
hash = "sha256-XAk+hffmX02/0wJlXZVSY325I1AyiJ6AozJizsv39Mg=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
util-macros
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
xorgproto
|
||||
libice
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=iceauth-(.*)" ]; };
|
||||
|
||||
meta = {
|
||||
description = "libICE authority file utility";
|
||||
longDescription = ''
|
||||
The iceauth program is used to edit and display the authorization information used in
|
||||
connecting with ICE (the X11 Inter-Client Exchange protocol). It operates very much like the
|
||||
xauth program for X11 connection authentication records.
|
||||
'';
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/app/iceauth";
|
||||
license = lib.licenses.mitOpenGroup;
|
||||
mainProgram = "iceauth";
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -13,7 +13,7 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "jellyfin-web";
|
||||
version = "10.11.3";
|
||||
version = "10.11.4";
|
||||
|
||||
src =
|
||||
assert version == jellyfin.version;
|
||||
@@ -21,7 +21,7 @@ buildNpmPackage rec {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-web";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rsAxV3ABO1HYnVsvsIMMoWizPuFL0GyfKNUGYkqFxBc=";
|
||||
hash = "sha256-5MgU9Fw+uiDJLRE1pFHwwfVSnZ47WPeT0Sz4G01jaXs=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_20; # does not build with 22
|
||||
@@ -31,7 +31,7 @@ buildNpmPackage rec {
|
||||
--replace-fail "git describe --always --dirty" "echo ${src.rev}" \
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-OLFjeCgq2c4d22L6yt7ihPuZiwsR1txZpjniuf/0L0I=";
|
||||
npmDepsHash = "sha256-52LteGNeSJ7tLxM5skMVeE7pZW4dwOe5p/ZEMSlcO2o=";
|
||||
|
||||
preBuild = ''
|
||||
# using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "jellyfin";
|
||||
version = "10.11.3"; # ensure that jellyfin-web has matching version
|
||||
version = "10.11.4"; # ensure that jellyfin-web has matching version
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xNQe0hjY1BjC1D+hYTj1Gv2jCpwhWJv9dlvY6K9jkSk=";
|
||||
hash = "sha256-Hs7G8igW7TJBTYuv83AhN/YhpLcO5pwuU5vYwDUEsUQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sqlite ];
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lagrange";
|
||||
version = "1.19.3";
|
||||
version = "1.19.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GyX4LKe2SHRlHqRfh7yAkOyISo/N3rhpkARevUmuLbc=";
|
||||
hash = "sha256-o8BDreuQbPrGuSV7k4OVy4XmMSSEXrdNzEzUXM6hMyA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,6 +19,7 @@ let
|
||||
"java.base"
|
||||
"java.logging"
|
||||
"java.xml"
|
||||
"jdk.crypto.ec"
|
||||
];
|
||||
jdk = jdk_headless;
|
||||
};
|
||||
|
||||
@@ -47,14 +47,14 @@ in
|
||||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limine";
|
||||
version = "10.3.2";
|
||||
version = "10.4.0";
|
||||
|
||||
# We don't use the Git source but the release tarball, as the source has a
|
||||
# `./bootstrap` script performing network access to download resources.
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-LeSBso/Y6I8lIy3TLvGeZLPjxsL1eHr/YSKXglHK08s=";
|
||||
hash = "sha256-yCNYjGG5B+G+8liJVZc+VW2ZqSbucC55YfExQkeMv6Q=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -11,13 +11,14 @@
|
||||
enableDarwinSandbox ? true,
|
||||
# for passthru.tests
|
||||
nix,
|
||||
lowdown-unsandboxed,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lowdown${
|
||||
lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"
|
||||
}";
|
||||
version = "2.0.2";
|
||||
version = "2.0.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
|
||||
hash = "sha512-cfzhuF4EnGmLJf5EGSIbWqJItY3npbRSALm+GarZ7SMU7Hr1xw0gtBFMpOdi5PBar4TgtvbnG4oRPh+COINGlA==";
|
||||
sha512 = "649a508b7727df6e7e1203abb3853e05f167b64832fd5e1271f142ccf782e600b1de73c72dc02673d7b175effdc54f2c0f60318208a968af9f9763d09cf4f9ef";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -38,6 +39,12 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
|
||||
|
||||
postPatch = ''
|
||||
# fails test, some column width mismatch
|
||||
rm regress/table-footnotes.md
|
||||
rm regress/table-styles.md
|
||||
'';
|
||||
|
||||
# The Darwin sandbox calls fail inside Nix builds, presumably due to
|
||||
# being nested inside another sandbox.
|
||||
preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) ''
|
||||
@@ -74,32 +81,8 @@ stdenv.mkDerivation rec {
|
||||
"install_static"
|
||||
];
|
||||
|
||||
postInstall =
|
||||
let
|
||||
soVersion = "2";
|
||||
in
|
||||
|
||||
# Check that soVersion is up to date even if we are not on darwin
|
||||
lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin) ''
|
||||
test -f $lib/lib/liblowdown.so.${soVersion} || \
|
||||
die "postInstall: expected $lib/lib/liblowdown.so.${soVersion} is missing"
|
||||
''
|
||||
# Fix lib extension so that fixDarwinDylibNames detects it, see
|
||||
# <https://github.com/kristapsdz/lowdown/issues/87#issuecomment-1532243650>.
|
||||
+ lib.optionalString (enableShared && stdenv.hostPlatform.isDarwin) ''
|
||||
darwinDylib="$lib/lib/liblowdown.${soVersion}.dylib"
|
||||
mv "$lib/lib/liblowdown.so.${soVersion}" "$darwinDylib"
|
||||
|
||||
# Make sure we are re-creating a symbolic link here
|
||||
test -L "$lib/lib/liblowdown.so" || \
|
||||
die "postInstall: expected $lib/lib/liblowdown.so to be a symlink"
|
||||
ln -s "$darwinDylib" "$lib/lib/liblowdown.dylib"
|
||||
rm "$lib/lib/liblowdown.so"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin || !enableDarwinSandbox) ''
|
||||
doInstallCheck = !stdenv.hostPlatform.isDarwin || !enableDarwinSandbox;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
echo '# TEST' > test.md
|
||||
@@ -108,12 +91,12 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
doCheck = !stdenv.hostPlatform.isDarwin || !enableDarwinSandbox;
|
||||
checkTarget = "regress";
|
||||
|
||||
passthru.tests = {
|
||||
# most important consumer in nixpkgs
|
||||
inherit nix;
|
||||
# most important consumers in nixpkgs
|
||||
inherit nix lowdown-unsandboxed;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -18,21 +18,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "matrix-authentication-service";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "matrix-authentication-service";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JSuhI38fLi9z7dMRL04eQ1UdMMe8S/F3qXrJT1DwnS0=";
|
||||
hash = "sha256-7bwpXy6y3tFeAExxu4oRT6jjOq375MFpEqpAP2hsBmg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PNPZFxCsBXwiQ2leDyHWOFtEQJW0DxU6pTEs04sdM+M=";
|
||||
cargoHash = "sha256-hpf4ocUSPi6jVvEKdhEYewjPVhwEmtE2+2FNS/JPuQU=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
src = "${finalAttrs.src}/${finalAttrs.npmRoot}";
|
||||
hash = "sha256-0YWguliIJjYh1IUUIX4/CHDYwvUk/M2Hz15tL558tws=";
|
||||
hash = "sha256-HVT1x378CRvyW1m9peM3Q0xHLRKocmtDUPkvnV5XQeQ=";
|
||||
};
|
||||
|
||||
npmRoot = "frontend";
|
||||
|
||||
@@ -23,13 +23,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mommy";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FWDekker";
|
||||
repo = "mommy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZxGHoBRWeGdUelykDdR51HigB85IrvNyswWjCTaOLvg=";
|
||||
hash = "sha256-G/8gUoJ6zKtSVlxrMYAkPX28SNG9XnLE72FZkqGhe+o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -94,6 +94,10 @@ stdenv.mkDerivation rec {
|
||||
url = "https://www.openwall.com/lists/musl/2025/02/13/1/2";
|
||||
hash = "sha256-BiD87k6KTlLr4ep14rUdIZfr2iQkicBYaSTq+p6WBqE=";
|
||||
})
|
||||
# required for systemd user namespacing and oomd to work correctly on musl
|
||||
# drop next release
|
||||
# https://git.musl-libc.org/cgit/musl/commit/?id=fde29c04adbab9d5b081bf6717b5458188647f1c
|
||||
./stdio-skip-empty-iovec-when-buffering-is-disabled.patch
|
||||
];
|
||||
CFLAGS = [
|
||||
"-fstack-protector-strong"
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From fde29c04adbab9d5b081bf6717b5458188647f1c Mon Sep 17 00:00:00 2001
|
||||
From: Casey Connolly <kcxt@postmarketos.org>
|
||||
Date: Wed, 23 Apr 2025 15:06:48 +0200
|
||||
Subject: stdio: skip empty iovec when buffering is disabled
|
||||
|
||||
When buffering on a FILE is disabled we still send both iovecs, even
|
||||
though the first one is always empty. Clean things up by skipping the
|
||||
empty iovec instead.
|
||||
---
|
||||
src/stdio/__stdio_write.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/stdio/__stdio_write.c b/src/stdio/__stdio_write.c
|
||||
index d2d89475..5356553d 100644
|
||||
--- a/src/stdio/__stdio_write.c
|
||||
+++ b/src/stdio/__stdio_write.c
|
||||
@@ -11,6 +11,11 @@ size_t __stdio_write(FILE *f, const unsigned char *buf, size_t len)
|
||||
size_t rem = iov[0].iov_len + iov[1].iov_len;
|
||||
int iovcnt = 2;
|
||||
ssize_t cnt;
|
||||
+
|
||||
+ if (!iov->iov_len) {
|
||||
+ iov++;
|
||||
+ iovcnt--;
|
||||
+ }
|
||||
for (;;) {
|
||||
cnt = syscall(SYS_writev, f->fd, iov, iovcnt);
|
||||
if (cnt == rem) {
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
pkg-config,
|
||||
util-macros,
|
||||
autoreconfHook,
|
||||
libxkbfile,
|
||||
libx11,
|
||||
libxext,
|
||||
libxmu,
|
||||
libxt,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "oclock";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
group = "xorg";
|
||||
owner = "app";
|
||||
repo = "oclock";
|
||||
tag = "oclock-${finalAttrs.version}";
|
||||
hash = "sha256-rk+PV2iEoqRwXN8bq0kCPk0qW0VPwid1T1XrH+Y9yLw=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
util-macros
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libxkbfile
|
||||
libx11
|
||||
libxext
|
||||
libxmu
|
||||
libxt
|
||||
];
|
||||
|
||||
installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=oclock-(.*)" ]; };
|
||||
|
||||
meta = {
|
||||
description = "simple analog clock using the X11 SHAPE extension to make a round window";
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/app/oclock";
|
||||
license = with lib.licenses; [
|
||||
mitOpenGroup
|
||||
x11
|
||||
];
|
||||
mainProgram = "oclock";
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -6,21 +6,25 @@
|
||||
pkg-config,
|
||||
openssl,
|
||||
rust-jemalloc-sys,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "oha";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hatoo";
|
||||
repo = "oha";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-N52j8WYEVlmHQdr0HZJZZo92OhIz4V0R1SdaWlOD684=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-M6wJy5X9JRM9tOOGT8b6YIUT0OakXQxjw17iuqaRT5s=";
|
||||
|
||||
CARGO_PROFILE_RELEASE_LTO = "fat";
|
||||
CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
pkg-config
|
||||
];
|
||||
@@ -33,12 +37,17 @@ rustPlatform.buildRustPackage rec {
|
||||
# tests don't work inside the sandbox
|
||||
doCheck = false;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "HTTP load generator inspired by rakyll/hey with tui animation";
|
||||
homepage = "https://github.com/hatoo/oha";
|
||||
changelog = "https://github.com/hatoo/oha/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/hatoo/oha/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = [ lib.maintainers.jpds ];
|
||||
mainProgram = "oha";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -18,11 +18,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oils-for-unix";
|
||||
version = "0.36.0";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://oils.pub/download/oils-for-unix-${version}.tar.gz";
|
||||
hash = "sha256-m2X8czNwjcHcd36KYUWuho6sb74MREqLErttbSllKQI=";
|
||||
hash = "sha256-9NQdIKBSPbz71LojH4Lt8lsI1JZdZbxx/LVmZtZ0MAA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optional withVtk vtk;
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
|
||||
env.NIX_CFLAGS_COMPILE = "-fpermissive";
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "USE_RAPIDJSON" true)
|
||||
# Enable exception handling for release builds.
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "renode-dts2repl";
|
||||
version = "0-unstable-2025-11-21";
|
||||
version = "0-unstable-2025-11-26";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antmicro";
|
||||
repo = "dts2repl";
|
||||
rev = "a4e216d0bef24c92674913f261197d17292def5c";
|
||||
hash = "sha256-hgdT7mQ7ociy518WK0Z6s6LfUluwWH8SDJhhfjdz29g=";
|
||||
rev = "f0c3d27b0f190defce22eaba0cb3f0b410d5d3db";
|
||||
hash = "sha256-Q90gF4UQqlRJ8Y116jp9gb/8hinpiTMg7QnXC7m2T+U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,18 +16,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ruff";
|
||||
version = "0.14.6";
|
||||
version = "0.14.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "ruff";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-xGQGodhDHrXIfCJ/Igv8TunsLo38FRRgnR1el+VKWGM=";
|
||||
hash = "sha256-7ZgA5e2Cd2xb/jlo0CrEJYKWAAsvyml2KBnhHRimduo=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--package=ruff" ];
|
||||
|
||||
cargoHash = "sha256-xbYWTuSvC1iqCNF+kIHKuQEjtdv+Z7DlL/4KUAXNcW0=";
|
||||
cargoHash = "sha256-2RXFT3ERzw1VpwGnLrS8bsrx4B5xLU6yQkwXAQuR/iM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
ocaml-ng,
|
||||
ipaexfont,
|
||||
junicode,
|
||||
libpng,
|
||||
lmodern,
|
||||
lmmath,
|
||||
which,
|
||||
@@ -47,7 +48,7 @@ ocamlPackages.buildDunePackage {
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace src/frontend/main.ml --replace \
|
||||
substituteInPlace src/frontend/main.ml --replace-fail \
|
||||
'/usr/local/share/satysfi"; "/usr/share/satysfi' \
|
||||
$out/share/satysfi
|
||||
'';
|
||||
@@ -59,6 +60,7 @@ ocamlPackages.buildDunePackage {
|
||||
|
||||
buildInputs = [
|
||||
camlpdf
|
||||
libpng
|
||||
yojson-with-position
|
||||
]
|
||||
++ (with ocamlPackages; [
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
# TODO: replace build system with meson next update
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
pkg-config,
|
||||
util-macros,
|
||||
autoreconfHook,
|
||||
libx11,
|
||||
libxkbfile,
|
||||
libxrandr,
|
||||
xkeyboard-config,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "setxkbmap";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
group = "xorg";
|
||||
owner = "app";
|
||||
repo = "setxkbmap";
|
||||
tag = "setxkbmap-${finalAttrs.version}";
|
||||
hash = "sha256-eEh1rifV+XY5RuKbA3Rgn9vmQPnyWvSae/m5lZA3FGE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
util-macros
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libx11
|
||||
libxkbfile
|
||||
libxrandr
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-xkb-config-root=${xkeyboard-config}/etc/X11/xkb" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=setxkbmap-(.*)" ]; };
|
||||
|
||||
meta = {
|
||||
description = "Set keymaps, layouts, and options via the X Keyboard Extension (XKB)";
|
||||
longDescription = ''
|
||||
setxkbmap is an X11 client to change the keymaps in the X server for a specified keyboard to
|
||||
use the layout determined by the options listed on the command line.
|
||||
'';
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/app/setxkbmap";
|
||||
license = lib.licenses.hpnd;
|
||||
mainProgram = "setxkbmap";
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -26,7 +26,7 @@ maven.buildMavenPackage rec {
|
||||
};
|
||||
|
||||
mvnJdk = jdk17;
|
||||
mvnHash = "sha256-cRDrd2QysN3KCndfdnTn8/hXuJ1xd28GcE8vrd6ILuM=";
|
||||
mvnHash = "sha256-Fk6JPMmzz7YnPWOdWKOXQ8z6bdYuXSgQdWBOaIlpd4A=";
|
||||
|
||||
# Disables failing tests which either need network access or are flaky.
|
||||
mvnParameters = lib.escapeShellArgs [
|
||||
@@ -49,7 +49,7 @@ maven.buildMavenPackage rec {
|
||||
|
||||
makeWrapper ${jre_headless}/bin/java $out/bin/sonarlint-ls \
|
||||
--add-flags "-jar $out/share/sonarlint-ls.jar" \
|
||||
--add-flags "-analyzers $(ls -1 $out/share/plugins | tr '\n' ' ')"
|
||||
--add-flags "-analyzers $(find $out/share/plugins/ -type f -name '*.jar' | sort | tr '\n' ' ')"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stevenblack-blocklist";
|
||||
version = "3.16.36";
|
||||
version = "3.16.38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenBlack";
|
||||
repo = "hosts";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7sOoxpT65O3Mks9+xfISuRgx55E6eRdbsDpdMafTq98=";
|
||||
hash = "sha256-QhuxJmSI09rPJf5W+MH/5ApBVTSYYY/kWENLr7vX/3A=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -3,12 +3,14 @@
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
cargo,
|
||||
capstone,
|
||||
libbfd,
|
||||
libelf,
|
||||
libiberty,
|
||||
readline,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -19,8 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "endrazine";
|
||||
repo = "wcc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hyelDAsE3IFvUxBqttYW7QmM6NPEa6pOREmawFjW2Q8=";
|
||||
deepClone = true;
|
||||
hash = "sha256-cg8rf8R3xYNJTJhrDfIdVAUR/OOd6JjB0NYHRosUzvU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -39,6 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
readline
|
||||
];
|
||||
|
||||
patches = [
|
||||
# The upstream forgot to bump WVERSION in header before tagging `v0.0.11`.
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/endrazine/wcc/commit/4bea2dac8b49d82e4f72e42027d74fc654380f7b.patch?full_index=1";
|
||||
hash = "sha256-RK0ue8hdK/G+njwGmWpaewclRHprO8aBdZ9vBGQIQOc=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
sed -i src/wsh/include/libwitch/wsh.h src/wsh/scripts/INDEX \
|
||||
@@ -71,6 +80,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/endrazine/wcc";
|
||||
description = "Witchcraft compiler collection: tools to convert and script ELF files";
|
||||
@@ -82,5 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
DieracDelta
|
||||
];
|
||||
mainProgram = "wcc";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -16,17 +16,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "xdg-desktop-portal-cosmic";
|
||||
version = "1.0.0-beta.7";
|
||||
version = "1.0.0-beta.8";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "xdg-desktop-portal-cosmic";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-oqggnwDzmi6ES3o3Pt51QwZUuqtqlbrMxFGaftyqgRo=";
|
||||
hash = "sha256-4rNHZcAq/LafUPywZ9XdpXr9wVFOBWkUvnCFwT+3lFA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CqzM1hVdY3+NhH58NDlOaFVU1na/bkh6fI9rAp2Vwog=";
|
||||
cargoHash = "sha256-0PsiB/xvePSi5o1eRUgCq02UAGzuBQEe8+LlFJi5814=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
python3Packages,
|
||||
stdenv,
|
||||
config,
|
||||
testers,
|
||||
enableCfp ? true,
|
||||
enableCuda ? config.cudaSupport,
|
||||
enableFortran ? builtins.elem stdenv.hostPlatform.system gfortran.meta.platforms,
|
||||
@@ -38,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs =
|
||||
lib.optional enableCuda cudatoolkit
|
||||
++ lib.optional enableFortran gfortran
|
||||
++ lib.optional enableOpenMP llvmPackages.openmp
|
||||
++ lib.optionals enablePython (
|
||||
with python3Packages;
|
||||
[
|
||||
@@ -48,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
);
|
||||
|
||||
propagatedBuildInputs = lib.optional (enableOpenMP && stdenv.cc.isClang) llvmPackages.openmp;
|
||||
|
||||
# compile CUDA code for all extant GPUs so the binary will work with any GPU
|
||||
# and driver combination. to be ultimately solved upstream:
|
||||
# https://github.com/LLNL/zfp/issues/178
|
||||
@@ -69,6 +71,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests = {
|
||||
cmake-config = testers.hasCmakeConfigModules {
|
||||
moduleNames = [ "zfp" ];
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://computing.llnl.gov/projects/zfp";
|
||||
description = "Library for random-access compression of floating-point arrays";
|
||||
|
||||
@@ -18,8 +18,8 @@ let
|
||||
param =
|
||||
if lib.versionAtLeast ppxlib.version "0.36" then
|
||||
{
|
||||
version = "3.17.0";
|
||||
hash = "sha256-gsiBnOn9IVt+fixlAeY456kE6+E6taHY6sJnnYz4pes=";
|
||||
version = "3.17.2";
|
||||
hash = "sha256-f0CHAW6MOToT1Xt3N2d7wdvxaXj9Q8GTVNTXmnlMjEc=";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -19,6 +19,13 @@ buildPythonPackage rec {
|
||||
hash = "sha256-WlIholi/nzq6Ikc0LS6FhG0Q5Kz0kvvAlA2YJ7EksZ4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Backport fix for test_long_password from upstream PR: https://github.com/maxcountryman/flask-bcrypt/pull/96
|
||||
substituteInPlace test_bcrypt.py \
|
||||
--replace-fail "self.assertTrue(self.bcrypt.check_password_hash(pw_hash, 'A' * 80))" \
|
||||
"self.assertTrue(self.bcrypt.check_password_hash(pw_hash, 'A' * 72))"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flask
|
||||
bcrypt
|
||||
|
||||
@@ -5,8 +5,7 @@
|
||||
texliveInfraOnly,
|
||||
|
||||
# build-system
|
||||
poetry-core,
|
||||
setuptools,
|
||||
hatchling,
|
||||
|
||||
# buildInputs
|
||||
cairo,
|
||||
@@ -37,6 +36,8 @@
|
||||
tqdm,
|
||||
typing-extensions,
|
||||
watchdog,
|
||||
pythonAtLeast,
|
||||
audioop-lts,
|
||||
|
||||
# optional-dependencies
|
||||
jupyterlab,
|
||||
@@ -187,18 +188,17 @@ in
|
||||
buildPythonPackage rec {
|
||||
pname = "manim";
|
||||
pyproject = true;
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ManimCommunity";
|
||||
repo = "manim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-eQgp/GwKsfQA1ZgqfB3HF2ThEgH3Fbn9uAtcko9pkjs=";
|
||||
hash = "sha256-VkMmIQNLUg6Epttze23vaAA8QOdlnAPQZ7UKpkFRzIk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
setuptools
|
||||
hatchling
|
||||
];
|
||||
|
||||
patches = [ ./pytest-report-header.patch ];
|
||||
@@ -231,6 +231,9 @@ buildPythonPackage rec {
|
||||
tqdm
|
||||
typing-extensions
|
||||
watchdog
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.13") [
|
||||
audioop-lts
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
@@ -278,7 +281,7 @@ buildPythonPackage rec {
|
||||
manim.
|
||||
'';
|
||||
mainProgram = "manim";
|
||||
changelog = "https://docs.manim.community/en/latest/changelog/${version}-changelog.html";
|
||||
changelog = "https://github.com/ManimCommunity/manim/releases/tag/${src.tag}";
|
||||
homepage = "https://github.com/ManimCommunity/manim";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ osbm ];
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocstrings";
|
||||
version = "0.30.1";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mkdocstrings";
|
||||
repo = "mkdocstrings";
|
||||
tag = version;
|
||||
hash = "sha256-BfqxL35prq+pvD21w0BOJx/ls8og+LjtGdOAZlHYGVE=";
|
||||
hash = "sha256-PQ8TL/eMYNX0gXvWhq/Rop2bv1oCoO7o3dxlCK9tbGE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymodbus";
|
||||
version = "3.11.3";
|
||||
version = "3.11.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pymodbus-dev";
|
||||
repo = "pymodbus";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2wOeghoi8FSk1II/0rid+ddRq7ceerH7ZeLcb+SSXKY=";
|
||||
hash = "sha256-Le/TJfDSvro9eMLOfY/il/0LSJ8orHSSjI7jaYdXaLs=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-lxml";
|
||||
version = "2025.08.25";
|
||||
version = "2025.11.25";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abelcheung";
|
||||
repo = "types-lxml";
|
||||
tag = version;
|
||||
hash = "sha256-XuQ3sZi/cuJF76JeyuFEZVsY3F9zmPHRUWbkNQaT0Lo=";
|
||||
hash = "sha256-WCG+jCkNPb6Mv7Mn1ivA5iwteR+vsfdGeo77HiQiQYc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "beautifulsoup4" ];
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "urllib3-future";
|
||||
version = "2.14.907";
|
||||
version = "2.14.908";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jawah";
|
||||
repo = "urllib3.future";
|
||||
tag = version;
|
||||
hash = "sha256-LdJplIA/hUIHmDNJKUwcr5ganKaxEQMGhjQsc5FcEjI=";
|
||||
hash = "sha256-EPM3LbzNA7gKkwJy4xd/d/Mhs0qhuPRGI4uVkDHiUnI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
diff --git a/warp/build_dll.py b/warp/build_dll.py
|
||||
index 2218ff13..3fcf5796 100644
|
||||
--- a/warp/build_dll.py
|
||||
+++ b/warp/build_dll.py
|
||||
@@ -404,8 +404,8 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[
|
||||
cuda_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "nvcc"
|
||||
cpp_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "g++"
|
||||
|
||||
- cpp_includes = f' -I"{warp_home_path.parent}/external/llvm-project/out/install/{mode}-{arch}/include"'
|
||||
- cpp_includes += f' -I"{warp_home_path.parent}/_build/host-deps/llvm-project/release-{arch}/include"'
|
||||
+ cpp_includes = ' -I"@LLVM_DEV@/include"'
|
||||
+ cpp_includes += ' -I"@LIBCLANG_DEV@/include"'
|
||||
cuda_includes = f' -I"{cuda_home}/include"' if cu_path else ""
|
||||
includes = cpp_includes + cuda_includes
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
diff --git a/warp/build_dll.py b/warp/build_dll.py
|
||||
index 11d2a898..33fb2a76 100644
|
||||
--- a/warp/build_dll.py
|
||||
+++ b/warp/build_dll.py
|
||||
@@ -636,8 +636,8 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: list[str]
|
||||
|
||||
else:
|
||||
# Unix compilation
|
||||
- cuda_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "nvcc"
|
||||
- cpp_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "g++"
|
||||
+ cuda_compiler = "@CLANG@" if getattr(args, "clang_build_toolchain", False) else "nvcc"
|
||||
+ cpp_compiler = "@CLANG@" if getattr(args, "clang_build_toolchain", False) else "g++"
|
||||
|
||||
cpp_includes = f' -I"{warp_home_path.parent}/external/llvm-project/out/install/{mode}-{arch}/include"'
|
||||
cpp_includes += f' -I"{warp_home_path.parent}/_build/host-deps/llvm-project/release-{arch}/include"'
|
||||
@@ -687,9 +687,9 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: list[str]
|
||||
else:
|
||||
# Use Clang compiler
|
||||
if mode == "debug":
|
||||
- cuda_cmd = f'clang++ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -g -O0 -fPIC -fvisibility=hidden -D_DEBUG -D_ITERATOR_DEBUG_LEVEL=0 -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"'
|
||||
+ cuda_cmd = f'@CLANG@ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -g -O0 -fPIC -fvisibility=hidden -D_DEBUG -D_ITERATOR_DEBUG_LEVEL=0 -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"'
|
||||
elif mode == "release":
|
||||
- cuda_cmd = f'clang++ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -O3 -fPIC -fvisibility=hidden -DNDEBUG -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"'
|
||||
+ cuda_cmd = f'@CLANG@ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -O3 -fPIC -fvisibility=hidden -DNDEBUG -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"'
|
||||
|
||||
with ScopedTimer("build_cuda", active=args.verbose):
|
||||
run_cmd(cuda_cmd)
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
diff --git a/build_llvm.py b/build_llvm.py
|
||||
index aee0a9f1..5e1c3557 100644
|
||||
--- a/build_llvm.py
|
||||
+++ b/build_llvm.py
|
||||
@@ -171,7 +171,6 @@ def build_llvm_clang_from_source_for_arch(args, arch: str, llvm_source: str) ->
|
||||
"-D", "LLVM_INCLUDE_TESTS=FALSE",
|
||||
"-D", "LLVM_INCLUDE_TOOLS=TRUE", # Needed by Clang
|
||||
"-D", "LLVM_INCLUDE_UTILS=FALSE",
|
||||
- "-D", f"CMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 {abi_version}", # The pre-C++11 ABI is still the default on the CentOS 7 toolchain
|
||||
"-D", f"CMAKE_INSTALL_PREFIX={install_path}",
|
||||
"-D", f"LLVM_HOST_TRIPLE={host_triple}",
|
||||
"-D", f"CMAKE_OSX_ARCHITECTURES={osx_architectures}",
|
||||
diff --git a/warp/build_dll.py b/warp/build_dll.py
|
||||
index 2218ff13..2354f69f 100644
|
||||
--- a/warp/build_dll.py
|
||||
+++ b/warp/build_dll.py
|
||||
@@ -417,7 +417,7 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[
|
||||
else:
|
||||
version = ""
|
||||
|
||||
- cpp_flags = f'-Werror -Wuninitialized {version} --std=c++17 -fno-rtti -D{cuda_enabled} -D{mathdx_enabled} -D{cuda_compat_enabled} -fPIC -fvisibility=hidden -D_GLIBCXX_USE_CXX11_ABI=0 -I"{native_dir}" {includes} '
|
||||
+ cpp_flags = f'-Werror -Wuninitialized {version} --std=c++17 -fno-rtti -D{cuda_enabled} -D{mathdx_enabled} -D{cuda_compat_enabled} -fPIC -fvisibility=hidden -I"{native_dir}" {includes} '
|
||||
|
||||
if mode == "debug":
|
||||
cpp_flags += "-O0 -g -D_DEBUG -DWP_ENABLE_DEBUG=1 -fkeep-inline-functions"
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/warp/build_dll.py b/warp/build_dll.py
|
||||
index 2218ff13..53786017 100644
|
||||
--- a/warp/build_dll.py
|
||||
+++ b/warp/build_dll.py
|
||||
@@ -441,6 +442,7 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[
|
||||
build_cmd = f'{cpp_compiler} {cpp_flags} -c "{cpp_path}" -o "{cpp_out}"'
|
||||
run_cmd(build_cmd)
|
||||
|
||||
+ ld_inputs.append('-L"@LIBCXX_LIB@/lib" -lc++')
|
||||
if cu_path:
|
||||
cu_out = cu_path + ".o"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user