Merge master into staging-nixos
This commit is contained in:
@@ -30891,6 +30891,11 @@
|
||||
githubId = 106241330;
|
||||
name = "Success Kingsley";
|
||||
};
|
||||
xqtc161 = {
|
||||
github = "xqtc161";
|
||||
githubId = 65857432;
|
||||
name = "tila";
|
||||
};
|
||||
xrelkd = {
|
||||
github = "xrelkd";
|
||||
githubId = 46590321;
|
||||
|
||||
@@ -8,6 +8,7 @@ let
|
||||
inherit (builtins) isList;
|
||||
inherit (lib)
|
||||
concatMapStrings
|
||||
escapeShellArg
|
||||
literalExpression
|
||||
maintainers
|
||||
mapAttrs'
|
||||
@@ -34,7 +35,7 @@ let
|
||||
else if isBool value then
|
||||
boolToString value
|
||||
else
|
||||
toString value;
|
||||
escapeShellArg (toString value);
|
||||
in
|
||||
{
|
||||
options.programs.bat = {
|
||||
|
||||
@@ -30,9 +30,8 @@ let
|
||||
|
||||
dnsmasqResolve = config.services.dnsmasq.enable && config.services.dnsmasq.resolveLocalQueries;
|
||||
|
||||
transformSettings =
|
||||
settings:
|
||||
lib.mapAttrs (
|
||||
transformSettings = settings: {
|
||||
Resolve = lib.mapAttrs (
|
||||
key: value:
|
||||
# concat lists for options that should result in space-separated values
|
||||
if
|
||||
@@ -46,7 +45,8 @@ let
|
||||
concatStringsSep " " value
|
||||
else
|
||||
value
|
||||
) settings;
|
||||
) settings.Resolve;
|
||||
};
|
||||
|
||||
resolvedConf = settingsToSections (transformSettings cfg.settings);
|
||||
in
|
||||
|
||||
@@ -1319,11 +1319,11 @@
|
||||
"vendorHash": "sha256-QvtirfTfnvy7CBNUng07OZnbXLHJAyRlf1I9Mur44N4="
|
||||
},
|
||||
"tencentcloudstack_tencentcloud": {
|
||||
"hash": "sha256-1UBML3E5ZnOcsdGZlZ5qkaqQsE1+Q9Uw9R8FeWJXFSw=",
|
||||
"hash": "sha256-mIiTAFVWNoD2JkVJNYUbrhOPNwCY/ocbTnoGbFROggo=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.83.10",
|
||||
"rev": "v1.83.13",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
librusty_v8 ? callPackage ./librusty_v8.nix {
|
||||
inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;
|
||||
},
|
||||
livekit-libwebrtc,
|
||||
lld,
|
||||
makeBinaryWrapper,
|
||||
nix-update-script,
|
||||
@@ -26,18 +25,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.144.4";
|
||||
version = "0.145.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-NmYZxjNFPkRWN4rw+eeka10pJt6/oU3ZoLXBxj3dPRU=";
|
||||
hash = "sha256-/r4mBoJhHB1v5NTA4Hk565/D5B0deYJf9xJW330hyf0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-S4dsZXfmKvJItL2XYKyxfhqdCMATEG6oPjrtVRwkuYc=";
|
||||
cargoHash = "sha256-t9IMRK9R+Z67ThEcgBI0HQU0E4aJHcOjKp22RFclh9U=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -57,12 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# webrtc-sys asks rustc to link libwebrtc statically by default,
|
||||
# but nixpkgs provides libwebrtc as a shared library.
|
||||
# use LK_CUSTOM_WEBRTC to point to the packaged library and adjust linking
|
||||
# to use the shared library instead
|
||||
substituteInPlace $cargoDepsCopy/*/webrtc-sys-*/build.rs \
|
||||
--replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc"
|
||||
substituteInPlace Cargo.toml \
|
||||
--replace-fail 'lto = "thin"' "" \
|
||||
--replace-fail 'codegen-units = 4' ""
|
||||
@@ -91,7 +84,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# character-conversion warning-as-error disabled.
|
||||
env = {
|
||||
LIBCLANG_PATH = "${lib.getLib libclang}/lib";
|
||||
LK_CUSTOM_WEBRTC = lib.getDev livekit-libwebrtc;
|
||||
NIX_CFLAGS_COMPILE = toString (
|
||||
lib.optionals stdenv.cc.isGNU [
|
||||
"-Wno-error=stringop-overflow"
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "egctl";
|
||||
version = "1.8.2";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "envoyproxy";
|
||||
repo = "gateway";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-givYesuucfw/gumEwxpU/NTtyfZQgmGXg7u+xg9Yx0s=";
|
||||
hash = "sha256-dhAzFpo+pnttcVBVTbOK7sOEeXaIkdPF058Zt8M2JHU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5Hlycq0+/wvboP81MKlKBFLEgxa545eyXwPtueHONNE=";
|
||||
vendorHash = "sha256-rAShQLNGffK/l8H6b004HfC/Jt3I4ReVlb2YV9yMrwQ=";
|
||||
# Fix case-insensitive conflicts producing platform-dependent checksums
|
||||
# https://github.com/microsoft/go-mssqldb/issues/234
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -4,21 +4,22 @@
|
||||
buildGoModule,
|
||||
testers,
|
||||
gitea-actions-runner,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitea-actions-runner";
|
||||
version = "1.0.3";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "gitea.com";
|
||||
owner = "gitea";
|
||||
repo = "runner";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-p6NdkQiZiEeuQjJp3CKTayStZlyk3d1XGigSI5uuLp0=";
|
||||
hash = "sha256-jkK61OZgbMDHD5yxrpyP1BWCVzDiR79dVaC5ItS99BU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T1T5ZpGqGmipIkTWlYxlsLdAthW8bhcAvr0xyZ74+wQ=";
|
||||
vendorHash = "sha256-5K0vL0CDYgL/Ud7i4um3mz887Er4qmuhCd9dt5zyUHA=";
|
||||
|
||||
# Tests require network access (artifactcache tests try to determine outbound IP)
|
||||
doCheck = false;
|
||||
@@ -33,9 +34,12 @@ buildGoModule (finalAttrs: {
|
||||
mv "$out/bin/runner" "$out/bin/gitea-runner"
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = gitea-actions-runner;
|
||||
version = "v${finalAttrs.version}";
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = gitea-actions-runner;
|
||||
version = "v${finalAttrs.version}";
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,39 +1,61 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
libtool,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
gettext,
|
||||
libtool,
|
||||
libgphoto2,
|
||||
fuse,
|
||||
fuse3,
|
||||
glib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gphoto2fs";
|
||||
version = "0.5.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gphoto/gphotofs/${finalAttrs.version}/gphotofs-0.5.tar.bz2";
|
||||
hash = "sha256-Z27E3mmoHBk//DG9x7WHrCosw3gLFPDnycTApRezQ8w=";
|
||||
version = "1.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gphoto";
|
||||
repo = "gphotofs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3DdL4FQzLEzvREhoZYfZlzZvyow/EATN/Q0HtOmdWKA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
gettext
|
||||
libtool
|
||||
glib
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgphoto2
|
||||
fuse
|
||||
fuse3
|
||||
glib
|
||||
libtool
|
||||
];
|
||||
|
||||
# gphotofs_init() still declares the FUSE 2 callback signature, which GCC 14 rejects
|
||||
env = lib.optionalAttrs stdenv.cc.isGNU {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
};
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/gphotofs --help > /dev/null
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Fuse FS to mount a digital camera";
|
||||
mainProgram = "gphotofs";
|
||||
homepage = "http://www.gphoto.org/";
|
||||
changelog = "https://github.com/gphoto/gphotofs/releases/tag/${finalAttrs.src.tag}";
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = with lib.licenses; [
|
||||
lgpl2
|
||||
gpl2
|
||||
];
|
||||
license = lib.licenses.gpl2Only;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,142 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
ags,
|
||||
astal,
|
||||
awww,
|
||||
bluez,
|
||||
bluez-tools,
|
||||
brightnessctl,
|
||||
btop,
|
||||
dart-sass,
|
||||
fetchFromGitHub,
|
||||
glib,
|
||||
glib-networking,
|
||||
gnome-bluetooth,
|
||||
gpu-screen-recorder,
|
||||
gpustat,
|
||||
grimblast,
|
||||
gtksourceview3,
|
||||
gvfs,
|
||||
hyprpicker,
|
||||
libgtop,
|
||||
libnotify,
|
||||
libsoup_3,
|
||||
matugen,
|
||||
networkmanager,
|
||||
nix-update-script,
|
||||
python3,
|
||||
pywal16,
|
||||
stdenv,
|
||||
upower,
|
||||
wireplumber,
|
||||
wl-clipboard,
|
||||
writeShellScript,
|
||||
writeShellScriptBin,
|
||||
|
||||
enableCuda ? config.cudaSupport,
|
||||
}:
|
||||
|
||||
let
|
||||
# TODO: Remove once hyprpanel updates to use `awww`
|
||||
swww-compat = writeShellScriptBin "swww" ''
|
||||
exec awww "$@"
|
||||
'';
|
||||
swww-daemon-compat = writeShellScriptBin "swww-daemon" ''
|
||||
exec awww-daemon "$@"
|
||||
'';
|
||||
in
|
||||
|
||||
ags.bundle {
|
||||
pname = "hyprpanel";
|
||||
version = "0-unstable-2026-04-23";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jas-SinghFSU";
|
||||
repo = "HyprPanel";
|
||||
rev = "1961ba86ad5ab880beb639e5454054b2b5037e0d";
|
||||
hash = "sha256-QowlCOrE4jGOTDCUCEx/E8gHjqSx3r25y7v4dEBpBhk=";
|
||||
};
|
||||
|
||||
# keep in sync with https://github.com/Jas-SinghFSU/HyprPanel/blob/master/flake.nix#L42
|
||||
dependencies = [
|
||||
astal.apps
|
||||
astal.battery
|
||||
astal.bluetooth
|
||||
astal.cava
|
||||
astal.hyprland
|
||||
astal.mpris
|
||||
astal.network
|
||||
astal.notifd
|
||||
astal.powerprofiles
|
||||
astal.tray
|
||||
astal.wireplumber
|
||||
|
||||
awww
|
||||
bluez
|
||||
bluez-tools
|
||||
brightnessctl
|
||||
btop
|
||||
dart-sass
|
||||
glib
|
||||
gnome-bluetooth
|
||||
grimblast
|
||||
gtksourceview3
|
||||
gvfs
|
||||
hyprpicker
|
||||
libgtop
|
||||
libnotify
|
||||
libsoup_3
|
||||
matugen
|
||||
networkmanager
|
||||
pywal16
|
||||
swww-compat
|
||||
swww-daemon-compat
|
||||
upower
|
||||
wireplumber
|
||||
wl-clipboard
|
||||
(python3.withPackages (
|
||||
ps:
|
||||
with ps;
|
||||
[
|
||||
dbus-python
|
||||
pygobject3
|
||||
]
|
||||
++ lib.optional enableCuda gpustat
|
||||
))
|
||||
]
|
||||
++ (lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ gpu-screen-recorder ]);
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
postFixup =
|
||||
let
|
||||
script = writeShellScript "hyprpanel" ''
|
||||
export GIO_EXTRA_MODULES='${glib-networking}/lib/gio/modules'
|
||||
if [ "$#" -eq 0 ]; then
|
||||
exec @out@/bin/.hyprpanel
|
||||
else
|
||||
exec ${astal.io}/bin/astal -i hyprpanel "$*"
|
||||
fi
|
||||
'';
|
||||
in
|
||||
# bash
|
||||
''
|
||||
mv "$out/bin/hyprpanel" "$out/bin/.hyprpanel"
|
||||
cp '${script}' "$out/bin/hyprpanel"
|
||||
substituteInPlace "$out/bin/hyprpanel" \
|
||||
--replace-fail '@out@' "$out"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Bar/Panel for Hyprland with extensive customizability";
|
||||
homepage = "https://github.com/Jas-SinghFSU/HyprPanel";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ PerchunPak ];
|
||||
mainProgram = "hyprpanel";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmwaw";
|
||||
version = "0.3.22";
|
||||
version = "0.3.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libmwaw/libmwaw/libmwaw-${finalAttrs.version}/libmwaw-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-oaOf/Oo/8qenquDCOHfd9JGLVUv4Kw3l186Of2HqjjI=";
|
||||
sha256 = "sha256-rDWQ9pGikE64x9yLdXuKKfEl9ZJEnkIUWa6PqSizmes=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lightningcss";
|
||||
version = "1.32.0";
|
||||
version = "1.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "parcel-bundler";
|
||||
repo = "lightningcss";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JqAzBPYbJq52exCpVTdhd90BQGsbfMOx68PD1xUripg=";
|
||||
hash = "sha256-twodhkzM/h4ijZFeB2tQAOAV131r1ggLr3tcXUUGHFo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zndBkOJ/U6lLaOJn273TabMAPbz96hQeWs4cPKFDGro=";
|
||||
cargoHash = "sha256-Jz6kpaan1HNJKhG7Jb5f5mfZoYNDwQhemTuVCf5Cn0Q=";
|
||||
|
||||
patches = [
|
||||
# Backport fix for build error for lightningcss-napi
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "markdown-code-runner";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drupol";
|
||||
repo = "markdown-code-runner";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-GcPMkwXwLyHoVljOpfnhmysDYIFXSyvNL5P3f6q/KJw=";
|
||||
hash = "sha256-xToBnuWjjh1Zle6lcWdYWO9iDhSJh1cbOOEr9p0n1vU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ul5cl6FDYkW02HGtQmLHkOsSaTIn2lCaTpKjCUzdcjM=";
|
||||
cargoHash = "sha256-tGEXJMlrxIBCzWVgOfcDNHq2Zli0mJVaOMdmwP9GhCk=";
|
||||
|
||||
dontUseCargoParallelTests = true;
|
||||
|
||||
|
||||
@@ -12,19 +12,32 @@
|
||||
lib.warn "tkremind is deprecated and should be removed; use withGui instead." tkremind
|
||||
else
|
||||
true,
|
||||
writeText,
|
||||
}:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "remind";
|
||||
version = "06.02.07";
|
||||
version = "06.02.08";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.skoll.ca";
|
||||
owner = "Skollsoft-Public";
|
||||
repo = "Remind";
|
||||
rev = version;
|
||||
hash = "sha256-5Cg7UdftyzjQg7pdewc7z8SfA3jtXQdPboXs9V/vDDo=";
|
||||
};
|
||||
src =
|
||||
let
|
||||
domain = "git.skoll.ca";
|
||||
netrc = writeText "netrc" ''
|
||||
machine ${domain}
|
||||
login notabot
|
||||
password notabot
|
||||
'';
|
||||
in
|
||||
fetchFromGitea {
|
||||
inherit domain;
|
||||
owner = "Skollsoft-Public";
|
||||
repo = "Remind";
|
||||
rev = version;
|
||||
hash = "sha256-+5ms52n5W2fmW7YhloB67vI0gF4+q8i1CyciSvY5lg0=";
|
||||
netrcPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
cp ${netrc} netrc
|
||||
'';
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals withGui [
|
||||
tclPackages.tcllib
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tenki";
|
||||
version = "1.11.0";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ckaznable";
|
||||
repo = "tenki";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-jd7D0iC3+s3w6uG0WqlvL9F4xQL+cQzsUvAIOc7ORgw=";
|
||||
hash = "sha256-kvGlysdm7vw5yvcH7MZCk0Gm9bEfpqf0wF4QJUvU48E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jV+KHHAPpsFxNnBaMPE5XYDG4Fhn3a89NBUpZg++YUE=";
|
||||
cargoHash = "sha256-e8ZFQ2CUgkHOGn5yH6/P/s4aI0wlFzvJRgzHQUDuw4Y=";
|
||||
|
||||
meta = {
|
||||
description = "tty-clock with weather effect";
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
zig_0_16,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
let
|
||||
zig = zig_0_16;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ziglint";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rockorager";
|
||||
repo = "ziglint";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kLcUIFMDJHuCA0rn3l5a3h/E6TUwNWA5mWRADCDB1cw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace build.zig \
|
||||
--replace-fail "getVersion(b)" '"${finalAttrs.version}"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ zig.hook ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rockorager/ziglint";
|
||||
description = "Linter for Zig source code";
|
||||
changelog = "https://github.com/rockorager/ziglint/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ xqtc161 ];
|
||||
mainProgram = "ziglint";
|
||||
inherit (zig.meta) platforms;
|
||||
};
|
||||
})
|
||||
@@ -27,8 +27,6 @@ lib.makeScope pkgs.newScope (
|
||||
# for git-head builds
|
||||
gnome-common = callPackage ./platform/gnome-common { };
|
||||
|
||||
gnome_mime_data = callPackage ./platform/gnome-mime-data { };
|
||||
|
||||
gtkglext = callPackage ./platform/gtkglext { };
|
||||
|
||||
#### DESKTOP
|
||||
@@ -64,6 +62,7 @@ lib.makeScope pkgs.newScope (
|
||||
gnomeicontheme = throw "gnome2.gnomeicontheme has been removed, please use top-level gnome-icon-theme";
|
||||
gnome_common = throw "gnome2.gnome_common has been removed, please use top-level gnome-common";
|
||||
|
||||
gnome_mime_data = throw "gnome2.gnome_mime_data has been removed as it was unused in Nixpkgs"; # 2026-07-23
|
||||
gnome_python = throw "gnome2.gnome_python has been removed"; # 2023-01-14
|
||||
gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14
|
||||
gnome_vfs = throw "gnome2.gnome_vfs has been removed"; # 2024-06-27
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
intltool,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-mime-data";
|
||||
version = "2.18.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-mime-data/${lib.versions.majorMinor version}/gnome-mime-data-${version}.tar.bz2";
|
||||
sha256 = "1mvg8glb2a40yilmyabmb7fkbzlqd3i3d31kbkabqnq86xdnn69p";
|
||||
};
|
||||
nativeBuildInputs = [ intltool ];
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
args@{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
@@ -56,12 +56,21 @@
|
||||
pytest-mock,
|
||||
pytest-timeout,
|
||||
pytest-vcr,
|
||||
pytestCheckHook,
|
||||
pytest_9_0,
|
||||
pytest9_0CheckHook,
|
||||
requests-mock,
|
||||
xlrd,
|
||||
yattag,
|
||||
}:
|
||||
|
||||
let
|
||||
# With pytest 9.1 fails: AssertionError: assert not self._finalizers
|
||||
pytestCheckHook = pytest9_0CheckHook;
|
||||
pytest-lazy-fixtures = args.pytest-lazy-fixtures.override {
|
||||
pytest = pytest_9_0;
|
||||
pytestCheckHook = pytest9_0CheckHook;
|
||||
};
|
||||
in
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "frictionless";
|
||||
version = "5.19.0";
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "starsessions";
|
||||
version = ".2.2.0";
|
||||
version = "2.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alex-oleshkevich";
|
||||
repo = "starsessions";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CR8eMyYyr+iFf2l1QE0N762LdkxemOayn/s++mBZRqA=";
|
||||
hash = "sha256-JI044sn6LQI37PvSLdz2dooa3v5qdHmp6DZD0p7VzJU=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -25,14 +25,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "urllib3-future";
|
||||
version = "2.22.901";
|
||||
version = "2.23.900";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jawah";
|
||||
repo = "urllib3.future";
|
||||
tag = version;
|
||||
hash = "sha256-SP6C6xF9McRbmCAfARKrFVSxKRkNZvs7fLdcR9pIEyM=";
|
||||
hash = "sha256-niT+olKVEOohM7WDS1nSC3ssg5uK7BmqOTi9YxVXPg0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "JeffSteinbok";
|
||||
domain = "dreo";
|
||||
version = "1.10.5";
|
||||
version = "1.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = "hass-dreo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Lt6c93rWdmzxVKyB+7IIuOq8fW5ZcLtlfhILfWxRy3c=";
|
||||
hash = "sha256-vfp5b5g9Rin0zN/eGhFNdxc77ulVKA8QnQNV70BvIy8=";
|
||||
};
|
||||
|
||||
dependencies = [ websockets ];
|
||||
|
||||
+3
-3
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "material-you-utilities";
|
||||
version = "2.1.19";
|
||||
version = "2.1.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nerwyn";
|
||||
repo = "material-you-utilities";
|
||||
tag = version;
|
||||
hash = "sha256-9eOn5E4lYzhfZSl7dmb3UNEkgU+hv7UFfmh6r6IX13M=";
|
||||
hash = "sha256-viSavtA0eTiPdCgt00whBLvIL5RZSsC1zpJ0tQmGBRg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-6WGpuiMDzlx0Pm6C9mPtCVXHDDp4JWk3jMu6XNetiYE=";
|
||||
npmDepsHash = "sha256-c/ZM2sMG3M4/cTdClu6I3Pnx2GJ/1jFgJVmCKrbiIsI=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -1055,6 +1055,7 @@ mapAliases {
|
||||
hydra_unstable = throw "'hydra_unstable' has been renamed to/replaced by 'hydra'"; # Converted to throw 2025-10-27
|
||||
hydraAntLogger = warnAlias "'hydraAntLogger' has been renamed to 'hydra-ant-logger'" hydra-ant-logger; # Added 2026-02-08
|
||||
hyprfreeze = warnAlias "'hyprfreeze' has been renamed to 'wl-freeze'" wl-freeze; # Added 2026-04-10
|
||||
hyprpanel = throw "'hyprpanel' has been archived, consider using 'wayle' instead"; # Added 2026-07-21
|
||||
i3-gaps = throw "'i3-gaps' has been renamed to/replaced by 'i3'"; # Converted to throw 2025-10-27
|
||||
i3lock-pixeled = throw "'i3lock-pixeled' has been unmaintained for several years now."; # Converted to throw 2026-01-24
|
||||
ibm-sw-tpm2 = throw "ibm-sw-tpm2 has been removed, as it was broken"; # Added 2025-08-25
|
||||
|
||||
Reference in New Issue
Block a user