Merge master into staging-nixos
This commit is contained in:
@@ -81,8 +81,6 @@ let
|
||||
};
|
||||
};
|
||||
settings.formatter.yamlfmt.excludes = [
|
||||
# Breaks helm templating
|
||||
"nixos/tests/k3s/k3s-test-chart/templates/*"
|
||||
# Aligns comments with whitespace
|
||||
"pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml"
|
||||
# TODO: Fix formatting for auto-generated file
|
||||
|
||||
@@ -483,6 +483,7 @@
|
||||
"wrmilling": 6162814
|
||||
},
|
||||
"members": {
|
||||
"azey7f": 41077433,
|
||||
"frederictobiasc": 26125115,
|
||||
"heywoodlh": 18178614,
|
||||
"rorosen": 76747196
|
||||
|
||||
@@ -290,4 +290,8 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
felixsinger
|
||||
];
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ in
|
||||
If you want to use knot-resolver 5, please use services.kresd.
|
||||
'';
|
||||
};
|
||||
package = lib.mkPackageOption pkgs "knot-resolver_6" {
|
||||
package = lib.mkPackageOption pkgs "knot-resolver-manager_6.knot-resolver" {
|
||||
example = "knot-resolver_6.override { extraFeatures = true; }";
|
||||
};
|
||||
managerPackage = lib.mkPackageOption pkgs "knot-resolver-manager_6" { };
|
||||
|
||||
@@ -109,6 +109,7 @@ in
|
||||
|
||||
# Default services
|
||||
services.blueman.enable = mkDefault (notExcluded pkgs.blueman);
|
||||
services.hardware.bolt.enable = mkDefault (notExcluded pkgs.bolt);
|
||||
hardware.bluetooth.enable = mkDefault true;
|
||||
security.polkit.enable = true;
|
||||
services.accounts-daemon.enable = true;
|
||||
@@ -173,6 +174,7 @@ in
|
||||
cinnamon-translations
|
||||
|
||||
# utils needed by some scripts
|
||||
inxi
|
||||
killall
|
||||
|
||||
# session requirements
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
|
||||
with subtest("Open virtual keyboard"):
|
||||
machine.succeed("${su "dbus-send --print-reply --dest=org.Cinnamon /org/Cinnamon org.Cinnamon.ToggleKeyboard"}")
|
||||
machine.wait_for_text('(Ctrl|Alt)')
|
||||
machine.wait_for_text('(Esc|123)')
|
||||
machine.sleep(2)
|
||||
machine.screenshot("cinnamon_virtual_keyboard")
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "sourcegraph";
|
||||
name = "amp";
|
||||
version = "0.0.1764950983";
|
||||
hash = "sha256-ydP5axyMbTt+h/cSuwOsFDj3Lm3sGtEi/ZKQELXzrpo=";
|
||||
version = "0.0.1765541481";
|
||||
hash = "sha256-LE4IsnLa5fI5hdhrrMzqhdomvDa6gMpTPtQ+xkGSyWo=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "fbneo";
|
||||
version = "0-unstable-2025-12-05";
|
||||
version = "0-unstable-2025-12-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fbneo";
|
||||
rev = "db02ef59a64209954b47965ae186ec95cf1da706";
|
||||
hash = "sha256-lbtc/3lu+wm19rRt+gT3tHrDaqfZYVXsiHN5Pvm5iM8=";
|
||||
rev = "a4a563a372b201d8cbac94fb9c50694f6f7137e9";
|
||||
hash = "sha256-KQJiwCnaLILy5fgIraTCI0y7eBL14nZnbHa0m8YHq6g=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame";
|
||||
version = "0-unstable-2025-11-30";
|
||||
version = "0-unstable-2025-12-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame";
|
||||
rev = "872488e6f457edd449bc3eb7554ed1198abcaad8";
|
||||
hash = "sha256-K0+uHdd85F5QBPhbV5U438TwVKwNk1NHHBTt5r45EgI=";
|
||||
rev = "31ea3529faead1fac8d712013290f910fe9863c2";
|
||||
hash = "sha256-VoUaixFM26EM7xRI+TYD+f6qTR/yRYcg8XwDst69axE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -813,7 +813,7 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "143.0.7499.40",
|
||||
"version": "143.0.7499.109",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "e2bb3cd55899346cc68bbfd5139e59c9d85a6984",
|
||||
@@ -825,16 +825,16 @@
|
||||
"hash": "sha256-kIPhfuJBQSISdRjloe0N2JrqvuVrEkNijb92/9zSE9I="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "143.0.7499.40-1",
|
||||
"hash": "sha256-x5Hd9adDj2hb33oiqrUXsXFR+Aza7fE8+m95P6JjKnA="
|
||||
"rev": "143.0.7499.109-1",
|
||||
"hash": "sha256-IiIQqo6U0yqBxamrlQ56FSViQ0mPUoM1yGZkVAur8is="
|
||||
},
|
||||
"npmHash": "sha256-HF6B4abJJJ9JDVbovtAdaHIvqE1zHJZ2a+g2Cudx8Pw="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "c23ff452476d1b6322d73b9b629420ef119d0388",
|
||||
"hash": "sha256-ujiHFq8I6yENksWhBJ/BYMd5eDdlThfZxMfvDZH9sUo=",
|
||||
"rev": "71a0dbd6672e2ccb6d1008376cbb7acd315cb8d6",
|
||||
"hash": "sha256-K7HzC+M7WIMsyB4Wuy04WvGAX+QsTN5daOhkox1wxnA=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -904,8 +904,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "9b75aecb1fa769e357d1dad2614228b6a04ddee6",
|
||||
"hash": "sha256-d375qLKzOX3fap5ZjbhPzU/8hWAB9GeT6IWrw3Vedsc="
|
||||
"rev": "2dfb5b7603d09c1d06f9d7a894752431d98b9a3e",
|
||||
"hash": "sha256-3F2K3UO3BHC0mJGUgc/q5AuxwL32O98PloF1cwyZLqU="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -1069,8 +1069,8 @@
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "4190a105897e986349694cae685b51054bf2dc51",
|
||||
"hash": "sha256-K+bg3OPmv7tN/elOtmlDXwyhC6FxrAEEAY/MqMkQbrU="
|
||||
"rev": "e4dd1d1d96b706a33ae7d60237d3cdcd58294e4c",
|
||||
"hash": "sha256-6to/NYTcx7H5OXF1u6YT55uCHwf8RU1uJaSXvuFsQ/c="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
@@ -1589,8 +1589,8 @@
|
||||
},
|
||||
"src/third_party/webrtc": {
|
||||
"url": "https://webrtc.googlesource.com/src.git",
|
||||
"rev": "a5751574a386ba0ba80b8c62201977f6aab6c225",
|
||||
"hash": "sha256-amrKVRN2QsjeDbxkKu0yjAs06U094MHj4ccSJHoVgPE="
|
||||
"rev": "1788a81407183acc98163a4e1507c5c63fb175cc",
|
||||
"hash": "sha256-7FIcH5MG7kNHmN2FE00Qyd1NlfYzb1xKmVDX7MCNyXQ="
|
||||
},
|
||||
"src/third_party/wuffs/src": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -100,8 +100,8 @@ rec {
|
||||
thunderbird-140 = common {
|
||||
applicationName = "Thunderbird ESR";
|
||||
|
||||
version = "140.5.0esr";
|
||||
sha512 = "ce0d0ab4715831656e6c841d75a69109db6d64b4151ab69ecc954f1d3a045abf64e641e0fa46113cc7f3149bfe237687d4c11de1c14d013ce76e55679cadb1c5";
|
||||
version = "140.6.0esr";
|
||||
sha512 = "817a807381fa0b5e5e2c3f961931855788649ed596b1c6773ec5b0d6715e90df137ab0f755408a9137b5573169c2e2040bf6a01c4ecdb9a8b010e6c43dbb6381";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-140";
|
||||
|
||||
@@ -61,13 +61,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "audacity";
|
||||
version = "3.7.6";
|
||||
version = "3.7.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "audacity";
|
||||
repo = "audacity";
|
||||
rev = "Audacity-${finalAttrs.version}";
|
||||
hash = "sha256-Y59bKs0l97HJWiCHYBkzbbHJsmraUkM2qRGfKSXjT80=";
|
||||
hash = "sha256-UyQffN9vOSD3uDk4jpYGsjH577pU4V7FpFAu0xdsXUA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -12,19 +12,15 @@
|
||||
libxml2,
|
||||
colord,
|
||||
polkit,
|
||||
libxkbfile,
|
||||
cinnamon-menus,
|
||||
libgnomekbd,
|
||||
libxklavier,
|
||||
networkmanager,
|
||||
libgudev,
|
||||
libwacom,
|
||||
wrapGAppsHook3,
|
||||
glibc,
|
||||
libnma,
|
||||
libXi,
|
||||
modemmanager,
|
||||
xorg,
|
||||
gdk-pixbuf,
|
||||
xorgproto,
|
||||
meson,
|
||||
ninja,
|
||||
cinnamon-translations,
|
||||
@@ -34,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-control-center";
|
||||
version = "6.4.2";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-control-center";
|
||||
tag = version;
|
||||
hash = "sha256-nw70sbiz3+dp40WP957hOVo/mQOg2MJknZNN5Kw/Q/0=";
|
||||
hash = "sha256-TjTwtTFbiC4A4qe9TIyZJtGrSymujhEgM8SpZQ92RZA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -50,19 +46,15 @@ stdenv.mkDerivation rec {
|
||||
cinnamon-desktop
|
||||
libnotify
|
||||
cinnamon-menus
|
||||
libxml2
|
||||
polkit
|
||||
libgnomekbd
|
||||
libxklavier
|
||||
colord
|
||||
libgudev
|
||||
libwacom
|
||||
networkmanager
|
||||
libnma
|
||||
libXi
|
||||
modemmanager
|
||||
xorg.libXxf86misc
|
||||
xorg.libxkbfile
|
||||
gdk-pixbuf
|
||||
xorgproto
|
||||
upower
|
||||
];
|
||||
|
||||
@@ -76,6 +68,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
libxml2 # xmllint
|
||||
pkg-config
|
||||
meson
|
||||
ninja
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-desktop";
|
||||
version = "6.4.2";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-desktop";
|
||||
tag = version;
|
||||
hash = "sha256-kNxVdPtCQtz4TSyCc6uKHmAGWm2nlWnLwC3Cm0E42Jc=";
|
||||
hash = "sha256-9qgt+E5qbzq+x9fJKkoSBFgA96HBDLysQvg6b04WbMU=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-menus";
|
||||
version = "6.4.0";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-menus";
|
||||
tag = version;
|
||||
hash = "sha256-ug1RSP2TBrypi0aGhF05k39koY3rGgJi0LuWyuuICd0=";
|
||||
hash = "sha256-vjgWPFNmRkJWynimvBuxCxLK5C7tQxqJ5Y4dkZXSDSA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
python3,
|
||||
pam,
|
||||
cairo,
|
||||
xapp,
|
||||
xdotool,
|
||||
xorg,
|
||||
iso-flags-png-320x240,
|
||||
@@ -29,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-screensaver";
|
||||
version = "6.4.1";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-screensaver";
|
||||
tag = version;
|
||||
hash = "sha256-CK4WP5IafNII81e8HxUNN3Vp36Ln78Xvv5lIMvL+nbk=";
|
||||
hash = "sha256-Jo9GRsiPvqGZ2ITaewV5H4VMc5EotTTXIaqzXwDA+Z4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -75,7 +74,6 @@ stdenv.mkDerivation rec {
|
||||
pycairo
|
||||
]
|
||||
))
|
||||
xapp
|
||||
xdotool
|
||||
pam
|
||||
cairo
|
||||
|
||||
@@ -33,13 +33,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-session";
|
||||
version = "6.4.2";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-session";
|
||||
tag = version;
|
||||
hash = "sha256-zv1X1MLZBg+Bayd4hjsmrdXkFTRkH4kz7PJe6mFTBqc=";
|
||||
hash = "sha256-16bBehc8NuPd9vr/J7Y5MoVsqOBQWzh63pzQZ96O0vs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -8,16 +8,13 @@
|
||||
gtk3,
|
||||
lcms2,
|
||||
libcanberra-gtk3,
|
||||
libgnomekbd,
|
||||
libnotify,
|
||||
libxklavier,
|
||||
wrapGAppsHook3,
|
||||
pkg-config,
|
||||
lib,
|
||||
stdenv,
|
||||
systemd,
|
||||
upower,
|
||||
dconf,
|
||||
cups,
|
||||
polkit,
|
||||
librsvg,
|
||||
@@ -33,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-settings-daemon";
|
||||
version = "6.4.3";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-settings-daemon";
|
||||
tag = version;
|
||||
hash = "sha256-L7+OgymYoYBdprw66RW8tiGA7XGWjTBpDpXhli8Fjoo=";
|
||||
hash = "sha256-Ho7L4BqLJ0Vz9+ZijZ8ZhQr1NJmGVf8JWtUpplx1JF0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -54,12 +51,9 @@ stdenv.mkDerivation rec {
|
||||
gsettings-desktop-schemas
|
||||
lcms2
|
||||
libcanberra-gtk3
|
||||
libgnomekbd
|
||||
libnotify
|
||||
libxklavier
|
||||
systemd
|
||||
upower
|
||||
dconf
|
||||
cups
|
||||
polkit
|
||||
librsvg
|
||||
@@ -67,7 +61,6 @@ stdenv.mkDerivation rec {
|
||||
xorg.libXext
|
||||
xorg.libX11
|
||||
xorg.libXi
|
||||
xorg.libXfixes
|
||||
fontconfig
|
||||
nss
|
||||
libgudev
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-translations";
|
||||
version = "6.4.2";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-translations";
|
||||
tag = version;
|
||||
hash = "sha256-By09Y4iHZz3XR7tRd5MyXK5BKOr01yJzTTLQHEZ00q0=";
|
||||
hash = "sha256-+aqMXice5INNkqLmPc4hawlrc2jRnsGimDPZf28dUSE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,9 +17,9 @@ index 3c1e9a4f..a77d9b3c 100644
|
||||
schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
|
||||
-pkglibdir = join_paths(libdir, meson.project_name().to_lower())
|
||||
+pkglibdir = libdir
|
||||
servicedir = join_paths(datadir, 'dbus-1', 'services')
|
||||
pkgdatadir = join_paths(datadir, meson.project_name().to_lower())
|
||||
po_dir = join_paths(meson.source_root(), 'po')
|
||||
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
cjs,
|
||||
evolution-data-server,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
gcr,
|
||||
gdk-pixbuf,
|
||||
gettext,
|
||||
@@ -19,7 +18,7 @@
|
||||
gobject-introspection,
|
||||
gsound,
|
||||
gtk3,
|
||||
intltool,
|
||||
ibus,
|
||||
json-glib,
|
||||
libsecret,
|
||||
libstartup_notification,
|
||||
@@ -35,7 +34,6 @@
|
||||
wrapGAppsHook3,
|
||||
libxml2,
|
||||
gtk-doc,
|
||||
caribou,
|
||||
python3,
|
||||
keybinder3,
|
||||
cairo,
|
||||
@@ -46,6 +44,7 @@
|
||||
accountsservice,
|
||||
gnome-online-accounts,
|
||||
glib-networking,
|
||||
graphene,
|
||||
pciutils,
|
||||
timezonemap,
|
||||
libnma,
|
||||
@@ -58,7 +57,6 @@
|
||||
let
|
||||
pythonEnv = python3.withPackages (
|
||||
pp: with pp; [
|
||||
dbus-python
|
||||
setproctitle
|
||||
pygobject3
|
||||
pycairo
|
||||
@@ -76,29 +74,18 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon";
|
||||
version = "6.4.13";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon";
|
||||
tag = version;
|
||||
hash = "sha256-XGG5Qf6Kx1gvZITuuZWn1ggY4FNW/aEuBLbpWyxE2V8=";
|
||||
hash = "sha256-DiAc1Ng03xzNYYpf79g9p338syPScKftmviNw6Y5i5o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./use-sane-install-dir.patch
|
||||
./libdir.patch
|
||||
|
||||
# js: Use DesktopAppInfo form GioUnix, not Gio
|
||||
# https://github.com/linuxmint/cinnamon/pull/13091
|
||||
(fetchpatch {
|
||||
url = "https://github.com/linuxmint/cinnamon/commit/fa3aef20533af4499fb1161011e62e048bbdc396.patch";
|
||||
hash = "sha256-qhgBniaUE/8q9BQ+EXcY7BF6eMJg+wC7EYgktwAMbwM=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/linuxmint/cinnamon/commit/330b9ff19f33ec1e94e36048ca46011404f796b4.patch";
|
||||
hash = "sha256-YEQG6C4tx2T3wMfCLZXPFynAzEeIE1eVoadWVENZDFc=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -113,8 +100,10 @@ stdenv.mkDerivation rec {
|
||||
gcr
|
||||
gdk-pixbuf
|
||||
glib
|
||||
graphene
|
||||
gsound
|
||||
gtk3
|
||||
ibus
|
||||
json-glib
|
||||
libsecret
|
||||
libstartup_notification
|
||||
@@ -131,7 +120,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# bindings
|
||||
cairo
|
||||
caribou
|
||||
keybinder3
|
||||
upower
|
||||
xapp
|
||||
@@ -151,7 +139,6 @@ stdenv.mkDerivation rec {
|
||||
meson
|
||||
ninja
|
||||
wrapGAppsHook3
|
||||
intltool
|
||||
gtk-doc
|
||||
perl
|
||||
python3.pkgs.libsass # for pysassc
|
||||
@@ -177,7 +164,6 @@ stdenv.mkDerivation rec {
|
||||
--replace-fail 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \
|
||||
--replace-fail "msgfmt" "${gettext}/bin/msgfmt"
|
||||
substituteInPlace ./modules/cs_info.py --replace-fail "lspci" "${pciutils}/bin/lspci"
|
||||
substituteInPlace ./modules/cs_keyboard.py --replace-fail "/usr/bin/cinnamon-dbus-command" "$out/bin/cinnamon-dbus-command"
|
||||
substituteInPlace ./modules/cs_themes.py --replace-fail "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d"
|
||||
substituteInPlace ./modules/cs_user.py --replace-fail "/usr/bin/passwd" "/run/wrappers/bin/passwd"
|
||||
popd
|
||||
@@ -189,7 +175,7 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} \
|
||||
--replace-fail "exec cinnamon-session" "exec ${cinnamon-session}/bin/cinnamon-session"
|
||||
|
||||
patchShebangs src/data-to-c.pl data/theme/parse-sass.sh
|
||||
patchShebangs src/data-to-c.pl
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
@@ -198,11 +184,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
# https://github.com/NixOS/nixpkgs/issues/101881
|
||||
gappsWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : "${caribou}/share"
|
||||
)
|
||||
|
||||
buildPythonPath "$out ${python3.pkgs.python-xapp}"
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/200397
|
||||
|
||||
@@ -17,18 +17,15 @@
|
||||
libxml2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cjs";
|
||||
version = "128.0-unstable-2025-09-15";
|
||||
version = "128.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cjs";
|
||||
# Backport fixes to support GLib 2.86.0 typelibs
|
||||
# nixpkgs-update: no auto update
|
||||
# https://github.com/linuxmint/cjs/issues/130
|
||||
rev = "1f39576bafe6bc05bce960e590dc743dd7990e39";
|
||||
hash = "sha256-drKLaTZLIZfPIhcVcCAB48PdM2b0GNLe5xrHGBysVmM=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YJwzFKEOnwBTJUPagXk1PCYmQqVqr7Zu7aVaJCPgirU=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -88,4 +85,4 @@ stdenv.mkDerivation {
|
||||
platforms = lib.platforms.linux;
|
||||
teams = [ lib.teams.cinnamon ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.65",
|
||||
"version": "2.0.67",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.65",
|
||||
"version": "2.0.67",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.0.65";
|
||||
version = "2.0.67";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-LcHY7pdnRdeEwtb1Fi/GW6D5Rv3StiKsoXQc3CPDmQw=";
|
||||
hash = "sha256-a1i8N6LZYA3XJx7AqDDOoyO5pf+t9WZ6vBQVZkUbpxM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-dJwYMrDILhtE5q06eQL2hfrKn3MuUzgm7FXgyw6+nI8=";
|
||||
npmDepsHash = "sha256-DNdRkN/rpCsN8fnZbz18r2KRUTl5HCur+GyrofH+T/Y=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-reader";
|
||||
version = "0-unstable-2025-12-05";
|
||||
version = "0-unstable-2025-12-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-reader";
|
||||
rev = "7a1f667b6c543d6322a02c9f872ffc053cfd2e3d";
|
||||
hash = "sha256-S4F09tb1O0xdAY/6pDPS2yBTVaGdptzclHT3w/kyfE0=";
|
||||
rev = "4bbbe6ad4346fddbb4b8dccef03f2b96d238c102";
|
||||
hash = "sha256-LsnoLpIw1QETB7SK2N4tOrH82MSiDT7WGufE6eCybTU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4ofAtZN3FpYwNahinldALbdEJA5lDwa+CUsVIISnSTc=";
|
||||
|
||||
@@ -79,6 +79,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
];
|
||||
|
||||
# Fix compatibility with Qt 6.10.1 - should be fixed in next release
|
||||
postPatch = ''
|
||||
substituteInPlace src/utils/starrating.cpp \
|
||||
--replace-fail '.arg(alignment);' '.arg(alignment.toInt());'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Customisable music player";
|
||||
homepage = "https://www.fooyin.org/";
|
||||
|
||||
@@ -20,14 +20,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "incus-ui-canonical";
|
||||
version = "0.18.3";
|
||||
version = "0.18.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zabbly";
|
||||
repo = "incus-ui-canonical";
|
||||
# only use tags prefixed by incus- they are the tested fork versions
|
||||
tag = "incus-${version}";
|
||||
hash = "sha256-0wKGPH+ffJ/S8FA46ve5SzyNZJ9C2fv8Psiqu8p6D0s=";
|
||||
hash = "sha256-IzXmW5MZZgHXnTGs85TQYvLETsamBxuBAgBUST4Q5m0=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
||||
@@ -81,6 +81,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
earldouglas
|
||||
felixsinger
|
||||
];
|
||||
changelog = "https://www.jenkins.io/changelog-stable/#v${finalAttrs.version}";
|
||||
mainProgram = "jenkins-cli";
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
testers,
|
||||
nodejs,
|
||||
node-gyp,
|
||||
gnutar,
|
||||
inter,
|
||||
python3,
|
||||
srcOnly,
|
||||
@@ -18,21 +19,25 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "karakeep";
|
||||
version = "0.27.0";
|
||||
version = "0.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "karakeep-app";
|
||||
repo = "karakeep";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KkRCMS/g+xCQyVh1qB/kf5Seqrn2McYBaUHqKOeigCA=";
|
||||
hash = "sha256-mOIX9pNVESRPD2Jjdr014NyYO/3rSvYpr4RP34RKE8c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./patches/use-local-font.patch
|
||||
./patches/dont-lock-pnpm-version.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${inter}/share/fonts/truetype ./apps/web/app/fonts
|
||||
|
||||
substituteInPlace apps/cli/src/commands/dump.ts \
|
||||
--replace-fail 'spawn("tar"' 'spawn("${lib.getExe gnutar}"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -41,6 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
node-gyp
|
||||
pnpm.configHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gnutar
|
||||
];
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version;
|
||||
|
||||
@@ -54,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-74jLff9v2+qc09b8ArooUX6qpFt2tDNW3ZayHPcDVj0=";
|
||||
hash = "sha256-rFMLmqPEvP6Vn7VNmE2tGsnv9YPMaL1aktwTsnjv5+M=";
|
||||
};
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
@@ -139,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
package = finalAttrs.finalPackage;
|
||||
# remove hardcoded version if upstream syncs general version with cli
|
||||
# version
|
||||
version = "0.25.0";
|
||||
version = "0.27.1";
|
||||
};
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
{
|
||||
knot-resolver_6,
|
||||
writeText,
|
||||
python3Packages,
|
||||
extraFeatures ? false,
|
||||
}:
|
||||
|
||||
let
|
||||
knot-resolver = knot-resolver_6.override { inherit extraFeatures; };
|
||||
in
|
||||
python3Packages.buildPythonPackage {
|
||||
pname = "knot-resolver-manager_6";
|
||||
inherit (knot-resolver_6) version src;
|
||||
inherit (knot-resolver) version;
|
||||
inherit (knot-resolver.unwrapped) src;
|
||||
pyproject = true;
|
||||
|
||||
patches = [
|
||||
@@ -19,8 +22,9 @@ python3Packages.buildPythonPackage {
|
||||
# Propagate meson config from the C part to the python part.
|
||||
# But the install-time etc differs from a sensible run-time etc.
|
||||
postPatch = ''
|
||||
substitute '${knot-resolver_6.config_py}'/knot_resolver/constants.py ./python/knot_resolver/constants.py \
|
||||
--replace-fail '${knot-resolver_6.out}/etc' '/etc'
|
||||
substitute '${knot-resolver.unwrapped.config_py}'/knot_resolver/constants.py ./python/knot_resolver/constants.py \
|
||||
--replace-fail '${knot-resolver.unwrapped.out}/etc' '/etc' \
|
||||
--replace-fail '${knot-resolver.unwrapped.out}/sbin' '${knot-resolver}/bin'
|
||||
'';
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@@ -38,9 +42,8 @@ python3Packages.buildPythonPackage {
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
doCheck = false; # FIXME
|
||||
checkInputs = with python3Packages; [
|
||||
python3Packages.augeas
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
augeas
|
||||
dnspython
|
||||
lief
|
||||
pytestCheckHook
|
||||
@@ -50,7 +53,29 @@ python3Packages.buildPythonPackage {
|
||||
toml
|
||||
];
|
||||
|
||||
meta = knot-resolver_6.meta // {
|
||||
preCheck = ''
|
||||
mkdir -p /tmp
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# FileNotFoundError: [Errno 2] No such file or directory: '/tmp/pytest-kresd-portdir/11076'
|
||||
"tests/pytests/test_conn_mgmt.py"
|
||||
"tests/pytests/test_edns.py"
|
||||
"tests/pytests/test_prefix.py"
|
||||
"tests/pytests/test_tls.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# FileNotFoundError: [Errno 2] No such file or directory: '/tmp/pytest-kresd-portdir/11076'
|
||||
"test_proxy_random_close"
|
||||
"test_proxy_rehandshake_tls12"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit knot-resolver;
|
||||
};
|
||||
|
||||
meta = knot-resolver.meta // {
|
||||
mainProgram = "knot-resolver";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -168,7 +168,7 @@ let
|
||||
];
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
inherit (unwrapped) meta;
|
||||
inherit (unwrapped) version meta;
|
||||
}
|
||||
(
|
||||
''
|
||||
|
||||
@@ -97,12 +97,10 @@ let
|
||||
++ [
|
||||
jemalloc
|
||||
nghttp2
|
||||
]
|
||||
++ [
|
||||
# dnstap support
|
||||
fstrm
|
||||
protobufc
|
||||
] # dnstap support
|
||||
;
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dkeyfile_default=${dns-root-data}/root.ds"
|
||||
@@ -138,6 +136,10 @@ let
|
||||
meson test --print-errorlogs --no-suite snowflake
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
unwrapped = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Caching validating DNS resolver, from .cz domain registry";
|
||||
homepage = "https://knot-resolver.cz";
|
||||
@@ -164,7 +166,10 @@ let
|
||||
];
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
inherit (unwrapped) meta;
|
||||
inherit (unwrapped) version meta;
|
||||
passthru = {
|
||||
inherit unwrapped;
|
||||
};
|
||||
}
|
||||
(
|
||||
''
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
replaceVars,
|
||||
cairo,
|
||||
cinnamon-desktop,
|
||||
@@ -44,7 +43,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "muffin";
|
||||
version = "6.4.1";
|
||||
version = "6.6.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -56,20 +55,13 @@ stdenv.mkDerivation rec {
|
||||
owner = "linuxmint";
|
||||
repo = "muffin";
|
||||
rev = version;
|
||||
hash = "sha256-cGC1yGft3uEqefm2DvZrMaROoZKYd6LNY0IJ+58f6vs=";
|
||||
hash = "sha256-yGbnqIKw+Ouk1onr2H+KckO/YQob1N1beLmfqQhOheU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(replaceVars ./fix-paths.patch {
|
||||
inherit zenity;
|
||||
})
|
||||
|
||||
# Fix Qt apps crashing on wayland
|
||||
# https://github.com/linuxmint/muffin/pull/739
|
||||
(fetchpatch {
|
||||
url = "https://github.com/linuxmint/muffin/commit/760e2a3046e13610c4fda1291a9a28e589d2bd93.patch";
|
||||
hash = "sha256-D0u8UxW5USzMW9KlP3Y4XCWxrQ1ySufDv+eCbrAP71c=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -119,7 +111,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
mesonFlags = [
|
||||
# Based on Mint's debian/rules.
|
||||
"-Degl_device=true"
|
||||
"-Dwayland_eglstream=true"
|
||||
"-Dxwayland_path=${lib.getExe xwayland}"
|
||||
];
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nemo-emblems";
|
||||
version = "6.4.0";
|
||||
version = "6.6.0";
|
||||
pyproject = true;
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "linuxmint";
|
||||
repo = "nemo-extensions";
|
||||
rev = version;
|
||||
hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
|
||||
hash = "sha256-tXeMkaCYnWzg+6ng8Tyg4Ms1aUeE3xiEkQ3tKEX6Vv8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/nemo-emblems";
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nemo-fileroller";
|
||||
version = "6.4.0";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "nemo-extensions";
|
||||
rev = version;
|
||||
hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
|
||||
hash = "sha256-tXeMkaCYnWzg+6ng8Tyg4Ms1aUeE3xiEkQ3tKEX6Vv8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/nemo-fileroller";
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nemo-preview";
|
||||
version = "6.4.0";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "nemo-extensions";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
|
||||
hash = "sha256-tXeMkaCYnWzg+6ng8Tyg4Ms1aUeE3xiEkQ3tKEX6Vv8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/nemo-preview";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nemo-python";
|
||||
version = "6.4.0";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "nemo-extensions";
|
||||
rev = version;
|
||||
hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
|
||||
hash = "sha256-tXeMkaCYnWzg+6ng8Tyg4Ms1aUeE3xiEkQ3tKEX6Vv8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/nemo-python";
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nemo-seahorse";
|
||||
version = "6.4.0";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "nemo-extensions";
|
||||
tag = version;
|
||||
hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
|
||||
hash = "sha256-tXeMkaCYnWzg+6ng8Tyg4Ms1aUeE3xiEkQ3tKEX6Vv8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/nemo-seahorse";
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
gvfs,
|
||||
cinnamon-desktop,
|
||||
xapp,
|
||||
xapp-symbolic-icons,
|
||||
libexif,
|
||||
json-glib,
|
||||
exempi,
|
||||
@@ -35,13 +36,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nemo";
|
||||
version = "6.4.5";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "nemo";
|
||||
rev = version;
|
||||
hash = "sha256-9JfCBC5YjfQadF7KzPgZ1yPkiSjmuEO1tfMU2BmJES8=";
|
||||
hash = "sha256-4YbWkS4J0iDkp+wnwyJg5TD/fhHsbutyh7q+yFLV9Mk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -93,9 +94,14 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
# Used for some non-fd.o icons (e.g. xapp-text-case-symbolic)
|
||||
gappsWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : "${xapp}/share"
|
||||
--prefix XDG_DATA_DIRS : ${
|
||||
lib.makeSearchPath "share" [
|
||||
# For non-fd.o icons.
|
||||
xapp
|
||||
xapp-symbolic-icons
|
||||
]
|
||||
}
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@@ -138,13 +138,13 @@ in
|
||||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ffovCXdL/Ooo2Gi/G/A5d+vIwa9LFnaiV1931x2vyG8=";
|
||||
hash = "sha256-DsAgosnvkyGFPKSjjnE9dZ37CfqAIlvodpVjHLihX2A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NM0vtue0MFrAJCjmpYJ/rPEDWBxWCzBrWDb0MVOhY+Q=";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "re-Isearch";
|
||||
version = "2.20220925.4.0a-unstable-2025-11-27";
|
||||
version = "2.20220925.4.0a-unstable-2025-12-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "re-Isearch";
|
||||
repo = "re-Isearch";
|
||||
rev = "e782ece4acc1f0011eaca16c099868839d903dc8";
|
||||
hash = "sha256-PZnRikX2G815tZAnyKaQXr7+yzazjakQEXjoVMTF55Q=";
|
||||
rev = "dfd0c39f62d83708b72ebc9332e7029c1d9be5b6";
|
||||
hash = "sha256-BGlpXOL5TBui+5OTaxLAsiRCIcp9Rg8J2IFtXn6EeoU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -48,7 +48,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Search $PATH for the shutdown binary instead of hard-coding /sbin/shutdown,
|
||||
# which isn't valid on NixOS (and a compatibility link on most other modern
|
||||
# distros anyway).
|
||||
./rtcwake-search-PATH-for-shutdown.patch
|
||||
# bits: only build when cpu_set_t is available
|
||||
# Otherwise, the build fails on macOS
|
||||
(fetchurl {
|
||||
name = "bits-only-build-when-cpu_set_t-is-available.patch";
|
||||
url = "https://lore.kernel.org/util-linux/20250501075806.88759-1-hi@alyssa.is/raw";
|
||||
|
||||
@@ -30,7 +30,6 @@ let
|
||||
python-xapp
|
||||
zeroconf
|
||||
grpcio
|
||||
setuptools
|
||||
cryptography
|
||||
pynacl
|
||||
netifaces
|
||||
@@ -43,13 +42,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "warpinator";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "warpinator";
|
||||
rev = version;
|
||||
hash = "sha256-R6ccyZLXwxvhvRCDguxufzXfVq5tzrPEtBbXgdO6AoI=";
|
||||
hash = "sha256-HfOxEVzMmZ7lqT6M3sT5FxynqKFQHHmzvHA4Wu4NPr8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,23 +11,27 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zerofs";
|
||||
version = "0.20.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Barre";
|
||||
repo = "ZeroFS";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8iPHIUESModoNFk8XEWjHZOGBOPxhOGM9gHaljWyqZg=";
|
||||
hash = "sha256-YdqZV8TdodSKP3h2Qa0+Xi7bfGKrtGq625Oco+UjIpU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/zerofs";
|
||||
|
||||
cargoHash = "sha256-JZerQne+jW6xjH13dQe3g1dD07BP3j+1DSF+a/SgGXc=";
|
||||
cargoHash = "sha256-rPa8XmApLClhJ2oAQxEoQL2Hd+8QlJAOZVw+kzS70KY=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ rust-jemalloc-sys ];
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "--cfg tokio_unstable";
|
||||
};
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
|
||||
let
|
||||
pname = "ex_doc";
|
||||
version = "0.39.2";
|
||||
version = "0.39.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "elixir-lang";
|
||||
repo = "${pname}";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-khQIYS7iHOODlLMwFYPJTVE0MNia/gwYcin9ITpwttY=";
|
||||
hash = "sha256-LLy4gemj3oiMbZKc9ZUWY3g2fyY1Rvxjtzx/sbAp8JE=";
|
||||
};
|
||||
in
|
||||
mixRelease {
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
qtsvg,
|
||||
hunspell,
|
||||
pkg-config,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
qtModule {
|
||||
@@ -16,4 +17,12 @@ qtModule {
|
||||
hunspell
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
patches = [
|
||||
# https://qt-project.atlassian.net/browse/QTBUG-137440
|
||||
(fetchpatch {
|
||||
name = "rb-link-core-into-styles.patch";
|
||||
url = "https://github.com/qt/qtvirtualkeyboard/commit/0b1e8be8dd874e1fbacd0c30ed5be7342f6cd44d.patch";
|
||||
hash = "sha256-Uk6EJOlkCRLUg1w3ljHaxV/dXEVWyUpP/ijoyjptbNc=";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
lib,
|
||||
buildDunePackage,
|
||||
dream,
|
||||
pure-html,
|
||||
@@ -8,7 +7,7 @@
|
||||
|
||||
buildDunePackage {
|
||||
pname = "dream-html";
|
||||
inherit (pure-html) src version;
|
||||
inherit (pure-html) src version meta;
|
||||
|
||||
buildInputs = [
|
||||
ppxlib
|
||||
@@ -18,11 +17,4 @@ buildDunePackage {
|
||||
pure-html
|
||||
dream
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Write HTML directly in your OCaml source files with editor support";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.naora ];
|
||||
broken = lib.versionAtLeast ppxlib.version "0.36";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,22 +5,26 @@
|
||||
uri,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "pure-html";
|
||||
version = "3.11.1";
|
||||
version = "3.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yawaramin";
|
||||
repo = "dream-html";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-L/q3nxUONPdZtzmfCfP8nnNCwQNSpeYI0hqowioGYNg=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/I233A86T+QEb2qbSHucgzRzYEjS08eKezSXOwz2ml0=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
propagatedBuildInputs = [ uri ];
|
||||
|
||||
meta = {
|
||||
description = "Write HTML directly in your OCaml source files with editor support";
|
||||
homepage = "https://github.com/yawaramin/dream-html";
|
||||
changelog = "https://raw.githubusercontent.com/yawaramin/dream-html/refs/tags/v${finalAttrs.version}/CHANGES.md";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.naora ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
pytest-asyncio,
|
||||
pytest-lazy-fixture,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pytz,
|
||||
redis,
|
||||
uvloop,
|
||||
@@ -29,16 +28,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiogram";
|
||||
version = "3.22.0";
|
||||
version = "3.23.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aiogram";
|
||||
repo = "aiogram";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4LZ4+bt9n0q8WMaMEaAAIFnEuDUSd+Aq+YW49Xbcp5c=";
|
||||
hash = "sha256-vk77HsZT/BwQHAWwgMpKJQSN6HUfIycl7GCFbZ5Fbr8=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
python,
|
||||
matplotlib,
|
||||
pytest,
|
||||
|
||||
buildStandalone ? true,
|
||||
}:
|
||||
toPythonModule (
|
||||
aligator.overrideAttrs (super: {
|
||||
@@ -19,7 +21,7 @@ toPythonModule (
|
||||
|
||||
cmakeFlags = super.cmakeFlags ++ [
|
||||
(lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" buildStandalone)
|
||||
];
|
||||
|
||||
# this is used by CMake at configure/build time
|
||||
@@ -27,11 +29,12 @@ toPythonModule (
|
||||
python
|
||||
];
|
||||
|
||||
propagatedBuildInputs = super.propagatedBuildInputs ++ [
|
||||
aligator
|
||||
propagatedBuildInputs = [
|
||||
crocoddyl
|
||||
pinocchio
|
||||
];
|
||||
]
|
||||
++ super.propagatedBuildInputs
|
||||
++ lib.optional buildStandalone aligator;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pythonImportsCheckHook
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
eigenpy,
|
||||
pylatexenc,
|
||||
numpy,
|
||||
|
||||
buildStandalone ? true,
|
||||
}:
|
||||
toPythonModule (
|
||||
coal.overrideAttrs (super: {
|
||||
@@ -17,7 +19,7 @@ toPythonModule (
|
||||
|
||||
cmakeFlags = super.cmakeFlags ++ [
|
||||
(lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" buildStandalone)
|
||||
];
|
||||
|
||||
# those are used by CMake at configure/build time
|
||||
@@ -26,11 +28,12 @@ toPythonModule (
|
||||
pylatexenc
|
||||
];
|
||||
|
||||
propagatedBuildInputs = super.propagatedBuildInputs ++ [
|
||||
propagatedBuildInputs = [
|
||||
boost
|
||||
coal
|
||||
eigenpy
|
||||
];
|
||||
]
|
||||
++ super.propagatedBuildInputs
|
||||
++ lib.optional buildStandalone coal;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pythonImportsCheckHook
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
ipykernel,
|
||||
python,
|
||||
scipy,
|
||||
|
||||
buildStandalone ? true,
|
||||
}:
|
||||
toPythonModule (
|
||||
crocoddyl.overrideAttrs (super: {
|
||||
@@ -21,7 +23,7 @@ toPythonModule (
|
||||
|
||||
cmakeFlags = super.cmakeFlags ++ [
|
||||
(lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" buildStandalone)
|
||||
];
|
||||
|
||||
# those are used by CMake at configure/build time
|
||||
@@ -29,10 +31,11 @@ toPythonModule (
|
||||
python
|
||||
];
|
||||
|
||||
propagatedBuildInputs = super.propagatedBuildInputs ++ [
|
||||
crocoddyl
|
||||
propagatedBuildInputs = [
|
||||
example-robot-data
|
||||
];
|
||||
]
|
||||
++ super.propagatedBuildInputs
|
||||
++ lib.optional buildStandalone crocoddyl;
|
||||
|
||||
nativeCheckInputs = [
|
||||
ffmpeg
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
|
||||
python,
|
||||
pinocchio,
|
||||
|
||||
buildStandalone ? true,
|
||||
}:
|
||||
toPythonModule (
|
||||
example-robot-data.overrideAttrs (super: {
|
||||
@@ -15,17 +17,18 @@ toPythonModule (
|
||||
|
||||
cmakeFlags = super.cmakeFlags ++ [
|
||||
(lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" buildStandalone)
|
||||
];
|
||||
|
||||
nativeBuildInputs = super.nativeBuildInputs ++ [
|
||||
python
|
||||
];
|
||||
|
||||
propagatedBuildInputs = super.propagatedBuildInputs ++ [
|
||||
example-robot-data
|
||||
propagatedBuildInputs = [
|
||||
pinocchio
|
||||
];
|
||||
]
|
||||
++ super.propagatedBuildInputs
|
||||
++ lib.optional buildStandalone example-robot-data;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pythonImportsCheckHook
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lacuscore";
|
||||
version = "1.20.1";
|
||||
version = "1.21.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ail-project";
|
||||
repo = "LacusCore";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-L7hmqNymXkZD/NQk1OQ9H34aJcCa6W23gkQSjomv7Iw=";
|
||||
hash = "sha256-q/JVvhI1NZTuX8vRWi/Q9ANE8ZTaTFNfb94n0NpH+/0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
|
||||
# nativeCheckInputs
|
||||
pytest,
|
||||
|
||||
buildStandalone ? true,
|
||||
}:
|
||||
toPythonModule (
|
||||
mim-solvers.overrideAttrs (super: {
|
||||
@@ -26,7 +28,7 @@ toPythonModule (
|
||||
|
||||
cmakeFlags = super.cmakeFlags ++ [
|
||||
(lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" buildStandalone)
|
||||
];
|
||||
|
||||
# this is used by CMake at configure/build time
|
||||
@@ -38,12 +40,12 @@ toPythonModule (
|
||||
boost
|
||||
crocoddyl
|
||||
eigenpy
|
||||
mim-solvers
|
||||
osqp
|
||||
proxsuite
|
||||
scipy
|
||||
]
|
||||
++ super.propagatedBuildInputs;
|
||||
++ super.propagatedBuildInputs
|
||||
++ lib.optional buildStandalone mim-solvers;
|
||||
|
||||
nativeCheckInputs = super.nativeCheckInputs ++ [
|
||||
pythonImportsCheckHook
|
||||
|
||||
@@ -9,13 +9,15 @@
|
||||
boost,
|
||||
pinocchio,
|
||||
python,
|
||||
|
||||
buildStandalone ? true,
|
||||
}:
|
||||
toPythonModule (
|
||||
ndcurves.overrideAttrs (super: {
|
||||
pname = "py-${super.pname}";
|
||||
cmakeFlags = super.cmakeFlags ++ [
|
||||
(lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" buildStandalone)
|
||||
];
|
||||
# those are used by CMake at configure/build time
|
||||
nativeBuildInputs = super.nativeBuildInputs ++ [
|
||||
@@ -24,12 +26,14 @@ toPythonModule (
|
||||
propagatedBuildInputs = [
|
||||
boost
|
||||
pinocchio
|
||||
ndcurves
|
||||
]
|
||||
++ super.propagatedBuildInputs;
|
||||
++ super.propagatedBuildInputs
|
||||
++ lib.optional buildStandalone ndcurves;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pythonImportsCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ndcurves"
|
||||
];
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
casadi,
|
||||
matplotlib,
|
||||
python,
|
||||
|
||||
buildStandalone ? true,
|
||||
}:
|
||||
toPythonModule (
|
||||
pinocchio.overrideAttrs (super: {
|
||||
@@ -17,18 +19,19 @@ toPythonModule (
|
||||
|
||||
cmakeFlags = super.cmakeFlags ++ [
|
||||
(lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" buildStandalone)
|
||||
];
|
||||
|
||||
nativeBuildInputs = super.nativeBuildInputs ++ [
|
||||
python
|
||||
];
|
||||
|
||||
propagatedBuildInputs = super.propagatedBuildInputs ++ [
|
||||
propagatedBuildInputs = [
|
||||
casadi
|
||||
coal
|
||||
pinocchio
|
||||
];
|
||||
]
|
||||
++ super.propagatedBuildInputs
|
||||
++ lib.optional buildStandalone pinocchio;
|
||||
|
||||
checkInputs = super.checkInputs ++ [
|
||||
matplotlib
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "playwrightcapture";
|
||||
version = "1.35.1";
|
||||
version = "1.36.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lookyloo";
|
||||
repo = "PlaywrightCapture";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-P2d2RY4A5Yxug1Rj5UmXBW5esEdk0M1wZyOBPKtJslA=";
|
||||
hash = "sha256-Iqk7VFhlmzjQPvm08HwYkopV9Q/TNwSVedGH5GiMdWE=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
|
||||
pinocchio,
|
||||
python,
|
||||
|
||||
buildStandalone ? true,
|
||||
}:
|
||||
toPythonModule (
|
||||
tsid.overrideAttrs (super: {
|
||||
@@ -15,7 +17,7 @@ toPythonModule (
|
||||
|
||||
cmakeFlags = super.cmakeFlags ++ [
|
||||
(lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
|
||||
(lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" buildStandalone)
|
||||
];
|
||||
|
||||
# those are used by CMake at configure/build time
|
||||
@@ -23,10 +25,11 @@ toPythonModule (
|
||||
python
|
||||
];
|
||||
|
||||
propagatedBuildInputs = super.propagatedBuildInputs ++ [
|
||||
propagatedBuildInputs = [
|
||||
pinocchio
|
||||
tsid
|
||||
];
|
||||
]
|
||||
++ super.propagatedBuildInputs
|
||||
++ lib.optional buildStandalone tsid;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pythonImportsCheckHook
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
pipewire,
|
||||
krunner,
|
||||
python3,
|
||||
fetchpatch,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "kwin";
|
||||
@@ -25,6 +26,12 @@ mkKdeDerivation {
|
||||
./0003-plugins-qpa-allow-using-nixos-wrapper.patch
|
||||
./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
|
||||
./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
|
||||
|
||||
# backport crash fix recommended by upstream
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/plasma/kwin/-/commit/ef4504320de2c3a7c7aebcf083d75db361f802ae.diff";
|
||||
hash = "sha256-aYUXlpnvtzWd5bJ3Y9NKDBqAg0x+4enaUTnyZiZCB48=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"serverVersion": "0.19.13",
|
||||
"uiVersion": "0.19.13",
|
||||
"serverHash": "sha256-EKZZsJ8B111z+5SC79arMQaPfhQBNX4uYXyRtU8yAJM=",
|
||||
"serverCargoHash": "sha256-sMPLxuG3leCVHqTK4MD5F3RxbO7u6om/vb0opquoa3I=",
|
||||
"uiHash": "sha256-SU/JS3LdSm4gEfwG9JXPH0WPzmT/8hiSEpuJdXpaywc=",
|
||||
"serverVersion": "0.19.14",
|
||||
"uiVersion": "0.19.14",
|
||||
"serverHash": "sha256-3Y9TnwnU1k+ITqiS8nbzAD36IlnlcDCTOshoMbFEH7Q=",
|
||||
"serverCargoHash": "sha256-R0jM7HL//yZKP3ZiaJLcZF84gWEsxl9xXyykO9vCdu8=",
|
||||
"uiHash": "sha256-eTvRSpZjmeC+CuC1LtRPO8OoGX/AVQr+O12+MilPWbw=",
|
||||
"uiPNPMDepsHash": "sha256-tuarUG1uKx6Q1O+rF6DHyK8MEseF9lKk34qtRWWScAg="
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user