Merge staging-next into staging
This commit is contained in:
@@ -2548,12 +2548,6 @@
|
||||
githubId = 6553158;
|
||||
name = "Joel Höner";
|
||||
};
|
||||
atila = {
|
||||
name = "Átila Saraiva";
|
||||
email = "atilasaraiva@gmail.com";
|
||||
github = "AtilaSaraiva";
|
||||
githubId = 29521461;
|
||||
};
|
||||
atkinschang = {
|
||||
email = "atkinschang+nixpkgs@gmail.com";
|
||||
github = "AtkinsChang";
|
||||
@@ -18750,12 +18744,6 @@
|
||||
githubId = 166791;
|
||||
name = "Neil Mayhew";
|
||||
};
|
||||
nek0 = {
|
||||
email = "nek0@nek0.eu";
|
||||
github = "nek0";
|
||||
githubId = 1859691;
|
||||
name = "Amedeo Molnár";
|
||||
};
|
||||
nekitdev = {
|
||||
email = "nekit@nekit.dev";
|
||||
github = "nekitdev";
|
||||
|
||||
@@ -841,6 +841,14 @@ in
|
||||
assert_lacks(out, "\nrestarting the following units:")
|
||||
assert_lacks(out, "\nstarting the following units:")
|
||||
assert_contains(out, "the following new units were started: test.mount\n")
|
||||
# we can start inactive mounts
|
||||
machine.succeed("systemctl stop test.mount")
|
||||
out = switch_to_specialisation("${machine}", "addedMount")
|
||||
assert_lacks(out, "stopping the following units:")
|
||||
assert_lacks(out, "NOT restarting the following changed units:")
|
||||
assert_lacks(out, "\nrestarting the following units:")
|
||||
assert_lacks(out, "\nstarting the following units:")
|
||||
assert_contains(out, "the following new units were started: local-fs.target, test.mount\n")
|
||||
# modify the mountpoint's options
|
||||
out = switch_to_specialisation("${machine}", "addedMountOptsModified")
|
||||
assert_lacks(out, "stopping the following units:")
|
||||
@@ -1444,6 +1452,15 @@ in
|
||||
switch_to_specialisation("${machine}", "mount")
|
||||
out = machine.succeed("mount | grep 'on /testmount'")
|
||||
assert_contains(out, "size=1024k")
|
||||
# We can start inactive mounts
|
||||
machine.succeed("systemctl stop testmount.mount")
|
||||
out = switch_to_specialisation("${machine}", "mount")
|
||||
assert_lacks(out, "stopping the following units:")
|
||||
assert_lacks(out, "NOT restarting the following changed units:")
|
||||
assert_lacks(out, "reloading the following units")
|
||||
assert_lacks(out, "restarting the following units:")
|
||||
assert_lacks(out, "starting the following units:")
|
||||
assert_contains(out, "the following new units were started: testmount.mount\n")
|
||||
# Changing options reloads the unit
|
||||
out = switch_to_specialisation("${machine}", "mountOptionsModified")
|
||||
assert_lacks(out, "stopping the following units:")
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.47";
|
||||
hash = "sha256-Hw9SOGaH/NyApySHHy0a8gqGQBNrVvt3nnxi6AerQVo=";
|
||||
version = "2.1.49";
|
||||
hash = "sha256-9WwA1TUM/h8kLoZV/ukh/4s3w9DnJ/cVAxypz4jlj6A=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -1967,8 +1967,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "gitlab-workflow";
|
||||
publisher = "gitlab";
|
||||
version = "6.69.3";
|
||||
hash = "sha256-u9f743vZar9FYWXam94wdF6wBZxp6/fikZM0rGXfces=";
|
||||
version = "6.71.0";
|
||||
hash = "sha256-jOD5VFF9g4BNdpm3ZoCi0LPkkBmLZ7vlXVVHgiCGac8=";
|
||||
};
|
||||
meta = {
|
||||
description = "GitLab extension for Visual Studio Code";
|
||||
|
||||
@@ -778,13 +778,13 @@
|
||||
"vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg="
|
||||
},
|
||||
"jianyuan_sentry": {
|
||||
"hash": "sha256-AH7Ef3G1C0jQX4Wprc8J9rP34u+xifzhclqtmVCQmAI=",
|
||||
"hash": "sha256-J8hINbcBEdukkSLw+nKwbln9EfNh4sIb5F7FPLmXLE4=",
|
||||
"homepage": "https://registry.terraform.io/providers/jianyuan/sentry",
|
||||
"owner": "jianyuan",
|
||||
"repo": "terraform-provider-sentry",
|
||||
"rev": "v0.14.8",
|
||||
"rev": "v0.14.9",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-owQrunW0X87DVdA/A/Pl5MWsVfx8kPL1L/xJYWS5ptI="
|
||||
"vendorHash": "sha256-ILb6eUVt961ZBcEVKT324OXMxF/d+Wx9tzA3PDTe5iU="
|
||||
},
|
||||
"joneshf_openwrt": {
|
||||
"hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=",
|
||||
@@ -1130,11 +1130,11 @@
|
||||
"vendorHash": "sha256-33NOGIvqLpgndG68GxAeoiISjWV7ApR4jmvqyZHjPKo="
|
||||
},
|
||||
"rootlyhq_rootly": {
|
||||
"hash": "sha256-8Y+S+uHrEmVrF95KazomTIVaj6GcwFNN050Jfx2ofpw=",
|
||||
"hash": "sha256-iNWJBv9idm0BUIeP7HScQP8MtWdyJCUF4p1EdRvgE98=",
|
||||
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
|
||||
"owner": "rootlyhq",
|
||||
"repo": "terraform-provider-rootly",
|
||||
"rev": "v5.6.0",
|
||||
"rev": "v5.7.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-UyfCHBSdGKCulExhUdYfvEab8cVjaHGDfgslRS0d1Co="
|
||||
},
|
||||
@@ -1229,13 +1229,13 @@
|
||||
"vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
|
||||
},
|
||||
"spacelift-io_spacelift": {
|
||||
"hash": "sha256-qQ8/y1KWHIc6WHEVXfiP6LKC44N8uK47x2Lv7TAMedE=",
|
||||
"hash": "sha256-W05b6v8OEPLRUzh0w5Wu7bySuaCkrD3Rl9CkomgEyEE=",
|
||||
"homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
|
||||
"owner": "spacelift-io",
|
||||
"repo": "terraform-provider-spacelift",
|
||||
"rev": "v1.43.0",
|
||||
"rev": "v1.44.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-XNPXjqrrTIC3WrpvDBP7veAYgmYws9FdF4W3j6ewRPk="
|
||||
"vendorHash": "sha256-E9e4+n12uSc12F428D8Oqe0iquTMywAY4DYWhSC+hmk="
|
||||
},
|
||||
"splunk-terraform_signalfx": {
|
||||
"hash": "sha256-dPhHzWOkNgIxlHSZm88zKkrgaXaXJ6RFdYeqX5zYSfU=",
|
||||
|
||||
@@ -40,7 +40,7 @@ appimageTools.wrapType2 {
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "mendeley-reference-manager";
|
||||
};
|
||||
|
||||
|
||||
@@ -85,7 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/nowrep/obs-vkcapture";
|
||||
changelog = "https://github.com/nowrep/obs-vkcapture/releases/tag/v${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [
|
||||
atila
|
||||
pedrohlc
|
||||
];
|
||||
license = lib.licenses.gpl2Only;
|
||||
|
||||
@@ -16,12 +16,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vdr-softhddevice";
|
||||
version = "2.4.6";
|
||||
version = "2.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ua0lnj";
|
||||
repo = "vdr-plugin-softhddevice";
|
||||
sha256 = "sha256-69mLiu/v+iZntrGvL0eNE/dDQwRVIlg5MfsNTr52Ots=";
|
||||
sha256 = "sha256-pQ437Du++L6KhBCqkHpiYCoT713RAB+rnoGCXr5M0S4=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
||||
@@ -40,13 +40,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "art";
|
||||
version = "1.26.1";
|
||||
version = "1.26.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "artpixls";
|
||||
repo = "ART";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Abh3Hj3wKdWNN7rdU61MgkZHmoa7ufYzZGKsrxplkj0=";
|
||||
hash = "sha256-zjGb5XiXry16xHlrlDw1b3ROYgHuJe3srRFWY/AIBRE=";
|
||||
};
|
||||
|
||||
# Fix the build with CMake 4.
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
lib,
|
||||
binutils,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
ninja,
|
||||
pkg-config,
|
||||
@@ -57,13 +56,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bambu-studio";
|
||||
version = "02.04.00.70";
|
||||
version = "02.05.00.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bambulab";
|
||||
repo = "BambuStudio";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BrH8gKbc0y76wbWrQxU+0xMJcYAm4Gi/xmECVf6pGkI=";
|
||||
hash = "sha256-jLaSUs6OmoD0yw1hOcJarYKfr1rbhB2TwRiBBU0utEI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -122,13 +121,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./patches/no-cereal.patch
|
||||
# Cmake 4 support
|
||||
./patches/cmake.patch
|
||||
# Fix build with gcc15
|
||||
# https://github.com/bambulab/BambuStudio/pull/8555
|
||||
(fetchpatch {
|
||||
name = "bambu-studio-include-stdint-header.patch";
|
||||
url = "https://github.com/bambulab/BambuStudio/commit/434752bf643933f22348d78335abe7f60550e736.patch";
|
||||
hash = "sha256-vWqTM6IHL/gBncLk6gZHw+dFe0sdVuPdUqYeVJUbTis=";
|
||||
})
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -27,6 +27,6 @@ stdenvNoCC.mkDerivation {
|
||||
homepage = "https://github.com/marnen/borg-sans-mono";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -39,7 +39,6 @@ buildDubPackage rec {
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
atila
|
||||
cybershadow
|
||||
];
|
||||
mainProgram = "btdu";
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "changedetection-io";
|
||||
version = "0.51.4";
|
||||
version = "0.53.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgtlmoon";
|
||||
repo = "changedetection.io";
|
||||
tag = version;
|
||||
hash = "sha256-Qm3dI5ZHkLK3hTsadnzIDdmeiDM/QovGw2FZDVml5tE=";
|
||||
hash = "sha256-B5T9M4JpNn4hUeV8rR1SIJobLKnuMkr4Se8d+Zu/xxY=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -99,7 +99,6 @@ stdenv.mkDerivation rec {
|
||||
mainProgram = "cider-2";
|
||||
maintainers = with lib.maintainers; [
|
||||
amadejkastelic
|
||||
itsvic-dev
|
||||
l0r3v
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "databricks-cli";
|
||||
version = "0.288.0";
|
||||
version = "0.289.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-GBkeIY/uYiLA6CmKiMnMuGX2sPSyOmr9gZXZTe/AoQs=";
|
||||
hash = "sha256-K3Zap7agH5tLkk5CVgU8s33giPuZwmQTdvh09TUa20U=";
|
||||
};
|
||||
|
||||
# Otherwise these tests fail asserting that the version is 0.0.0-dev
|
||||
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
|
||||
--replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-YtXdGQzuzTHBrqRUk2ORacVNixdLt+jHxJ8zMxwlcmI=";
|
||||
vendorHash = "sha256-XNGoUDmoso6hx+pj6oLBa/Fsyzk5wRyFm/VtKZw5Pmk=";
|
||||
|
||||
excludedPackages = [
|
||||
"bundle/internal"
|
||||
|
||||
@@ -108,12 +108,12 @@ in
|
||||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "312";
|
||||
version = "313";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
hash = "sha256-bILLE0MwPYHQtkvIQibbkZ0dENySbshaWX1oWDGQmu8=";
|
||||
hash = "sha256-rOjWxb6nWvfMWr2+9AyoCoOSg2jo3ZeoF8R6A8VvBj8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -67,7 +67,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
homepage = "https://distrobox.it/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "distrobox";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
|
||||
homepage = "https://www.videomap.it/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.attrNames srcs;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,20 +20,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# the Equicord repository. Dates as tags (and automatic releases) were the compromise
|
||||
# we came to with upstream. Please do not change the version schema (e.g., to semver)
|
||||
# unless upstream changes the tag schema from dates.
|
||||
version = "2026-01-19";
|
||||
version = "2026-02-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Equicord";
|
||||
repo = "Equicord";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-pEFU1E+BqAAAz2ywPrS1MejhZ/g47iG/4BBey+2F7Hw=";
|
||||
hash = "sha256-YSTLO2DtUWNfTpUMjtFjVOAt8jOnAxZnfZFFFXe7Fkg=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-iBCA4G1E1Yw/d94pQzcbBGJYeIIgZI+Gw87/x4ogoyg=";
|
||||
hash = "sha256-um8CmR4H+sck6sOpIpnISPhYn/rvXNfSn6i/EgQFvk0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.5.26";
|
||||
etcdSrcHash = "sha256-bEWswJM7r6Kxy9im/TkXkEQN5tEIvQK6Azd7LbIVwYA=";
|
||||
etcdServerVendorHash = "sha256-pwVAy8wQXBGE0MqE3v7OLukwcKIQhEW3BjwPdSMtAYM=";
|
||||
etcdUtlVendorHash = "sha256-dIxu7MUG5Yk3+DkCgfsGEmpyEklqvyz7wpWylHTDIkQ=";
|
||||
etcdCtlVendorHash = "sha256-NJ1jc/0J5+GUxu1r1g9t6pnlHjx3CnmBe5NR+qWK7Dc=";
|
||||
version = "3.5.27";
|
||||
etcdSrcHash = "sha256-ne0uKpS7KQL/Efi5sMdnD8PQl5phDivBEM1PrsSxVf4=";
|
||||
etcdServerVendorHash = "sha256-6vu0ttbes5uN+m/tW/zuPZgyc1z+VcNpoJauykxBUUY=";
|
||||
etcdUtlVendorHash = "sha256-Z8Rc19p5Sigg71/r9yURE6LNHqHjah3b/ZfxI0nH4qc=";
|
||||
etcdCtlVendorHash = "sha256-uAo50jN69YKuW3NCRtc9HE8AnqKWtZQ+sJvwgw1BJj0=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "etcd-io";
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "feh";
|
||||
version = "3.11.2";
|
||||
version = "3.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derf";
|
||||
repo = "feh";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-bwp/hzkuwQTgPakE0zkNtBWrNUkVWt9btTD8MVx+Xq4=";
|
||||
hash = "sha256-7I/aqm8mE6B/FLmkirgybr6QUZKU6p0inlvj0rFH/lU=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
libiconv,
|
||||
pcre2,
|
||||
pkg-config,
|
||||
sphinx,
|
||||
gettext,
|
||||
ncurses,
|
||||
python3,
|
||||
@@ -150,13 +149,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fish";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fish-shell";
|
||||
repo = "fish-shell";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-vUNmlEVQ5nxXSDfpgQ3l/+dzYW/MllhcfJhmFx4kY/A=";
|
||||
hash = "sha256-9EhvCStAeL+ADkLy9b4gXPx+JrVzUZ5Fdkf+imY3Vw0=";
|
||||
};
|
||||
|
||||
env = {
|
||||
@@ -169,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src patches;
|
||||
hash = "sha256-9Wi9KlMzTrecEkHyfW/H9WPHpQDEMpdGB8snFs7zFb4=";
|
||||
hash = "sha256-RVg6Zciy9mqZQwM5P3ngJi2NjC0qwFH7XgVEanaKnsg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -188,6 +187,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# * <https://github.com/LnL7/nix-darwin/issues/122>
|
||||
# * <https://github.com/fish-shell/fish-shell/issues/7142>
|
||||
./nix-darwin-path.patch
|
||||
|
||||
# these tests fail, likely due to dumb terminal issues, but setting a TERM
|
||||
# doesn't help. Skipping them.
|
||||
./skip-sgr-tests.patch
|
||||
];
|
||||
|
||||
# Fix FHS paths in tests
|
||||
@@ -298,7 +301,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
rustc
|
||||
rustPlatform.cargoSetupHook
|
||||
sphinx
|
||||
(python3.withPackages (ps: [
|
||||
ps.pexpect
|
||||
ps.sphinx
|
||||
]))
|
||||
# Avoid warnings when building the manpages about HOME not being writable
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
@@ -343,13 +349,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optional (!stdenv.hostPlatform.isDarwin) man-db;
|
||||
|
||||
# disable darwin pending https://github.com/NixOS/nixpkgs/pull/462090 getting through staging
|
||||
# disable darwin checks due to multiple failures
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
nativeCheckInputs = [
|
||||
coreutils
|
||||
glibcLocales
|
||||
(python3.withPackages (ps: [ ps.pexpect ]))
|
||||
procps
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
diff --git a/src/terminal.rs b/src/terminal.rs
|
||||
--- a/src/terminal.rs
|
||||
+++ b/src/terminal.rs
|
||||
@@ -787,6 +787,7 @@
|
||||
SgrTerminalCommand::ExitAttributeMode,
|
||||
};
|
||||
|
||||
+ #[ignore]
|
||||
#[test]
|
||||
fn sgr_combining() {
|
||||
// No style, no content
|
||||
@@ -823,6 +824,7 @@
|
||||
assert_eq!(String::from_utf8_lossy(outp.contents()), "\u{1b}[30;40m");
|
||||
}
|
||||
|
||||
+ #[ignore]
|
||||
#[test]
|
||||
fn sgr_max_length() {
|
||||
// Cut at max length
|
||||
@@ -23,19 +23,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flare";
|
||||
version = "0.18.3";
|
||||
version = "0.18.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.com";
|
||||
owner = "schmiddi-on-mobile";
|
||||
repo = "flare";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-+25nDG/xw82Iv6gGYWmGHUBf4CbTLBTzrOqKdrCFIMQ=";
|
||||
hash = "sha256-6a/up/UbaB9WQEiw8fmuh9Xjz73oBxO2k9jKhKwo0mc=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-nY+rxWzZJoQRB+Pn4yjof+fCcI2GU2+QFCN73kgRLZ0=";
|
||||
hash = "sha256-wjm3R43iMbXZeMe4dPyreXNqc+3FrDvaEeJJM+IYtz4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,18 +14,18 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "gemini-cli";
|
||||
version = "0.28.2";
|
||||
version = "0.29.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-gemini";
|
||||
repo = "gemini-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IOc4Y8U2J4Dpl0A5gfffAayiHKISlFiHU2qg61fR1Tw=";
|
||||
hash = "sha256-+gFSTq0CXMZa2OhP2gOuWa5WtteKW7Ys78lgnz7J72g=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmDepsHash = "sha256-XfD+PmmeLsbb9rC7DCmqu08/+cXZpGewMN5olrHhH4M=";
|
||||
npmDepsHash = "sha256-RGiWtJkLFV1UfFahHPzxtzJIsPCseEwfSsPdLfBkavI=";
|
||||
|
||||
dontPatchElf = stdenv.isDarwin;
|
||||
|
||||
|
||||
@@ -185,8 +185,7 @@ let
|
||||
mkdir -p $out/share/${pname}/
|
||||
cp -R $src/* $out/share/${pname}
|
||||
|
||||
mkdir -p $out/share/pixmaps
|
||||
cp gitkraken.png $out/share/pixmaps/
|
||||
install -Dm444 gitkraken.png $out/share/icons/hicolor/512x512/apps/gitkraken.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -152,7 +152,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
ck3d
|
||||
atila
|
||||
twesterhout
|
||||
];
|
||||
broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
@@ -39,11 +39,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "haproxy";
|
||||
version = "3.3.3";
|
||||
version = "3.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-DqLQ4VfN0q/z1gDCNl2t9Q5qKMQdPlLcztU84Qpm5TI=";
|
||||
hash = "sha256-UGPszYGKC7Exp1KcqYJNqVJpf793feDIN2rWEKZhc6w=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
libGL,
|
||||
openssl,
|
||||
oniguruma,
|
||||
vulkan-loader,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -72,6 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
patchelf $out/bin/inlyne \
|
||||
--add-needed ${lib.getLib vulkan-loader}/lib/libvulkan.so \
|
||||
--add-rpath ${
|
||||
lib.makeLibraryPath [
|
||||
libGL
|
||||
|
||||
@@ -90,7 +90,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.all;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
maintainers = with lib.maintainers; [
|
||||
atila
|
||||
rafaelrc
|
||||
];
|
||||
mainProgram = "irpf";
|
||||
|
||||
@@ -24,11 +24,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "keycloak";
|
||||
version = "26.5.3";
|
||||
version = "26.5.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
|
||||
hash = "sha256-OMx2E4Q1Pob73iqWo/sfYI14+IMW0cp/22wMUKcqQvg=";
|
||||
hash = "sha256-jRINK5PdsRTbWbDMYzatkEpfXcN6o3hwsul/U4ZuXjg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kine";
|
||||
version = "0.14.11";
|
||||
version = "0.14.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k3s-io";
|
||||
repo = "kine";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-4MbzSRgzh2m5V4Pn9EnDmyyotD1Cv2i2uWmyVPc80bk=";
|
||||
hash = "sha256-/8qTtnlZhEDkb+V7KOB2VT9dkQRTYFSZN8Cmx2i9BGw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RyL7N0n7Nacq0UZc4+bY2vD9sXZnJiX2HaEWtP51k8E=";
|
||||
vendorHash = "sha256-AVlq/1+ESjx8tcndaDHk5xDY0jFCJ7LqIjuj1Ccm/dE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
homepage = "https://kompute.cc/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -153,7 +153,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://krita.org/";
|
||||
maintainers = with lib.maintainers; [
|
||||
sifmelcara
|
||||
nek0
|
||||
];
|
||||
mainProgram = "krita";
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
homepage = "https://invent.kde.org/graphics/kseexpr";
|
||||
description = "Embeddable expression evaluation engine";
|
||||
maintainers = with lib.maintainers; [ nek0 ];
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -37,6 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/arximboldi/lager";
|
||||
description = "C++ library for value-oriented design using the unidirectional data-flow architecture — Redux for C++";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ nek0 ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
From 72c1023fbf00fc48866acab05f6ccebcae7f3213 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Cho <michael@michaelcho.dev>
|
||||
Date: Mon, 11 Aug 2025 17:08:15 -0400
|
||||
Subject: [PATCH] Fix build with Boost 1.89.0
|
||||
|
||||
---
|
||||
cpp/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
||||
index 27e4680ccc..39f05d2c9a 100644
|
||||
--- a/cpp/CMakeLists.txt
|
||||
+++ b/cpp/CMakeLists.txt
|
||||
@@ -145,7 +145,7 @@ if (USE_BOOST)
|
||||
if (WIN32)
|
||||
set (Boost_USE_STATIC_LIBS ON)
|
||||
endif ()
|
||||
- find_package (Boost 1.40.0 COMPONENTS date_time system thread)
|
||||
+ find_package (Boost 1.40.0 COMPONENTS date_time thread OPTIONAL_COMPONENTS system)
|
||||
if (NOT Boost_FOUND)
|
||||
print_error ("Boost Date_Time/System/Thread" "Boost")
|
||||
endif ()
|
||||
@@ -8,8 +8,7 @@
|
||||
gtest,
|
||||
jre,
|
||||
pkg-config,
|
||||
# complains about missing boost.system on 1.89
|
||||
boost188,
|
||||
boost,
|
||||
icu,
|
||||
protobuf,
|
||||
}:
|
||||
@@ -31,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./build-reproducibility.patch
|
||||
# Fix include directory in generated cmake files with split outputs
|
||||
./cmake-include-dir.patch
|
||||
# Finding `boost_system` fails because the stub compiled library of
|
||||
# Boost.System, which has been a header-only library since 1.69, was
|
||||
# removed in 1.89.
|
||||
# Upstream PR: https://github.com/google/libphonenumber/pull/3903
|
||||
./boost-1.89.patch
|
||||
];
|
||||
|
||||
outputs = [
|
||||
@@ -53,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals enableTests [
|
||||
boost188
|
||||
boost
|
||||
];
|
||||
|
||||
cmakeDir = "../cpp";
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||
|
||||
# Upstream needs quite a bit of porting to c23:
|
||||
# https://github.com/ttdoda/lv/issues/3
|
||||
NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
preAutoreconf = "cd src";
|
||||
postAutoreconf = "cd ..";
|
||||
|
||||
@@ -104,7 +104,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
# Ignore subcrate releases (fox, aqua-registry)
|
||||
"--version-regex=^v([0-9]+\\.[0-9]+\\.[0-9])$"
|
||||
"--version-regex=^v([0-9]+\\.[0-9]+\\.[0-9]+)$"
|
||||
];
|
||||
};
|
||||
tests = {
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "mistral-vibe";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mistralai";
|
||||
repo = "mistral-vibe";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q79/xP+kaovkch5wXzXumQb9l4wSspXg2cl7mD0Q2f8=";
|
||||
hash = "sha256-vJnykMcnwQDmzq0L4OhPzortliggtK8Hz+iG2cGu8BM=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@@ -86,6 +86,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
"test_updates_index_on_file_deletion"
|
||||
"test_updates_index_on_file_rename"
|
||||
"test_updates_index_on_folder_rename"
|
||||
"test_watcher_toggle_flow_off_on_off"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -61,6 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "mpvpaper";
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -68,16 +68,16 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "netbird-${componentName}";
|
||||
version = "0.64.6";
|
||||
version = "0.65.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-og5azhvqxtjyAZaMaQDIa4jvaPbPDobQZ/xznxHl6lc=";
|
||||
hash = "sha256-7OLCrmgkRViFhzxhyuRZGua6Bu8ntWdYNNlEpC0tB+o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-54ohzpyAzyD1YX90W7y7qDzFgqLksIFGUOOrGWImT6I=";
|
||||
vendorHash = "sha256-zMjbciItpzzCmUoLZy+gEF9etQy2dRmZrRVg4iSC0+o=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@ let
|
||||
mainProgram = "obsidian";
|
||||
license = lib.licenses.obsidian;
|
||||
maintainers = with lib.maintainers; [
|
||||
atila
|
||||
conradmearns
|
||||
zaninime
|
||||
qbit
|
||||
|
||||
@@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
description = "Search-as-you-type cli frontend for the buku bookmarks manager using peco";
|
||||
homepage = "https://github.com/AndreiUlmeyda/oil";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "oil";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
nodejs,
|
||||
@@ -12,7 +12,7 @@
|
||||
discord-development,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "openasar";
|
||||
version = "0-unstable-2025-11-21";
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
;
|
||||
|
||||
cargoRoot = "packages/desktop/src-tauri";
|
||||
cargoHash = "sha256-Sfw/1380knqusED8OJcCn0D7erkX1sLtQq9m6Dd0v4Y=";
|
||||
cargoHash = "sha256-6YOygSNNhAAD49ZkhWS03qGwVP2mvwItzJeyg0/ARLg=";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencode";
|
||||
version = "1.2.5";
|
||||
version = "1.2.9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "opencode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0Zr7705Ya9Aj6ZmwVL6t289JN4XwDYafgGA5cuYOJh4=";
|
||||
hash = "sha256-MPr+bJ3GVuVf5P/wCHxg+fk3+4Aca4EaV5NVtshAhuk=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
@@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
# NOTE: Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-hK7ad7tG60K0VARAlZJsSxKjiHU78XQYl/tbIReBusc=";
|
||||
outputHash = "sha256-jxCPz0vSIuF/E6idil2eEH92sWuo+7bGEAhr4JrNWj0=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
@@ -17,13 +17,13 @@ buildGoModule (finalAttrs: {
|
||||
webkitgtk_4_1
|
||||
];
|
||||
pname = "paretosecurity";
|
||||
version = "0.3.14";
|
||||
version = "0.3.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ParetoSecurity";
|
||||
repo = "agent";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Exl1PGTf1i5DKDcU5XOwYE6rEbrD+1wPnjB4rcz3lhA=";
|
||||
hash = "sha256-2oGDxnbxuyAMWjEUFKzwYz72/FYUbUZHSFoZk2pMfeY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jAcUf4VjtKB/Q2wHOVnCgcmPp5XNMqV8Ei9kpWoGO4Q=";
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "photoqt";
|
||||
version = "5.1";
|
||||
version = "5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://photoqt.org/downloads/source/photoqt-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-GQT0JDuhrtQh9u5R2DBIlYWEHsSJ8cvDp3+0s6I0iHY=";
|
||||
hash = "sha256-ufgDXKN7LY8Uy0uwL+QKvjH3O/F1EIAx2MPYYS1/els=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sdl_gamecontrollerdb";
|
||||
version = "0-unstable-2026-02-12";
|
||||
version = "0-unstable-2026-02-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mdqinc";
|
||||
repo = "SDL_GameControllerDB";
|
||||
rev = "c9e695ef7709d9f2e5d8e44e36e27b56b881366f";
|
||||
hash = "sha256-IH3oEmaTzeiUARJSWgurG9ZYBGDMWMOMyQO6zg7WwLw=";
|
||||
rev = "a050623bb0e35e3e0ba635c48faddecf42ff225c";
|
||||
hash = "sha256-yZiM3ykAII6PK4PCvu+knyHLg7orbCT9eYGvZWuU1F4=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "SG-323";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greyboxaudio";
|
||||
repo = "SG-323";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-yAC4YQt8f5kQ03ECAxvoM9wcqna98F4XKcwUQg6l4E0=";
|
||||
hash = "sha256-7zqIWLF9gcqHFg2LYauvF+6qUTIohYC5vZEn76siS7o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sonivox";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbeddedSynth";
|
||||
repo = "sonivox";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eOC/7R45X93Q9KKnP+/fyPMESOVyTnzpqnLHnDQwLnQ=";
|
||||
hash = "sha256-6ybGHlgI/1uyFNzSiIC4l7FQ6gVJw35NrdpooygnnQo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stress-ng";
|
||||
version = "0.20.00";
|
||||
version = "0.20.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = "stress-ng";
|
||||
tag = "V${finalAttrs.version}";
|
||||
hash = "sha256-KbsxZhsS5q/MZ2laA16ideicRu7oezH12yzmEBMyzVc=";
|
||||
hash = "sha256-C9TpUM18W+ARFAFLSqTl6RjRrI60pxhdP/veBHu2cco=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
type, scope, interface ID, etc.).
|
||||
'';
|
||||
mainProgram = "subnetcalc";
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
homepage = "https://github.com/tmccombs/swaytools";
|
||||
description = "Collection of simple tools for sway (and i3)";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage {
|
||||
mainProgram = "swayws";
|
||||
homepage = "https://gitlab.com/w0lff/swayws";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.atila ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -825,16 +825,6 @@ fn parse_fstab(fstab: impl BufRead) -> (HashMap<String, Filesystem>, HashMap<Str
|
||||
(filesystems, swaps)
|
||||
}
|
||||
|
||||
// Converts a path to the name of a systemd mount/automount unit that would be responsible for
|
||||
// mounting this path.
|
||||
fn path_to_unit_name(path: &str, is_automount: bool) -> String {
|
||||
format!(
|
||||
"{}.{}",
|
||||
libsystemd::unit::escape_path(path),
|
||||
if is_automount { "automount" } else { "mount" },
|
||||
)
|
||||
}
|
||||
|
||||
// Returns a HashMap containing the same contents as the passed in `units`, minus the units in
|
||||
// `units_to_filter`.
|
||||
fn filter_units(
|
||||
@@ -1320,8 +1310,9 @@ won't take effect until you reboot the system.
|
||||
|
||||
// Compare the previous and new fstab to figure out which filesystems need a remount or need to
|
||||
// be unmounted. New filesystems are mounted automatically by starting local-fs.target.
|
||||
// FIXME: might be nicer if we generated units for all mounts; then we could unify this with
|
||||
// the unit checking code above.
|
||||
//
|
||||
// TODO: We should probably not reimplement some of the logic of systemd-fstab-generator, and
|
||||
// instead only consume and act upon the mount/automount units created from that generator.
|
||||
let (current_filesystems, current_swaps) = std::fs::read_to_string("/etc/fstab")
|
||||
.map(|fstab| parse_fstab(std::io::Cursor::new(fstab)))
|
||||
.unwrap_or_default();
|
||||
@@ -1330,10 +1321,10 @@ won't take effect until you reboot the system.
|
||||
.unwrap_or_default();
|
||||
|
||||
for (mountpoint, current_filesystem) in current_filesystems {
|
||||
let is_automount = current_filesystem.options.contains("x-systemd.automount");
|
||||
let current_is_automount = current_filesystem.options.contains("x-systemd.automount");
|
||||
let mount_unit = format!("{}.mount", libsystemd::unit::escape_path(&mountpoint));
|
||||
let automount_unit = format!("{}.automount", libsystemd::unit::escape_path(&mountpoint));
|
||||
|
||||
// Use current version of systemctl binary before daemon is reexeced.
|
||||
let unit = path_to_unit_name(&mountpoint, is_automount);
|
||||
if let Some(new_filesystem) = new_filesystems.get(&mountpoint) {
|
||||
if current_filesystem.fs_type != new_filesystem.fs_type
|
||||
|| current_filesystem.device != new_filesystem.device
|
||||
@@ -1341,25 +1332,30 @@ won't take effect until you reboot the system.
|
||||
if matches!(mountpoint.as_str(), "/" | "/nix") {
|
||||
if current_filesystem.options != new_filesystem.options {
|
||||
// Mount options changes, so remount it.
|
||||
units_to_reload.insert(unit.to_string(), ());
|
||||
record_unit(RELOAD_LIST_FILE, &unit)
|
||||
units_to_reload.insert(mount_unit.to_string(), ());
|
||||
record_unit(RELOAD_LIST_FILE, &mount_unit)
|
||||
} else {
|
||||
// Don't unmount / or /nix if the device changed
|
||||
units_to_skip.insert(unit, ());
|
||||
units_to_skip.insert(mount_unit, ());
|
||||
}
|
||||
} else {
|
||||
// Filesystem type or device changed, so unmount and mount it.
|
||||
units_to_restart.insert(unit.to_string(), ());
|
||||
record_unit(RESTART_LIST_FILE, &unit);
|
||||
units_to_restart.insert(mount_unit.to_string(), ());
|
||||
record_unit(RESTART_LIST_FILE, &mount_unit);
|
||||
}
|
||||
} else if current_filesystem.options != new_filesystem.options {
|
||||
// Mount options changes, so remount it.
|
||||
units_to_reload.insert(unit.to_string(), ());
|
||||
record_unit(RELOAD_LIST_FILE, &unit)
|
||||
units_to_reload.insert(mount_unit.clone(), ());
|
||||
record_unit(RELOAD_LIST_FILE, &mount_unit)
|
||||
}
|
||||
} else {
|
||||
// Filesystem entry disappeared, so unmount it.
|
||||
units_to_stop.insert(unit, ());
|
||||
// Filesystem entry disappeared, so unmount it. Stopping the automount unit also stops
|
||||
// the mount unit.
|
||||
if current_is_automount {
|
||||
units_to_stop.insert(automount_unit, ());
|
||||
} else {
|
||||
units_to_stop.insert(mount_unit, ());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1806,17 +1802,23 @@ won't take effect until you reboot the system.
|
||||
if !units_to_reload.is_empty() {
|
||||
for (unit, _) in units_to_reload.clone() {
|
||||
if !unit_is_active(&dbus_conn, &unit)? {
|
||||
// Figure out if we need to start the unit
|
||||
let unit_info = parse_unit(
|
||||
// Figure out if we need to start the unit. We skip units that are not found in the
|
||||
// NixOS-managed /etc/systemd/system directory (e.g. mount units that are generated
|
||||
// from /etc/fstab).
|
||||
if parse_unit(
|
||||
toplevel.join("etc/systemd/system").join(&unit).as_path(),
|
||||
toplevel.join("etc/systemd/system").join(&unit).as_path(),
|
||||
)?;
|
||||
if !parse_systemd_bool(Some(&unit_info), "Unit", "RefuseManualStart", false)
|
||||
|| parse_systemd_bool(Some(&unit_info), "Unit", "X-OnlyManualStart", false)
|
||||
)
|
||||
.map(|unit_info| {
|
||||
!parse_systemd_bool(Some(&unit_info), "Unit", "RefuseManualStart", false)
|
||||
|| parse_systemd_bool(Some(&unit_info), "Unit", "X-OnlyManualStart", false)
|
||||
})
|
||||
.unwrap_or_default()
|
||||
{
|
||||
units_to_start.insert(unit.clone(), ());
|
||||
record_unit(START_LIST_FILE, &unit);
|
||||
}
|
||||
|
||||
// Don't reload the unit, reloading would fail
|
||||
units_to_reload.remove(&unit);
|
||||
unrecord_unit(RELOAD_LIST_FILE, &unit);
|
||||
|
||||
@@ -133,7 +133,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.agpl3Only;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [
|
||||
atila
|
||||
justanotherariel
|
||||
];
|
||||
};
|
||||
|
||||
@@ -319,7 +319,6 @@ buildNpmPackage (finalAttrs: {
|
||||
license = lib.licenses.agpl3Only;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [
|
||||
atila
|
||||
justanotherariel
|
||||
mynacol
|
||||
];
|
||||
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
homepage = "https://github.com/arximboldi/zug";
|
||||
description = "Library for functional interactive c++ programs";
|
||||
maintainers = with lib.maintainers; [ nek0 ];
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.boost;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -29,14 +29,14 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "zulip-term";
|
||||
version = "0.7.0-unstable-2025-05-19";
|
||||
version = "0.7.0-unstable-2026-02-10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zulip";
|
||||
repo = "zulip-terminal";
|
||||
rev = "8e5c0357c8746df64ac427d5db3d2cb0f002f975";
|
||||
hash = "sha256-DW3GZ1hY/wZ6P/djPUlAvNIFcBV994FLJ3aiPfDVUBM=";
|
||||
rev = "6a799870eccc00d612e25ff881d18f4ff66d92fa";
|
||||
hash = "sha256-saimbccJ5iJITs/Bw97bOkGrVcko1kAl61nlxNwBrms=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -99,6 +99,9 @@ buildPythonApplication rec {
|
||||
homepage = "https://github.com/zulip/zulip-terminal";
|
||||
changelog = "https://github.com/zulip/zulip-terminal/releases/tag/${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
maintainers = with lib.maintainers; [
|
||||
dotlambda
|
||||
erooke
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26,15 +26,15 @@
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lxqt-config";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = "lxqt-config";
|
||||
rev = version;
|
||||
hash = "sha256-2CAQeX2X0DPmgOaAEJoCLtgjFT+Z6epc/dUCbaEIlB0=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2fviPhSBwUU9jg3217PLbREh8MkArd2Uc4bhFXo2J7U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -86,4 +86,4 @@ stdenv.mkDerivation rec {
|
||||
teams = [ lib.teams.lxqt ];
|
||||
};
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{
|
||||
"version": "3.41.1",
|
||||
"engineVersion": "3452d735bd38224ef2db85ca763d862d6326b17f",
|
||||
"version": "3.41.2",
|
||||
"engineVersion": "6c0baaebf70e0148f485f27d5616b3d3382da7bf",
|
||||
"engineSwiftShaderHash": "sha256-qbtCl2nTpmtp9dnaoXc7rF3RqLnAZEmzw1BzPoCRWrc=",
|
||||
"engineSwiftShaderRev": "794b0cfce1d828d187637e6d932bae484fbe0976",
|
||||
"channel": "stable",
|
||||
"engineHashes": {
|
||||
"aarch64-linux": {
|
||||
"aarch64-linux": "sha256-XZvyhT3X4MBehSxWdceVFCNH9teXuGYjTaquuoiVp0w=",
|
||||
"x86_64-linux": "sha256-XZvyhT3X4MBehSxWdceVFCNH9teXuGYjTaquuoiVp0w="
|
||||
"aarch64-linux": "sha256-/qFsER5fdrFcOYR7UPih98CRx52TzaZay0GqcwbwSmU=",
|
||||
"x86_64-linux": "sha256-/qFsER5fdrFcOYR7UPih98CRx52TzaZay0GqcwbwSmU="
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"aarch64-linux": "sha256-u2JDoBxDdOIj7no+9Ym+JLwAQZxTKXmOjrRtaDlktuc=",
|
||||
"x86_64-linux": "sha256-u2JDoBxDdOIj7no+9Ym+JLwAQZxTKXmOjrRtaDlktuc="
|
||||
"aarch64-linux": "sha256-mbpazHaIvHtKYIM0Si3NjceEuHadBcP1qtfW5eR2XLw=",
|
||||
"x86_64-linux": "sha256-mbpazHaIvHtKYIM0Si3NjceEuHadBcP1qtfW5eR2XLw="
|
||||
}
|
||||
},
|
||||
"dartVersion": "3.11.0",
|
||||
@@ -21,53 +21,53 @@
|
||||
"x86_64-darwin": "sha256-Wlwpx6g4EmkzKAEyaxHMrc8M/nMB7QGj8G6BdmvLjXQ=",
|
||||
"aarch64-darwin": "sha256-IjJFpC6rG4EeUC4VYluGcHX/4BLenrU3Skzd4u4IdTQ="
|
||||
},
|
||||
"flutterHash": "sha256-qn0r6/JHPN+bFrsxkZ6NvVo3yLFgYnt70LwzsKXNRSk=",
|
||||
"flutterHash": "sha256-2Pcg6+bMSuCpb9ZKVA+JgqRLK9Xb6O9hVXHpgcgOt8E=",
|
||||
"artifactHashes": {
|
||||
"android": {
|
||||
"aarch64-darwin": "sha256-9bjCiMYvcwMMWU8lJdJB+f2P0WxZzzjfs/pUD4qr74g=",
|
||||
"aarch64-linux": "sha256-u8O8uDaGrmAPexC+TIq0/dlnt3+B5+RQNiyk2GnVWLM=",
|
||||
"x86_64-darwin": "sha256-9bjCiMYvcwMMWU8lJdJB+f2P0WxZzzjfs/pUD4qr74g=",
|
||||
"x86_64-linux": "sha256-u8O8uDaGrmAPexC+TIq0/dlnt3+B5+RQNiyk2GnVWLM="
|
||||
"aarch64-darwin": "sha256-MVik5WrekVdyuLdh7b6jEsCXnPwr8jP6nWo14iutKvQ=",
|
||||
"aarch64-linux": "sha256-yzjxb2tn6UwrN8G1kNFp8dsMNdjYYyxh9pZI/l09MR4=",
|
||||
"x86_64-darwin": "sha256-MVik5WrekVdyuLdh7b6jEsCXnPwr8jP6nWo14iutKvQ=",
|
||||
"x86_64-linux": "sha256-yzjxb2tn6UwrN8G1kNFp8dsMNdjYYyxh9pZI/l09MR4="
|
||||
},
|
||||
"fuchsia": {
|
||||
"aarch64-darwin": "sha256-hFiXjW34BhtPsw5jC22SqDsfMQzuZVidci6a6b63L4o=",
|
||||
"aarch64-linux": "sha256-hFiXjW34BhtPsw5jC22SqDsfMQzuZVidci6a6b63L4o=",
|
||||
"x86_64-darwin": "sha256-hFiXjW34BhtPsw5jC22SqDsfMQzuZVidci6a6b63L4o=",
|
||||
"x86_64-linux": "sha256-hFiXjW34BhtPsw5jC22SqDsfMQzuZVidci6a6b63L4o="
|
||||
"aarch64-darwin": "sha256-CVkWu42Zo+PlWW3/VCfHSFqhT9/465NdvDiTGIqVFOU=",
|
||||
"aarch64-linux": "sha256-CVkWu42Zo+PlWW3/VCfHSFqhT9/465NdvDiTGIqVFOU=",
|
||||
"x86_64-darwin": "sha256-CVkWu42Zo+PlWW3/VCfHSFqhT9/465NdvDiTGIqVFOU=",
|
||||
"x86_64-linux": "sha256-CVkWu42Zo+PlWW3/VCfHSFqhT9/465NdvDiTGIqVFOU="
|
||||
},
|
||||
"ios": {
|
||||
"aarch64-darwin": "sha256-lPCidjKmqgotphFvjWUL2t3o6NBIFos1lfh958pCATQ=",
|
||||
"aarch64-linux": "sha256-lPCidjKmqgotphFvjWUL2t3o6NBIFos1lfh958pCATQ=",
|
||||
"x86_64-darwin": "sha256-lPCidjKmqgotphFvjWUL2t3o6NBIFos1lfh958pCATQ=",
|
||||
"x86_64-linux": "sha256-lPCidjKmqgotphFvjWUL2t3o6NBIFos1lfh958pCATQ="
|
||||
"aarch64-darwin": "sha256-sv3NhB+8YMStlTuCgXjVw2PU2AvsKQE3nHcvn3V7/zI=",
|
||||
"aarch64-linux": "sha256-sv3NhB+8YMStlTuCgXjVw2PU2AvsKQE3nHcvn3V7/zI=",
|
||||
"x86_64-darwin": "sha256-sv3NhB+8YMStlTuCgXjVw2PU2AvsKQE3nHcvn3V7/zI=",
|
||||
"x86_64-linux": "sha256-sv3NhB+8YMStlTuCgXjVw2PU2AvsKQE3nHcvn3V7/zI="
|
||||
},
|
||||
"linux": {
|
||||
"aarch64-darwin": "sha256-RwXbextfT+342Zg19z0k1EykHo6flPYPHuHE5czDs+4=",
|
||||
"aarch64-linux": "sha256-RwXbextfT+342Zg19z0k1EykHo6flPYPHuHE5czDs+4=",
|
||||
"x86_64-darwin": "sha256-J9cGfpF5LIjY17lVJlmlcyucLCpT49jt5P8jAWyeoiU=",
|
||||
"x86_64-linux": "sha256-J9cGfpF5LIjY17lVJlmlcyucLCpT49jt5P8jAWyeoiU="
|
||||
"aarch64-darwin": "sha256-bgNcc68wrVRxiwywWCQ0NkXrIQcm2xVqp8mZ6IBlTqM=",
|
||||
"aarch64-linux": "sha256-bgNcc68wrVRxiwywWCQ0NkXrIQcm2xVqp8mZ6IBlTqM=",
|
||||
"x86_64-darwin": "sha256-ZSyIouKMNNajEPFBN+VB5q6//QzsQz/J5Zj6Q8ms46M=",
|
||||
"x86_64-linux": "sha256-ZSyIouKMNNajEPFBN+VB5q6//QzsQz/J5Zj6Q8ms46M="
|
||||
},
|
||||
"macos": {
|
||||
"aarch64-darwin": "sha256-xHoNZrOn5yu734jDEE0RN+cNO/DCuiNqwlEG1br82fY=",
|
||||
"aarch64-linux": "sha256-xHoNZrOn5yu734jDEE0RN+cNO/DCuiNqwlEG1br82fY=",
|
||||
"x86_64-darwin": "sha256-xHoNZrOn5yu734jDEE0RN+cNO/DCuiNqwlEG1br82fY=",
|
||||
"x86_64-linux": "sha256-xHoNZrOn5yu734jDEE0RN+cNO/DCuiNqwlEG1br82fY="
|
||||
"aarch64-darwin": "sha256-erI+Iiy+jm6NY4GeasD9hyHqpYs7v7y1QFEdtO58x4g=",
|
||||
"aarch64-linux": "sha256-erI+Iiy+jm6NY4GeasD9hyHqpYs7v7y1QFEdtO58x4g=",
|
||||
"x86_64-darwin": "sha256-erI+Iiy+jm6NY4GeasD9hyHqpYs7v7y1QFEdtO58x4g=",
|
||||
"x86_64-linux": "sha256-erI+Iiy+jm6NY4GeasD9hyHqpYs7v7y1QFEdtO58x4g="
|
||||
},
|
||||
"universal": {
|
||||
"aarch64-darwin": "sha256-OKUry7x+5lrGzElLnmltaIaLyq5tHtNR40z33FgL+Z0=",
|
||||
"aarch64-linux": "sha256-ZqmkJ5KGnKU4FGAOBGTF7vU7XZ7UmgCML0Pdg0bXNn4=",
|
||||
"x86_64-darwin": "sha256-orb4XUtX9Uq3Uq1xwoZAzrd+GgkOKGiOek3NEEDVQR4=",
|
||||
"x86_64-linux": "sha256-uN/wDyFnMLxqEfFR2PWesRGnigbsnqzs+mPDxEMZ+1g="
|
||||
"aarch64-darwin": "sha256-gGt+tk7eDRuZ4f9RX8A+FGgezsYOwpaO0FJ+2KE3gbk=",
|
||||
"aarch64-linux": "sha256-niLDdkedhlORVMr3HgWJik4XOd5BHph0sX+jfqgN+JM=",
|
||||
"x86_64-darwin": "sha256-7Gpvr0dKqkjXEtsNGCKqN+lxx1deeNDhCOxr0xi7N4s=",
|
||||
"x86_64-linux": "sha256-SG9fBf0urA5Na6Ff9NXoE8eRatMQHzoxoEoe9oyCe/E="
|
||||
},
|
||||
"web": {
|
||||
"aarch64-darwin": "sha256-sQNM2Hx+NEMKtbCv2tX9kh45TB/NH9yaRm4eZqDfJQE=",
|
||||
"aarch64-linux": "sha256-sQNM2Hx+NEMKtbCv2tX9kh45TB/NH9yaRm4eZqDfJQE=",
|
||||
"x86_64-darwin": "sha256-sQNM2Hx+NEMKtbCv2tX9kh45TB/NH9yaRm4eZqDfJQE=",
|
||||
"x86_64-linux": "sha256-sQNM2Hx+NEMKtbCv2tX9kh45TB/NH9yaRm4eZqDfJQE="
|
||||
"aarch64-darwin": "sha256-HovW39xCgObtExLUqn5xN2t4Wz0UQYArlqF4ZAGjv6A=",
|
||||
"aarch64-linux": "sha256-HovW39xCgObtExLUqn5xN2t4Wz0UQYArlqF4ZAGjv6A=",
|
||||
"x86_64-darwin": "sha256-HovW39xCgObtExLUqn5xN2t4Wz0UQYArlqF4ZAGjv6A=",
|
||||
"x86_64-linux": "sha256-HovW39xCgObtExLUqn5xN2t4Wz0UQYArlqF4ZAGjv6A="
|
||||
},
|
||||
"windows": {
|
||||
"x86_64-darwin": "sha256-YZ7HehFv90UHmv0hfcyv0YsQxsNRRzOitPdf5BqaJJM=",
|
||||
"x86_64-linux": "sha256-YZ7HehFv90UHmv0hfcyv0YsQxsNRRzOitPdf5BqaJJM="
|
||||
"x86_64-darwin": "sha256-8DmZF1AFsJ9V4X8IGXVPxKbAtBJWbKybZsvu7MdtHpU=",
|
||||
"x86_64-linux": "sha256-8DmZF1AFsJ9V4X8IGXVPxKbAtBJWbKybZsvu7MdtHpU="
|
||||
}
|
||||
},
|
||||
"pubspecLock": {
|
||||
|
||||
@@ -43,12 +43,12 @@ in
|
||||
);
|
||||
julia_112-bin = wrapJulia (
|
||||
callPackage (import ./generic-bin.nix {
|
||||
version = "1.12.4";
|
||||
version = "1.12.5";
|
||||
sha256 = {
|
||||
x86_64-linux = "0pcq75k0vg1gdl39p3chszwmlcig91nkj98srdm94h71iwbsyyy5";
|
||||
aarch64-linux = "1p9xcv4sz69wry29vww0kvyy4hr7czf6fxg4d3yj84lkxvgs40m6";
|
||||
x86_64-darwin = "15zl9gqca1c5ss95xmqrk9j0hihm9y926wvafyxg5802ndd4jd1c";
|
||||
aarch64-darwin = "03vyvn7d5nkz0p7kgypa6c9l44ir6512sbrqdzl04havxc6v4ipa";
|
||||
x86_64-linux = "1rxsb2bnk2wgd2nkzxwpj1xj8gbpblczm4lyxprzp5jfgrr4vf21";
|
||||
aarch64-linux = "1qp8ydagd39c1rcj9ryrq0y1hcimw1dgmaaviaqbyqj4x92fhp9f";
|
||||
x86_64-darwin = "1b8mdpy6ww89xngsl1q3ym245iyw59alki9cvnplcbg3iqjhgdz4";
|
||||
aarch64-darwin = "01fli18s43p74hb7z2fcv8sv72pijp3k1azba6rjjpgfic7f1h0z";
|
||||
};
|
||||
}) { }
|
||||
);
|
||||
@@ -87,8 +87,8 @@ in
|
||||
julia_112 = wrapJulia (
|
||||
callPackage
|
||||
(import ./generic.nix {
|
||||
version = "1.12.4";
|
||||
hash = "sha256-bqYMBTleKQErY5NOaGsNqhzBVZR75CmuCyR7PqfnvpM=";
|
||||
version = "1.12.5";
|
||||
hash = "sha256-3jvzaT2TjX4VU5pcOsIXfFRqzQ17e8TjJ+MNanI48eM=";
|
||||
})
|
||||
{
|
||||
stdenv = gcc14Stdenv;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
genericBuilder:
|
||||
|
||||
genericBuilder {
|
||||
version = "26.2.5.16";
|
||||
hash = "sha256-3WxURI1o/CqN0KK+voUMk6al2mtsrqoniBJpDxKpxPo=";
|
||||
version = "26.2.5.17";
|
||||
hash = "sha256-UUAC7SCWQlDC869IlJooeCPvIpro4DKnmTk3JxbyJOA=";
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
genericBuilder:
|
||||
|
||||
genericBuilder {
|
||||
version = "27.3.4.7";
|
||||
hash = "sha256-3D+j36vNio0REx02bJ/dYey/nTojZuQSnzIWBIOch1U=";
|
||||
version = "27.3.4.8";
|
||||
hash = "sha256-s40YSNhkoacSnLyZxF4tpivw1b9bnq/XHuNz8IvdjQI=";
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
genericBuilder:
|
||||
|
||||
genericBuilder {
|
||||
version = "28.3.1";
|
||||
hash = "sha256-i8X7liVtBVeU43cM563omIjcSKNItMO66COrzJRsjhM=";
|
||||
version = "28.3.2";
|
||||
hash = "sha256-+x5n8JjALeW4tTxLfN37976Gp/5HOuLKXuIrlkOo4G0=";
|
||||
}
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "indilib";
|
||||
version = "2.1.6";
|
||||
version = "2.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "indilib";
|
||||
repo = "indi";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-WfVC5CLzwyO40Kpv/SZaYiPGDvWLUydQaA8FvTVhHqg=";
|
||||
hash = "sha256-L3qZ1VgL4J4TYYdgeSrWuVC2Xy+iBxIU9GBx8cllm1o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -65,7 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
checkInputs = [ gtest ];
|
||||
|
||||
doCheck = true;
|
||||
# tests seem to be broken on darwin
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
doInstallCheck = true;
|
||||
|
||||
# Socket address collisions between tests
|
||||
|
||||
@@ -41,13 +41,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
thirdparty_version = "2.1.6.2";
|
||||
thirdparty_version = "2.1.9";
|
||||
fxload = libusb1.override { withExamples = true; };
|
||||
src-3rdparty = fetchFromGitHub {
|
||||
owner = "indilib";
|
||||
repo = "indi-3rdparty";
|
||||
rev = "v${thirdparty_version}";
|
||||
hash = "sha256-FMvdm7dkOkRlmbPNeQjh0jd+2bOinzW13QPP2NnOr/M=";
|
||||
hash = "sha256-zHcJDbi+xsI1xDnZTFmUbk4GNGD8WqZUzf3hfSCmvpU=";
|
||||
};
|
||||
|
||||
buildIndi3rdParty =
|
||||
@@ -127,6 +127,11 @@ let
|
||||
|
||||
libaltaircam = buildIndi3rdParty {
|
||||
pname = "libaltaircam";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
|
||||
@@ -140,7 +145,7 @@ let
|
||||
indilib
|
||||
libusb1
|
||||
];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
cmakeFlags = [ "-DCONF_DIR=etc/" ];
|
||||
meta = {
|
||||
license = lib.licenses.mpl20;
|
||||
@@ -152,6 +157,7 @@ let
|
||||
pname = "libasi";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
substituteInPlace 99-asi.rules \
|
||||
--replace-fail "/bin/echo" "${lib.getBin coreutils}/bin/echo" \
|
||||
--replace-fail "/bin/sh" "${lib.getExe bash}" \
|
||||
@@ -162,32 +168,55 @@ let
|
||||
libusb1
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ i686 ++ arm;
|
||||
platforms = [
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
"armv6l-linux"
|
||||
"armv7l-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
libastroasis = buildIndi3rdParty {
|
||||
pname = "libastroasis";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
buildInputs = [ (lib.getLib stdenv.cc.cc) ];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
|
||||
platforms = [
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
"armv6l-linux"
|
||||
"armv7l-linux"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
libatik = buildIndi3rdParty {
|
||||
pname = "libatik";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
libusb1
|
||||
systemd
|
||||
libdc1394
|
||||
];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ i686 ++ arm;
|
||||
@@ -196,7 +225,12 @@ let
|
||||
|
||||
libbressercam = buildIndi3rdParty {
|
||||
pname = "libbressercam";
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
|
||||
@@ -242,13 +276,24 @@ let
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm ++ i686;
|
||||
platforms = [
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
"armv6l-linux"
|
||||
"armv7l-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
libmallincam = buildIndi3rdParty {
|
||||
pname = "libmallincam";
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
|
||||
@@ -257,6 +302,11 @@ let
|
||||
|
||||
libmeadecam = buildIndi3rdParty {
|
||||
pname = "libmeadecam";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
buildInputs = [ libusb1 ];
|
||||
meta = {
|
||||
license = lib.licenses.lgpl21Only;
|
||||
@@ -266,8 +316,13 @@ let
|
||||
|
||||
libmicam = buildIndi3rdParty {
|
||||
pname = "libmicam";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
buildInputs = [ libusb1 ];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm ++ i686;
|
||||
@@ -276,7 +331,12 @@ let
|
||||
|
||||
libnncam = buildIndi3rdParty {
|
||||
pname = "libnncam";
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
|
||||
@@ -285,7 +345,12 @@ let
|
||||
|
||||
libogmacam = buildIndi3rdParty {
|
||||
pname = "libogmacam";
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
|
||||
@@ -294,7 +359,12 @@ let
|
||||
|
||||
libomegonprocam = buildIndi3rdParty {
|
||||
pname = "libomegonprocam";
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
|
||||
@@ -330,7 +400,9 @@ let
|
||||
|
||||
libplayerone = buildIndi3rdParty {
|
||||
pname = "libplayerone";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
substituteInPlace 99-player_one_astronomy.rules \
|
||||
--replace-fail "/bin/echo" "${lib.getBin coreutils}/bin/echo" \
|
||||
--replace-fail "/bin/sh" "${lib.getExe bash}"
|
||||
@@ -341,7 +413,7 @@ let
|
||||
libusb1
|
||||
systemd
|
||||
];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
|
||||
@@ -352,6 +424,7 @@ let
|
||||
pname = "libqhy";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "/lib/firmware" "lib/firmware"
|
||||
|
||||
@@ -369,11 +442,17 @@ let
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
libusb1
|
||||
];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"armv6l-linux"
|
||||
"armv7l-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -383,7 +462,7 @@ let
|
||||
libftdi1
|
||||
indilib
|
||||
];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = lib.platforms.linux;
|
||||
@@ -396,7 +475,7 @@ let
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
libusb1
|
||||
];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ i686 ++ arm;
|
||||
@@ -407,6 +486,7 @@ let
|
||||
pname = "libsbig";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
substituteInPlace CMakeLists.txt --replace-fail "/lib/firmware" "lib/firmware"
|
||||
substituteInPlace 51-sbig-debian.rules \
|
||||
--replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \
|
||||
@@ -416,7 +496,7 @@ let
|
||||
'';
|
||||
|
||||
buildInputs = [ libusb1 ];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
@@ -426,7 +506,12 @@ let
|
||||
|
||||
libstarshootg = buildIndi3rdParty {
|
||||
pname = "libstarshootg";
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
|
||||
@@ -435,20 +520,37 @@ let
|
||||
|
||||
libsvbony = buildIndi3rdParty {
|
||||
pname = "libsvbony";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
libusb1
|
||||
];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm ++ i686;
|
||||
platforms = [
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
"armv6l-linux"
|
||||
"armv7l-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
libsvbonycam = buildIndi3rdParty {
|
||||
pname = "libsvbonycam";
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
|
||||
@@ -457,7 +559,12 @@ let
|
||||
|
||||
libtoupcam = buildIndi3rdParty {
|
||||
pname = "libtoupcam";
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
|
||||
@@ -466,7 +573,12 @@ let
|
||||
|
||||
libtscam = buildIndi3rdParty {
|
||||
pname = "libtscam";
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/FIX_MACOS_LIBRARIES/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
meta = {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
platforms = with lib.platforms; x86_64 ++ aarch64 ++ arm;
|
||||
|
||||
@@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
mit
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "archspec";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ariadne";
|
||||
version = "0.28.0";
|
||||
version = "0.29.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirumee";
|
||||
repo = "ariadne";
|
||||
tag = version;
|
||||
hash = "sha256-7rDlt+f+53UXUa3IpGzm0AX/pqnzDc8b3nwpY1TRAZs=";
|
||||
hash = "sha256-u6iKgugj30OxIEQ3P0+e05IC/Mh0hvKfTohTc/7pkUk=";
|
||||
};
|
||||
|
||||
patches = [ ./remove-opentracing.patch ];
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bonsai";
|
||||
version = "1.5.4";
|
||||
version = "1.5.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noirello";
|
||||
repo = "bonsai";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1AKdayvkRIY8F9UhuEvGg3uboYh7A/4BkmJ11RkYI9w=";
|
||||
hash = "sha256-q0BE1TuxiS01Z83dqDH54XzRgdF3ZszRBJsMIfsvTeU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -43,6 +43,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/inducer/codepy";
|
||||
description = "Generate and execute native code at run time, from Python";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -40,6 +40,6 @@ buildPythonPackage {
|
||||
homepage = "https://github.com/brouberol/contexttimer";
|
||||
description = "Timer as a context manager";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -68,6 +68,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/ar4/deepwave";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -154,6 +154,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://www.devitoproject.org/";
|
||||
changelog = "https://github.com/devitocodes/devito/releases/tag/${src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/NVIDIA/hpc-container-maker";
|
||||
changelog = "https://github.com/NVIDIA/hpc-container-maker/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "hpccm";
|
||||
platforms = lib.platforms.x86;
|
||||
};
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-groq";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain-groq==${version}";
|
||||
hash = "sha256-WpIP41eALPoWuYjm2ygEH7TwClKYwAG0uEd1ZbbqMTY=";
|
||||
hash = "sha256-OS9i4o8UhEmRFgZEKB5owWx2hJuVBRV5XvQLCQnBi9g=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/partners/groq";
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lunatone-rest-api-client";
|
||||
version = "0.6.3";
|
||||
version = "0.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "lunatone-public";
|
||||
repo = "lunatone-rest-api-client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KP+i5TmvCkdyIiuGiP9H8GmRC2+/r7QCqmzD+/2+tU8=";
|
||||
hash = "sha256-Hw4sH2CYhE205iDc8QWvg9LJVHJSpqI1ziJZoQyXFts=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonAtLeast,
|
||||
|
||||
# build-system
|
||||
cython,
|
||||
@@ -26,6 +27,9 @@ buildPythonPackage rec {
|
||||
version = "1.10.24";
|
||||
pyproject = true;
|
||||
|
||||
# https://github.com/pydantic/pydantic/pull/12263
|
||||
disabled = pythonAtLeast "3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydantic";
|
||||
repo = "pydantic";
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyfirefly";
|
||||
version = "0.1.13";
|
||||
version = "0.1.14";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erwindouna";
|
||||
repo = "pyfirefly";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-h3p1uP8K/M2DNLapnBlaYmRcYDNzhqdx8507nm7ugqY=";
|
||||
hash = "sha256-MS3iDyH7rR/fsIVVEvhJjaNvjT81r6ReSzS6cqjChR8=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pypck";
|
||||
version = "0.9.10";
|
||||
version = "0.9.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alengwenus";
|
||||
repo = "pypck";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-UTUYYnXY+Wak4cd0fH1V5rdkJ/Aet0DSCHfd+PL+SBo=";
|
||||
hash = "sha256-XULSgnVp7uIob/tL8zqszTBTdxMY4QIeIBruO2Augnc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyportainer";
|
||||
version = "1.0.24";
|
||||
version = "1.0.27";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erwindouna";
|
||||
repo = "pyportainer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RuoOkmiEndS2NpNKWRD+ZScNLwGl9Ud2sGvg5IWb7JI=";
|
||||
hash = "sha256-h/z4CUPxOmcA57gkclEJdIWRFGfsG8v6VS8vNLneS3A=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrainbird";
|
||||
version = "6.0.2";
|
||||
version = "6.0.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "allenporter";
|
||||
repo = "pyrainbird";
|
||||
tag = version;
|
||||
hash = "sha256-CcoZZ60PItqy0bCc36WfyNF9Fc28aHwQ6hhnY41lBNg=";
|
||||
hash = "sha256-8zEbj6n16ZBLPLMNFQxOXObz4GisKQMEh03sdSNtDHs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -51,6 +51,6 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/devitocodes/pyrevolve/releases/tag/${src.tag}";
|
||||
description = "Python library to manage checkpointing for adjoints";
|
||||
license = lib.licenses.epl10;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -57,6 +57,6 @@ buildPythonPackage rec {
|
||||
description = "Fast Python library for SEGY files";
|
||||
homepage = "https://github.com/equinor/segyio";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -39,6 +39,6 @@ buildPythonPackage rec {
|
||||
description = "N-dimensional NumPy array tiling and merging with overlapping, padding and tapering";
|
||||
homepage = "https://the-lay.github.io/tiler/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xeddsa";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Syndace";
|
||||
repo = "python-xeddsa";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5s6ERazWnwYEc0d5e+eSdvOCTklBQVrjzvlNifC2zKU=";
|
||||
hash = "sha256-FHZ9oo9Ps+98dWyPfu3RcmFqZ26zCmO3wNhw+hzuB+w=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
+2
-2
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kzones";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gerritdevriese";
|
||||
repo = "kzones";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-RhdSzDF7F4CL1zGP8OPd1ywgyE2CMIzMqaMv1M+RMlA=";
|
||||
hash = "sha256-JtKE66J/yJfKsS7K6j4wYd1C7A1iVcajsQA+vzL18AY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -49,7 +49,7 @@ let
|
||||
pname = "linux-headers";
|
||||
inherit version;
|
||||
|
||||
ARCH = stdenvNoCC.hostPlatform.linuxArch;
|
||||
env.ARCH = stdenvNoCC.hostPlatform.linuxArch;
|
||||
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -49,7 +49,6 @@ stdenv.mkDerivation {
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
tvorog
|
||||
atila
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
broken = kernel.kernelOlder "4.20";
|
||||
|
||||
@@ -272,6 +272,7 @@ let
|
||||
''
|
||||
touch $out
|
||||
if $OBJDUMP -d \
|
||||
-j .text \
|
||||
--no-addresses \
|
||||
--no-show-raw-insn \
|
||||
"$(PATH=$HOST_PATH type -P test-bin)" \
|
||||
|
||||
@@ -12611,31 +12611,7 @@ with pkgs;
|
||||
|
||||
wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { };
|
||||
|
||||
winePackagesFor =
|
||||
wineBuild:
|
||||
lib.makeExtensible (
|
||||
self: with self; {
|
||||
callPackage = newScope self;
|
||||
|
||||
inherit wineBuild;
|
||||
|
||||
inherit (callPackage ./wine-packages.nix { })
|
||||
minimal
|
||||
base
|
||||
full
|
||||
stable
|
||||
stableFull
|
||||
unstable
|
||||
unstableFull
|
||||
staging
|
||||
stagingFull
|
||||
wayland
|
||||
waylandFull
|
||||
yabridge
|
||||
fonts
|
||||
;
|
||||
}
|
||||
);
|
||||
winePackagesFor = wineBuild: callPackage ./wine-packages.nix { inherit wineBuild; };
|
||||
|
||||
winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32"));
|
||||
wine64Packages = recurseIntoAttrs (winePackagesFor "wine64");
|
||||
|
||||
@@ -2,73 +2,83 @@
|
||||
lib,
|
||||
stdenv,
|
||||
config,
|
||||
callPackage,
|
||||
# not for anything bound in the package set, do note
|
||||
pkgs,
|
||||
newScope,
|
||||
wineBuild,
|
||||
}:
|
||||
|
||||
rec {
|
||||
fonts = callPackage ../applications/emulators/wine/fonts.nix { };
|
||||
minimal = callPackage ../applications/emulators/wine {
|
||||
wineRelease = config.wine.release or "stable";
|
||||
inherit wineBuild;
|
||||
};
|
||||
lib.makeExtensible (
|
||||
self:
|
||||
let
|
||||
callPackage = newScope self;
|
||||
in
|
||||
{
|
||||
inherit callPackage wineBuild;
|
||||
|
||||
base = minimal.override {
|
||||
gettextSupport = true;
|
||||
fontconfigSupport = stdenv.hostPlatform.isLinux;
|
||||
alsaSupport = stdenv.hostPlatform.isLinux;
|
||||
openglSupport = true;
|
||||
vulkanSupport = true;
|
||||
tlsSupport = true;
|
||||
cupsSupport = true;
|
||||
dbusSupport = stdenv.hostPlatform.isLinux;
|
||||
cairoSupport = stdenv.hostPlatform.isLinux;
|
||||
cursesSupport = true;
|
||||
saneSupport = stdenv.hostPlatform.isLinux;
|
||||
pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux;
|
||||
udevSupport = stdenv.hostPlatform.isLinux;
|
||||
xineramaSupport = stdenv.hostPlatform.isLinux;
|
||||
sdlSupport = true;
|
||||
mingwSupport = true;
|
||||
usbSupport = true;
|
||||
waylandSupport = stdenv.hostPlatform.isLinux;
|
||||
x11Support = stdenv.hostPlatform.isLinux;
|
||||
ffmpegSupport = true;
|
||||
};
|
||||
fonts = callPackage ../applications/emulators/wine/fonts.nix { };
|
||||
minimal = callPackage ../applications/emulators/wine {
|
||||
wineRelease = config.wine.release or "stable";
|
||||
inherit wineBuild;
|
||||
};
|
||||
|
||||
full = base.override {
|
||||
gtkSupport = stdenv.hostPlatform.isLinux;
|
||||
gstreamerSupport = true;
|
||||
openclSupport = true;
|
||||
odbcSupport = true;
|
||||
netapiSupport = stdenv.hostPlatform.isLinux;
|
||||
vaSupport = stdenv.hostPlatform.isLinux;
|
||||
pcapSupport = true;
|
||||
v4lSupport = stdenv.hostPlatform.isLinux;
|
||||
gphoto2Support = true;
|
||||
krb5Support = true;
|
||||
embedInstallers = true;
|
||||
};
|
||||
base = self.minimal.override {
|
||||
gettextSupport = true;
|
||||
fontconfigSupport = stdenv.hostPlatform.isLinux;
|
||||
alsaSupport = stdenv.hostPlatform.isLinux;
|
||||
openglSupport = true;
|
||||
vulkanSupport = true;
|
||||
tlsSupport = true;
|
||||
cupsSupport = true;
|
||||
dbusSupport = stdenv.hostPlatform.isLinux;
|
||||
cairoSupport = stdenv.hostPlatform.isLinux;
|
||||
cursesSupport = true;
|
||||
saneSupport = stdenv.hostPlatform.isLinux;
|
||||
pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux;
|
||||
udevSupport = stdenv.hostPlatform.isLinux;
|
||||
xineramaSupport = stdenv.hostPlatform.isLinux;
|
||||
sdlSupport = true;
|
||||
mingwSupport = true;
|
||||
usbSupport = true;
|
||||
waylandSupport = stdenv.hostPlatform.isLinux;
|
||||
x11Support = stdenv.hostPlatform.isLinux;
|
||||
ffmpegSupport = true;
|
||||
};
|
||||
|
||||
stable = base.override { wineRelease = "stable"; };
|
||||
stableFull = full.override { wineRelease = "stable"; };
|
||||
full = self.base.override {
|
||||
gtkSupport = stdenv.hostPlatform.isLinux;
|
||||
gstreamerSupport = true;
|
||||
openclSupport = true;
|
||||
odbcSupport = true;
|
||||
netapiSupport = stdenv.hostPlatform.isLinux;
|
||||
vaSupport = stdenv.hostPlatform.isLinux;
|
||||
pcapSupport = true;
|
||||
v4lSupport = stdenv.hostPlatform.isLinux;
|
||||
gphoto2Support = true;
|
||||
krb5Support = true;
|
||||
embedInstallers = true;
|
||||
};
|
||||
|
||||
unstable = base.override { wineRelease = "unstable"; };
|
||||
unstableFull = full.override { wineRelease = "unstable"; };
|
||||
stable = self.base.override { wineRelease = "stable"; };
|
||||
stableFull = self.full.override { wineRelease = "stable"; };
|
||||
|
||||
staging = base.override { wineRelease = "staging"; };
|
||||
stagingFull = full.override { wineRelease = "staging"; };
|
||||
unstable = self.base.override { wineRelease = "unstable"; };
|
||||
unstableFull = self.full.override { wineRelease = "unstable"; };
|
||||
|
||||
wayland = base.override {
|
||||
x11Support = false;
|
||||
};
|
||||
waylandFull = full.override {
|
||||
x11Support = false;
|
||||
};
|
||||
staging = self.base.override { wineRelease = "staging"; };
|
||||
stagingFull = self.full.override { wineRelease = "staging"; };
|
||||
|
||||
yabridge =
|
||||
let
|
||||
yabridge = base.override { wineRelease = "yabridge"; };
|
||||
in
|
||||
if wineBuild == "wineWow" then yabridge else lib.dontDistribute yabridge;
|
||||
}
|
||||
wayland = self.base.override {
|
||||
x11Support = false;
|
||||
};
|
||||
waylandFull = self.full.override {
|
||||
x11Support = false;
|
||||
};
|
||||
|
||||
yabridge =
|
||||
let
|
||||
yabridge = self.base.override { wineRelease = "yabridge"; };
|
||||
in
|
||||
if wineBuild == "wineWow" then yabridge else lib.dontDistribute yabridge;
|
||||
}
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user