Merge master into staging-next

This commit is contained in:
github-actions[bot] 2025-01-14 18:04:33 +00:00 committed by GitHub
commit 44e4abfaf6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
95 changed files with 1099 additions and 7521 deletions

View file

@ -16554,6 +16554,18 @@
githubId = 3521180;
name = "Tom Sydney Kerckhove";
};
normalcea = {
name = "normalcea";
email = "normalc@posteo.net";
github = "normalcea";
githubId = 190049873;
keys = [
{
fingerprint = "6057 1155 7BA4 B922 66D6 2064 3DE3 BCB2 142A 8C71";
}
];
matrix = "@normalcea:matrix.org";
};
nosewings = {
name = "Nicholas Coltharp";
email = "coltharpnicholas@gmail.com";

View file

@ -268,10 +268,10 @@ in
${lib.optionalString config.system.etc.overlay.mutable ''
# These directories are usually created in initrd,
# but we need to create them here when we didn't we're called directly,
# but we need to create them here when we're called directly,
# for instance by nixos-enter
mkdir --parents /.rw-etc/upper /.rw-etc/work
chmod --recursive 0755 /.rw-etc
chmod 0755 /.rw-etc /.rw-etc/upper /.rw-etc/work
''}
tmpMetadataMount=$(TMPDIR="/run" mktemp --directory -t nixos-etc-metadata.XXXXXXXXXX)

View file

@ -271,6 +271,7 @@ import ./make-test-python.nix (
pleroma.succeed("provision-db")
pleroma.wait_for_file("/var/lib/pleroma")
pleroma.succeed("provision-secrets")
pleroma.systemctl("restart pleroma-migrations.service")
pleroma.systemctl("restart pleroma.service")
pleroma.wait_for_unit("pleroma.service")
pleroma.succeed("provision-user")

View file

@ -714,13 +714,13 @@
"vendorHash": "sha256-F78OR8EG0Vy3WVJWTOlAsIBazsSXGD6KeceYuGnBqjQ="
},
"kubectl": {
"hash": "sha256-5r8ZpifNJZ+UHys7jWVZCd6f9ylT3NBiccsCSQbNy6o=",
"hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=",
"homepage": "https://registry.terraform.io/providers/gavinbunney/kubectl",
"owner": "gavinbunney",
"repo": "terraform-provider-kubectl",
"rev": "v1.18.0",
"rev": "v1.19.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-pE0WujGxCMW0/27F8aaNtyIHdsOJTwEJL+bdiHpzu7s="
"vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA="
},
"kubernetes": {
"hash": "sha256-eSAgeN/ExP75Kbhb099t3vW0XQA2TXIhiyv1RUt4ziM=",

View file

@ -2,7 +2,6 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
cmake,
docbook-xsl-nons,
libxslt,
@ -62,20 +61,19 @@
# tries to compile and run generate_argument_docbook.c
withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
buildPackages,
gnome,
remmina,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "freerdp";
version = "3.9.0";
version = "3.10.3";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = finalAttrs.version;
hash = "sha256-oThlqUpEmhcLpMMYExMA3GbtB2+lq6oc5TRZt0eKRLA=";
hash = "sha256-qFjR1Z2GZsNpgjlbHw+o+dLCBLZQ9D9c93FFqFGM8T4=";
};
postPatch =
@ -84,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
# skip NIB file generation on darwin
substituteInPlace "client/Mac/CMakeLists.txt" "client/Mac/cli/CMakeLists.txt" \
--replace-fail "if (NOT IS_XCODE)" "if (FALSE)"
--replace-fail "if(NOT IS_XCODE)" "if(FALSE)"
substituteInPlace "libfreerdp/freerdp.pc.in" \
--replace-fail "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "treesheets";
version = "0-unstable-2024-12-22";
version = "0-unstable-2025-01-13";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
rev = "b3bf8f2763aa9efaac428107d62194582839df1b";
hash = "sha256-qY5DSFW6jnngvHCBgz9Go9Xsfo2nd7xDyZWuKSpyMMM=";
rev = "89b40de858f598975098a0436637bca8357a4a86";
hash = "sha256-kduZ+1EYxwuKAIVNBg9u32UD463gpBIjcxSj1FgvIIg=";
};
nativeBuildInputs = [

View file

@ -33,5 +33,9 @@ buildGoModule rec {
mainProgram = "arc";
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
knownVulnerabilities = [
"CVE-2024-0406"
"Package is unmaintained upstream"
];
};
}

View file

