Merge master into staging-next
This commit is contained in:
@@ -35,6 +35,8 @@
|
||||
|
||||
- `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x).
|
||||
|
||||
- Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases.
|
||||
|
||||
- The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld.
|
||||
|
||||
- `navidrome` 0.58.0 introduces [multi-library support](https://www.navidrome.org/docs/usage/multi-library/)
|
||||
|
||||
@@ -21,14 +21,14 @@ in
|
||||
options.services.greetd = {
|
||||
enable = lib.mkEnableOption "greetd, a minimal and flexible login manager daemon";
|
||||
|
||||
package = lib.mkPackageOption pkgs [ "greetd" "greetd" ] { };
|
||||
package = lib.mkPackageOption pkgs "greetd" { };
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = settingsFormat.type;
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
default_session = {
|
||||
command = "''${pkgs.greetd.greetd}/bin/agreety --cmd sway";
|
||||
command = "''${pkgs.greetd}/bin/agreety --cmd sway";
|
||||
};
|
||||
}
|
||||
'';
|
||||
|
||||
@@ -172,6 +172,11 @@ in
|
||||
assertion = cfg.settings.dynamic_tuning -> cfg.settings.daemon;
|
||||
message = "`services.tuned.settings.dynamic_tuning` requires `services.tuned.settings.daemon` to be `true`.";
|
||||
}
|
||||
|
||||
{
|
||||
assertion = cfg.ppdSupport -> config.services.upower.enable;
|
||||
message = "`services.tuned.ppdSupport` requires `services.upower` to be enabled.";
|
||||
}
|
||||
]
|
||||
# Declare service conflicts, also sourced from `tuned.service`
|
||||
++
|
||||
@@ -218,6 +223,11 @@ in
|
||||
# Many DEs (like GNOME and KDE Plasma) enable PPD by default
|
||||
# Let's try to make it easier to transition by only enabling this module
|
||||
power-profiles-daemon.enable = false;
|
||||
|
||||
# NOTE: Required by `tuned-ppd` for handling power supply changes
|
||||
# (i.e., `services.tuned.ppdSettings.main.battery_detection`)
|
||||
# https://github.com/NixOS/nixpkgs/issues/431105
|
||||
upower.enable = lib.mkIf cfg.ppdSupport true;
|
||||
};
|
||||
|
||||
systemd = {
|
||||
|
||||
@@ -60,7 +60,7 @@ let
|
||||
# We only include the out output here to avoid needing to include all
|
||||
# other outputs in the installer tests as well
|
||||
# We only need the udevadm command anyway
|
||||
pkgs.systemdMinimal.out
|
||||
pkgs.buildPackages.systemdMinimal.out
|
||||
];
|
||||
}
|
||||
''
|
||||
|
||||
@@ -184,6 +184,10 @@ let
|
||||
(boolOpt "enabled" cfg.ntcp2.enable)
|
||||
(boolOpt "published" cfg.ntcp2.published)
|
||||
(intOpt "port" cfg.ntcp2.port)
|
||||
(sec "ssu2")
|
||||
(boolOpt "enabled" cfg.ssu2.enable)
|
||||
(boolOpt "published" cfg.ssu2.published)
|
||||
(intOpt "port" cfg.ssu2.port)
|
||||
(sec "addressbook")
|
||||
(strOpt "defaulturl" cfg.addressbook.defaulturl)
|
||||
]
|
||||
@@ -540,6 +544,18 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
ssu2 = {
|
||||
enable = mkEnableTrueOption "SSU2";
|
||||
published = mkEnableOption "SSU2 publication";
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 0;
|
||||
description = ''
|
||||
Port to listen for incoming SSU2 connections (0=auto).
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
limits.transittunnels = mkOption {
|
||||
type = types.int;
|
||||
default = 2500;
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
enable = true;
|
||||
settings = {
|
||||
default_session = {
|
||||
command = "${pkgs.greetd.greetd}/bin/agreety --cmd bash";
|
||||
command = "${pkgs.greetd}/bin/agreety --cmd bash";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
pkgs,
|
||||
}:
|
||||
let
|
||||
version = "0.0.27-unstable-2025-07-28";
|
||||
version = "0.0.27-unstable-2025-08-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yetone";
|
||||
repo = "avante.nvim";
|
||||
rev = "5e4eb8652b4776f139282a343f04a3a8c7f23cb0";
|
||||
hash = "sha256-rmpBI2j7zwU5tIUjK7fMhfle5LVksk/kuCnwN9WQkic=";
|
||||
rev = "2fc63d4128d2dc2fef0913c7480b4586959ebe4e";
|
||||
hash = "sha256-hHa300Ldszsnp6AuYVJwOFc5FfuRTd3phyM6/qBUIQo=";
|
||||
};
|
||||
avante-nvim-lib = rustPlatform.buildRustPackage {
|
||||
pname = "avante-nvim-lib";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "flycast";
|
||||
version = "0-unstable-2025-07-11";
|
||||
version = "0-unstable-2025-08-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flyinghead";
|
||||
repo = "flycast";
|
||||
rev = "48c58dbd18501fae92e641b6ee6ca5ca9de0d5c3";
|
||||
hash = "sha256-AlvNh+tDY7FEqUm5zgm7072Z1zIXn54tvLGzLbTjLXo=";
|
||||
rev = "40e400ab084175d3bd0f9e10cf8d6ac78c8b9544";
|
||||
hash = "sha256-k/w1tmuGuRD98bR/kmc/9pLFGeobHMhKQapJOv8qVJo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blackfire";
|
||||
version = "2.28.29";
|
||||
version = "2.28.31";
|
||||
|
||||
src =
|
||||
passthru.sources.${stdenv.hostPlatform.system}
|
||||
@@ -60,23 +60,23 @@ stdenv.mkDerivation rec {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
|
||||
sha256 = "WIL8Y2pQq9vYuSI2fq2+T21HvjAd6PJPWKi4phKB5pw=";
|
||||
sha256 = "v2MkLqTNG9creNZBBshTuhrMxlF4OIDlzQOgrEyKmMY=";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
|
||||
sha256 = "hcTVPb1zGrR3C1b5F2bgIzwH/lZV0ujeERNx0qt00Pc=";
|
||||
sha256 = "hFJdO/YFxwCpWBmR8jZwmak2Fc9wgMwLax5puaLVEbs=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
|
||||
sha256 = "7Qs47SjAhsOAIcCCCJk7jjDD1ab7CyjbPHfXl25z9mE=";
|
||||
sha256 = "RDk4DE0x24m5yBBezlGuLQ/l7yugyd5SYvfYoDFfJuI=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
|
||||
sha256 = "v4ApyuA9kMfqZAGVXPSSJJS0fm9lP2zz0iD8lf9VGa0=";
|
||||
sha256 = "Xq0G0w2FJXEGVmXmyhbdzXY9OiZn4+5i8GypMOdeAhA=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
|
||||
sha256 = "t78kpafSfbCA/0Kzhn/+/wjAet2qne33CYqFvRT0XUM=";
|
||||
sha256 = "cHmh1JyPa2u2c6KGlZC1/hlDlxMSrDKY1jwaEcJVq0M=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
let
|
||||
pnpm = pnpm_9;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "test-app";
|
||||
inherit (cargo-tauri) version src;
|
||||
@@ -35,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-I++iYwqSxACmXFvfPYAnY/0WSWSY6ElJYnylJDC03D8=";
|
||||
hash = "sha256-7F2vk6WUeXunTuXX9J0rVhl2I0ENYagRdqTy+WAXBB8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+4
-4
@@ -6,13 +6,13 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@anthropic-ai/claude-code": "^1.0.67"
|
||||
"@anthropic-ai/claude-code": "^1.0.69"
|
||||
}
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-code": {
|
||||
"version": "1.0.67",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.67.tgz",
|
||||
"integrity": "sha512-r7CfhbKBXgaL5Wo0BIh08SOahFYQPcbHCNnMLtse7iDd2IVBWeOxqoiqQvzRQ0wTCiqLTshRbnmLWHyP4AbuyQ==",
|
||||
"version": "1.0.69",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.69.tgz",
|
||||
"integrity": "sha512-kF86lNI9o6rt14cEDw16G89rHz4pL0lv/sASztV8XenEeQ/6VUZ5Jk+icYg6XTQKe33BsdtNKFS3IL3iLyzQyw==",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "claude-code";
|
||||
version = "1.0.67";
|
||||
version = "1.0.69";
|
||||
|
||||
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
|
||||
hash = "sha256-NZgv0nGsq+RuPTJcX0GsE1NWs/PFge2A0ek3BL1fJeY=";
|
||||
hash = "sha256-uZbe7N3FSAVxNxL7npujJcBFH6ZjnwDz327bZWN2IEM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-v994F0x0LCh+QbIfCywk5agxn7tNhhi+uo/3ka5Iuww=";
|
||||
npmDepsHash = "sha256-a06NT96pVOiz06ZZ9r+1s+oF9U/I7SRJFFAw1e0NkMY=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -28,7 +28,7 @@ buildGoModule rec {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MqHcwomsVYbjziO0vIpGAcREChe5mbJVGsvM96bszLA=";
|
||||
hash = "sha256-eC9mfB/FWDxOGucNizHBiRkhkEFDdSxu9vRnXZp5Tug=";
|
||||
};
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "deja-dup";
|
||||
version = "48.2";
|
||||
version = "48.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "deja-dup";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-g6bGOlpiEMJ9d+xe2GJyTBWAuGlY9EZTlJaYhB/5Ldw=";
|
||||
hash = "sha256-3tjJljCdugfjfysd0afUYY7Gc1UcaP4w4jgxVDr5tBM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -92,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
and uses duplicity as the backend.
|
||||
'';
|
||||
homepage = "https://apps.gnome.org/DejaDup/";
|
||||
changelog = "https://gitlab.gnome.org/World/deja-dup/-/releases/${finalAttrs.version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
teams = [ teams.gnome-circle ];
|
||||
|
||||
@@ -13,13 +13,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dokieli";
|
||||
version = "0-unstable-2025-07-11";
|
||||
version = "0-unstable-2025-08-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dokieli";
|
||||
repo = "dokieli";
|
||||
rev = "13c0c2d2d307ab1f391aca9aec4efc4ac4ba43c5";
|
||||
hash = "sha256-V9tKoSu1r8LZaIZUu1JSyZ0dM7/zblTDQZHu86/V3LE=";
|
||||
rev = "64374c6b9a53b68ae7921604a1fbe231d3e4f067";
|
||||
hash = "sha256-5baBKXmOxS0BOKNedMSbmw21rDBONZwmim9hlXn5OzQ=";
|
||||
};
|
||||
|
||||
missingHashes = ./missing-hashes.json;
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fluxcd-operator-mcp";
|
||||
version = "0.24.1";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "controlplaneio-fluxcd";
|
||||
repo = "fluxcd-operator";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/a/k2q1Qu/0Zz7qxBtGB27CZ5vKhqAAIDUknRT8dK04=";
|
||||
hash = "sha256-OT2H2veijX5l0QCpecLsq1vBR8+912MR3kojMICfFAg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tyYE/OdVUxqNP3Csukc2ctDchB9x2BdBYXYq9EsiFkg=";
|
||||
vendorHash = "sha256-w7WEckmoajsR4sKCrheq34T0XC2ubnZhz6cVQmzHzN0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "garnet";
|
||||
version = "1.0.78";
|
||||
version = "1.0.79";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "garnet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-V/h0X4CZ9FOcUetyyvo9umYS+VqJbYehg3QS/yp4OBM=";
|
||||
hash = "sha256-EXI/6yctbAX2tcUYsb9sHXed5pik/uttXoY0gCnH9H8=";
|
||||
};
|
||||
|
||||
projectFile = "main/GarnetServer/GarnetServer.csproj";
|
||||
|
||||
+35
-9
@@ -5,17 +5,24 @@
|
||||
pam,
|
||||
scdoc,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
# legacy passthrus
|
||||
gtkgreet,
|
||||
qtgreet,
|
||||
regreet,
|
||||
tuigreet,
|
||||
wlgreet,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "greetd";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~kennylevinsen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg=";
|
||||
repo = "greetd";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JwTLZawY9+M09IDbMPoNUcNrnW1C2OVlEVn1n7ol6dY=";
|
||||
@@ -37,7 +44,26 @@ rustPlatform.buildRustPackage rec {
|
||||
installManPage man/*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
# Added 2025-07-23. To be deleted on 26.05
|
||||
passthru =
|
||||
let
|
||||
warnPassthru = name: lib.warnOnInstantiate "`greetd.${name}` was renamed to `${name}`";
|
||||
in
|
||||
lib.mapAttrs warnPassthru {
|
||||
inherit
|
||||
gtkgreet
|
||||
qtgreet
|
||||
regreet
|
||||
tuigreet
|
||||
wlgreet
|
||||
;
|
||||
}
|
||||
// {
|
||||
greetd = warnPassthru "greetd" finalAttrs.finalPackage;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Minimal and flexible login manager daemon";
|
||||
longDescription = ''
|
||||
greetd is a minimal and flexible login manager daemon
|
||||
@@ -46,8 +72,8 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
homepage = "https://sr.ht/~kennylevinsen/greetd/";
|
||||
mainProgram = "greetd";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
+12
-9
@@ -12,17 +12,18 @@
|
||||
json_c,
|
||||
librsvg,
|
||||
scdoc,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gtkgreet";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~kennylevinsen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-GKBYql0hzqB6uY87SsAqHwf3qLAr7xznMnAjRtP4HS8=";
|
||||
repo = "gtkgreet";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-GKBYql0hzqB6uY87SsAqHwf3qLAr7xznMnAjRtP4HS8=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
@@ -54,12 +55,14 @@ stdenv.mkDerivation rec {
|
||||
# G_APPLICATION_FLAGS_NONE is deprecated in GLib 2.73.3+.
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "GTK based greeter for greetd, to be run under cage or similar";
|
||||
homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "gtkgreet";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "h2o";
|
||||
version = "2.3.0.20250519";
|
||||
version = "2.3.0.20250717";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "h2o";
|
||||
repo = "h2o";
|
||||
rev = "87e2aa634f2c0d9f3d9429f7a3cf273f98db0058";
|
||||
sha256 = "sha256-/9YnaOqvYmFme4/mFq8Sx78FMDyGwnErEW45qPVELjU=";
|
||||
rev = "db98b59ba7abfcd1dc9b43ea4b9ad1052aba775e";
|
||||
sha256 = "sha256-vBA5TWyvtaaBZV4RmfAAA7F34fXNkROS0rbZRpEJgrc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "hyprls";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprland-community";
|
||||
repo = "hyprls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cJDDyF44nD/XvxtaGPYCk2MC574HDBHP1ByhVwqatvQ=";
|
||||
hash = "sha256-txJSqXIkIYmjg/k5enChHHwJaoAhJ2c6hMHjS/i4v5c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WTdwIAC3gDWgCKlVuOtMyl0ZfdZ9RhlpqUl2S2d65HA=";
|
||||
vendorHash = "sha256-a2OdESOXrinALzC2AJ0cudMsDwzdi1Jl2kckI0OratA=";
|
||||
|
||||
checkFlags = [
|
||||
# Not yet implemented
|
||||
|
||||
@@ -15,11 +15,11 @@ bundlerApp {
|
||||
|
||||
passthru.updateScript = bundlerUpdateScript "inspec";
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Inspec is an open-source testing framework for infrastructure with a human- and machine-readable language for specifying compliance, security and policy requirements";
|
||||
homepage = "https://inspec.io/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dylanmtaylor ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dylanmtaylor ];
|
||||
mainProgram = "inspec";
|
||||
};
|
||||
}
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.83.0";
|
||||
version = "1.84.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitea {
|
||||
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cwNSjzCy4lv71O3XAcDXVF+75MhQ6gMrMz/IuePCdak=";
|
||||
hash = "sha256-bzz49ILpqzOStBdRGMhBKkxI4RlVuDjCqhcIjQGGQmk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lock";
|
||||
version = "1.6.6";
|
||||
version = "1.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "konstantintutsch";
|
||||
repo = "Lock";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JAtQxmcLFNj6epk3ipVaa/u7fQ4E2maHZN+7jk+ktmE=";
|
||||
hash = "sha256-5wbt+zZANWNbKJtcptovkPsGMUjGHmiX2vniLRqrQNc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.1.3";
|
||||
version = "2.1.5";
|
||||
pname = "lunatask";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
|
||||
hash = "sha256-kVNuCtUyY8UkalXlIpfenjB4JApDZVabawLOhFxToyY=";
|
||||
hash = "sha256-kuf3NE7or7zCcefShhKzVoCX7WsnHwtleZRafKYhWrM=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
+36
-19
@@ -1,10 +1,3 @@
|
||||
# Type aliases
|
||||
# Release = {
|
||||
# version: String
|
||||
# hash: String
|
||||
# supportedGpuTargets: List String
|
||||
# }
|
||||
|
||||
{
|
||||
autoPatchelfHook,
|
||||
blas,
|
||||
@@ -13,14 +6,12 @@
|
||||
cudaPackages,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
gfortran,
|
||||
gpuTargets ? [ ], # Non-CUDA targets, that is HIP
|
||||
rocmPackages,
|
||||
lapack,
|
||||
lib,
|
||||
libpthreadstubs,
|
||||
magmaRelease,
|
||||
ninja,
|
||||
python3,
|
||||
config,
|
||||
@@ -40,10 +31,37 @@ let
|
||||
strings
|
||||
trivial
|
||||
;
|
||||
inherit (magmaRelease) version hash supportedGpuTargets;
|
||||
|
||||
inherit (cudaPackages) cudaAtLeast flags cudaOlder;
|
||||
|
||||
supportedGpuTargets = [
|
||||
"700"
|
||||
"701"
|
||||
"702"
|
||||
"703"
|
||||
"704"
|
||||
"705"
|
||||
"801"
|
||||
"802"
|
||||
"803"
|
||||
"805"
|
||||
"810"
|
||||
"900"
|
||||
"902"
|
||||
"904"
|
||||
"906"
|
||||
"908"
|
||||
"909"
|
||||
"90c"
|
||||
"1010"
|
||||
"1011"
|
||||
"1012"
|
||||
"1030"
|
||||
"1031"
|
||||
"1032"
|
||||
"1033"
|
||||
];
|
||||
|
||||
# NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements
|
||||
# of the first list *from* the second list. That means:
|
||||
# lists.subtractLists a b = b - a
|
||||
@@ -95,12 +113,11 @@ assert (builtins.match "[^[:space:]]*" gpuTargetString) != null;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "magma";
|
||||
inherit version;
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "magma-${version}.tar.gz";
|
||||
url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz";
|
||||
inherit hash;
|
||||
url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-/3f9Nyaz3+w7+1V5CwZICqXMOEOWwts1xW/a5KgsZBw=";
|
||||
};
|
||||
|
||||
# Magma doesn't have anything which could be run under doCheck, but it does build test suite executables.
|
||||
@@ -363,13 +380,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Matrix Algebra on GPU and Multicore Architectures";
|
||||
license = licenses.bsd3;
|
||||
license = lib.licenses.bsd3;
|
||||
homepage = "https://icl.utk.edu/magma/";
|
||||
changelog = "https://github.com/icl-utk-edu/magma/blob/v${version}/ReleaseNotes";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ connorbaker ];
|
||||
changelog = "https://github.com/icl-utk-edu/magma/blob/v${finalAttrs.version}/ReleaseNotes";
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ connorbaker ];
|
||||
|
||||
# Cf. https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L24-L31
|
||||
broken =
|
||||
@@ -52,14 +52,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mkvtoolnix";
|
||||
version = "93.0";
|
||||
version = "94.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "mbunkus";
|
||||
repo = "mkvtoolnix";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-xCO5wKZO2fcO6+KhPO5+OpOvAFuqOuQ2A3V+LzFYLNY=";
|
||||
hash = "sha256-BEvb0+e1ugGPkj6MnX1uOvQ2k+zvlqLXFiBHFt3a5qw=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "nest-cli";
|
||||
version = "11.0.8";
|
||||
version = "11.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nestjs";
|
||||
repo = "nest-cli";
|
||||
tag = version;
|
||||
hash = "sha256-vqu5eUtr8oO2HgQhXIHel92qHhHJSqyAJmI2+Oc5VoY=";
|
||||
hash = "sha256-mNnEbZv6LG5YDYZj7kAiPcg2Se9wJidON+9Tp/TIpd4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-QLJBqVHEvOhRRGU9x/5hCvRSi0xKYMDXeqMi6yWNHbU=";
|
||||
npmDepsHash = "sha256-dEg0WmNNNLMQj+9bHkwf0uz9Vyx+QFSHrQv7fk1DxjQ=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
env = {
|
||||
|
||||
@@ -27,18 +27,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "newsflash";
|
||||
version = "4.1.2";
|
||||
version = "4.1.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "news-flash";
|
||||
repo = "news_flash_gtk";
|
||||
tag = "v.${finalAttrs.version}";
|
||||
hash = "sha256-yNO9ju5AQzMeZlQN1f3FRiFA6hq89mSuQClrJkoM+xE=";
|
||||
hash = "sha256-Ll1w6gWwlGq7pG/S/PZYujG6SqhThg4gLkdBdu/8czI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-gF1wHLM5t0jYm/nWQQeAbDlExsPYNV0/YYH0yfQuetM=";
|
||||
hash = "sha256-GJzBdJIa1KNZax4FSns/IfNLnAdpOfkEi/lFLuNmHVs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -116,14 +116,13 @@ in
|
||||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
version = "0.11.0";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-po7BxJAj9eOpOaXsLDmw6/1RyjXPtXza0YUv0pVojZ0=";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-FghgCtVQIxc9qB5vZZlblugk6HLnxoT8xanZK+N8qEc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";
|
||||
|
||||
@@ -61,6 +61,13 @@ buildGoModule (finalAttrs: {
|
||||
# Skip tests that require network, not available in the darwin sandbox
|
||||
"TestHTTPSClient"
|
||||
"TestHTTPSNoClientCerts"
|
||||
"TestSocketHTTPGetRequest"
|
||||
|
||||
# Flaky
|
||||
"TestBenchMainWithBundleRegoVersion"
|
||||
"TestClientTLSWithCustomCACert"
|
||||
"TestECR"
|
||||
"TestManagerWithOPATelemetryUpdateLoop"
|
||||
]
|
||||
++ lib.optionals (!enableWasmEval) [
|
||||
"TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages"
|
||||
@@ -81,6 +88,7 @@ buildGoModule (finalAttrs: {
|
||||
# remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
rm v1/server/server_test.go
|
||||
rm v1/server/server_bench_test.go
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
+10
-7
@@ -8,16 +8,17 @@
|
||||
gtk4,
|
||||
pango,
|
||||
librsvg,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "regreet";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rharish101";
|
||||
repo = "ReGreet";
|
||||
rev = version;
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-f8Xvno5QqmWz4SUiFYDvs8lFU1ZaqQ8gpTaVzWxW4T8=";
|
||||
};
|
||||
|
||||
@@ -36,12 +37,14 @@ rustPlatform.buildRustPackage rec {
|
||||
librsvg
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Clean and customizable greeter for greetd";
|
||||
homepage = "https://github.com/rharish101/ReGreet";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ fufexan ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ fufexan ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "regreet";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "renode-dts2repl";
|
||||
version = "0-unstable-2025-07-24";
|
||||
version = "0-unstable-2025-08-01";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antmicro";
|
||||
repo = "dts2repl";
|
||||
rev = "b94aaad8ad6cd3252160a11ac37f2bde8280d1b0";
|
||||
hash = "sha256-Cdg3uyZC55ajUlghHkqoGGN/kZnjuHVxIEvo2LDua1Q=";
|
||||
rev = "c281274af377459710de24eb44672bb9a37d10b1";
|
||||
hash = "sha256-K2dlQHBKDNh5ndGvbRr35AMG/g1Bvmsumr9uBuRxHZ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shotman";
|
||||
version = "0.4.7";
|
||||
version = "0.4.10";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~whynothugo";
|
||||
repo = "shotman";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kf/qloCaptxPzPEgd8fkzTfgqsI/PC3KJfHpBQWadjQ=";
|
||||
hash = "sha256-j9HNqRJnGiy720uS0zC6Tt1WjF4b6+XqPEMTqTEOD6w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZL0dKvCX/cvMzJi05qPULlwWuUcXH/bY84sDH67UFHg=";
|
||||
cargoHash = "sha256-+PpNf79yz5e5Mr6HAqE9Wg/0S8JO4rWrMT7JtQYAWPs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "skim";
|
||||
version = "0.20.2";
|
||||
version = "0.20.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "skim-rs";
|
||||
repo = "skim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fEd6t+adYI1jpRapZ/XHpxVWtX0nwUl9ZurIwywSFgk=";
|
||||
hash = "sha256-DyrndFT4gPLLdBtvS/QI0UDMtKKeK8oX2K2h4/6xvb0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-oRcqaXWa/eh5QQtTk0NQr90aL/Q0zgxQbPIoMLMtHe8=";
|
||||
cargoHash = "sha256-BcWszU7S0imGlXgQ5e1L9yLfXzYzseK0z2BnqIqKkzg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -88,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cp src/squid $out/bin
|
||||
cp src/unlinkd $out/libexec
|
||||
cp src/mime.conf.default $out/etc/mime.conf
|
||||
cp src/log/file/log_file_daemon $out/libexec
|
||||
cp -r icons $out/share
|
||||
cp -r errors $out/share
|
||||
runHook postInstall
|
||||
|
||||
+8
-6
@@ -2,19 +2,19 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
|
||||
installShellFiles,
|
||||
scdoc,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tuigreet";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apognu";
|
||||
repo = "tuigreet";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-w6ZOqpwogKoN4oqqI1gFqY8xAnfvhEBVaL8/6JXpKXs=";
|
||||
@@ -29,13 +29,15 @@ rustPlatform.buildRustPackage rec {
|
||||
installManPage tuigreet.1
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Graphical console greeter for greetd";
|
||||
homepage = "https://github.com/apognu/tuigreet";
|
||||
changelog = "https://github.com/apognu/tuigreet/releases/tag/${version}";
|
||||
changelog = "https://github.com/apognu/tuigreet/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "tuigreet";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -6,6 +6,7 @@
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
versionCheckHook,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wayland-bongocat";
|
||||
@@ -45,6 +46,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
# Package information
|
||||
meta = {
|
||||
description = "Delightful Wayland overlay that displays an animated bongo cat reacting to keyboard input";
|
||||
|
||||
+11
-8
@@ -6,16 +6,17 @@
|
||||
gcc-unwrapped,
|
||||
wayland,
|
||||
libxkbcommon,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wlgreet";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~kennylevinsen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
repo = "wlgreet";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-TQTHFBOTxtSuzrAG4cjZ9oirl80xc0rPdYeLJ0t39DQ=";
|
||||
};
|
||||
|
||||
@@ -30,12 +31,14 @@ rustPlatform.buildRustPackage rec {
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Raw wayland greeter for greetd, to be run under sway or similar";
|
||||
mainProgram = "wlgreet";
|
||||
homepage = "https://git.sr.ht/~kennylevinsen/wlgreet";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -99,7 +99,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.197.5";
|
||||
version = "0.197.6";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IbyM7iM9ErzVSb07NgTpgRI2VH1y+DJeKKiFYLyOqpk=";
|
||||
hash = "sha256-+QynG2YvAxl3v6Rb89+wv4wSSrBKYKeYfmoQ6pGLa4w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-ECtVsZiOEYsax8Zp4EFqbtCo/w6FfjJCnPWJ7YnmQ0U=";
|
||||
cargoHash = "sha256-O5HUOVtaxUdanh83JjauUskMnEv+y7BWY6S7T4WbgyE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -52,6 +52,10 @@ let
|
||||
hash = "sha256-mZWP9yF1O4knCiXx8CqolnS+93bM+hTQy40cd0HZmwI=";
|
||||
};
|
||||
commit_date = "2023-01-05";
|
||||
patches = [
|
||||
# Changes to the GNAT frontend: https://github.com/AdaCore/spark2014/issues/58
|
||||
./0003-Adjust-after-category-change-for-N_Formal_Package_De.patch
|
||||
];
|
||||
};
|
||||
"14" = {
|
||||
src = fetchSpark2014 {
|
||||
|
||||
@@ -245,11 +245,9 @@ in
|
||||
"13" = [
|
||||
(fetchpatch {
|
||||
name = "gcc-13-darwin-aarch64-support.patch";
|
||||
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/bda0faddfbfb392e7b9c9101056b2c5ab2500508/gcc/gcc-13.3.0.diff";
|
||||
sha256 = "sha256-RBTCBXIveGwuQGJLzMW/UexpUZdDgdXprp/G2NHkmQo=";
|
||||
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/698885df7f624d0ce15bceb79a4d9760a473b502/gcc/gcc-13.4.0.diff";
|
||||
hash = "sha256-xqkBDFYZ6fdowtqR3kV7bR8a4Cu11RDokSzGn1k3a1w=";
|
||||
})
|
||||
# Needed to build LLVM>18
|
||||
./cfi_startproc-reorder-label-2.diff
|
||||
];
|
||||
# Patches from https://github.com/iains/gcc-12-branch/compare/2bada4bc59bed4be34fab463bdb3c3ebfd2b41bb..gcc-12-4-darwin
|
||||
"12" = [
|
||||
|
||||
@@ -2,7 +2,7 @@ let
|
||||
majorMinorToVersionMap = {
|
||||
"15" = "15.1.0";
|
||||
"14" = "14.3.0";
|
||||
"13" = "13.3.0";
|
||||
"13" = "13.4.0";
|
||||
"12" = "12.4.0";
|
||||
"11" = "11.5.0";
|
||||
"10" = "10.5.0";
|
||||
@@ -19,7 +19,7 @@ let
|
||||
# 4 digits: snapshots (14.2.1.20250322)
|
||||
"15.1.0" = "sha256-4rCewhZg8B/s/7cV4BICZSFpQ/A40OSKmGhxPlTwbOo=";
|
||||
"14.3.0" = "sha256-4Nx3KXYlYxrI5Q+pL//v6Jmk63AlktpcMu8E4ik6yjo=";
|
||||
"13.3.0" = "sha256-CEXpYhyVQ6E/SE6UWEpJ/8ASmXDpkUYkI1/B0GGgwIM=";
|
||||
"13.4.0" = "sha256-nEzm27BAVo/cVFWIrAPFy8lajb8MeqSQFwhDr7WcqPU=";
|
||||
"12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU=";
|
||||
"11.5.0" = "sha256-puIYaOrVRc+H8MAfhCduS1KB1nIJhZHByJYkHwk2NHg=";
|
||||
"10.5.0" = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E=";
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
args@{
|
||||
callPackage,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
# Type aliases
|
||||
# Release = {
|
||||
# version: String
|
||||
# hash: String
|
||||
# supportedGpuTargets: List String
|
||||
# }
|
||||
|
||||
let
|
||||
inherit (lib) lists strings trivial;
|
||||
|
||||
computeName = version: "magma_${strings.replaceStrings [ "." ] [ "_" ] version}";
|
||||
|
||||
# buildMagmaPackage :: Release -> Derivation
|
||||
buildMagmaPackage =
|
||||
magmaRelease:
|
||||
callPackage ./generic.nix (
|
||||
(builtins.removeAttrs args [ "callPackage" ])
|
||||
// {
|
||||
inherit magmaRelease;
|
||||
}
|
||||
);
|
||||
|
||||
# Reverse the list to have the latest release first
|
||||
# magmaReleases :: List Release
|
||||
magmaReleases = lists.reverseList (builtins.import ./releases.nix);
|
||||
|
||||
# The latest release is the first element of the list and will be our default choice
|
||||
# latestReleaseName :: String
|
||||
latestReleaseName = computeName (builtins.head magmaReleases).version;
|
||||
|
||||
# Function to transform our releases into build attributes
|
||||
# toBuildAttrs :: Release -> { name: String, value: Derivation }
|
||||
toBuildAttrs = release: {
|
||||
name = computeName release.version;
|
||||
value = buildMagmaPackage release;
|
||||
};
|
||||
|
||||
# Add all supported builds as attributes
|
||||
# allBuilds :: AttrSet String Derivation
|
||||
allBuilds = builtins.listToAttrs (lists.map toBuildAttrs magmaReleases);
|
||||
|
||||
# The latest release will be our default build
|
||||
# defaultBuild :: AttrSet String Derivation
|
||||
defaultBuild.magma = allBuilds.${latestReleaseName};
|
||||
|
||||
# builds :: AttrSet String Derivation
|
||||
builds = allBuilds // defaultBuild;
|
||||
in
|
||||
|
||||
builds
|
||||
@@ -1,38 +0,0 @@
|
||||
# NOTE: Order matters! Put the oldest version first, and the newest version last.
|
||||
# NOTE: Make sure the supportedGpuTargets are in order of oldest to newest.
|
||||
# You can update the supportedGpuTargets by looking at the CMakeLists.txt file.
|
||||
# HIP is here: https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L290
|
||||
# CUDA works around magma's wrappers and uses FindCUDAToolkit directly
|
||||
[
|
||||
{
|
||||
version = "2.9.0";
|
||||
hash = "sha256-/3f9Nyaz3+w7+1V5CwZICqXMOEOWwts1xW/a5KgsZBw=";
|
||||
supportedGpuTargets = [
|
||||
"700"
|
||||
"701"
|
||||
"702"
|
||||
"703"
|
||||
"704"
|
||||
"705"
|
||||
"801"
|
||||
"802"
|
||||
"803"
|
||||
"805"
|
||||
"810"
|
||||
"900"
|
||||
"902"
|
||||
"904"
|
||||
"906"
|
||||
"908"
|
||||
"909"
|
||||
"90c"
|
||||
"1010"
|
||||
"1011"
|
||||
"1012"
|
||||
"1030"
|
||||
"1031"
|
||||
"1032"
|
||||
"1033"
|
||||
];
|
||||
}
|
||||
]
|
||||
@@ -47,12 +47,12 @@ buildDunePackage rec {
|
||||
nativeBuildInputs = [ cppo ];
|
||||
buildInputs = [
|
||||
findlib
|
||||
ppxlib
|
||||
];
|
||||
propagatedBuildInputs =
|
||||
lib.optional (lib.versionOlder version "5.2") ocaml-migrate-parsetree
|
||||
++ [
|
||||
ppx_derivers
|
||||
ppxlib
|
||||
]
|
||||
++ lib.optional (lib.versionOlder version "6.0") result;
|
||||
|
||||
|
||||
-1334
File diff suppressed because it is too large
Load Diff
@@ -75,21 +75,24 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "tokenizers";
|
||||
version = "0.21.3";
|
||||
version = "0.21.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = "tokenizers";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8z1jgH0Nj7D+joN42AA2ORNSLvcfWiYHn4dpTq1HWB0=";
|
||||
hash = "sha256-HJUycrNDpy2FOYi6aZ76orLewZCuLC1MoJ57peYJqvI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-0olujhOOO/BAH4JvnmXd1kE7T/sp5Vr3Z3P2X2jhZKs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/bindings/python";
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sgt-puzzles";
|
||||
version = "20250722.dbe6378";
|
||||
version = "20250730.a7c7826";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
|
||||
hash = "sha256-ayNBRAAIForVZgHQJ1fr3m1aZ3bG9YNQxHTeO0YcwTA=";
|
||||
hash = "sha256-oGk0HOXqXNxEVWixS6rptEF0bZYIkJeJzYhL3TSVhic=";
|
||||
};
|
||||
|
||||
sgt-puzzles-menu = fetchurl {
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
kernelModuleMakeFlags,
|
||||
elfutils,
|
||||
python3,
|
||||
perl,
|
||||
newt,
|
||||
slang,
|
||||
asciidoc,
|
||||
@@ -137,7 +136,6 @@ stdenv.mkDerivation {
|
||||
openssl
|
||||
numactl
|
||||
python3
|
||||
perl
|
||||
babeltrace
|
||||
]
|
||||
++ (
|
||||
@@ -177,7 +175,7 @@ stdenv.mkDerivation {
|
||||
doCheck = false; # requires "sparse"
|
||||
|
||||
installTargets = [
|
||||
"install"
|
||||
"install-tools" # don't install tests, as those depend on perl
|
||||
"install-man"
|
||||
];
|
||||
|
||||
|
||||
@@ -159,12 +159,12 @@ rec {
|
||||
# Last one without the bug reported here:
|
||||
# https://bbs.archlinux.org/viewtopic.php?pid=2155426#p2155426
|
||||
legacy_535 = generic {
|
||||
version = "535.216.01";
|
||||
sha256_64bit = "sha256-Xd6hFHgQAS4zlnwxgTQbzWYkvT1lTGP4Rd+DO07Oavc=";
|
||||
sha256_aarch64 = "sha256-SGmuA0W1iSsqUK7VZsgibT4HgT0RkKpGb+ul6eIbM7k=";
|
||||
openSha256 = "sha256-ey96oMbY32ahcHSOj1+MykvJrep6mhHPVl+V8+B2ZDk=";
|
||||
settingsSha256 = "sha256-9PgaYJbP1s7hmKCYmkuLQ58nkTruhFdHAs4W84KQVME=";
|
||||
persistencedSha256 = "sha256-ckF/BgDA6xSFqFk07rn3HqXuR0iGfwA4PRxpP38QZgw=";
|
||||
version = "535.261.03";
|
||||
sha256_64bit = "sha256-10th0R6cm5BS9AQtbsRDfxPR3vMOlk4jLUfl1lnRHWg=";
|
||||
sha256_aarch64 = "sha256-mkEtOsAcmdLKAhAKcTlZf86IBMUr9TPRG2BDcoaDSpM=";
|
||||
openSha256 = "sha256-qUn0Kk9t6TZA6ZmUSPzqclOsU6n4Tp4dXkgGa1ZF+OA=";
|
||||
settingsSha256 = "sha256-E05oCGuMdE3KhVrDl2ZQspaPqPHoVSwdaftoPKItYTE";
|
||||
persistencedSha256 = "sha256-pnOq9+6l3BbIEKHboGeTwEcEcYhtESzmroUfCahqn0U=";
|
||||
};
|
||||
|
||||
# Last one supporting Kepler architecture
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
{
|
||||
"asterisk_18": {
|
||||
"sha256": "745689c84d63ae94dfa0b3d4bdde3c6907b72472018532f757d9c0d169705964",
|
||||
"version": "18.26.2"
|
||||
"sha256": "0df8be2f57779019895628363a11f74ea356068cca983462ec0feb72528fc8e9",
|
||||
"version": "18.26.3"
|
||||
},
|
||||
"asterisk_20": {
|
||||
"sha256": "7c45cf254c7442748fa14ba4e31ae8f09cd2ad958168577de091c0bf0b0a2d2e",
|
||||
"version": "20.15.0"
|
||||
"sha256": "fa286ac7a024e685233af6fde54a68a21c8e9934b438da878fb3cff080a6346c",
|
||||
"version": "20.15.1"
|
||||
},
|
||||
"asterisk_21": {
|
||||
"sha256": "16051efbcc6fb95c0408f0ecc9dcf2d78a9346323f5d1fcd9723faedcb0f3fd8",
|
||||
"version": "21.10.0"
|
||||
"sha256": "811c5b8c501004ee378e77efd009892b366a03a508cfc51eead52396cbf65b2c",
|
||||
"version": "21.10.1"
|
||||
},
|
||||
"asterisk_22": {
|
||||
"sha256": "944967288ec01587feeef42869a97baa37ab635bea7d539df16f70d3af48c613",
|
||||
"version": "22.5.0"
|
||||
"sha256": "cbe67229f813ccf5e545fbda1fc05eb221897bf03393917390f8f6235cc62179",
|
||||
"version": "22.5.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
description = "RDF database";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://jena.apache.org";
|
||||
downloadPage = "https://archive.apache.org/dist/jena/binaries/";
|
||||
};
|
||||
|
||||
@@ -383,8 +383,6 @@ with pkgs;
|
||||
|
||||
inherit (gridlock) nyarr;
|
||||
|
||||
inspec = callPackage ../tools/misc/inspec { };
|
||||
|
||||
lshw-gui = lshw.override { withGUI = true; };
|
||||
|
||||
kdePackages = callPackage ../kde { };
|
||||
@@ -2996,8 +2994,6 @@ with pkgs;
|
||||
gitlabEnterprise = true;
|
||||
};
|
||||
|
||||
gitlab-triage = callPackage ../applications/version-management/gitlab-triage { };
|
||||
|
||||
gitlab-workhorse = callPackage ../by-name/gi/gitlab/gitlab-workhorse { };
|
||||
|
||||
glogg = libsForQt5.callPackage ../tools/text/glogg { };
|
||||
@@ -11958,20 +11954,6 @@ with pkgs;
|
||||
};
|
||||
gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs;
|
||||
|
||||
greetd = recurseIntoAttrs (
|
||||
{
|
||||
greetd = callPackage ../applications/display-managers/greetd { };
|
||||
gtkgreet = callPackage ../applications/display-managers/greetd/gtkgreet.nix { };
|
||||
qtgreet = callPackage ../applications/display-managers/greetd/qtgreet.nix { };
|
||||
regreet = callPackage ../applications/display-managers/greetd/regreet.nix { };
|
||||
tuigreet = callPackage ../applications/display-managers/greetd/tuigreet.nix { };
|
||||
wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { };
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
dlm = throw "greetd.dlm has been removed as it is broken and abandoned upstream"; # Added 2024-07-15
|
||||
}
|
||||
);
|
||||
|
||||
goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
|
||||
goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { };
|
||||
|
||||
@@ -15059,8 +15041,6 @@ with pkgs;
|
||||
# standard BLAS and LAPACK.
|
||||
openblasCompat = openblas.override { blas64 = false; };
|
||||
|
||||
inherit (callPackage ../development/libraries/science/math/magma { }) magma;
|
||||
|
||||
magma-cuda = magma.override {
|
||||
cudaSupport = true;
|
||||
rocmSupport = false;
|
||||
|
||||
Reference in New Issue
Block a user