@ -1,49 +1,101 @@
diff --git a/auto_cpufreq/bin/auto_cpufreq.py b/auto_cpufreq/bin/auto_cpufreq.py
index d9fcd37..7436a7e 100755
--- a/auto_cpufreq/bin/auto_cpufreq.py
+++ b/auto_cpufreq/bin/auto_cpufreq.py
@@ -136,20 +136,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
except KeyboardInterrupt: break
conf.notifier.stop()
elif install:
- root_check()
- if IS_INSTALLED_WITH_SNAP:
- running_daemon_check()
- gnome_power_detect_snap()
- tlp_service_detect_snap()
- bluetooth_notif_snap()
- gov_check()
- run("snapctl set daemon=enabled", shell=True)
- run("snapctl start --enable auto-cpufreq", shell=True)
- else:
- running_daemon_check()
- gov_check()
- deploy_daemon()
- deploy_complete_msg()
+ print("install is disabled in the nix package")
elif update:
root_check()
custom_dir = "/opt/auto-cpufreq/source"
@@ -187,21 +174,7 @@ def main(monitor, live, daemon, install, update, remove, force, config, stats, g
run(["auto-cpufreq", "--version"])
else: print("Aborted")
elif remove:
- root_check()
- if IS_INSTALLED_WITH_SNAP:
- run("snapctl set daemon=disabled", shell=True)
- run("snapctl stop --disable auto-cpufreq", shell=True)
- if auto_cpufreq_stats_path.exists():
- if auto_cpufreq_stats_file is not None:
- auto_cpufreq_stats_file.close()
diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py
index f03e7de..2dff5fb 100755
--- a/auto_cpufreq/core.py
+++ b/auto_cpufreq/core.py
@@ -277,19 +277,12 @@ def get_current_gov():
)
def cpufreqctl():
- """
- deploy cpufreqctl.auto-cpufreq script
- """
- if not (IS_INSTALLED_WITH_SNAP or os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq")):
- copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/local/bin/cpufreqctl.auto-cpufreq")
- call(["chmod", "a+x", "/usr/local/bin/cpufreqctl.auto-cpufreq"])
+ # scripts are already in the correct place
+ pass
def cpufreqctl_restore():
- """
- remove cpufreqctl.auto-cpufreq script
- """
- if not IS_INSTALLED_WITH_SNAP and os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"):
- os.remove("/usr/local/bin/cpufreqctl.auto-cpufreq")
+ #no need to restore
+ pass
def footer(l=79): print("\n" + "-" * l + "\n")
@@ -307,31 +300,8 @@ def remove_complete_msg():
footer()
def deploy_daemon():
- print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n")
-
- auto_cpufreq_stats_path.unlink()
- # ToDo:
- # {the following snippet also used in --update, update it there too(if required)}
- # * undo bluetooth boot disable
- gnome_power_rm_reminder_snap()
- else: remove_daemon()
- remove_complete_msg()
+ print("remove is disabled in the nix package")
elif stats:
not_running_daemon_check()
config_info_dialog()
- cpufreqctl() # deploy cpufreqctl script func call
-
- bluetooth_disable() # turn off bluetooth on boot
-
- auto_cpufreq_stats_path.touch(exist_ok=True)
-
- print("\n* Deploy auto-cpufreq install script")
- copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/local/bin/auto-cpufreq-install")
- call(["chmod", "a+x", "/usr/local/bin/auto-cpufreq-install"])
-
- print("\n* Deploy auto-cpufreq remove script")
- copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/local/bin/auto-cpufreq-remove")
- call(["chmod", "a+x", "/usr/local/bin/auto-cpufreq-remove"])
-
- # output warning if gnome power profile is running
- gnome_power_detect_install()
- gnome_power_svc_disable()
-
- tuned_svc_disable()
-
- tlp_service_detect() # output warning if TLP service is detected
-
- call("/usr/local/bin/auto-cpufreq-install", shell=True)
+ # prevent needless copying and system changes
+ pass
def deploy_daemon_performance():
print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon (performance) " + "-" * 22 + "\n")
@@ -363,37 +333,7 @@ def deploy_daemon_performance():
call("/usr/local/bin/auto-cpufreq-install", shell=True)
-def remove_daemon():
- # check if auto-cpufreq is installed
- if not os.path.exists("/usr/local/bin/auto-cpufreq-remove"):
- print("\nauto-cpufreq daemon is not installed.\n")
- sys.exit(1)
-
- print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n")
-
- bluetooth_enable() # turn on bluetooth on boot
-
- # output warning if gnome power profile is stopped
- gnome_power_rm_reminder()
- gnome_power_svc_enable()
-
- tuned_svc_enable()
-
- # run auto-cpufreq daemon remove script
- call("/usr/local/bin/auto-cpufreq-remove", shell=True)
-
- # remove auto-cpufreq-remove
- os.remove("/usr/local/bin/auto-cpufreq-remove")
-
- # delete override pickle if it exists
- if os.path.exists(governor_override_state): os.remove(governor_override_state)
-
- # delete stats file
- if auto_cpufreq_stats_path.exists():
- if auto_cpufreq_stats_file is not None: auto_cpufreq_stats_file.close()
- auto_cpufreq_stats_path.unlink()
-
- cpufreqctl_restore() # restore original cpufrectl script
+def remove_daemon(): pass
def gov_check():
for gov in AVAILABLE_GOVERNORS:

View file

@ -78,9 +78,9 @@
},
"amg": {
"pname": "amg",
"version": "2.5.3",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.3-py3-none-any.whl",
"hash": "sha256-xrJS464daKWiw7QeXzzicm9WWl7+0GVi7N1GV203IMk=",
"version": "2.5.4",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.4-py3-none-any.whl",
"hash": "sha256-4sNSdZJleUc+MzvzgLW57zrhsGLcGIpBzxHX+A7JM0g=",
"description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"
},
"amlfs": {
@ -225,9 +225,9 @@
},
"connectedvmware": {
"pname": "connectedvmware",
"version": "1.2.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedvmware-1.2.0-py2.py3-none-any.whl",
"hash": "sha256-tzGoIcYJqui/q34EcLNCuReefgxlSC9KQypg2HpMOV8=",
"version": "1.2.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedvmware-1.2.1-py2.py3-none-any.whl",
"hash": "sha256-zEljltE9NdxAg2KUbDYJ4D9NMb1fGhQ0SmPdM6OhXvo=",
"description": "Microsoft Azure Command-Line Tools Connectedvmware Extension"
},
"cosmosdb-preview": {
@ -274,9 +274,9 @@
},
"databricks": {
"pname": "databricks",
"version": "1.0.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-1.0.1-py3-none-any.whl",
"hash": "sha256-VRZddDXNeg3IdYfoL8IC15Kl8oycRDmGVbCkdw0DjDA=",
"version": "1.1.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-1.1.0-py3-none-any.whl",
"hash": "sha256-JOyOqiRtMscqYPJYVh8D9HNMB3irp5eqYs19gSt9RbI=",
"description": "Microsoft Azure Command-Line Tools DatabricksClient Extension"
},
"datadog": {
@ -295,9 +295,9 @@
},
"datamigration": {
"pname": "datamigration",
"version": "1.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-1.0.0b2-py3-none-any.whl",
"hash": "sha256-iQG1ZkqV5mV4Fpi8Au6UtCl8gqyf36uZ3U8TusHAkj4=",
"version": "1.0.0b3",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-1.0.0b3-py3-none-any.whl",
"hash": "sha256-pObfLaS8pQZFXgUI8epvYThjUpcjwWgfLWaCs1ZYTgw=",
"description": "Microsoft Azure Command-Line Tools DataMigrationManagementClient Extension"
},
"dataprotection": {
@ -337,9 +337,9 @@
},
"devcenter": {
"pname": "devcenter",
"version": "6.1.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-6.1.0-py3-none-any.whl",
"hash": "sha256-OaWjjAv4bu2KsUYXcQrxrlEiiUrnqa2rfHXg7ZxbyB4=",
"version": "6.2.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-6.2.0-py3-none-any.whl",
"hash": "sha256-JPT+sOq8D1Ojjy/7e4Nwd9jWuUNg1o/Dhn8C6Y4PcLc=",
"description": "Microsoft Azure Command-Line Tools DevCenter Extension"
},
"diskpool": {
@ -372,9 +372,9 @@
},
"durabletask": {
"pname": "durabletask",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/durabletask-1.0.0b1-py3-none-any.whl",
"hash": "sha256-16kpspSSjfedgxL79q9yxdko4wTEp7N9rz/3cmZ9+yU=",
"version": "1.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/durabletask-1.0.0b2-py3-none-any.whl",
"hash": "sha256-llVzI3aKDrxZKUdPijLEmh2gf/BY7Jl9BZYm0g15Iik=",
"description": "Microsoft Azure Command-Line Tools Durabletask Extension"
},
"dynatrace": {
@ -414,9 +414,9 @@
},
"eventgrid": {
"pname": "eventgrid",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/eventgrid-1.0.0b1-py2.py3-none-any.whl",
"hash": "sha256-Ziyio4Hvz4IaFmSP87ie2+IfTpiH4Y/6fuDbuvAzLt4=",
"version": "1.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/eventgrid-1.0.0b2-py2.py3-none-any.whl",
"hash": "sha256-x9Q9JDXHEic5pZVSEphx+4HoM7dxE5b/0bby879XiGg=",
"description": "Microsoft Azure Command-Line Tools EventGrid Command Module"
},
"express-route-cross-connection": {
@ -519,9 +519,9 @@
},
"healthcareapis": {
"pname": "healthcareapis",
"version": "1.0.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthcareapis-1.0.0-py3-none-any.whl",
"hash": "sha256-RSFMiiNWGMw4PjI+PKQ7UxGn00Jb5CUxRyKK/fRLruc=",
"version": "1.0.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthcareapis-1.0.1-py3-none-any.whl",
"hash": "sha256-VTL1/L/UfORNWvyY0hvSJrvoz5zHabLPFX/sEdQaLhI=",
"description": "Microsoft Azure Command-Line Tools HealthcareApisManagementClient Extension"
},
"hpc-cache": {
@ -631,9 +631,9 @@
},
"maintenance": {
"pname": "maintenance",
"version": "1.7.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-1.7.0b1-py3-none-any.whl",
"hash": "sha256-cZmLfV3nIjxeKuehwARFtBHROaAjh2+EeI9R8fUQsts=",
"version": "1.7.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-1.7.0b2-py3-none-any.whl",
"hash": "sha256-ebiJ8U5FyRLG9VHBGB75AqkjPVars8kGxWnjUCMiiCI=",
"description": "Microsoft Azure Command-Line Tools MaintenanceManagementClient Extension"
},
"managedccfs": {
@ -659,9 +659,9 @@
},
"mcc": {
"pname": "mcc",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/mcc-1.0.0b1-py3-none-any.whl",
"hash": "sha256-anNMf7Gdca1dIQFGSyR8e//doeWcJlHphUf/eesZ7U0=",
"version": "1.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/mcc-1.0.0b2-py3-none-any.whl",
"hash": "sha256-z8u9+D5A5bq8WAUqeZx1H1Y+2ukQQXnAyefW51OvEU0=",
"description": "Microsoft Connected Cache CLI Commands"
},
"mdp": {
@ -804,6 +804,13 @@
"hash": "sha256-/k47qFwfZZZqBZKR5G6+t8lW8o2isVtUGwSSdltiOZI=",
"description": "Microsoft Azure Command-Line Tools PeeringManagementClient Extension"
},
"playwright-cli-extension": {
"pname": "playwright-cli-extension",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/playwright_cli_extension-1.0.0b1-py3-none-any.whl",
"hash": "sha256-bxsHF5TdEdT97up3pngs5HrNKOUJgHQpTrpxgWu42i0=",
"description": "Microsoft Azure Command-Line Tools PlaywrightCliExtension Extension"
},
"portal": {
"pname": "portal",
"version": "0.1.3",
@ -932,9 +939,9 @@
},
"spring": {
"pname": "spring",
"version": "1.26.0",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring-1.26.0-py3-none-any.whl",
"hash": "sha256-6CxqOuyIoHNsdhR3B7ZOZM/ZuFRQM12eD6zHkOHnYbQ=",
"version": "1.26.1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring-1.26.1-py3-none-any.whl",
"hash": "sha256-TyY/a5DJ1zntN22Gl9YCWz/Ty26zubZpwzlS10IyeVo=",
"description": "Microsoft Azure Command-Line Tools spring Extension"
},
"spring-cloud": {
@ -1009,9 +1016,9 @@
},
"subscription": {
"pname": "subscription",
"version": "1.0.0b1",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/subscription-1.0.0b1-py2.py3-none-any.whl",
"hash": "sha256-Pzu0+7dhF00ToPhjNit084i8ZI9/KW+bbiGRs1UHrk8=",
"version": "1.0.0b2",
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/subscription-1.0.0b2-py2.py3-none-any.whl",
"hash": "sha256-G5N/S3Ng0vKStpXab6If8tiajJANZp8SyXz5jDg2XR8=",
"description": "Microsoft Azure Command-Line Tools Subscription Extension"
},
"support": {

View file

@ -26,14 +26,14 @@
}:
let
version = "2.67.0";
version = "2.68.0";
src = fetchFromGitHub {
name = "azure-cli-${version}-src";
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
hash = "sha256-UrWReU9x7n2GqFt+OO9SLo0uAuwQBXUr4rYtTZfHlfY=";
hash = "sha256-WJkuLZUWNzbjAmOPilOK6jnjmax/3ct+ZVWQB3ho/BI=";
};
# put packages that needs to be overridden in the py package scope
@ -251,6 +251,7 @@ py.pkgs.toPythonApplication (
# remove garbage
rm $out/bin/az.bat
rm $out/bin/az.completion.sh
rm $out/bin/azps.ps1
'';
# wrap the executable so that the python packages are available

View file

@ -83,6 +83,7 @@ let
--ignore=azure/cli/core/tests/test_cloud.py \
--ignore=azure/cli/core/tests/test_extension.py \
--ignore=azure/cli/core/tests/test_util.py \
--ignore=azure/cli/core/tests/test_argcomplete.py \
-k 'not metadata_url and not test_send_raw_requests and not test_format_styled_text_legacy_powershell'
'';

View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "bird";
version = "2.16";
version = "2.16.1";
src = fetchurl {
url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz";
hash = "sha256-ZikRApOvbxcnlnEh1k+cjclO1hgcTvix3FHH/dZphxw=";
hash = "sha256-9uWcvMrKYmaK6gIGhyS9QnuexEnH4PD8VoFQOYjHNbQ=";
};
nativeBuildInputs = [

View file

@ -16,16 +16,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "cargo-leptos";
version = "0.2.24";
version = "0.2.25";
src = fetchFromGitHub {
owner = "leptos-rs";
repo = pname;
rev = "v${version}";
hash = "sha256-KNasxy/hEU04H/xAV3y92OtxBmYgA0RZjCQnC/XvBoo=";
hash = "sha256-vgYr6mMS2O4/102R+6iCW9IBziM1tIav569d36iIbl8=";
};
cargoHash = "sha256-dxDmJVkkdT6hbhboyn8XwMJp379xAVZ8GFVp3F+LtWA=";
cargoHash = "sha256-Q3+tOpvzDqIn2M6Zrm1xK6TeTV4zrxK0PYgcIsEBIhE=";
buildInputs = optionals isDarwin [
SystemConfiguration

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-xwin";
version = "0.18.3";
version = "0.18.4";
src = fetchFromGitHub {
owner = "rust-cross";
repo = "cargo-xwin";
rev = "v${version}";
hash = "sha256-JwN0eUtj2qa5Hdl4aeDr9FtEpTB/Y36/q8ValfuvN/A=";
hash = "sha256-bzyEIBOa0yqjAYjWGw4Fbb8Cv3yCCfJ4vV0q600Rwyk=";
};
cargoHash = "sha256-pHy5sImtaN5MzkewygFbPK1yFLRmHrzPDa7NOoUoA5M=";
cargoHash = "sha256-uAQD1SUo8W5TtnZyprOFGztpOqvjPEDddA6CBPUN74g=";
meta = with lib; {
description = "Cross compile Cargo project to Windows MSVC target with ease";

View file

@ -14,16 +14,16 @@
buildGoModule rec {
pname = "chart-testing";
version = "3.11.0";
version = "3.12.0";
src = fetchFromGitHub {
owner = "helm";
repo = pname;
rev = "v${version}";
hash = "sha256-eiU8omDEGDJVmumHwZkNix7qMVkoR6Irg0x9dTBzadA=";
hash = "sha256-q56ZM+YzL7RRC3RD3xO3K0hIDomKun5xmSKuiDTq1cU=";
};
vendorHash = "sha256-o9oZnQPztrK6HvclPt33Y05GQFWDsnUYti5x8R7aWS8=";
vendorHash = "sha256-kTlqGZVOppf+WMcFw0T9FVbu9eOWAWzotR8fPPyo2Ms=";
postPatch = ''
substituteInPlace pkg/config/config.go \

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "Washington-University";
repo = "CiftiLib";
rev = "v${version}";
tag = "v${version}";
hash = "sha256-xc2dpMse4SozYEV/w3rXCrh1LKpTThq5nHB2y5uAD0A=";
};
@ -32,8 +32,9 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'big|datatype-md5'" ];
# error: no member named 'file_string' in 'boost::filesystem::path'
env.NIX_CFLAGS_COMPILE = "-UCIFTILIB_BOOST_NO_FSV3";
# error: no member named 'file_string' in 'boost::filesystem::path';
# error: 'class boost::filesystem::path' has no member named 'normalize', resp.
env.NIX_CFLAGS_COMPILE = "-UCIFTILIB_BOOST_NO_FSV3 -UCIFTILIB_BOOST_NO_CANONICAL";
doCheck = true;

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "civo";
version = "1.1.93";
version = "1.1.95";
src = fetchFromGitHub {
owner = "civo";
repo = "cli";
rev = "v${version}";
hash = "sha256-FX2hnqYqvPoD6Fn1363XrK4n0tMd9xkWlIcyIhDJDW4=";
hash = "sha256-/byI9QFxkCiyVvxF0K1RjK5xW4EE8l/+LqqKy9GW1Pw=";
};
vendorHash = "sha256-G3ijLi3ZbURVHkjUwylFWwxRyxroppVUFJveKw5qLq8=";
vendorHash = "sha256-ZylfnOeS6tXYaBbXg5znus6CKE+IZXmPSOc9UwYtscc=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -12,12 +12,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "disko";
version = "1.10.0";
version = "1.11.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "disko";
rev = "v${finalAttrs.version}";
hash = "sha256-snPBgTqwn3FPZVdFC5yt7Bnk3squim1vZOZ8CObWykk=";
hash = "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bash ];

View file

@ -3,6 +3,7 @@
stdenv,
autoreconfHook,
fetchFromGitHub,
fetchpatch,
ldns,
libck,
nghttp2,
@ -33,6 +34,16 @@ stdenv.mkDerivation rec {
openssl
];
patches = lib.optionals stdenv.hostPlatform.isMusl [
# dnsperf doesn't have support for musl (https://github.com/DNS-OARC/dnsperf/issues/265)
# and strerror_r returns int on non-glibc: https://github.com/NixOS/nixpkgs/issues/370498
# TODO: remove if better non-glibc detection is ever upstreamed
(fetchpatch {
url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/5bd92b8f86a0bf15dddf8fa180adf14344d6cc15/testing/dnsperf/musl-perf_strerror_r.patch";
hash = "sha256-yTJHXkti/xSklmVfAV45lEsOiHy7oL1phImNTNtcPkM=";
})
];
doCheck = true;
meta = with lib; {

View file

@ -0,0 +1,91 @@
{
lib,
stdenvNoCC,
fetchurl,
gzip,
xar,
cpio,
writeShellApplication,
curl,
cacert,
gawk,
common-updater-scripts,
versionCheckHook,
writeShellScript,
coreutils,
xcbuild,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "enpass-mac";
version = "6.11.8.1861";
src = fetchurl {
url = "https://dl.enpass.io/stable/mac/package/${finalAttrs.version}/Enpass.pkg";
hash = "sha256-n0ClsyGTS52ms161CJihIzBI5GjiMIF6HEJ59+jciq8=";
};
dontPatch = true;
dontConfigure = true;
dontBuild = true;
dontFixup = true;
nativeBuildInputs = [
gzip
xar
cpio
];
unpackPhase = ''
runHook preUnpack
xar -xf $src
gunzip -dc Enpass_temp.pkg/Payload | cpio -i
runHook postUnpack
'';
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
mv Enpass.app $out/Applications
runHook postInstall
'';
passthru.updateScript = lib.getExe (writeShellApplication {
name = "enpass-mac-update-script";
runtimeInputs = [
curl
cacert
gawk
common-updater-scripts
];
text = ''
url="https://www.enpass.io/download/macos/website/stable"
version=$(curl -Ls -o /dev/null -w "%{url_effective}" "$url" | awk -F'/' '{print $7}')
update-source-version enpass-mac "$version"
'';
});
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = writeShellScript "version-check" ''
marketing_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleShortVersionString" "$1" | ${coreutils}/bin/tr -d '"')
build_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleVersion" "$1")
echo $marketing_version.$build_version
'';
versionCheckProgramArg = [ "${placeholder "out"}/Applications/Enpass.app/Contents/Info.plist" ];
doInstallCheck = true;
meta = {
description = "Choose your own safest place to store passwords";
homepage = "https://www.enpass.io";
changelog = "https://www.enpass.io/release-notes/macos-website-ver/";
license = [ lib.licenses.unfree ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
maintainers = with lib.maintainers; [ DimitarNestorov ];
platforms = lib.platforms.darwin;
};
})

View file

@ -25,13 +25,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gef";
version = "2024.06";
version = "2025.01";
src = fetchFromGitHub {
owner = "hugsy";
repo = "gef";
rev = version;
sha256 = "sha256-fo8hC2T2WDcG0MQffPm2QBPR89EPiqctkUJC40PeyWg=";
sha256 = "sha256-JM9zH1wWEdjpBafnxMIFtePjXWf3UOXhBSWZCXEOzKw=";
};
dontBuild = true;

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "glooctl";
version = "1.18.2";
version = "1.18.5";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
hash = "sha256-EpZaO7I8wQ8PnZKc8hBiK/mY+v+A8osuvrmGH/qGr64=";
hash = "sha256-0ITszVZnxbXSCie9lFotMwZYSVTAhqDgKiz19apPkog=";
};
vendorHash = "sha256-N6S/g89mNsDlJIWOl9F4xo8L/k/k8971rEV9pSShf3U=";
vendorHash = "sha256-AEfDeUD7A4ZFgctNa8b1XeJMFnmcQCLvlQqNFM/gSCc=";
subPackages = [ "projects/gloo/cli/cmd" ];

View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "goose";
version = "3.24.0";
version = "3.24.1";
src = fetchFromGitHub {
owner = "pressly";
repo = pname;
rev = "v${version}";
hash = "sha256-VAdRlmEY4fAMQtKLfleleW/thnPJJcfSBw+efCNNSmc=";
hash = "sha256-Dy6HHmf1kHd0KJ1EuPnNaa/zIQPUClvwJ8gUR7pi3Cw=";
};
proxyVendor = true;

View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "govulncheck";
version = "1.1.3";
version = "1.1.4";
src = fetchFromGitHub {
owner = "golang";
repo = "vuln";
tag = "v${version}";
hash = "sha256-ydJ8AeoCnLls6dXxjI05+THEqPPdJqtAsKTriTIK9Uc=";
hash = "sha256-d1JWh/K+65p0TP5vAQbSyoatjN4L5nm3VEA+qBSrkAA=";
};
patches = [
@ -23,7 +23,7 @@ buildGoModule rec {
})
];
vendorHash = "sha256-jESQV4Na4Hooxxd0RL96GHkA7Exddco5izjnhfH6xTg=";
vendorHash = "sha256-MSTKDeWVxD2Fa6fNoku4EwFwC90XZ5acnM67crcgXDg=";
subPackages = [
"cmd/govulncheck"

View file

@ -5,10 +5,10 @@
}:
let
pname = "heptabase";
version = "1.50.0";
version = "1.50.1";
src = fetchurl {
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
hash = "sha256-HFnHzftnLO4nfHxXhvHH4+lVdcPp2N3ihgMhnxSv2bA=";
hash = "sha256-rxCpgetkm8Ma3d5PvTCM2SBcPffImw380UPuR+q0LaQ=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };

View file

@ -19,14 +19,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2025-01-02";
version = "0-unstable-2025-01-13";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "5f6aa268e419d053c3d5025da740e390b12ac936";
hash = "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=";
rev = "fc52a210b60f2f52c74eac41a8647c1573d2071d";
hash = "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=";
};
nativeBuildInputs = [

View file

@ -11,16 +11,16 @@
buildGoModule rec {
pname = "imgproxy";
version = "3.27.0";
version = "3.27.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
hash = "sha256-swqbT/DXI2LsW006wBesqYLbAEscn2p/36gT3VE7pqg=";
hash = "sha256-ewfBMHSrt7fBazgswOwOmeqk0uAc3uULPYppQZcLep4=";
rev = "v${version}";
};
vendorHash = "sha256-VBJo9Ai130u9tChU2f2tdSynuad7TACTSiYyULTK5Bw=";
vendorHash = "sha256-ckJ9HJkkaDx42wS/j9cwDGOku9X7yZ5uL1bun6IMfH4=";
nativeBuildInputs = [
pkg-config

View file

@ -1,6 +1,5 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
versionCheckHook,
@ -9,23 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "jaq";
version = "2.0.1";
version = "2.1.0";
src = fetchFromGitHub {
owner = "01mf02";
repo = "jaq";
tag = "v${version}";
hash = "sha256-S8ELxUKU8g8+6HpM+DxINEqMDha7SgesDymhCb7T9bg=";
hash = "sha256-J+48TWGio6KplqYFJM25LGIuf+yAyE7NMqgPUPgpTeY=";
};
cargoHash = "sha256-i3AxIlRY6r0zrMmZVh1l9fPiR652xjhTcwCyHCHCrL8=";
# This very line fails on `x86_64-darwin`: assertion failed: out.eq(ys)
# https://github.com/01mf02/jaq/blob/v2.0.1/jaq-json/tests/funs.rs#L118
postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
substituteInPlace jaq-json/tests/funs.rs \
--replace-fail 'give(json!(null), "2.1 % 0 | isnan", json!(true));' ""
'';
cargoHash = "sha256-9N24D4fKsy/n+f5uTNkbQNgW+BgGkdEvgitvqbnOcGs=";
nativeInstallCheckInputs = [
versionCheckHook

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubedock";
version = "0.17.1";
version = "0.18.0";
src = fetchFromGitHub {
owner = "joyrex2001";
repo = "kubedock";
rev = version;
hash = "sha256-413VUnVYPHKoy9r/XQ4An/TNfEjozsGANfKawFN7Y08=";
hash = "sha256-axJNlmQfcltmFHNiCkQiK7l2KydvP8HEiHqN6JwsrjQ=";
};
vendorHash = "sha256-S/0oyps1zrbncfy31C6SV13gt/oE+GeXGxD0KaKCn/s=";
vendorHash = "sha256-9mPcHMNAkjO8Ae9HcgvdR2+UUPMYmE2oTfYksZ/KL+Y=";
# config.Build not defined as it would break r-ryantm
ldflags = [

View file

@ -61,23 +61,26 @@ stdenv.mkDerivation (finalAttrs: {
checkPhase =
let
disabledTests =
lib.optionals stdenv.hostPlatform.isAarch64 [
# Broken on all platforms, test just accidentally passes on some.
# https://gitlab.com/inkscape/lib2geom/-/issues/63
"elliptical-arc-test"
]
++ lib.optionals stdenv.hostPlatform.isMusl [
lib.optionals stdenv.hostPlatform.isMusl [
# Fails due to rounding differences
# https://gitlab.com/inkscape/lib2geom/-/issues/70
"circle-test"
]
++ lib.optionals (stdenv.hostPlatform.system != "x86_64-linux") [
# Broken on all platforms, test just accidentally passes on some.
# https://gitlab.com/inkscape/lib2geom/-/issues/63
"elliptical-arc-test"
# https://gitlab.com/inkscape/lib2geom/-/issues/69
"polynomial-test"
# https://gitlab.com/inkscape/lib2geom/-/issues/75
"line-test"
# Failure observed on i686
"angle-test"
"self-intersections-test"
# Failure observed on aarch64-darwin
"bezier-test"
"ellipse-test"

View file

@ -14,6 +14,12 @@ stdenv.mkDerivation {
url = "mirror://sourceforge/libnids/libnids-1.24.tar.gz";
sha256 = "1cblklfdfxcmy0an6xyyzx4l877xdawhjd28daqfsvrh81mb07k1";
};
postPatch = ''
substituteInPlace src/Makefile.in \
--replace-fail ar '${stdenv.cc.targetPrefix}ar'
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libpcap

View file

@ -3,42 +3,26 @@ From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Fri, 20 Dec 2024 16:37:07 +0100
Subject: [PATCH] nvc: nvidia-docker-compatible binary lookups
This patch maintains compatibility with NixOS' `virtualisation.docker.enableNvidia` option (which is to be removed soon), while also enabling supplying a custom PATH, to work with the modern CDI-based approach.
This patch maintains compatibility with NixOS' `virtualisation.docker.enableNvidia` option (which is to be removed soon), while also including the driver package's path, to work with the modern CDI-based approach.
---
src/nvc_info.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
src/nvc_info.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/nvc_info.c b/src/nvc_info.c
index cf4b1905fd2127c28ee16649501be122d3be5261..2ab552860ef98879b76398a6f9be95f07b2c8a4a 100644
index cf4b1905fd2127c28ee16649501be122d3be5261..cdfa19721bc913d8e2adb96d106cd65ee6111623 100644
--- a/src/nvc_info.c
+++ b/src/nvc_info.c
@@ -243,16 +243,28 @@ static int
find_binary_paths(struct error *err, struct dxcore_context* dxcore, struct nvc_driver_info* info,
const char *root, const char * const bins[], size_t size)
{
- char *env, *ptr;
+ char *env, *ptr, *os_path;
const char *dir;
char tmp[PATH_MAX];
@@ -249,10 +249,13 @@ find_binary_paths(struct error *err, struct dxcore_context* dxcore, struct nvc_d
char path[PATH_MAX];
int rv = -1;
- if ((env = secure_getenv("PATH")) == NULL) {
+ if ((os_path = secure_getenv("PATH")) == NULL) {
+ // TODO: Remove this patch once `virtualisation.docker.enableNvidia` is removed from NixOS.
+ // It only exists to maintain compatibility with the old nvidia-docker package.
+ if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin:@driverLink@/bin") == NULL) {
error_setx(err, "environment variable PATH not found");
return (-1);
}
+
+ // TODO: Remove this patch once `virtualisation.docker.enableNvidia` is removed from NixOS.
+ // It only exists to maintain compatibility with the old nvidia-docker package.
+ int p_rv = snprintf(env, PATH_MAX, "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin:%s", os_path);
+ if (p_rv >= PATH_MAX) {
+ error_setx(err, "PATH environment variable too long");
+ return (-1);
+ } else if (p_rv < 0) {
+ error_setx(err, "error setting PATH environment variable");
+ return (-1);
+ }
+
if ((env = ptr = xstrdup(err, env)) == NULL)
return (-1);

View file

@ -52,7 +52,9 @@ stdenv.mkDerivation rec {
# for binary lookups.
# TODO: Remove the legacy compatibility once nvidia-docker is removed
# from NixOS.
./0002-nvc-nvidia-docker-compatible-binary-lookups.patch
(replaceVars ./0002-nvc-nvidia-docker-compatible-binary-lookups.patch {
inherit (addDriverRunpath) driverLink;
})
# fix bogus struct declaration
./0003-nvc-fix-struct-declaration.patch

View file

@ -21,13 +21,13 @@
# "${edids}/lib/firmware/edid/PG278Q_2014.bin";
stdenv.mkDerivation rec {
pname = "linuxhw-edid-fetcher";
version = "0-unstable-2023-05-08";
version = "0-unstable-2025-01-06";
src = fetchFromGitHub {
owner = "linuxhw";
repo = "EDID";
rev = "98bc7d6e2c0eaad61346a8bf877b562fee16efc3";
hash = "sha256-+Vz5GU2gGv4QlKO4A6BlKSETxE5GAcehKZL7SEbglGE=";
rev = "cc83e52221a9a6d98632f00b54be64fd0bee0394";
hash = "sha256-qwTHQOEeFG7SOM2JG9mNpJEoPI8M7GHuwYPWWfU/ID4=";
};
fetch = lib.getExe (writeShellApplication {

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "mark";
version = "11.3.1";
version = "12.0.0";
src = fetchFromGitHub {
owner = "kovetskiy";
repo = "mark";
rev = version;
sha256 = "sha256-gYNNh29Z65f7lAYooK0GQe3zlJ7OIpDfIQsc68UDeCc=";
sha256 = "sha256-kMP6+L7kfK/qfVI49ssD6Ar1c7ugKgiXUIk9yjQYXE8=";
};
vendorHash = "sha256-I3hJn2wGRB5Kr6aoyiQHEIaFAQPwUn6kDJHCFuX+nAM=";
vendorHash = "sha256-40hYy3rXyTqrmTp6lNsLI5c2GWZ6Aoi3KRPJV0Ry5Ds=";
ldflags = [
"-s"

View file

@ -14,13 +14,13 @@
}:
stdenv.mkDerivation rec {
pname = "narsil";
version = "1.4.0";
version = "bbc8fc5efd779ec885045f9b8d903d0df1bec1b2";
src = fetchFromGitHub {
owner = "NickMcConnell";
repo = "NarSil";
rev = version;
hash = "sha256-uupuWqzaVNmowXNjZJiiuZKId7EMDxLq+EHUg5YRSbk=";
hash = "sha256-keN1IJao80Pr8SpHe0tYXg14l9rBfboyNoDaivzWsyM=";
};
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };

View file

@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "nextcloud-client";
version = "3.15.2";
version = "3.15.3";
outputs = [ "out" "dev" ];
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "nextcloud-releases";
repo = "desktop";
tag = "v${version}";
hash = "sha256-JA6ke9tBS4IiuDWJ8Efa76+5os+RT0L/zv00ncgH+IU=";
hash = "sha256-48iqLd1S84ZElibdgwEXl3LZeYruo9r34LPn7BzYpdk=";
};
patches = [

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
version = "1.30.0";
version = "1.31.0";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UFpTDZAPFZIoI0pOWZDhx7t/GhXNY4Xy1DtwvjPzSGs=";
sha256 = "sha256-t9eC7WdPGROLW+j/2O4rV2n16hA9/+rHHyB8E5LLUnE=";
};
cargoHash = "sha256-ecrAaix3dsCa6nTvZ1jqAwW5N/7lF+0MclXkk7zt2zk=";
cargoHash = "sha256-HGAhXhThcxCmjJt4Xu3qU5LSBNKvC3rztWVQoiB7GQs=";
# skip test due FHS dependency
doCheck = false;

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "nomino";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "yaa110";
repo = pname;
rev = version;
hash = "sha256-mHw1nk5RtrOT1BUVzdfbnqzH9Ubk5fBwM6wxICJTWyM=";
hash = "sha256-/5rKlPRo3+BsqPgHJ0M/JDGwA0c4rAiOd7gGClPfxMg=";
};
cargoHash = "sha256-A8Edb+30SXfaUC9yE8WPuk8rYEIP6uD/Lo1sn078Bv4=";
cargoHash = "sha256-LaLMa66paTW9Wubus3phc7IgDW54sJFSf4VHnJHGq3o=";
meta = with lib; {
description = "Batch rename utility for developers";

View file

@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
installShellFiles,
pandoc,
@ -11,38 +10,22 @@
expat,
libosmium,
lz4,
nlohmann_json,
protozero,
zlib,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "osmium-tool";
version = "1.16.0";
version = "1.17.0";
src = fetchFromGitHub {
owner = "osmcode";
repo = "osmium-tool";
rev = "v${version}";
sha256 = "sha256-DObqbzdPA4RlrlcZhqA0MQtWBE+D6GRD1pd9U4DARIk=";
tag = "v${finalAttrs.version}";
sha256 = "sha256-l6C2DGGKcbMUkKDruM8QzpriqFMvDnsi4OE99a2EzhA=";
};
patches = [
# Work around https://github.com/osmcode/osmium-tool/issues/276
# by applying changes from https://github.com/Tencent/rapidjson/pull/719
(fetchpatch {
url = "https://github.com/Tencent/rapidjson/commit/3b2441b87f99ab65f37b141a7b548ebadb607b96.patch";
hash = "sha256-Edmq+hdJQFQ4hT3Oz1cv5gX95qQxPLD4aY8QMTonDe8=";
})
(fetchpatch {
url = "https://github.com/Tencent/rapidjson/commit/862c39be371278a45a88d4d1d75164be57bb7e2d.patch";
hash = "sha256-V5zbq/THUY75p1RdEPKJK2NVnxbZs07MMwJBAH7nAMg=";
})
(fetchpatch {
url = "https://github.com/osmcode/osmium-tool/commit/1c62771a62f260b07c1b9a52338a24a978dcd967.patch";
hash = "sha256-/2HUu4tLRZzoCcGVEM61gE4RjiA2XGalr9OnhCUhKj8=";
})
];
nativeBuildInputs = [
cmake
installShellFiles
@ -55,6 +38,7 @@ stdenv.mkDerivation rec {
expat
libosmium
lz4
nlohmann_json
protozero
zlib
];
@ -65,16 +49,16 @@ stdenv.mkDerivation rec {
installShellCompletion --zsh ../zsh_completion/_osmium
'';
meta = with lib; {
meta = {
description = "Multipurpose command line tool for working with OpenStreetMap data based on the Osmium library";
homepage = "https://osmcode.org/osmium-tool/";
changelog = "https://github.com/osmcode/osmium-tool/blob/v${version}/CHANGELOG.md";
license = with licenses; [
changelog = "https://github.com/osmcode/osmium-tool/blob/v${finalAttrs.version}/CHANGELOG.md";
license = with lib.licenses; [
gpl3Plus
mit
bsd3
];
maintainers = with maintainers; teams.geospatial.members ++ [ das-g ];
maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ das-g ]);
mainProgram = "osmium";
};
}
})

View file

@ -14,17 +14,17 @@
rustPlatform.buildRustPackage rec {
pname = "pixi";
version = "0.40.0";
version = "0.40.1";
src = fetchFromGitHub {
owner = "prefix-dev";
repo = "pixi";
tag = "v${version}";
hash = "sha256-LuRnPG8vag8SNSChZlWBBavxAlLRk1P73N+VpO0SeTA=";
hash = "sha256-brhc9Zk1uXRySzWLANTrYekGwIq5IICEsJo+B82c9PY=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-I3TnZ9ZHU4TUOUkBIeeRjP+sc/k2qVNtltzkyN87aZo=";
cargoHash = "sha256-1q9+y3q4AR8oTrK2MSiXvvs3Wa8KD4DtmX2MD3a8cK4=";
nativeBuildInputs = [
pkg-config

View file

@ -4,7 +4,7 @@
fetchFromGitHub,
ensureNewerSourcesForZipFilesHook,
makeDesktopItem,
imagemagick,
copyDesktopItems,
cmake,
pkg-config,
alsa-lib,
@ -14,33 +14,36 @@
curl,
xorg,
python3,
libsysprof-capture,
pcre2,
util-linux,
libselinux,
libsepol,
libthai,
libxkbcommon,
libdatrie,
libepoxy,
libsoup_2_4,
libGL,
libjack2,
lerc,
sqlite,
expat,
makeWrapper,
nix-update-script,
}:
let
# data copied from build system: https://build.opensuse.org/package/view_file/home:plugdata/plugdata/PlugData.desktop
desktopItem = makeDesktopItem {
name = "PlugData";
desktopName = "PlugData";
exec = "plugdata";
icon = "plugdata_logo.png";
comment = "Pure Data as a plugin, with a new GUI";
type = "Application";
categories = [
"AudioVideo"
"Music"
];
};
version = "0.9.1";
in
stdenv.mkDerivation (finalAttrs: {
stdenv.mkDerivation {
pname = "plugdata";
version = "0.8.0";
inherit version;
src = fetchFromGitHub {
owner = "plugdata-team";
repo = "plugdata";
rev = "v${finalAttrs.version}";
hash = "sha256-qG9fH5C42jiHj03p/KM28jmDIkJkrQMe7fxg92Lg7B4=";
tag = "v${version}";
hash = "sha256-dcggq455lZiwl1lps11fuKX6sx0A8UtFwFoiBJWtwFQ=";
fetchSubmodules = true;
};
@ -48,10 +51,11 @@ stdenv.mkDerivation (finalAttrs: {
cmake
pkg-config
ensureNewerSourcesForZipFilesHook
imagemagick
copyDesktopItems
python3
makeWrapper
];
buildInputs = [
alsa-lib
curl
@ -63,71 +67,95 @@ stdenv.mkDerivation (finalAttrs: {
xorg.libXinerama
xorg.libXrender
xorg.libXrandr
xorg.libXdmcp
xorg.libXtst
xorg.xvfb
libsysprof-capture
pcre2
util-linux
libGL
libselinux
libsepol
libthai
libxkbcommon
libdatrie
libepoxy
libsoup_2_4
lerc
libjack2
expat
sqlite
];
# Standard fix for JUCE programs: https://github.com/NixOS/nixpkgs/blob/5014727e62ae7b22fb1afc61d789ca6ad9170435/pkgs/applications/audio/bespokesynth/default.nix#L137
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-rpath ${
lib.makeLibraryPath ([
xorg.libX11
xorg.libXrandr
xorg.libXinerama
xorg.libXext
xorg.libXcursor
xorg.libXrender
])
}";
dontPatchELF = true; # needed or nix will try to optimize the binary by removing "useless" rpath
postPatch = ''
# Don't build LV2 plugin (it hangs), and don't automatically install
sed -i 's/ LV2 / /g' CMakeLists.txt
desktopItems = [
(makeDesktopItem {
name = "PlugData";
desktopName = "PlugData";
exec = "plugdata";
icon = "plugdata_logo";
comment = "Pure Data as a plugin, with a new GUI";
type = "Application";
categories = [
"AudioVideo"
"Music"
];
})
];
NIX_LDFLAGS = (
toString [
"-lX11"
"-lXext"
"-lXcomposite"
"-lXcursor"
"-lXinerama"
"-lXrandr"
"-lXtst"
"-lXdmcp"
]
);
preBuild = ''
# fix LV2 build
HOME=$(mktemp -d)
'';
installPhase = ''
runHook preInstall
cd .. # build artifacts are placed inside the source directory for some reason
mkdir -p $out/{bin,lib/{clap,vst3}}
mkdir -p $out/bin $out/lib/clap $out/lib/lv2 $out/lib/vst3
cp Plugins/Standalone/plugdata $out/bin
cp -r Plugins/CLAP/plugdata{,-fx}.clap $out/lib/clap
cp -r Plugins/VST3/plugdata{,-fx}.vst3 $out/lib/vst3
cp -r Plugins/LV2/plugdata{,-fx}.lv2 $out/lib/lv2
icon_name="plugdata_logo.png"
icon_path="Resources/Icons/$icon_name"
install -m644 -D "${desktopItem}"/share/applications/* -t $out/share/applications
for size in 16 24 32 48 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
convert -resize "$size"x"$size" "$icon_path" $out/share/icons/hicolor/"$size"x"$size"/apps/"$icon_name"
done
install -Dm444 $src/Resources/Icons/plugdata_logo_linux.png $out/share/pixmaps/plugdata_logo.png
runHook postInstall
'';
postInstall = ''
# Ensure zenity is available, or it won't be able to open new files.
# These X11 libs get dlopen'd, they cause visual bugs when unavailable.
wrapProgram $out/bin/plugdata \
--prefix PATH : '${
lib.makeBinPath [
zenity
]
}' \
--prefix LD_LIBRARY_PATH : '${
lib.makeLibraryPath [
xorg.libXrandr
xorg.libXinerama
xorg.libXcursor
xorg.libXrender
]
}'
'';
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
description = "Plugin wrapper around Pure Data to allow patching in a wide selection of DAWs";
mainProgram = "plugdata";
homepage = "https://plugdata.org/";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ PowerUser64 ];
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
maintainers = [
lib.maintainers.PowerUser64
lib.maintainers.l1npengtul
];
};
})
}

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "poetry-plugin-export";
version = "1.8.0";
version = "1.9.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "python-poetry";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ZXhj9FwCCNFMzyoAtQTD8bddOvVM4KzNtd+3sBn9i+w=";
tag = version;
hash = "sha256-AP3/njzbLEi2s4pOUSLLLzqNprvxwLe9LSY7qh08EWc=";
};
build-system = [

View file

@ -46,15 +46,15 @@ let
zam-plugins # maximizer
];
in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "pulseeffects";
version = "4.8.7";
version = "4.8.7-unstable-2024-09-17";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
sha256 = "sha256-ldvcA8aTHOgaascH6MF4CzmJ8I2rYOiR0eAkCZzvK/M=";
rev = "fbe0a724c1405cee624802f381476cf003dfcfa";
hash = "sha256-tyVUWc8w08WUnJRTjJVTIiG/YBWTETNYG+4amwEYezY=";
};
nativeBuildInputs = [

View file

@ -6,16 +6,16 @@
buildGoModule rec {
name = "regal";
version = "0.29.2";
version = "0.30.0";
src = fetchFromGitHub {
owner = "StyraInc";
repo = "regal";
rev = "v${version}";
hash = "sha256-VB4x2zGyK/lohJPlekJjmu4tL8dHW6zXihEJvfmO0uI=";
hash = "sha256-sr+tGfKDSgJ5SiHihJ/aMAn6AnAC8bEb838+xYdFosc=";
};
vendorHash = "sha256-BvGzoATrMmtquO7fipNQkaQv8HpZs0sNK0EF/RzFTPU=";
vendorHash = "sha256-6JheW6JHkAidZda7WWHSfEAuPYoBdli8wWHp2sX2r5Q=";
ldflags = [
"-s"

View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "rs-tftpd";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "altugbakan";
repo = "rs-tftpd";
rev = version;
hash = "sha256-RUjxCHO4X3V3Mt6zargqqT2v92XTt8FO9S68+tYZFC0=";
hash = "sha256-qazPEzLMIlnqKTayurZgNJ8TLLdB4qNO88tKMoh6VVI=";
};
cargoHash = "sha256-sLdOVthIHXzdY0/tVn2J0CUr3IqLsVHO/5S4X0NmN64=";
cargoHash = "sha256-4OVP3W5Packi5KcIqbDFpNQ2DXaAEPZTZ8pqABVLByQ=";
buildFeatures = [ "client" ];

File diff suppressed because it is too large Load diff

View file

@ -21,9 +21,8 @@
libxkbcommon,
darwin,
}:
let
version = "nightly-2024-11-07";
version = "nightly-2025-01-04";
in
rustPlatform.buildRustPackage {
pname = "ruffle";
@ -33,7 +32,7 @@ rustPlatform.buildRustPackage {
owner = "ruffle-rs";
repo = "ruffle";
rev = version;
hash = "sha256-eufp3myszqguoHGYGqIpv5gMkVx1d4L/GflRgvnxPTQ=";
hash = "sha256-MxYl5fTTNerCwG3w34cltb6aasP6TvGRkvwf77lKIgs=";
};
nativeBuildInputs =
@ -67,6 +66,16 @@ rustPlatform.buildRustPackage {
dontWrapGApps = true;
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
install -Dm644 -t $out/share/icons/hicolor/scalable/apps/ desktop/packages/linux/rs.ruffle.Ruffle.svg
install -Dm644 -t $out/share/applications/ desktop/packages/linux/rs.ruffle.Ruffle.desktop
substituteInPlace $out/share/applications/rs.ruffle.Ruffle.desktop \
--replace-fail "Exec=ruffle %u" "Exec=ruffle_desktop %u"
install -Dm644 -t $out/share/metainfo/ desktop/packages/linux/rs.ruffle.Ruffle.metainfo.xml
'';
preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf $out/bin/ruffle_desktop \
--add-needed libxkbcommon-x11.so \
@ -94,29 +103,22 @@ rustPlatform.buildRustPackage {
cargoBuildFlags = [ "--workspace" ];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"flash-lso-0.6.0" = "sha256-dhOAnVfxZw9JaOrY17xAeN7/y/aWZP+KUoDQuCf6D3Q=";
"h263-rs-0.1.0" = "sha256-dyQHnCe7LwwZYlF57sbRzir9vUavN3K8wLhwPIWlmik=";
"jpegxr-0.3.1" = "sha256-aV4Qh9ea0CirWU3lScjSKi4mii0cDTnx+miTcqWzxGg=";
"nellymoser-rs-0.1.2" = "sha256-66yt+CKaw/QFIPeNkZA2mb9ke64rKcAw/6k/pjNYY04=";
"nihav_codec_support-0.1.0" = "sha256-HAJS4I6yyzQzCf+vmaFp1MWXpcUgFAHPxLhfMVXmN1c=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-q+9yhUjYolPlBt6W1xJPoyE7DgqDffEhkQqJmSX4y3Y=";
meta = with lib; {
description = "Adobe Flash Player emulator written in the Rust programming language";
meta = {
description = "Cross platform Adobe Flash Player emulator";
homepage = "https://ruffle.rs/";
license = with licenses; [
mit
asl20
license = [
lib.licenses.mit
lib.licenses.asl20
];
maintainers = with maintainers; [
govanify
jchw
maintainers = [
lib.maintainers.govanify
lib.maintainers.jchw
lib.maintainers.normalcea
];
platforms = platforms.linux ++ platforms.darwin;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
mainProgram = "ruffle_desktop";
};
}

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20250107";
version = "20250113-1";
src = fetchFromGitHub {
owner = "bepaald";
repo = "signalbackup-tools";
rev = version;
hash = "sha256-NXV9QK7Ssj0wXS3bjYyHtJrhZxEH3lLGIzMPEE4FLMA=";
hash = "sha256-aunXBPPWHTlgWVNwsBZAZJi+/dE/BwFC1kfBj0AXMos=";
};
nativeBuildInputs = [

View file

@ -12,16 +12,16 @@
buildGoModule rec {
pname = "sing-box";
version = "1.10.6";
version = "1.10.7";
src = fetchFromGitHub {
owner = "SagerNet";
repo = pname;
rev = "v${version}";
hash = "sha256-EUH0SoAAAaepyjGasUGRtIr5VXboYPTO3/kaW2hG0xc=";
hash = "sha256-+0wzCFeQ0ZdjYKGQQcwBOAj3bGRHOaHeFMMg/hyXDGQ=";
};
vendorHash = "sha256-8pkg/tAAKagVsq+EjzzdqeaUiZYVc7MkVdd7zr4b7xY=";
vendorHash = "sha256-Z3SGEDphy4U+AJzI7QSTEWG/T+U/FwTlP/zJN/mBAL0=";
tags = [
"with_quic"

View file

@ -6,12 +6,12 @@
python3Packages.buildPythonApplication rec {
pname = "snowmachine";
version = "2.0.1";
version = "2.0.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256:119e6da12f430af1519f1a9f091b77b7676c7a9dbeaab6616cb196fe793d8e61";
hash = "sha256-GhCfiMPEYa9EGCyVDncqKtLKpSN0SwIQ0XnmGEXBQ5I=";
};
propagatedBuildInputs = with python3Packages; [

View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "sqldef";
version = "0.17.25";
version = "0.17.27";
src = fetchFromGitHub {
owner = "sqldef";
repo = "sqldef";
rev = "v${version}";
hash = "sha256-lJZbSAh5wjC51EhXc1v0flxQmBGrAQkpBbYNApxeDMo=";
hash = "sha256-h0WOd3w6G9jmdhKzfD0AtdTzeLZgEPQ9LPlbIsASm34=";
};
proxyVendor = true;

View file

@ -0,0 +1,28 @@
{
fetchFromGitHub,
lib,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "srec2bin";
version = "1.51";
src = fetchFromGitHub {
owner = "srec2bin";
repo = "srec";
tag = "V${finalAttrs.version}";
hash = "sha256-akExYUp59Y0XA/MWif+/agz7DcsY/8Y6UI7jt/qMdwk=";
};
patches = [ ./package.patch ]; # upstream builds for windows
meta = {
description = "Tool for converting Motorola S-Record file into a binary image";
homepage = "https://github.com/srec2bin/srec";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ KSJ2000 ];
mainProgram = "srec2bin";
};
})

View file

@ -0,0 +1,31 @@
diff --git a/Makefile b/Makefile
index 56bbd49..23164ce 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,12 @@ CFLAGS = -c -Wall -O2 -MMD
LDFLAGS = -fno-exceptions -s
MAKEFLAGS += -s
-
-ifeq ($(OS), Windows_NT)
- CC = mingw32-gcc
- EXE_SUFFIX = .exe
-else
+UNAME := $(shell uname -s)
+EXE_SUFFIX = ""
+ifeq ($(UNAME), Linux)
CC = gcc
+else ifeq ($(UNAME), Darwin)
+ CC = clang
endif
LD = $(CC)
@@ -59,4 +59,6 @@ clean:
-$(RM) $(RULES)
-$(RM) $(BIN2SREC_EXE) $(SREC2BIN_EXE) $(BINSPLIT_EXE)
--include $(RULES)
\ No newline at end of file
+-include $(RULES)
+install:
+ install -Dm755 $(BIN2SREC_EXE) $(SREC2BIN_EXE) $(BINSPLIT_EXE) -t $(out)/bin

View file

@ -0,0 +1,5 @@
{
"version": "4.3.8",
"url": "https://dl.devmate.com/com.macpaw.site.theunarchiver/146/1715865652/TheUnarchiver-146.zip",
"hash": "sha256-VcgNT7z7KtdAZxya8DS4Kuk323AAh3Mv/2L7LpUS2NU="
}

View file

@ -0,0 +1,41 @@
{
lib,
stdenvNoCC,
fetchurl,
unzip,
}:
let
info = lib.importJSON ./info.json;
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "the-unarchiver";
inherit (info) version;
src = fetchurl { inherit (info) url hash; };
sourceRoot = ".";
nativeBuildInputs = [ unzip ];
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
mv "The Unarchiver.app" $out/Applications
runHook postInstall
'';
passthru.updateScript = ./update/update.mjs;
meta = {
description = "Unpacks archive files";
homepage = "https://theunarchiver.com/";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ xiaoxiangmoe ];
platforms = [
"aarch64-darwin"
"x86_64-darwin"
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
})

View file

@ -0,0 +1,9 @@
{
"compilerOptions": {
"allowJs": true,
"checkJs": true,
"module": "NodeNext",
"noEmit": true,
"strict": true
}
}

View file

@ -0,0 +1,103 @@
#!/usr/bin/env nix-shell
/*
#!nix-shell -i node --pure --packages cacert nodejs yq-go nix
*/
import * as assert from "node:assert/strict";
import * as child_process from "node:child_process";
import * as fsPromises from "node:fs/promises";
import * as path from "node:path";
const __dirname = import.meta.dirname;
/** @typedef {{
rss: {
channel: {
item: Array<{
pubDate: string;
enclosure: {
"+@url": string;
"+@length": string;
"+@type": string;
"+@sparkle:version": string;
"+@sparkle:shortVersionString": string;
};
}>
}
}
}} UpdatesXmlInfo */
/** @typedef {{
version: string;
url: string;
hash: string;
}} Info */
const UPDATE_URL =
"https://updateinfo.devmate.com/com.macpaw.site.theunarchiver/updates.xml";
async function main() {
const filePath = path.join(__dirname, "../info.json");
/** @type {Info} */
const oldInfo = JSON.parse(
await fsPromises.readFile(filePath, { encoding: "utf-8" })
);
const response = await fetch(UPDATE_URL);
assert.ok(response.ok, `Failed to fetch ${UPDATE_URL}`);
/** @type {UpdatesXmlInfo} */
const updatesXmlInfo = JSON.parse(
child_process
.execSync(`yq eval --input-format=xml --output-format=json`, {
input: Buffer.from(await response.arrayBuffer()),
})
.toString()
);
const items = updatesXmlInfo?.rss?.channel?.item;
assert.ok(Array.isArray(items), "items is required");
const item = items.sort(
(a, b) => new Date(b.pubDate).getTime() - new Date(a.pubDate).getTime()
)[0];
const {
"+@url": url,
"+@sparkle:shortVersionString": version,
"+@length": fileSize,
} = item.enclosure;
assert.ok(url, "url is required");
assert.ok(version, "version is required");
assert.ok(fileSize, "fileSize is required");
if (oldInfo.url === url && oldInfo.version === version) {
console.log("[update] No updates found");
return;
}
const [prefetchHash, prefetchStorePath] = child_process
.execSync(`nix-prefetch-url --print-path ${url}`)
.toString()
.split("\n");
const downloadedFileSize = (await fsPromises.stat(prefetchStorePath)).size;
if (Number(fileSize) !== downloadedFileSize) {
console.error(
`File size mismatch: expected ${fileSize}, got ${downloadedFileSize}`
);
process.exit(1);
}
const hash = child_process
.execSync(`nix hash convert --hash-algo sha256 --to sri ${prefetchHash}`)
.toString()
.trim();
/** @type {Info} */
const info = {
version,
url,
hash,
};
console.log(`[update] Updating Notion ${oldInfo.version} -> ${info.version}`);
await fsPromises.writeFile(filePath, JSON.stringify(info, null, 2) + "\n", {
encoding: "utf-8",
});
console.log("[update] Updating Notion complete");
}
main();

View file

@ -11,19 +11,19 @@
buildGoModule rec {
pname = "trivy";
version = "0.58.1";
version = "0.58.2";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = "trivy";
tag = "v${version}";
hash = "sha256-YKeNIi6PBIfzd/Kuv5cgxeAEbqfFXWwmK9JTOBsRLsw=";
hash = "sha256-td0FYnrfq+bBpH3YdNbLJp3MG6hiGD5fU77+sO6HP9k=";
};
# Hash mismatch on across Linux and Darwin
proxyVendor = true;
vendorHash = "sha256-e5tNyV5EHYlXS0EPvEEjHEOaH/jY8yQ8hT7vK8FOvkI=";
vendorHash = "sha256-6RUPSYSvhGqtnX/eeOtIdBZVsv+faGOimYt74f598qM=";
subPackages = [ "cmd/trivy" ];

View file

@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "unhide-gui";
version = "20220611";
version = "20240510";
format = "other";
src = fetchFromGitHub {
owner = "YJesus";
repo = "Unhide";
rev = "v${version}";
hash = "sha256-v4otbDhKKRLywH6aP+mbMR0olHbW+jk4TXTBY+iaxdo=";
tag = "v${version}";
hash = "sha256-CcS/rR/jPgbcF09aM4l6z52kwFhdQI1VZOyDF2/X6Us=";
};
propagatedBuildInputs = with python3Packages; [ tkinter ];

View file

@ -11,13 +11,13 @@
buildGoModule rec {
pname = "usql";
version = "0.19.15";
version = "0.19.16";
src = fetchFromGitHub {
owner = "xo";
repo = "usql";
rev = "v${version}";
hash = "sha256-sZre2hMJvUyAmsTeXXzwQZhLzZUTx3eFmi7mGHHTAkk=";
hash = "sha256-zV/6AIglY1tEeOe2bYZqpOOkuS8O+YklXkwsDidap0U=";
};
buildInputs = [
@ -25,7 +25,7 @@ buildGoModule rec {
icu
];
vendorHash = "sha256-DpqQK6PQaqNYaLL0SsWLyKy8xFZdsYk9RjRx3178g7U=";
vendorHash = "sha256-NTbsyoKL5lyY7sUjmKFGH1USCGa1EwtjWOhxQEohQr4=";
proxyVendor = true;
# Exclude drivers from the bad group

View file

@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "vpl-gpu-rt";
version = "24.4.4";
version = "25.1.0";
outputs = [ "out" "dev" ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "vpl-gpu-rt";
rev = "intel-onevpl-${version}";
hash = "sha256-5xtF+8ffHkuGADmeb+ltYuypKp4g3EawwtH2GDLrBco=";
hash = "sha256-J3yp9KbAmXVE0jhFcNkEIsPdMe/LsWxLes3zC56FS08=";
};
nativeBuildInputs = [ cmake pkg-config ];

View file

@ -1,50 +1,79 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitLab,
meson,
ninja,
pkg-config,
scdoc,
libgbm,
mesa,
lz4,
zstd,
ffmpeg,
libva,
cargo,
rustc,
git,
vulkan-headers,
vulkan-loader,
shaderc,
vulkan-tools,
llvmPackages,
autoPatchelfHook,
wayland,
wayland-scanner,
rust-bindgen,
egl-wayland,
}:
stdenv.mkDerivation rec {
llvmPackages.stdenv.mkDerivation rec {
pname = "waypipe";
version = "0.9.2";
version = "0.10.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mstoeckl";
repo = "waypipe";
rev = "v${version}";
hash = "sha256-DW+WWwuav0lxnoV55L8RrX0enRURRnHMljtwEC0+9t4=";
tag = "v${version}";
hash = "sha256-OV0FHieHce83W2O379VpGmUMrtID7NdtIrxIe+IJfF0=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit pname version src;
hash = "sha256-pC1m1P4wJOT3jARGlpc86u7GdyPXX+YHsFLOcWRqdxI=";
};
strictDeps = true;
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
meson
ninja
pkg-config
scdoc
cargo
git
vulkan-headers
vulkan-loader
shaderc
rustc
wayland-scanner
rustPlatform.cargoSetupHook
autoPatchelfHook
rust-bindgen
];
buildInputs = [
# Optional dependencies:
libgbm
mesa
lz4
zstd
ffmpeg
libva
vulkan-headers
];
runtimeDependencies = [
vulkan-tools
vulkan-loader
wayland
egl-wayland
];
meta = with lib; {

View file

@ -1,39 +0,0 @@
From f63028c5712a89cb310165cde9701538fa85ce46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
<848000+eclairevoyant@users.noreply.github.com>
Date: Wed, 6 Mar 2024 06:09:44 -0500
Subject: [PATCH] fix desktop item
---
Makefile | 1 -
src/etc/wslview.desktop | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 2399009..e823882 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,6 @@ res_install:
install -Dm 644 src/etc/*.ps1 -t $(DESTDIR)$(PREFIX)/share/wslu
install -Dm 644 src/etc/*.ico -t $(DESTDIR)$(PREFIX)/share/wslu
install -Dm 755 src/etc/*.sh -t $(DESTDIR)$(PREFIX)/share/wslu
- install -Dm 644 src/etc/*.desktop $(DESTDIR)$(PREFIX)/share/wslu
install -Dm 644 src/etc/conf $(DESTDIR)$(PREFIX)/share/wslu
conf_install:
diff --git a/src/etc/wslview.desktop b/src/etc/wslview.desktop
index ebb84b6..235a365 100644
--- a/src/etc/wslview.desktop
+++ b/src/etc/wslview.desktop
@@ -2,7 +2,7 @@
Name=WSLView
Comment=Open files and addresses in Windows
Icon=windows
-Exec=/usr/bin/wslview %U
+Exec=wslview %U
Terminal=false
Type=Application
Categories=Utility;
--
2.43.1

View file

@ -7,25 +7,26 @@
stdenv.mkDerivation rec {
pname = "wslu";
version = "4.1.3";
version = "4.1.4";
src = fetchFromGitHub {
owner = "wslutilities";
repo = "wslu";
rev = "v${version}";
hash = "sha256-lyJk8nOADq+s7GkZXsd1T4ilrDzMRsoALOesG8NxYK8=";
hash = "sha256-ssiwYkQg2rOirC/ZZVq2bJm4Ggc364uRkoS2y365Eb0=";
};
nativeBuildInputs = [ copyDesktopItems ];
patches = [
./fallback-conf-nix-store.diff
./fix-desktop-item.patch
];
postPatch = ''
substituteInPlace src/wslu-header \
--subst-var out
substituteInPlace src/etc/wslview.desktop \
--replace-fail /usr/bin/wslview wslview
'';
makeFlags = [
@ -33,8 +34,6 @@ stdenv.mkDerivation rec {
"PREFIX="
];
desktopItems = [ "src/etc/wslview.desktop" ];
meta = with lib; {
description = "Collection of utilities for Windows Subsystem for Linux";
homepage = "https://github.com/wslutilities/wslu";

View file

@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "lomiri-sounds";
version = "22.02";
version = "25.01";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-sounds";
rev = finalAttrs.version;
hash = "sha256-t9JYxrJ5ICslxidHmbD1wa6n7XZMf2a+PgMLcwgsDvU=";
hash = "sha256-j4OUwE1z++rLsg5y2YvZktFQfOys3QjoE8Ravd1JFVA=";
};
postPatch = ''

View file

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hfd-service";
version = "0.2.2";
version = "0.2.3";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/hfd-service";
rev = finalAttrs.version;
hash = "sha256-OpT1vNjnyq66v54EoGOZOUb4HECD4WRJRh9hYMB0GI0=";
hash = "sha256-PvZPdisqpKl9OSuQXIJW1y6EJ5moesJiEAQjpQjzyWQ=";
};
postPatch = ''

View file

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "kotlin-native";
version = "1.9.24";
version = "2.1.0";
src =
let
@ -22,14 +22,14 @@ stdenv.mkDerivation rec {
getUrl =
version: arch:
"https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz";
"https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-prebuilt-${arch}-${version}.tar.gz";
getHash =
arch:
{
"macos-aarch64" = "sha256-RGXi2SyUviH9HdMApSoBJfEdeOfnssaTnWldvGJ6ysY=";
"macos-x86_64" = "sha256-eDwbmVV0jLN5REb3D5JfDbjzUuZujxA2puw75Te1aFs=";
"linux-x86_64" = "sha256-sEvljAwLSzBxUxxpRAPxtlDnKlwH4FGQTDaQI+XcGaE=";
"macos-aarch64" = "sha256-FHXR5XA7B/fqox2GTIkCJ6BIaSKoufLY0yMLe2ZmoqM=";
"macos-x86_64" = "sha256-qXAnTdF9dkojOzb+vV08fZYYJUnQ43y8Yo0SxL6n2Ac=";
"linux-x86_64" = "sha256-5aAqD/ru6OGWitm+QGouXMNIc4xV8o4ltLWPc29t8P4=";
}
.${arch};
in

View file

@ -13,7 +13,7 @@ buildDunePackage rec {
version = "3.1.5";
pname = "lablgtk3";
minimalOCamlVersion = "4.05";
minimalOCamlVersion = "4.06";
src = fetchurl {
url = "https://github.com/garrigue/lablgtk/releases/download/${version}/lablgtk3-${version}.tbz";

View file

@ -1,5 +1,6 @@
{
stdenv,
gcc13Stdenv,
lib,
makeWrapper,
fetchzip,
@ -11,6 +12,7 @@
}:
let
defaultStdenv = stdenv;
params =
let
mkNewParam =
@ -18,9 +20,10 @@ let
version,
sha256,
rev ? version,
stdenv ? defaultStdenv,
}:
{
inherit version;
inherit stdenv version;
src = fetchzip {
url = "https://github.com/garrigue/labltk/archive/${rev}.tar.gz";
inherit sha256;
@ -32,15 +35,18 @@ let
version = "8.06.4";
rev = "labltk-8.06.4";
sha256 = "03xwnnnahb2rf4siymzqyqy8zgrx3h26qxjgbp5dh1wdl7n02c7g";
stdenv = gcc13Stdenv;
};
"4.07" = mkNewParam {
version = "8.06.5";
rev = "1b71e2c6f3ae6847d3d5e79bf099deb7330fb419";
sha256 = "02vchmrm3izrk7daldd22harhgrjhmbw6i1pqw6hmfmrmrypypg2";
stdenv = gcc13Stdenv;
};
_8_06_7 = mkNewParam {
version = "8.06.7";
sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h";
stdenv = gcc13Stdenv;
};
"4.08" = _8_06_7;
"4.09" = _8_06_7;
@ -78,7 +84,7 @@ let
or (throw "labltk is not available for OCaml ${ocaml.version}");
in
stdenv.mkDerivation rec {
param.stdenv.mkDerivation rec {
inherit (param) version src;
pname = "ocaml${ocaml.version}-labltk";

View file

@ -9,7 +9,7 @@ buildDunePackage rec {
pname = "linenoise";
version = "1.5.1";
minimalOCamlVersion = "4.03";
minimalOCamlVersion = "4.06";
src = fetchFromGitHub {
owner = "fxfactorial";

View file

@ -26,7 +26,5 @@ buildDunePackage rec {
npy
];
doCheck = false;
# Tests fail with Clang: https://github.com/owlbarn/owl/issues/462
# and with GCC 13: https://github.com/owlbarn/owl/issues/653
doCheck = true;
}

View file

@ -11,6 +11,8 @@ buildDunePackage rec {
pname = "patch";
version = "2.0.0";
minimalOCamlVersion = "4.03";
src = fetchFromGitHub {
owner = "hannesm";
repo = "patch";

View file

@ -13,6 +13,8 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.2")
pname = "stdcompat";
version = "19";
minimalOCamlVersion = "4.06";
src = fetchurl {
url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz";
sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU=";

View file

@ -7,7 +7,7 @@
z3,
}:
if lib.versionOlder ocaml.version "4.07" then
if lib.versionOlder ocaml.version "4.08" then
throw "z3 is not available for OCaml ${ocaml.version}"
else

View file

@ -1,37 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
aiohttp,
requests,
}:
buildPythonPackage rec {
pname = "amiibo-py";
version = "unstable-2021-01-16";
format = "setuptools";
disabled = pythonOlder "3.5.3"; # Older versions are not supported upstream
src = fetchFromGitHub {
owner = "XiehCanCode";
repo = "amiibo.py";
rev = "4766037530f41ad11368240e994888d196783b83";
sha256 = "0ln8ykaws8c5fvzlzccn60mpbdbvxlhkp3nsvs2xqdbsqp270yv2";
};
propagatedBuildInputs = [
aiohttp
requests
];
doCheck = false; # No tests are available upstream
pythonImportsCheck = [ "amiibo" ];
meta = with lib; {
description = "API Wrapper for amiiboapi.com";
homepage = "https://github.com/XiehCanCode/amiibo.py";
license = licenses.mit;
maintainers = [ ];
};
}

View file

@ -5,10 +5,10 @@
pycryptodome,
pythonOlder,
requests,
setuptools,
websocket-client,
# dependencies for tests
pytest-cov-stub,
pytest,
sure,
responses,
pytestCheckHook,
@ -16,8 +16,8 @@
buildPythonPackage rec {
pname = "binance-connector";
version = "3.11.0";
format = "setuptools";
version = "3.12.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -25,10 +25,12 @@ buildPythonPackage rec {
owner = "binance";
repo = "${pname}-python";
tag = "v${version}";
hash = "sha256-qy6J/03GzpvDX+KJz9ZrQc0OoT1LXWD0umN7dMLxxb4=";
hash = "sha256-8O73+fli0HNbvGBcyg79ZGOTQvL0TF5SCfogI6btlrA=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
requests
pycryptodome
websocket-client
@ -36,7 +38,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytest-cov-stub
pytest
sure
responses
pytestCheckHook

View file

@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
version = 4
[[package]]
name = "arrayref"
@ -22,7 +22,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "blake3"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"blake3 1.5.5",
"hex",
@ -47,9 +47,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.2.2"
version = "1.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc"
checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b"
dependencies = [
"shlex",
]
@ -68,9 +68,9 @@ checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
[[package]]
name = "crossbeam-deque"
version = "0.8.5"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
dependencies = [
"crossbeam-epoch",
"crossbeam-utils",
@ -87,9 +87,9 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
version = "0.8.20"
version = "0.8.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
[[package]]
name = "either"
@ -117,9 +117,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
[[package]]
name = "libc"
version = "0.2.167"
version = "0.2.169"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
[[package]]
name = "memmap2"
@ -153,18 +153,18 @@ checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
[[package]]
name = "proc-macro2"
version = "1.0.92"
version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
dependencies = [
"unicode-ident",
]
[[package]]
name = "pyo3"
version = "0.23.2"
version = "0.23.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f54b3d09cbdd1f8c20650b28e7b09e338881482f4aa908a5f61a00c98fba2690"
checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc"
dependencies = [
"cfg-if",
"indoc",
@ -180,9 +180,9 @@ dependencies = [
[[package]]
name = "pyo3-build-config"
version = "0.23.2"
version = "0.23.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3015cf985888fe66cfb63ce0e321c603706cd541b7aec7ddd35c281390af45d8"
checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7"
dependencies = [
"once_cell",
"target-lexicon",
@ -190,9 +190,9 @@ dependencies = [
[[package]]
name = "pyo3-ffi"
version = "0.23.2"
version = "0.23.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fca7cd8fd809b5ac4eefb89c1f98f7a7651d3739dfb341ca6980090f554c270"
checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d"
dependencies = [
"libc",
"pyo3-build-config",
@ -200,9 +200,9 @@ dependencies = [
[[package]]
name = "pyo3-macros"
version = "0.23.2"
version = "0.23.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34e657fa5379a79151b6ff5328d9216a84f55dc93b17b08e7c3609a969b73aa0"
checksum = "91871864b353fd5ffcb3f91f2f703a22a9797c91b9ab497b1acac7b07ae509c7"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
@ -212,9 +212,9 @@ dependencies = [
[[package]]
name = "pyo3-macros-backend"
version = "0.23.2"
version = "0.23.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "295548d5ffd95fd1981d2d3cf4458831b21d60af046b729b6fd143b0ba7aee2f"
checksum = "43abc3b80bc20f3facd86cd3c60beed58c3e2aa26213f3cda368de39c60a27e4"
dependencies = [
"heck",
"proc-macro2",
@ -225,9 +225,9 @@ dependencies = [
[[package]]
name = "quote"
version = "1.0.37"
version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
dependencies = [
"proc-macro2",
]
@ -260,9 +260,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
[[package]]
name = "syn"
version = "2.0.90"
version = "2.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
dependencies = [
"proc-macro2",
"quote",

View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "blake3";
version = "1.0.0";
version = "1.0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "oconnor663";
repo = "blake3-py";
tag = version;
hash = "sha256-4fUCBragb4AQ75f1LEUvCiVOLYinjrg9cmJRz4TP4Vs=";
hash = "sha256-Wdy/zAepuMRTyOskC6gxCFkUVCAzR05eZNO/PFjT9sE=";
};
postPatch = ''

View file

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "databricks-sql-connector";
version = "3.7.0";
version = "3.7.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "databricks";
repo = "databricks-sql-python";
tag = "v${version}";
hash = "sha256-drtMkES3eHo1LfUICwxsIwfVc1qA0+0ZWm5W+Av81Z8=";
hash = "sha256-nq8+rkwY6WyxtdqWcSncyzeC8x50Iu6747f4J79mTws=";
};
pythonRelaxDeps = [

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "dbt-bigquery";
version = "1.9.0";
version = "1.9.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "dbt-labs";
repo = "dbt-bigquery";
tag = "v${version}";
hash = "sha256-jn4U01aUpnjBnOJNyzJXPqmXJZc16pSLN9WkRxsC0zo=";
hash = "sha256-YZA8lcUGoq5jMNS1GlbBd036X2F3khsZWr5Pv65zpPI=";
};
pythonRelaxDeps = [ "agate" ];

View file

@ -0,0 +1,84 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
rustPlatform,
# nativeBuildInputs
cargo,
rustc,
# dependencies
pyarrow,
pythonOlder,
typing-extensions,
# optional-dependencies
pandas,
polars,
# tests
pytest-mock,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "fastexcel";
version = "0.12.1";
pyproject = true;
src = fetchFromGitHub {
owner = "ToucanToco";
repo = "fastexcel";
tag = "v${version}";
hash = "sha256-1BcArjhdbsYZ8VIz1FJYOLKSKQXOjLUXFonIXB+TfiY=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-JGDNqRF264hNAjQ9bwJnBsQgAcqJjreEbgRZAA58JnY=";
};
nativeBuildInputs = [
cargo
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
rustc
];
dependencies =
[
pyarrow
]
++ lib.optionals (pythonOlder "3.9") [
typing-extensions
];
optional-dependencies = {
pandas = [
pandas
];
polars = [
polars
];
};
pythonImportsCheck = [
"fastexcel"
];
nativeCheckInputs = [
pandas
polars
pytest-mock
pytestCheckHook
];
meta = {
description = "Fast excel file reader for Python, written in Rust";
homepage = "https://github.com/ToucanToco/fastexcel/";
changelog = "https://github.com/ToucanToco/fastexcel/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
}

View file

@ -2,9 +2,11 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
pdm-backend,
numpy,
pdm-backend,
pytestCheckHook,
pythonAtLeast,
pythonOlder,
setuptools,
}:
@ -13,6 +15,8 @@ buildPythonPackage rec {
version = "1.0.1";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "DLR-RM";
repo = "python-jsonconversion";
@ -20,15 +24,15 @@ buildPythonPackage rec {
hash = "sha256-XmAQXu9YkkMUvpf/QVk4u1p8UyNfRb0NeoLxC1evCT4=";
};
build-system = [
pdm-backend
];
build-system = [ pdm-backend ];
pythonRemoveDeps = [
"pytest-runner"
"pytest"
];
pythonRelaxDeps = [ "numpy" ];
dependencies = [
numpy
setuptools
@ -38,10 +42,13 @@ buildPythonPackage rec {
pythonImportsCheck = [ "jsonconversion" ];
disabledTests = lib.optionals (pythonAtLeast "3.13") [ "test_dict" ];
meta = with lib; {
description = "This python module helps converting arbitrary Python objects into JSON strings and back";
homepage = "https://github.com/DLR-RM/python-jsonconversion";
changelog = "https://github.com/DLR-RM/python-jsonconversion/releases/tag/${version}";
license = licenses.bsd2;
maintainers = [ maintainers.terlar ];
maintainers = with maintainers; [ terlar ];
};
}

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "velbus-aio";
version = "2024.12.3";
version = "2025.1.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Cereal2nd";
repo = "velbus-aio";
tag = version;
hash = "sha256-tRcPwbvQBy0cmavAyEvhp6SimseeBYAMH9wAfC4fpKg=";
hash = "sha256-ZaaHywHX1TScjW0XN/krCYgupHlbH1mRB0fd7YZ2iMY=";
fetchSubmodules = true;
};

View file

@ -26,14 +26,14 @@
buildPythonPackage rec {
pname = "wagtail";
version = "6.3.1";
version = "6.3.2";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-k4dsx6O/z/9MA5OUlWLL8knyRMTKZT1Yoturc39FVxU=";
hash = "sha256-5CcSIr0kmAQKYN1eJyKNzUgcwjEKqPyVHw9OI9IPvFA=";
};
postPatch = ''

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "moon";
version = "1.30.6";
version = "1.31.0";
src = fetchFromGitHub {
owner = "moonrepo";
repo = pname;
rev = "v${version}";
hash = "sha256-rucRenc/mHFkl4pqXdf0b7enGqTRxuJkP+TjDzAX3ww=";
hash = "sha256-2418rlM8WdQ2b4wrtUC+6yCgy+wxfApQTaVDPXbnvKo=";
};
cargoHash = "sha256-zOGMci7G6TaZnmlc1FgrB571LDykY21h60HbE8/ffhE=";
cargoHash = "sha256-I958/qvPqqRayvQwe8/SMgERwM+E7d3J6hpKPHfSBf0=";
env = {
RUSTFLAGS = "-C strip=symbols";

View file

@ -1,18 +1,18 @@
{
"asterisk_18": {
"sha256": "5da6fbd94f668115ae85aabf484a8b584faac72d75ed98bbb2bb800eeb17db3e",
"version": "18.26.0"
"sha256": "5df5d1c3885428b8bf03e78d7b8c3079d4512679137ef1d47e865dc2058aa825",
"version": "18.26.1"
},
"asterisk_20": {
"sha256": "69325bf5ae0b38b361c9fd2f936fafdf2387be9812e857bdeb379cbec252bcca",
"version": "20.11.0"
"sha256": "5ad25c136c7772f0ad10ae02d59f19b32c0cf64027278e3de6a6314ee24d5ff9",
"version": "20.11.1"
},
"asterisk_21": {
"sha256": "a46e22478b891b2e6d7ce9ba7b1908c6a7f1c4095c013d95415864da80ab2831",
"version": "21.6.0"
"sha256": "8df00a37b448fdaf63ffe25be0df02112211c1617efcb00b21cdb58f1baed89d",
"version": "21.6.1"
},
"asterisk_22": {
"sha256": "c892e9a51919d62bee2bed8b7c6f59ec79dfd48768ae289df61dba2da83f4413",
"version": "22.1.0"
"sha256": "e697740d91c33bf02d506d4da04635da48bfb0b5bb79bf8863c1a9b8f791264f",
"version": "22.1.1"
}
}

View file

@ -13,19 +13,20 @@
pkg-config,
glib,
darwin,
fetchpatch,
...
}:
beamPackages.mixRelease rec {
pname = "pleroma";
version = "2.7.0";
version = "2.8.0";
src = fetchFromGitLab {
domain = "git.pleroma.social";
owner = "pleroma";
repo = "pleroma";
rev = "v${version}";
sha256 = "sha256-2uKVwjxMLC8jyZWW+ltBRNtOR7RaAb8SPO1iV2wyROc=";
sha256 = "sha256-8xhBItGl2BvpYB1N1hZbO1xbtYFldUPCiOI4Kvvywaw=";
};
patches = [ ./Revert-Config-Restrict-permissions-of-OTP-config.patch ];
@ -33,6 +34,38 @@ beamPackages.mixRelease rec {
mixNixDeps = import ./mix.nix {
inherit beamPackages lib;
overrides = final: prev: {
# Upstream is pointing to
# https://github.com/feld/phoenix/commits/v1.7.14-websocket-headers/
# which is v1.7.14 with an extra patch applied on top.
phoenix = beamPackages.buildMix {
name = "phoenix";
version = "1.7.14-websocket-headers";
src = fetchFromGitHub {
owner = "phoenixframework";
repo = "phoenix";
tag = "v1.7.14";
hash = "sha256-hb8k0bUl28re1Bv2AIs17VHOP8zIyCfbpaVydu1Dh24=";
};
patches = [
(fetchpatch {
name = "0001-Support-passing-through-the-value-of-the-sec-websocket-protocol-header.patch";
url = "https://github.com/feld/phoenix/commit/fb6dc76c657422e49600896c64aab4253fceaef6.patch";
hash = "sha256-eMla+D3EcVTc1WwlRaKvLPV5eXwGfAgZOxiYlGSkBIQ=";
})
];
beamDeps = with final; [
phoenix_pubsub
plug
plug_crypto
telemetry
phoenix_template
websock_adapter
phoenix_view
castore
plug_cowboy
jason
];
};
# mix2nix does not support git dependencies yet,
# so we need to add them manually
captcha = beamPackages.buildMix {

View file

@ -28,6 +28,22 @@ let
beamDeps = [ ];
};
argon2_elixir = buildMix rec {
name = "argon2_elixir";
version = "4.0.0";
src = fetchHex {
pkg = "argon2_elixir";
version = "${version}";
sha256 = "f9da27cf060c9ea61b1bd47837a28d7e48a8f6fa13a745e252556c14f9132c7f";
};
beamDeps = [
comeonin
elixir_make
];
};
bandit = buildMix rec {
name = "bandit";
version = "1.5.5";
@ -164,12 +180,12 @@ let
castore = buildMix rec {
name = "castore";
version = "0.1.22";
version = "1.0.8";
src = fetchHex {
pkg = "castore";
version = "${version}";
sha256 = "c17576df47eb5aa1ee40cc4134316a99f5cad3e215d5c77b8dd3cfef12a22cac";
sha256 = "0b2b66d2ee742cb1d9cb8c8be3b43c3a70ee8651f37b75a8b982e036752983f1";
};
beamDeps = [ ];
@ -326,12 +342,12 @@ let
credo = buildMix rec {
name = "credo";
version = "1.7.3";
version = "1.7.7";
src = fetchHex {
pkg = "credo";
version = "${version}";
sha256 = "35ea675a094c934c22fb1dca3696f3c31f2728ae6ef5a53b5d648c11180a4535";
sha256 = "8bc87496c9aaacdc3f90f01b7b0582467b69b4bd2441fe8aae3109d843cc2f2e";
};
beamDeps = [
@ -705,12 +721,12 @@ let
fast_html = buildMix rec {
name = "fast_html";
version = "2.2.0";
version = "2.3.0";
src = fetchHex {
pkg = "fast_html";
version = "${version}";
sha256 = "064c4f23b4a6168f9187dac8984b056f2c531bb0787f559fd6a8b34b38aefbae";
sha256 = "f18e3c7668f82d3ae0b15f48d48feeb257e28aa5ab1b0dbf781c7312e5da029d";
};
beamDeps = [
@ -937,12 +953,12 @@ let
jason = buildMix rec {
name = "jason";
version = "1.4.3";
version = "1.4.4";
src = fetchHex {
pkg = "jason";
version = "${version}";
sha256 = "9a90e868927f7c777689baa16d86f4d0e086d968db5c05d917ccff6d443e58a3";
sha256 = "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b";
};
beamDeps = [ decimal ];
@ -1013,6 +1029,19 @@ let
beamDeps = [ ];
};
mail = buildMix rec {
name = "mail";
version = "0.3.1";
src = fetchHex {
pkg = "mail";
version = "${version}";
sha256 = "1db701e89865c1d5fa296b2b57b1cd587587cca8d8a1a22892b35ef5a8e352a6";
};
beamDeps = [ ];
};
majic = buildMix rec {
name = "majic";
version = "1.0.0";
@ -1166,12 +1195,12 @@ let
mogrify = buildMix rec {
name = "mogrify";
version = "0.8.0";
version = "0.9.3";
src = fetchHex {
pkg = "mogrify";
version = "${version}";
sha256 = "2278d245f07056ea3b586e98801e933695147066fa4cf563f552c1b4f0ff8ad9";
sha256 = "0189b1e1de27455f2b9ae8cf88239cefd23d38de9276eb5add7159aea51731e6";
};
beamDeps = [ ];
@ -1190,6 +1219,32 @@ let
beamDeps = [ ];
};
mua = buildMix rec {
name = "mua";
version = "0.2.3";
src = fetchHex {
pkg = "mua";
version = "${version}";
sha256 = "7fe861a87fcc06a980d3941bbcb2634e5f0f30fd6ad15ef6c0423ff9dc7e46de";
};
beamDeps = [ castore ];
};
multipart = buildMix rec {
name = "multipart";
version = "0.4.0";
src = fetchHex {
pkg = "multipart";
version = "${version}";
sha256 = "3c5604bc2fb17b3137e5d2abdf5dacc2647e60c5cc6634b102cf1aef75a06f0a";
};
beamDeps = [ mime ];
};
nimble_options = buildMix rec {
name = "nimble_options";
version = "1.1.1";
@ -1231,12 +1286,12 @@ let
oban = buildMix rec {
name = "oban";
version = "2.17.12";
version = "2.18.3";
src = fetchHex {
pkg = "oban";
version = "${version}";
sha256 = "7a647d6cd6bb300073db17faabce22d80ae135da3baf3180a064fa7c4fa046e3";
sha256 = "36ca6ca84ef6518f9c2c759ea88efd438a3c81d667ba23b02b062a0aa785475e";
};
beamDeps = [
@ -1322,30 +1377,6 @@ let
beamDeps = [ comeonin ];
};
phoenix = buildMix rec {
name = "phoenix";
version = "1.7.14";
src = fetchHex {
pkg = "phoenix";
version = "${version}";
sha256 = "c7859bc56cc5dfef19ecfc240775dae358cbaa530231118a9e014df392ace61a";
};
beamDeps = [
castore
jason
phoenix_pubsub
phoenix_template
phoenix_view
plug
plug_cowboy
plug_crypto
telemetry
websock_adapter
];
};
phoenix_ecto = buildMix rec {
name = "phoenix_ecto";
version = "4.4.3";
@ -1807,7 +1838,10 @@ let
gen_smtp
hackney
jason
mail
mime
mua
multipart
plug
plug_cowboy
telemetry

View file

@ -21,15 +21,15 @@ let
}.${stdenv.hostPlatform.system} or unsupported;
hash = {
aarch64-darwin = "sha256-cGHmreI6M9CI2CsL2iC9O0dOcyvdlYQDpJ8NRG1Yt2U=";
aarch64-linux = "sha256-vXFQL6Sifjin3NoEhvjH9pTbcBy7aqwA9LI6T7sJQyI=";
x86_64-darwin = "sha256-+OB+OBj9W2c9b655gUMcDg12iWePKC4gDa5pubsNImA=";
x86_64-linux = "sha256-h1mwt8iAv9z9Qg+zUgEkB698lsoTtcOocAJz5kKmKQI=";
aarch64-darwin = "sha256-N5BDsx9iunG5qUau6gJvdSFscPkNe5/35zMMfsvM+eE=";
aarch64-linux = "sha256-cqSakzwokb4ym8852MYsoyAV3vS9eSyU4/xhHPtsD4o=";
x86_64-darwin = "sha256-2x4k5c1HdNFzDmoEsrrQ3+s41+3wukSMJPHZJJKd/eE=";
x86_64-linux = "sha256-OqZo+kFMTSklwPlj2hr7sAOXCh0HvqbeXWzfmScWXKU=";
}.${stdenv.hostPlatform.system} or unsupported;
in stdenv.mkDerivation rec {
inherit pname;
version = "1.28.2.4885";
version = "1.29.2.4915";
src = fetchurl {
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";

View file

@ -585,6 +585,8 @@ self: super:
xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ];
buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ];
# fixes `implicit declaration of function 'wfbScreenInit'; did you mean 'fbScreenInit'?`
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
});
xf86videoglint = super.xf86videoglint.overrideAttrs (attrs: {

View file

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "auth";
version = "2.167.0";
version = "2.168.0";
src = fetchFromGitHub {
owner = "supabase";
repo = "auth";
rev = "v${version}";
hash = "sha256-L5yhrlbZk5R1f21rLpaskg/CW1ITt51sfgXu0DdSD3M=";
hash = "sha256-XPfqb1kO4sJbREZhCJ/FMTNeNtooqSWQJvNPjjS/gAE=";
};
vendorHash = "sha256-em1dBnNHsVPI7owd2gjERcJnrQbiVtZGtIqnFyker6M=";

View file

@ -452,7 +452,9 @@ let
either = callPackage ../development/ocaml-modules/either { };
elina = callPackage ../development/ocaml-modules/elina { };
elina = callPackage ../development/ocaml-modules/elina {
stdenv = pkgs.gcc13Stdenv;
};
eliom = callPackage ../development/ocaml-modules/eliom { };
@ -2063,21 +2065,37 @@ in let inherit (pkgs) callPackage; in rec
{
inherit mkOcamlPackages;
ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { });
ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix { });
ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_02 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.02.nix { });
ocamlPackages_4_02 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.02.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { });
ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { });
ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix { });
ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { });
ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { });
ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix {
stdenv = pkgs.gcc13Stdenv;
});
ocamlPackages_4_08 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.08.nix { });

View file

@ -53,6 +53,7 @@ mapAliases ({
amazon_kclpy = amazon-kclpy; # added 2023-08-08
ambiclimate = throw "ambiclimate has been removed, because the service has been terminated after 2024-03-31."; # Added 2024-06-07
ambee = throw "ambee has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04
amiibo-py = throw "amiibo-py has been removed because the upstream repository was removed"; # Added 2025-01-13
ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30
ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute name: `pkgs.ansible-doctor`"; # Added 2023-05-16
ansible-later = throw "ansible-later has been promoted to a top-level attribute name: `pkgs.ansible-later`"; # Added 2023-05-16

View file

@ -576,8 +576,6 @@ self: super: with self; {
amcrest = callPackage ../development/python-modules/amcrest { };
amiibo-py = callPackage ../development/python-modules/amiibo-py { };
amply = callPackage ../development/python-modules/amply { };
amqp = callPackage ../development/python-modules/amqp { };
@ -4486,6 +4484,8 @@ self: super: with self; {
faster-whisper = callPackage ../development/python-modules/faster-whisper { };
fastexcel = callPackage ../development/python-modules/fastexcel { };
fastimport = callPackage ../development/python-modules/fastimport { };
fastjet = callPackage ../development/python-modules/fastjet { };