Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -211,7 +211,7 @@ in
|
||||
};
|
||||
};
|
||||
options.sync_api.search = {
|
||||
enable = lib.mkEnableOption "Dendrite's full-text search engine";
|
||||
enabled = lib.mkEnableOption "Dendrite's full-text search engine";
|
||||
index_path = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "${workingDir}/searchindex";
|
||||
@@ -287,6 +287,13 @@ in
|
||||
nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = !(cfg.settings.sync_api.search ? enable);
|
||||
message = ''
|
||||
The `services.dendrite.settings.sync_api.search.enable` option
|
||||
has been renamed to `services.dendrite.settings.sync_api.search.enabled`.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.dendrite = {
|
||||
|
||||
-7103
File diff suppressed because it is too large
Load Diff
@@ -44,21 +44,8 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-vBBYNHgZiW5JfGeUG6YZObf4oK0hHxTbsZNTfnIX95Y=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI=";
|
||||
"floem-0.1.1" = "sha256-/4Y38VXx7wFVVEzjqZ2D6+jiXCXPfzK44rDiNOR1lAk=";
|
||||
"human-sort-0.2.2" = "sha256-tebgIJGXOY7pwWRukboKAzXY47l4Cn//0xMKQTaGu8w=";
|
||||
"locale_config-0.3.1-alpha.0" = "sha256-cCEO+dmU05TKkpH6wVK6tiH94b7k2686xyGxlhkcmAM=";
|
||||
"lsp-types-0.95.1" = "sha256-+tWqDBM5x/gvQOG7V3m2tFBZB7smgnnZHikf9ja2FfE=";
|
||||
"psp-types-0.1.0" = "sha256-/oFt/AXxCqBp21hTSYrokWsbFYTIDCrHMUBuA2Nj5UU=";
|
||||
"regalloc2-0.9.3" = "sha256-tzXFXs47LDoNBL1tSkLCqaiHDP5vZjvh250hz0pbEJs=";
|
||||
"structdesc-0.1.0" = "sha256-KiR0R2YWZ7BucXIIeziu2FPJnbP7WNSQrxQhcNlpx2Q=";
|
||||
"tracing-0.2.0" = "sha256-31jmSvspNstOAh6VaWie+aozmGu4RpY9Gx2kbBVD+CI=";
|
||||
"wasi-experimental-http-wasmtime-0.10.0" = "sha256-FuF3Ms1bT9bBasbLK+yQ2xggObm/lFDRyOvH21AZnQI=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-cgSr1GHQUF4ccVd9w3TT0+EI+lqQpDzfXHdRWr75eDE=";
|
||||
|
||||
env = {
|
||||
# Get openssl-sys to use pkg-config
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-pylance";
|
||||
publisher = "MS-python";
|
||||
version = "2025.2.1";
|
||||
hash = "sha256-8aqua60QeKue8DUpRQynUQRm2tZNt8qq/OS8VdWTDas=";
|
||||
version = "2025.3.1";
|
||||
hash = "sha256-W7+nwMwoux2m3ZWlgne8XQApsHsqynnTp4WgMa8RHvQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ pyright ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "bsnes";
|
||||
version = "0-unstable-2025-01-17";
|
||||
version = "0-unstable-2025-02-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "bsnes-libretro";
|
||||
rev = "05e820a436d2e2cbbb1b871400f84a96e76e2359";
|
||||
hash = "sha256-jq1W1OrltfTc4WEnEDZSNQUPSWfnUtzrOtiA4fzlIpk=";
|
||||
rev = "cb4a0695ec4eea7298ddc5dd013bb1bb23d5a496";
|
||||
hash = "sha256-13d2quwMBK7ocNWWmbQNJXYj2MxvfGwvpXy2bcCGfMQ=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "nestopia";
|
||||
version = "0-unstable-2025-01-19";
|
||||
version = "0-unstable-2025-02-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "nestopia";
|
||||
rev = "5b56b6b98ed5f0d7871be4c957fc9d39a608a7c0";
|
||||
hash = "sha256-SBVvfrIaXFx984PG4pG1CE0xsTVypOfn/kCvWSgtZSA=";
|
||||
rev = "72003d06eb9fbc2191f5a7a874abc039bde3157f";
|
||||
hash = "sha256-fo9ZNqgMDt9s/18WDhD+7kGb9O8LF47Xk5yuIP3trqY=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "parallel-n64";
|
||||
version = "0-unstable-2025-02-06";
|
||||
version = "0-unstable-2025-03-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "parallel-n64";
|
||||
rev = "a1e6d69f819cd25a30c701d244315f648818a163";
|
||||
hash = "sha256-cg7FmjNqhCE4UeQzvWvgnJ2ChbOJT8iPh3Ed65Hq2iY=";
|
||||
rev = "f8605345e13c018a30c8f4ed03c05d8fc8f70be8";
|
||||
hash = "sha256-6yb/vrcp0pQpNzngDHhcWC1U4ghtSZ0BVoT5NXd8Gwo=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "helm-dt";
|
||||
version = "0.4.3";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-labs";
|
||||
repo = "distribution-tooling-for-helm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-m+XTR+LYTXeDTqo/deFAIQjbUqGn6yD/n5cQvJ+jKPc=";
|
||||
hash = "sha256-jSX18FJCQORHFIUBROWZqAO5EBPXFvN/k0NRfkdkUFM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rovAY4G4ew6JhehyXMz7cDKSEsHu0IQwaNYvClDog2s=";
|
||||
vendorHash = "sha256-8HefE1a3pcbBgq/bC0mnhWzSa5xTi2dbqw0tyJ9EyTI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -354,11 +354,11 @@
|
||||
"vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
|
||||
},
|
||||
"digitalocean": {
|
||||
"hash": "sha256-MOKhwnrGfeg71d2LFcNGSZU6WI5byP8BYdnHqktjQeU=",
|
||||
"hash": "sha256-smGK6ZRcKMf5Wcxd7Sv6LQkbT6swVNOK0o0JbeNacY0=",
|
||||
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
|
||||
"owner": "digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.49.0",
|
||||
"rev": "v2.49.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -642,13 +642,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"ibm": {
|
||||
"hash": "sha256-dmHsNNA4gKOiNLmhJ74ryNfgh2kl3zVRMVLg4UUQCPo=",
|
||||
"hash": "sha256-VMiTOItbL8GV3gUlUu68WCzWgGLTh6Lk6S/fUkuMI68=",
|
||||
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
|
||||
"owner": "IBM-Cloud",
|
||||
"repo": "terraform-provider-ibm",
|
||||
"rev": "v1.75.2",
|
||||
"rev": "v1.76.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-k1EQbBnpdkC7FdvyRTM8AAhUIAk3hY4CBD9wOVQnMIs="
|
||||
"vendorHash": "sha256-YUCyq1GiFnXSmx9VvhYc3MGnrMXdnOuAVx9BKp1R2N8="
|
||||
},
|
||||
"icinga2": {
|
||||
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
|
||||
@@ -913,13 +913,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"okta": {
|
||||
"hash": "sha256-Nub3S2RDz9ubnHT657xF+usnrOFPiAIDEqxPyKMS9CA=",
|
||||
"hash": "sha256-QvJ7yQmyOxhBltfckFC5Nkv7DXdpH79JRVF4BRAx+zs=",
|
||||
"homepage": "https://registry.terraform.io/providers/okta/okta",
|
||||
"owner": "okta",
|
||||
"repo": "terraform-provider-okta",
|
||||
"rev": "v4.14.0",
|
||||
"rev": "v4.14.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-KoKjPoIFlzASSCevd/pyLnkVAwf4GZn2cHlRl7QGSXo="
|
||||
"vendorHash": "sha256-pykDVH44iZoOihiRr9rA9rEsCc9N6TD+UMbHelab6Nw="
|
||||
},
|
||||
"oktaasa": {
|
||||
"hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
|
||||
@@ -1183,13 +1183,13 @@
|
||||
"vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw="
|
||||
},
|
||||
"snowflake": {
|
||||
"hash": "sha256-s5jtG1UOAtvFVf4GZ3ruGjow1MRaKd8wpze9pxOAz6k=",
|
||||
"hash": "sha256-enDKtqIulPbDSftkDFH783CJlTK5VyImvVpKePuZXh8=",
|
||||
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
|
||||
"owner": "Snowflake-Labs",
|
||||
"repo": "terraform-provider-snowflake",
|
||||
"rev": "v1.0.3",
|
||||
"rev": "v1.0.4",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-Nf3MBMjsGDOdxTrhHo72NxIXx2xYCU/SEmYGHO6C/3s="
|
||||
"vendorHash": "sha256-9tHeFnNa5tnmB74p3VJtkw+ldhnDXsP5p3oTOAri1tY="
|
||||
},
|
||||
"sops": {
|
||||
"hash": "sha256-MdsWKV98kWpZpTK5qC7x6vN6cODxeeiVVc+gtlh1s88=",
|
||||
|
||||
-1563
File diff suppressed because it is too large
Load Diff
@@ -17,21 +17,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "youtube-tui";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Siriusmart";
|
||||
repo = "youtube-tui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FOiK3yQcQuwdCEjBtRPW4iBd+8uNsvZ6l5tclHVzL+M=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-PAQkFg9SV6q3No5drYPPJZXzQ/XqtOhMr3eQOCnM+7Q=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"libmpv-2.0.1" = "sha256-efbXk0oXkzlIqgbP4wKm7sWlVZBT2vzDSN3iwsw2vL0=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-AjqxuNEyuDkYYuvi6Oii3/BfKFNUoJiBH4cS8cb7yMs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "agate";
|
||||
version = "3.3.12";
|
||||
version = "3.3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbrubeck";
|
||||
repo = "agate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jc/JsGHAm+3t3PeI4HgpMPZrXr9TvzwHj13NOGUIH8c=";
|
||||
hash = "sha256-VbGndkR7AdSDF9yWVUQToxlkpTPN8KljrxtJauHEqQ4=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-9G/97n7TapOlybjU1eqbWbXHd9+/v8Xm2IV/M7XuJMM=";
|
||||
cargoHash = "sha256-zM1ih6J0wi5+UXiy7LnJuPbh33NcfulZNr7BBm5+cfs=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -10,8 +10,8 @@ php.buildComposerProject2 (finalAttrs: {
|
||||
version = "1.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = finalAttrs.pname;
|
||||
repo = finalAttrs.pname;
|
||||
owner = "agorakit";
|
||||
repo = "agorakit";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-mBBl/8nXG3FsMeecbERLyY2tGFhh+5nS8A4nd7HI+8c=";
|
||||
};
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.0.254";
|
||||
version = "3.0.256";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aliyun";
|
||||
repo = "aliyun-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-udj5wBt4UNm+/rPZpNa6K1I+04q8eiRwCFl1f4b/6T4=";
|
||||
hash = "sha256-yB6y7A9MuZMBUqKfeJW8n8G9x7fIK8m9kcN2lV3Lknc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "application-title-bar";
|
||||
version = "0.8.3";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antroids";
|
||||
repo = "application-title-bar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-orAgSPFKIgBXw2NAlVglJGQ4Db2zF7BqLJfZJDOqZgE=";
|
||||
hash = "sha256-VlZlcPBGwV8Gyqm8CjwUZdaQgTiPLsSxj0iIXKbLEpE=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = with kdePackages; [ kconfig ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "auth0-cli";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "auth0";
|
||||
repo = "auth0-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ynB4N9XbApvs7XdHeY23eZrrwNZc9hENbE/60ZVuWt8=";
|
||||
hash = "sha256-P+V/OQ40iFfDVEtiZcp0TqjcSX+K7s4bPtqaslK9+PI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-S/K65q6glfHZslns1A2zplefC1kGzd9OCNMdvH8CZGM=";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "backblaze-b2";
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Backblaze";
|
||||
repo = "B2_Command_Line_Tool";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZDjKDLxzz6sHH0VnLlVvmQ0BSbmDBpujDgrtCEmZ2hU=";
|
||||
hash = "sha256-uWANUb7AV9ADWJ7Ut8qloEhgoXJ62yTSbXrCHVY1tFE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
@@ -102,7 +102,7 @@ python3Packages.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "Command-line tool for accessing the Backblaze B2 storage service";
|
||||
homepage = "https://github.com/Backblaze/B2_Command_Line_Tool";
|
||||
changelog = "https://github.com/Backblaze/B2_Command_Line_Tool/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/Backblaze/B2_Command_Line_Tool/blob/${src.tag}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hrdinka ];
|
||||
mainProgram = "backblaze-b2";
|
||||
|
||||
@@ -16,7 +16,7 @@ buildNimPackage (finalAttrs: {
|
||||
meta = finalAttrs.src.meta // {
|
||||
description = "Base45 library for Nim";
|
||||
license = lib.licenses.unlicense;
|
||||
mainProgram = finalAttrs.pname;
|
||||
mainProgram = "base45";
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buildkit";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "buildkit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ApmAeR93szAqeOJR7h5MwtDPf6nrUy4vYKgFeRZlCXw=";
|
||||
hash = "sha256-+zDS4MMGgVVygJdO5Wyl8MJN4U0fMdf8qy3yzvMlahU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "bundletool";
|
||||
version = "1.18.0";
|
||||
version = "1.18.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar";
|
||||
sha256 = "sha256-eDQ3ZNLnnI9VcQN4sEmB/LHkba6/w7XcV3d4CC5qmP0=";
|
||||
sha256 = "sha256-Z1eGSTmDeH/6EVUL23wHFWeaROFkPz/5gKUp6cgiWVw=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-bundle-licenses";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sstadick";
|
||||
repo = "cargo-bundle-licenses";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dA6jaYqPIxARwCP4R4+agbLKZFgx2gti4Vyhl56FzWw=";
|
||||
hash = "sha256-leSHjl/B76Z4JM1wO9IBKbdfMgHtY/pGut1hnDd8/L0=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-hiwKoQ6vd7Jjr2M3U5GPDjsLMrcF/POIvIV/Gok6Gms=";
|
||||
cargoHash = "sha256-I5zIrMZ9GnlAUfWaaFP6yr+pv8wWtxguxSL0zho3BRs=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate a THIRDPARTY file with all licenses in a cargo project";
|
||||
|
||||
@@ -13,17 +13,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tauri";
|
||||
version = "2.2.7";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = "tauri";
|
||||
tag = "tauri-cli-v${version}";
|
||||
hash = "sha256-BUZMIrPaeoYgmzzkPNEf83KjeiY9dlObivlC3jO5vIc=";
|
||||
hash = "sha256-EQ/df2fPhB4j6HcBjnwwSES8l65QU0VUjkMJfDBh5MA=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-OhKp7fZjsVrB/ipvzFAei7kRqYgybrSm6uZRAnijKek=";
|
||||
cargoHash = "sha256-d+d2QFZfGZ9n3wefxWaQC3ePmokAV5J5743jLYjfI2s=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = {
|
||||
description = "Build smaller, faster, and more secure desktop applications with a web frontend";
|
||||
homepage = "https://tauri.app/";
|
||||
changelog = "https://github.com/tauri-apps/tauri/releases/tag/tauri-v${version}";
|
||||
changelog = "https://github.com/tauri-apps/tauri/releases/tag/${src.tag}";
|
||||
license = with lib.licenses; [
|
||||
asl20 # or
|
||||
mit
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src
|
||||
;
|
||||
|
||||
hash = "sha256-zG4TmZlZ6oPvbDr3a8RlhM6ivtMG+vWox/OJETSUR2A=";
|
||||
hash = "sha256-qomBrnpJeFuDr3Vz173uYrMxTvVgu/qJvMAOYII4smI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "chirp";
|
||||
version = "0.4.0-unstable-2025-02-20";
|
||||
version = "0.4.0-unstable-2025-03-05";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kk7ds";
|
||||
repo = "chirp";
|
||||
rev = "0d84388e6c7399d4468016483dd5eb846dece8b0";
|
||||
hash = "sha256-RyIf1yaV08aLPsukQ5Ntsc5vPsZu5Iwo1oYhL+Kqevs=";
|
||||
rev = "3e663d36f96aef03a58cab81d32122ca14a59343";
|
||||
hash = "sha256-ODb+Q1Q+7XF/mX1GY2qItY4OOigguTFF+53vnaO5Ap0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RubyMetric";
|
||||
repo = finalAttrs.pname;
|
||||
repo = "chsrc";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-MwT6SuDisJ2ynxlOqAUA8WjhrTeUcyoAMArehnby8Yw=";
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.20.5";
|
||||
version = "2.20.6";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
hash = "sha256-B6qO+kO2geYFwba4By1h1IwzlGyktWJlJ9sbR2jTrro=";
|
||||
hash = "sha256-f3CigPHi3z2Sd4CwsITPDPMqKEZimbjuIPByd4+oeK8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dcrwallet";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "decred";
|
||||
repo = "dcrwallet";
|
||||
rev = "release-v${version}";
|
||||
hash = "sha256-0Sqv71G/hxk793kY/j9+HH4P1/W+/do87TZascd8UoI=";
|
||||
hash = "sha256-MrQrDip8vE0l5XHkx/zIegSZd/AkWq1aFZLUVPdMy50=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UyU6aSgkHNIi8mP9IUHzD/o726l/XyfgBJOfdCksywo=";
|
||||
vendorHash = "sha256-Ulh6RxK+PvS70mJ7TYiGMzKFsR79+asWuQ5W1FAI23I=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eigenmath";
|
||||
version = "337-unstable-2025-02-18";
|
||||
version = "337-unstable-2025-03-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "georgeweigt";
|
||||
repo = pname;
|
||||
rev = "0c1d7cbb618c62e3a691e3cd4991bbf472faeb66";
|
||||
hash = "sha256-lyHWt5EWO96b+E1GpcVTgAuXpGAzvy6qTn1boKEHUVU=";
|
||||
rev = "8fc8573000f40a8322f7fc140f384cf79e8c4a7f";
|
||||
hash = "sha256-MQnQmxafJhwxVJ+iAwAm48nFCE9QVel56xWgX8egmOk=";
|
||||
};
|
||||
|
||||
checkPhase =
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "elasticsearch-curator";
|
||||
version = "8.0.17";
|
||||
version = "8.0.18";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "curator";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Y2GXh+LUKU3VcQ51yZZdEIUjfKzRdbu6QKnXshI1Em0=";
|
||||
hash = "sha256-J0RHCWr0l1Vm/rcmcH3w0E0U+S9AvM0XMO89rnG38mY=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "es-client" ];
|
||||
|
||||
@@ -16,17 +16,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "espup";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esp-rs";
|
||||
repo = "espup";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LMzVxLwl24bw1o+OYiNcxm+KrnDyrg8tjkWhwsYYKzs=";
|
||||
hash = "sha256-sPWGpQi9JrkdaPV2jvwaY9zjb8urK+ibhvxw/CC2UOQ=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-4ModbVBymWLCtLlX6SBSWm8M2ZdcqakRqB+uHRQPArM=";
|
||||
cargoHash = "sha256-k6hczvuEvutUWOrKYFUltA0ZD+AHa8E0+5YW1+0TKQA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exfatprogs";
|
||||
version = "1.2.7";
|
||||
version = "1.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZMtDQ+RCTV0gUAXhsgUfRQlqcseWhbWa1szWfmgpDFk=";
|
||||
sha256 = "sha256-lPPUjSc6ti/CqSChWrsBLWCtASN95Cnj+O6FbVvFeDA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "fanficfare";
|
||||
version = "4.42.0";
|
||||
version = "4.43.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-DfiZqndOh9XENU3MVubKydhdyeUdzhmRyHhLdxU+qDc=";
|
||||
hash = "sha256-uaYMmb896gJ31nbcGJs42jlSpvHUTvpLlD00r1icXRY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -86,8 +86,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FRRouting";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
repo = "frr";
|
||||
rev = "frr-${finalAttrs.version}";
|
||||
hash = "sha256-TWqW6kI5dDl6IW2Ql6eeySDSyxp0fPgcJOOX1JxjAxs=";
|
||||
};
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fzf";
|
||||
version = "0.60.2";
|
||||
version = "0.60.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "junegunn";
|
||||
repo = "fzf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1is5cja7BdtO1PK6MpSonnb0b8//Zrf0TA9FI0aCKLA=";
|
||||
hash = "sha256-wa4tRPw+PMzGxvSm/uceQF1gZw2Kh5uattpgDCYoedA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-i4ofEI4K6Pypf5KJi/OW6e/vhnCHUArMHnZKrvQ8eww=";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.67.0";
|
||||
version = "2.68.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fX2iYfJVwJSBIHRRCsAiQRqmCPgWZB3WwNKu2B//56s=";
|
||||
hash = "sha256-yJwRC25QQKWeRrp0ItovuBCrTla3dezArzFvnkZchFg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TuhTM7v1PrcRFVFuGr9CUnm/btisiHsRFeFxGiNSKjQ=";
|
||||
vendorHash = "sha256-QmZBdnxcVywCGpaBAZZRO0LDr6WidaFXGpaAkWfn+gs=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (final: {
|
||||
pname = "glaze";
|
||||
version = "4.3.1";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stephenberry";
|
||||
repo = "glaze";
|
||||
rev = "v${final.version}";
|
||||
hash = "sha256-AIPsujIJl0LXK6p+GttyjDsXJ0595jl/2Y3adzv2TvE=";
|
||||
hash = "sha256-NjR/MsjnnLH2jVHrQXyWnyWOvsDQYbP/V9mWSII8mnc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "goflow2";
|
||||
@@ -14,7 +14,7 @@ buildGoModule {
|
||||
owner = "netsampler";
|
||||
repo = "goflow2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-u2wdlmAwRqBPKD+aof34ud9O4aJ+4ccuMxyk8Cgpsp0=";
|
||||
hash = "sha256-H+YeW1FOx4hE8ad8sEWFQPxl8IOZ+xIaiSk1a5w+0+Y=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -23,7 +23,7 @@ buildGoModule {
|
||||
"-X=main.version=${version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-4I4gIRJ80x9lmPpbJraSo1OD9CzT6povZDUAr1ZZEa0=";
|
||||
vendorHash = "sha256-AR4jKNzHato9qz0fkHurGGfIyQC9BYsGQ/87y9mtJpE=";
|
||||
|
||||
meta = {
|
||||
description = "High performance sFlow/IPFIX/NetFlow Collector";
|
||||
|
||||
Generated
-6438
File diff suppressed because it is too large
Load Diff
@@ -21,14 +21,8 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-aThIu+3eNHCKS6lsio7cLZeIMg0509qkE0YQ6M6vPAI=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"ksni-0.2.1" = "sha256-cq3PAqkiYEv4MW5CtT7eau38Mf4uxdJ1C2fw640RXzI=";
|
||||
"tasklist-0.2.15" = "sha256-YVAXqXuE4azxYi0ObOq4c9ZeMKFa2KjwwjjQlAeIPro=";
|
||||
"xpc-connection-sys-0.1.1" = "sha256-VYZyf271sDjnvgIv4iDA6bcPt9dm4Tp8rRxr682iWwU=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-EhqniqdgD95yUwiaqlA0vtRZfq4cR7wxsGPmjpvzgdI=";
|
||||
|
||||
buildInputs = [
|
||||
libpulseaudio
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gvproxy";
|
||||
version = "0.8.3";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "gvisor-tap-vsock";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oJxuOl9Q94QdH0egc4BTwOESljTJ+tii0mSkaEsmq2s=";
|
||||
hash = "sha256-2Anh/jWnDCqGxsIz8/DMzQ5Jj9FpvxHgEk9MeqBPFms=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hermit";
|
||||
version = "0.44.0";
|
||||
version = "0.44.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "cashapp";
|
||||
repo = "hermit";
|
||||
hash = "sha256-sEgl/DA0W0KNhVkB4zDYWlOS6X4YBaTIqI7Z6tFI33I=";
|
||||
hash = "sha256-u5NklyTtrTfqC+p3UnUv7LJ2Dm7GuQnuAAyplm1M7rE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GPIJ3IvTM2da962M1FLHKn8OitHDPZ9zp8nSLaeRq10=";
|
||||
|
||||
-3811
File diff suppressed because it is too large
Load Diff
@@ -41,21 +41,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hyperspeedcube";
|
||||
version = "1.0.7";
|
||||
version = "1.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HactarCE";
|
||||
repo = "Hyperspeedcube";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ykFf0dfc8j88Y25tx+G9lic09eHDz3WR+h6+owTeWbU=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ctBvc2xANM/gGzDDv8ygSO4nTOiG6iKyuSKnz385PIw=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"key-names-1.5.1" = "sha256-ZO3mlCoUHCaMnxD2vQno6GNx0+JmwZ8OiqpyveiVfvc=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ebjkEWYeeXHuKQzqbMe8+zVol2vPyLiu7ke5Ng7gbs8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "analogdevicesinc";
|
||||
repo = finalAttrs.pname;
|
||||
repo = "iio-oscilloscope";
|
||||
rev = "v${finalAttrs.version}-master";
|
||||
hash = "sha256-wCeOLAkrytrBaXzUbNu8z2Ayz44M+b+mbyaRoWHpZYU=";
|
||||
};
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
{
|
||||
"version": "1.128.0",
|
||||
"hash": "sha256-g/lDI8/ap+CfoXH6dZKKt6xQJ79YqvWD44qW/HpOwFg=",
|
||||
"version": "1.129.0",
|
||||
"hash": "sha256-cBTWmbJLbpUPLCfa0WsO87p79mZycS/vxPD55gdEYI4=",
|
||||
"components": {
|
||||
"cli": {
|
||||
"npmDepsHash": "sha256-hQlCvMkUJNUJ2QkXuQ6w7U/P3EjgYdd+qG40cKKeSzw=",
|
||||
"version": "2.2.52"
|
||||
"npmDepsHash": "sha256-dMa0ZcLu2oU9jpYl3EEXTz0mY0YoK41mm6o0AGNaroU=",
|
||||
"version": "2.2.53"
|
||||
},
|
||||
"server": {
|
||||
"npmDepsHash": "sha256-s5T/IAcpW3u7Gb37dCuIY8PR9CbR/gjye9PbQ+eLQeo=",
|
||||
"version": "1.128.0"
|
||||
"npmDepsHash": "sha256-VoY+/nUtjHcgeD66DHoRR53eTLqLsGrI3V3LCO1H934=",
|
||||
"version": "1.129.0"
|
||||
},
|
||||
"web": {
|
||||
"npmDepsHash": "sha256-/CCemxeHiitcRF2r4RWSkHHZ5BU54SjShnv4AE0l7sM=",
|
||||
"version": "1.128.0"
|
||||
"npmDepsHash": "sha256-xRKKRDq0T321tbAGIrVojiVVtjYmg2p2RjoXteRIVoQ=",
|
||||
"version": "1.129.0"
|
||||
},
|
||||
"open-api/typescript-sdk": {
|
||||
"npmDepsHash": "sha256-tLj6Wd8i1NGC5Udbd/Or4FK1IXHDMVXY6QZkkg1Ixys=",
|
||||
"version": "1.128.0"
|
||||
"npmDepsHash": "sha256-ZcsVTxmMzy3fGlnHMUIzZxyXw9rDgWMcfeqqkYuF7hQ=",
|
||||
"version": "1.129.0"
|
||||
},
|
||||
"geonames": {
|
||||
"timestamp": "20250228235146",
|
||||
"hash": "sha256-hCnM/JjRMYolv6k8vxK3kwn6XCnUJxv/xSo2w8CWpHM="
|
||||
"timestamp": "20250306005539",
|
||||
"hash": "sha256-2JYoUVF2w4RCyPn/PRoJ0/bv/hADwoLhrwY1K/51c64="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jasmin-compiler";
|
||||
version = "2024.07.3";
|
||||
version = "2025.02.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2";
|
||||
hash = "sha256-z5J4zxnsykNWXeAfS0GhU4oK0GJFa5qca9HhgzWx/34=";
|
||||
hash = "sha256-xLTMdyFyZGlnhuZ1iOg8Tgm7aLijg5lceJxgLdEHw+Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.123.0";
|
||||
version = "0.124.0";
|
||||
pname = "jbang";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
|
||||
sha256 = "sha256-KzltlTI8uyJGhkPIbA/ZUd4OZp5ORrgQB8Y19nhDAW4=";
|
||||
sha256 = "sha256-mFAp7lfXAS4Y6GERRpmOvE3cjonOi52BS9G8Z5ixvpw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "json-sort-cli";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tillig";
|
||||
repo = "json-sort-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-h7RlAFSb2pFolkd+0M5tddPxM5RgZJtNLLAoTuYNdIQ=";
|
||||
hash = "sha256-0NiDrZM00B3GcG+bH40QJZFXBFzY+4r1E1w1NbhiqUE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-g+6yLvEnZ2Zi7+4M+KDVSL2Qf3COWGgiBtpYrwG4HRM=";
|
||||
npmDepsHash = "sha256-UGy1+AfIWQTCP38E1w7I8PTc7Bsh/2gV5wNmfCvIau8=";
|
||||
dontNpmBuild = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jsonfmt";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "caarlos0";
|
||||
repo = "jsonfmt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rVv7Dv4vQmss4eiiy+KaO9tZ5U58WlRlsOz4QO0gdfM=";
|
||||
hash = "sha256-4SNpW/+4S4sEwjM7b9ClqKqwqFFVbCVv5VnftGIHtjo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xtwN+TemiiyXOxZ2DNys4G6w4KA3BjLSWAmzox+boMY=";
|
||||
vendorHash = "sha256-6pCgBCwHgTRnLDNfveBEKbs7kiXSSacD0B82A2Sbl1U=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
libgit2,
|
||||
libssh2,
|
||||
openssl,
|
||||
darwin,
|
||||
libiconv,
|
||||
git,
|
||||
gnupg,
|
||||
openssh,
|
||||
@@ -21,7 +19,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
@@ -32,7 +30,7 @@ rustPlatform.buildRustPackage {
|
||||
owner = "jj-vcs";
|
||||
repo = "jj";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jGy+0VDxQrgNhj+eX06FRhPP31V8QZVAM4j4yBosAGE=";
|
||||
hash = "sha256-fBgJrSglH46+NHu3spk5mC51ASDHWnOoW6veKZ0R2YA=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
@@ -42,25 +40,18 @@ rustPlatform.buildRustPackage {
|
||||
./libgit2-1.9.0.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-CtyRekrbRwUvQq2HsFwNo46RCDEGwy9e4ZU8/TwGxSU=";
|
||||
cargoHash = "sha256-35DJdAUXc2gb/EXECScwinSzzp7uaxFbUxedjqRGfj8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
zstd
|
||||
libgit2
|
||||
libssh2
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
libiconv
|
||||
];
|
||||
buildInputs = [
|
||||
zstd
|
||||
libgit2
|
||||
libssh2
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
|
||||
Generated
-5117
File diff suppressed because it is too large
Load Diff
@@ -26,14 +26,8 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-ggePJH2kKJ17aOWRKUnLyolIdSzlc6Axf5Iw74iFfek=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"bevy_egui-0.21.0" = "sha256-hu55tZQppw1NajwqIsYsw6de0IAwQwgra3D9OFzSSLc=";
|
||||
"bones_asset-0.3.0" = "sha256-1UeOXW6O/gMQBBUnHxRreJgmiUTPC5SJB+uLn9V8aa4=";
|
||||
"kira-0.8.5" = "sha256-z4R5aIaoRQQprL6JsVrFI69rwTOsW5OH01+jORS+hBQ=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-hVEpTNTXwOQoxlhOewUvHyfBh+APnx8Fox90CmdMRQ4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
+40
-51
@@ -1,41 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
extra-cmake-modules,
|
||||
fetchurl,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
kconfig,
|
||||
kdoctools,
|
||||
kguiaddons,
|
||||
ki18n,
|
||||
kinit,
|
||||
kiconthemes,
|
||||
kio,
|
||||
knewstuff,
|
||||
kplotting,
|
||||
kwidgetsaddons,
|
||||
kxmlgui,
|
||||
knotifyconfig,
|
||||
qtx11extras,
|
||||
qtwebsockets,
|
||||
qtkeychain,
|
||||
qtdatavis3d,
|
||||
wrapQtAppsHook,
|
||||
breeze-icons,
|
||||
libsecret,
|
||||
eigen,
|
||||
zlib,
|
||||
cfitsio,
|
||||
cmake,
|
||||
curl,
|
||||
eigen,
|
||||
gsl,
|
||||
indi-full,
|
||||
xplanet,
|
||||
kdePackages,
|
||||
libnova,
|
||||
libraw,
|
||||
gsl,
|
||||
wcslib,
|
||||
stellarsolver,
|
||||
libsecret,
|
||||
libxisf,
|
||||
curl,
|
||||
opencv,
|
||||
stellarsolver,
|
||||
wcslib,
|
||||
xplanet,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -69,54 +53,58 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kstars";
|
||||
version = "3.7.4";
|
||||
version = "3.7.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-WdVsPCwDQWW/NIRehuqk5f8rgtucAbGLSbmwZLMLiHM=";
|
||||
hash = "sha256-L9hyVfdgFlFfM6MyjR4bUa86FHPbVg7xBWPY8YSHUXw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = with kdePackages; [
|
||||
extra-cmake-modules
|
||||
kdoctools
|
||||
wrapQtAppsHook
|
||||
cmake
|
||||
];
|
||||
buildInputs = [
|
||||
buildInputs = with kdePackages; [
|
||||
breeze-icons
|
||||
cfitsio
|
||||
curl
|
||||
eigen'
|
||||
gsl
|
||||
indi-full
|
||||
kconfig
|
||||
kdoctools
|
||||
kguiaddons
|
||||
ki18n
|
||||
kinit
|
||||
kiconthemes
|
||||
kio
|
||||
knewstuff
|
||||
knotifyconfig
|
||||
kplotting
|
||||
kwidgetsaddons
|
||||
kxmlgui
|
||||
knotifyconfig
|
||||
qtx11extras
|
||||
qtwebsockets
|
||||
qtkeychain
|
||||
qtdatavis3d
|
||||
breeze-icons
|
||||
libsecret
|
||||
eigen'
|
||||
zlib
|
||||
cfitsio
|
||||
indi-full
|
||||
xplanet
|
||||
libnova
|
||||
libraw
|
||||
gsl
|
||||
wcslib
|
||||
stellarsolver
|
||||
libsecret
|
||||
libxisf
|
||||
curl
|
||||
opencv
|
||||
qtdatavis3d
|
||||
qtkeychain
|
||||
qtsvg
|
||||
qtwayland
|
||||
qtwebsockets
|
||||
stellarsolver
|
||||
wcslib
|
||||
xplanet
|
||||
zlib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DINDI_PREFIX=${indi-full}"
|
||||
"-DXPLANET_PREFIX=${xplanet}"
|
||||
cmakeFlags = with lib.strings; [
|
||||
(cmakeBool "BUILD_QT5" false)
|
||||
(cmakeFeature "INDI_PREFIX" "${indi-full}")
|
||||
(cmakeFeature "XPLANET_PREFIX" "${xplanet}")
|
||||
(cmakeFeature "DATA_INSTALL_DIR" "$out/share/kstars/")
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
@@ -133,6 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with maintainers; [
|
||||
timput
|
||||
hjones2199
|
||||
returntoreality
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubergrunt";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = "kubergrunt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FOXnerB6qmUUotWLlTTsR5x0+A0Q9D8PVDTMG8j8b9o=";
|
||||
sha256 = "sha256-m7Cx/0XsHJrnsH68vcwpsHlPggEN4XuXYXw0Xgp+qcI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rgU6Yv+gmKShWfpPaWtK2VIBPgFSsPVOnUzIp2+V7oI=";
|
||||
vendorHash = "sha256-gJrZ0iQTRUypbYaeTYNxH3AlT5J65uzKpKNtylwEApk=";
|
||||
|
||||
# Disable tests since it requires network access and relies on the
|
||||
# presence of certain AWS infrastructure
|
||||
|
||||
Generated
-1718
File diff suppressed because it is too large
Load Diff
@@ -18,12 +18,8 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-uMjM3w78qWnB/sNXRcxl30KJRm0I3BPEOr5IRU8FI0s=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"minecraft-protocol-0.1.0" = "sha256-3eDMj8+Ug46WOl3zRqNxUa+SZr2qlhyi8OSewLu+gI8=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-jqqqWZKO1HgwxLBGMz9rlFQ5xmZTycfUZjqHf+uVTBQ=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
|
||||
@@ -25,13 +25,13 @@ let
|
||||
in
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "lemminx";
|
||||
version = "0.29.0";
|
||||
version = "0.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eclipse";
|
||||
repo = "lemminx";
|
||||
rev = version;
|
||||
hash = "sha256-joeaN0Q/XxEWa7UX/LVSWIAb8GGTfVUE+NudedbBLBI=";
|
||||
hash = "sha256-xGC3ZGQ1dA0485/IPHsmX2NO1QOPp/nHMLBZvcC4Om8=";
|
||||
# Lemminx reads this git information at runtime from a git.properties
|
||||
# file on the classpath
|
||||
leaveDotGit = true;
|
||||
@@ -47,7 +47,7 @@ maven.buildMavenPackage rec {
|
||||
};
|
||||
|
||||
mvnJdk = jdk_headless;
|
||||
mvnHash = "sha256-7RLZSlmXnjl9vwvCf/Z+mc2906JtuUbjjkRGVMC1En8=";
|
||||
mvnHash = "sha256-0KnaXr5Mmwm0pV4o5bAX0MWKl6f/cvlO6cyV9UcgXeo=";
|
||||
|
||||
# Disable gitcommitid plugin which needs a .git folder which we don't have.
|
||||
# Disable failing tests which either need internet access or are flaky.
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "licensure";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chasinglogic";
|
||||
repo = "licensure";
|
||||
rev = version;
|
||||
hash = "sha256-Zd3Jidw3bC/B9vE3zdxDl3UyQNbtwiVBB2VRzBtt7d8=";
|
||||
hash = "sha256-ZizTcXmxAQsDXthNaXxrlsZr/tdAa8U3i70mwpvBmHw=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Rua/o1klNDHdCaRqs1HqyFAq1Gq1XssBhuipVNxwrP4=";
|
||||
cargoHash = "sha256-tQZ9/Ki7uaWM/zCKfiM9nL4X65K2JRmQmEWY/bnQPPA=";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs =
|
||||
[
|
||||
|
||||
-495
@@ -1,495 +0,0 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
[[package]]
|
||||
name = "atk"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "444daefa55f229af145ea58d77efd23725024ee1f6f3102743709aa6b18c663e"
|
||||
dependencies = [
|
||||
"atk-sys",
|
||||
"bitflags",
|
||||
"glib",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "atk-sys"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
|
||||
[[package]]
|
||||
name = "cairo-rs"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "157049ba9618aa3a61c39d5d785102c04d3b1f40632a706c621a9aedc21e6084"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cairo-sys-rs",
|
||||
"glib",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cairo-sys-rs"
|
||||
version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.52"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d"
|
||||
|
||||
[[package]]
|
||||
name = "futures-channel"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures-core"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
|
||||
|
||||
[[package]]
|
||||
name = "futures-executor"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f674f3e1bcb15b37284a90cedf55afdba482ab061c407a9c0ebbd0f3109741ba"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-task",
|
||||
"futures-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures-io"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
|
||||
|
||||
[[package]]
|
||||
name = "futures-macro"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
|
||||
dependencies = [
|
||||
"proc-macro-hack",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures-task"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
|
||||
|
||||
[[package]]
|
||||
name = "futures-util"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-macro",
|
||||
"futures-task",
|
||||
"pin-utils",
|
||||
"proc-macro-hack",
|
||||
"proc-macro-nested",
|
||||
"slab",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gdk"
|
||||
version = "0.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fbe5e8772fc0865c52460cdd7a59d7d47700f44d9809d1dd00eecceb769a7589"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cairo-rs",
|
||||
"cairo-sys-rs",
|
||||
"gdk-pixbuf",
|
||||
"gdk-sys",
|
||||
"gio",
|
||||
"gio-sys",
|
||||
"glib",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"libc",
|
||||
"pango",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gdk-pixbuf"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e248220c46b329b097d4b158d2717f8c688f16dd76d0399ace82b3e98062bdd7"
|
||||
dependencies = [
|
||||
"gdk-pixbuf-sys",
|
||||
"gio",
|
||||
"gio-sys",
|
||||
"glib",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gdk-pixbuf-sys"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0"
|
||||
dependencies = [
|
||||
"gio-sys",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gdk-sys"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb"
|
||||
dependencies = [
|
||||
"cairo-sys-rs",
|
||||
"gdk-pixbuf-sys",
|
||||
"gio-sys",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"libc",
|
||||
"pango-sys",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gio"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0cd10f9415cce39b53f8024bf39a21f84f8157afa52da53837b102e585a296a5"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
"futures-io",
|
||||
"futures-util",
|
||||
"gio-sys",
|
||||
"glib",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gio-sys"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glib"
|
||||
version = "0.9.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "40fb573a09841b6386ddf15fd4bc6655b4f5b106ca962f57ecaecde32a0061c0"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
"futures-executor",
|
||||
"futures-task",
|
||||
"futures-util",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glib-sys"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gobject-sys"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gtk"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87e1e8d70290239c668594002d1b174fcc7d7ef5d26670ee141490ede8facf8f"
|
||||
dependencies = [
|
||||
"atk",
|
||||
"bitflags",
|
||||
"cairo-rs",
|
||||
"cairo-sys-rs",
|
||||
"cc",
|
||||
"gdk",
|
||||
"gdk-pixbuf",
|
||||
"gdk-pixbuf-sys",
|
||||
"gdk-sys",
|
||||
"gio",
|
||||
"gio-sys",
|
||||
"glib",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"gtk-sys",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
"pango",
|
||||
"pango-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gtk-sys"
|
||||
version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1"
|
||||
dependencies = [
|
||||
"atk-sys",
|
||||
"cairo-sys-rs",
|
||||
"gdk-pixbuf-sys",
|
||||
"gdk-sys",
|
||||
"gio-sys",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"libc",
|
||||
"pango-sys",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.69"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005"
|
||||
|
||||
[[package]]
|
||||
name = "libhandy"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2aa9f5620e4143358bcd645fe7d7d27b974ed9148cbdd490bc811813899afa07"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"gdk",
|
||||
"gdk-sys",
|
||||
"gio",
|
||||
"gio-sys",
|
||||
"glib",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"gtk",
|
||||
"gtk-sys",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
"libhandy-sys",
|
||||
"pango",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libhandy-sys"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d707af842e918719b71af0ac6cf31d1843f6e8a4d1e9c733b998d8d482e60446"
|
||||
dependencies = [
|
||||
"gdk",
|
||||
"gdk-sys",
|
||||
"gio",
|
||||
"gio-sys",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"gtk-sys",
|
||||
"libc",
|
||||
"pango-sys",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "light-dm-sys"
|
||||
version = "0.0.1"
|
||||
source = "git+https://git.raatty.club/raatty/lightdm-rs.git#a3c669583bb932e2b25372048b1e9dbda1f10e11"
|
||||
dependencies = [
|
||||
"gio-sys",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lightdm"
|
||||
version = "0.1.0"
|
||||
source = "git+https://git.raatty.club/raatty/lightdm-rs.git#a3c669583bb932e2b25372048b1e9dbda1f10e11"
|
||||
dependencies = [
|
||||
"gio",
|
||||
"gio-sys",
|
||||
"glib",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"libc",
|
||||
"light-dm-sys",
|
||||
"once_cell",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lightdm-mobile-greeter"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"gdk",
|
||||
"gtk",
|
||||
"libhandy",
|
||||
"lightdm",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b"
|
||||
|
||||
[[package]]
|
||||
name = "pango"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e9c6b728f1be8edb5f9f981420b651d5ea30bdb9de89f1f1262d0084a020577"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"glib",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
"pango-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pango-sys"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pin-utils"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-hack"
|
||||
version = "0.5.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d659fe7c6d27f25e9d80a1a094c223f5246f6a6596453e09d7229bf42750b63"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-nested"
|
||||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
|
||||
dependencies = [
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "slab"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-xid"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
|
||||
@@ -21,12 +21,9 @@ rustPlatform.buildRustPackage rec {
|
||||
rev = "8c8d6dfce62799307320c8c5a1f0dd5c8c18e4d3";
|
||||
hash = "sha256-SrAR2+An3BN/doFl/s8PcYZMUHLfVPXKZOo6ndO60nY=";
|
||||
};
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"light-dm-sys-0.0.1" = "sha256-91MZhbO/Or0QOt0yVAUhtorpMBBzElFg6U59mF7WB0k=";
|
||||
};
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-9beOnuyzr1vC511il3Yjy9OVcQ0ZP9RQ88eCzx3xLsA=";
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
makeDesktopItem,
|
||||
pkg-config,
|
||||
cmake,
|
||||
freefont_ttf,
|
||||
@@ -41,35 +39,19 @@
|
||||
pipewireSupport ? true,
|
||||
pulseSupport ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "looking-glass-client";
|
||||
desktopName = "Looking Glass Client";
|
||||
type = "Application";
|
||||
exec = "looking-glass-client";
|
||||
icon = "lg-logo";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "looking-glass-client";
|
||||
version = "B7-rc1";
|
||||
version = "B7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnif";
|
||||
repo = "LookingGlass";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ne1Q+67+P8RHcTsqdiSSwkFf0g3pSNT91WN/lsSzssU=";
|
||||
hash = "sha256-I84oVLeS63mnR19vTalgvLvA5RzCPTXV+tSsw+ImDwQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix failing cmake assertion when disabling X11 without explicitly enabling Wayland.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gnif/LookingGlass/commit/20972cfd9b940fddf9e7f3d2887a271d16398979.patch";
|
||||
hash = "sha256-CqB8AmOZ4YxnEsQkyu/ZEaun6ywpSh4B7PM+MFJF0qU=";
|
||||
stripLen = 1;
|
||||
})
|
||||
./nanosvg-unvendor.diff
|
||||
];
|
||||
|
||||
@@ -132,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/pixmaps
|
||||
ln -s ${desktopItem}/share/applications $out/share/
|
||||
cp $src/resources/lg-logo.png $out/share/pixmaps
|
||||
'';
|
||||
|
||||
|
||||
Generated
-4264
File diff suppressed because it is too large
Load Diff
@@ -49,13 +49,8 @@ rustPlatform.buildRustPackage rec {
|
||||
"--skip=test_refactor_action_sequence"
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"hf-hub-0.3.2" = "sha256-1AcishEVkTzO3bU0/cVBI2hiCFoQrrPduQ1diMHuEwo=";
|
||||
"tree-sitter-zig-0.0.1" = "sha256-UXJCh8GvXzn+sssTrIsLViXD3TiBZhLFABYCKM+fNMQ=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-KR6BmYj3q9w0yGHFq9+l1x989XjiG3mkaZiyDGCYWPA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -20,11 +20,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lunacy";
|
||||
version = "10.11";
|
||||
version = "11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb";
|
||||
hash = "sha256-yRTp23UISWBbBkA9YavYcjqYMU0RijMyLOCoYk49Jxo=";
|
||||
hash = "sha256-++UJiJBsb+ywLOVmmUt/YZe3yadF/8ZLIAmm6sygcQ0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/mangojuice.vala b/src/mangojuice.vala
|
||||
index 8c2cbef..46e7f73 100644
|
||||
--- a/src/mangojuice.vala
|
||||
+++ b/src/mangojuice.vala
|
||||
@@ -2566,7 +2566,7 @@ public class MangoJuice : Adw.Application {
|
||||
}
|
||||
|
||||
async bool check_vkbasalt_installed_async () {
|
||||
- string[] paths = { "/usr/lib/libvkbasalt.so", "/usr/lib/x86_64-linux-gnu/libvkbasalt.so", "/usr/local/lib/libvkbasalt.so" };
|
||||
+ string[] paths = { "@vkbasalt@" };
|
||||
foreach (var path in paths) {
|
||||
if (FileUtils.test (path, FileTest.EXISTS)) {
|
||||
return true;
|
||||
@@ -7,6 +7,7 @@
|
||||
vala,
|
||||
pkg-config,
|
||||
makeBinaryWrapper,
|
||||
replaceVars,
|
||||
|
||||
gtk4,
|
||||
libadwaita,
|
||||
@@ -18,6 +19,7 @@
|
||||
mangohud,
|
||||
mesa-demos,
|
||||
vulkan-tools,
|
||||
vkbasalt,
|
||||
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -32,6 +34,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-NpNsYwktcce9R1LpoIL2vh5UzsgDqdPyS0D3mhM3F0w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(replaceVars ./fix-vkbasalt-path.patch {
|
||||
vkbasalt = lib.getLib vkbasalt + "/lib/vkbasalt/libvkbasalt.so";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
||||
@@ -11,18 +11,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mergiraf";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "mergiraf";
|
||||
repo = "mergiraf";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CiZG0O5F2sidInSFUtB1q5GSfTIjX9xUr52y0TZ5tDs=";
|
||||
hash = "sha256-1GiXGwNgJvA3uftLu2nWa2/Tp/koCybr2r/MXkJR6hk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-32DXHg0xVfUID8/jFNm3gowjOwCOsXH9sXDGM5yK7sA=";
|
||||
cargoHash = "sha256-+qnaxWkh0ZOi4gKSLHxSeFDMmJsUM9PHL7jaH3+6OhY=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrkite";
|
||||
repo = finalAttrs.pname;
|
||||
repo = "minutor";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "0ldjnrk429ywf8cxdpjkam5k73s6fq7lvksandfn3xn7gl9np5rk";
|
||||
};
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "misskey-dev";
|
||||
repo = finalAttrs.pname;
|
||||
repo = "misskey";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-uei5Ojx39kCbS8DCjHZ5PoEAsqJ5vC6SsFqIEIJ16n8=";
|
||||
fetchSubmodules = true;
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "moar";
|
||||
version = "1.31.3";
|
||||
version = "1.31.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "walles";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OL+imCEmHCWFRlSW+2h6rgJM+/LxCpxrFYK7g2zjlZ8=";
|
||||
hash = "sha256-28rD8NYuvfNoBtegGXBuoa5qb3f1eYilkmE4ykIeHTU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-J9u7LxzXk4npRyymmMKyN2ZTmhT4WwKjy0X5ITcHtoE=";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nu_scripts";
|
||||
version = "0-unstable-2025-02-17";
|
||||
version = "0-unstable-2025-02-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nushell";
|
||||
repo = pname;
|
||||
rev = "a8919f9c01ec4ece1cef8a08f3d6df32d616ea95";
|
||||
hash = "sha256-nbucy8iy0ADNDEIuQ1cdN7Yl9oV9ZF64vgGXKqh0K64=";
|
||||
rev = "698e24064710f9dcaca8d378181c8b954e37ac6e";
|
||||
hash = "sha256-VcPydbV2zEhQGJajBI1DRuJYJ/XKbTWsCGecDLGeLAs=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "openapi-changes";
|
||||
version = "0.0.75";
|
||||
version = "0.0.76";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pb33f";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/bUnCN+/Gs5RW3N5fl0/ucwMG4mrYPG0syYMMqIQzIQ=";
|
||||
hash = "sha256-Z+jFfsreJYLdvxfFjmTr8SKHOV22iNDFKYUdi9/8QRI=";
|
||||
};
|
||||
|
||||
# this test requires the `.git` of the project to be present
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
unzip,
|
||||
|
||||
SDL2,
|
||||
cmake,
|
||||
@@ -14,6 +16,7 @@
|
||||
freetype,
|
||||
gbenchmark,
|
||||
icu,
|
||||
innoextract,
|
||||
jansson,
|
||||
libGLU,
|
||||
libiconv,
|
||||
@@ -30,7 +33,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
openrct2-version = "0.4.19.1";
|
||||
openrct2-version = "0.4.20";
|
||||
|
||||
# Those versions MUST match the pinned versions within the CMakeLists.txt
|
||||
# file. The REPLAYS repository from the CMakeLists.txt is not necessary.
|
||||
@@ -39,50 +42,38 @@ let
|
||||
opensfx-version = "1.0.5";
|
||||
title-sequences-version = "0.4.14";
|
||||
|
||||
openrct2-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "OpenRCT2";
|
||||
rev = "v${openrct2-version}";
|
||||
hash = "sha256-sg09JmoWF9utPG7PakKpgLgX64FAc2x8ILX3lVHkRi0=";
|
||||
objects = fetchurl {
|
||||
url = "https://github.com/OpenRCT2/objects/releases/download/v${objects-version}/objects.zip";
|
||||
hash = "sha256-xrgAy817G5xwfzZX+8Xy2508/Zwq32aKzMndus14Qd8=";
|
||||
};
|
||||
|
||||
objects-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "objects";
|
||||
rev = "v${objects-version}";
|
||||
hash = "sha256-mxlabWuh8TTJs74yXdiv7XtdeGmCWQ5N1JoY7Xo0itQ=";
|
||||
openmsx = fetchurl {
|
||||
url = "https://github.com/OpenRCT2/OpenMusic/releases/download/v${openmsx-version}/openmusic.zip";
|
||||
hash = "sha256-8JfTpMzTn3VG+X2z7LG4vnNkj1O3p1lbhszL3Bp1V+Q=";
|
||||
};
|
||||
|
||||
openmsx-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "OpenMusic";
|
||||
rev = "v${openmsx-version}";
|
||||
hash = "sha256-KjWJSB2tdE0ExswVlz0dLXNPhLJ1kI6VZb3vqXQfx8w=";
|
||||
opensfx = fetchurl {
|
||||
url = "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${opensfx-version}/opensound.zip";
|
||||
hash = "sha256-qVIUi+FkwSjk/TrqloIuXwUe3ZoLHyyE3n92KM47Lhg=";
|
||||
};
|
||||
|
||||
opensfx-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "OpenSoundEffects";
|
||||
rev = "v${opensfx-version}";
|
||||
hash = "sha256-ucADnMLGm36eAo+NiioxEzeMqtu7YbGF9wsydK1mmoE=";
|
||||
};
|
||||
|
||||
title-sequences-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "title-sequences";
|
||||
rev = "v${title-sequences-version}";
|
||||
hash = "sha256-ier7sBYJjBIvKVxfaCelJPZ+oF9NEshvR2k/X9JpP+0=";
|
||||
title-sequences = fetchurl {
|
||||
url = "https://github.com/OpenRCT2/title-sequences/releases/download/v${title-sequences-version}/title-sequences.zip";
|
||||
hash = "sha256-FA33FOgG/tQRzEl2Pn8WsPzypIelcAHR5Q/Oj5FIqfM=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openrct2";
|
||||
version = openrct2-version;
|
||||
|
||||
src = openrct2-src;
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "OpenRCT2";
|
||||
rev = "v${openrct2-version}";
|
||||
hash = "sha256-G/uD3t8m7C74pjSA6dbz4gzu9CwEpmyFwtYpoFIiRjM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
unzip
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -96,6 +87,7 @@ stdenv.mkDerivation {
|
||||
freetype
|
||||
gbenchmark
|
||||
icu
|
||||
innoextract
|
||||
jansson
|
||||
libGLU
|
||||
libiconv
|
||||
@@ -118,12 +110,17 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
mkdir -p $sourceRoot/data/assetpack
|
||||
mkdir -p $sourceRoot/data/{object,sequence}
|
||||
unzip -o ${objects} -d $sourceRoot/data/object
|
||||
unzip -o ${openmsx} -d $sourceRoot/data
|
||||
unzip -o ${opensfx} -d $sourceRoot/data
|
||||
unzip -o ${title-sequences} -d $sourceRoot/data/sequence
|
||||
'';
|
||||
|
||||
cp -r ${objects-src} $sourceRoot/data/object
|
||||
cp -r ${openmsx-src} $sourceRoot/data/assetpack/openrct2.music.alternative.parkap
|
||||
cp -r ${opensfx-src} $sourceRoot/data/assetpack/openrct2.sound.parkap
|
||||
cp -r ${title-sequences-src} $sourceRoot/data/sequence
|
||||
# Fix blank changelog & contributors screen. See https://github.com/OpenRCT2/OpenRCT2/issues/16988
|
||||
postPatch = ''
|
||||
substituteInPlace src/openrct2/platform/Platform.Linux.cpp \
|
||||
--replace-fail "/usr/share/doc/openrct2" "$out/share/doc/openrct2"
|
||||
'';
|
||||
|
||||
preConfigure =
|
||||
@@ -141,12 +138,15 @@ stdenv.mkDerivation {
|
||||
+ (versionCheck "TITLE_SEQUENCE" title-sequences-version)
|
||||
);
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Open source re-implementation of RollerCoaster Tycoon 2 (original game required)";
|
||||
homepage = "https://openrct2.io/";
|
||||
downloadPage = "https://github.com/OpenRCT2/OpenRCT2/releases";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ oxzi ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
oxzi
|
||||
keenanweaver
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pgmetrics";
|
||||
version = "1.17.0";
|
||||
version = "1.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapidloop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-P0IUMYALCy1upd+JLnNqDlNKMAEccfwjc3s8Rn7xI4k=";
|
||||
sha256 = "sha256-SaJc09RRm8MR8OiBIznCRHLhpflQ4Gi8tlXQvYd/j9A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GOKgGONoM2q4doMoQwCLnHQjnB2QpPS3cxNnwzzz9ZU=";
|
||||
vendorHash = "sha256-/QAdHC2Ge2Bp2zcn9cpgCPpT8TADqeJC4GlJWsGPe8Q=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
picom.overrideAttrs (previousAttrs: {
|
||||
pname = "picom-pijulius";
|
||||
version = "8.2-unstable-2025-02-19";
|
||||
version = "8.2-unstable-2025-03-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pijulius";
|
||||
repo = "picom";
|
||||
rev = "48022df5d237170091a6912db4309026e23b162b";
|
||||
hash = "sha256-cy8+xT0rOgR/wepqDXiZc6zk0VDC+elfLmUPHIxtOzU=";
|
||||
rev = "e9834631b85da58d1f9cb258a0e020eedda58100";
|
||||
hash = "sha256-HvQdFAmoROZpiqDgrbn3L2ozAmsPibEB4Wy/cTtjMHc=";
|
||||
};
|
||||
|
||||
dontVersionCheck = true;
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plantuml-server";
|
||||
version = "1.2025.0";
|
||||
version = "1.2025.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war";
|
||||
hash = "sha256-AQL5ad7xowQbZdwngWVT2RsHdyKNRKGm2rP0dFUhyTM=";
|
||||
hash = "sha256-Qwaqt2Tlc5ruo0nnhepBXHOHVPqwcIP2Ec6GL+EyGTU=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -16,6 +16,9 @@
|
||||
}:
|
||||
|
||||
with python3Packages;
|
||||
let
|
||||
i686Linux = stdenv.buildPlatform.system == "i686-linux";
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "pre-commit";
|
||||
version = "4.0.1";
|
||||
@@ -45,26 +48,35 @@ buildPythonApplication rec {
|
||||
virtualenv
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
cargo
|
||||
coursier
|
||||
dotnet-sdk
|
||||
gitMinimal
|
||||
glibcLocales
|
||||
go
|
||||
libiconv # For rust tests on Darwin
|
||||
nodejs
|
||||
perl
|
||||
pytest-env
|
||||
pytest-forked
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
re-assert
|
||||
cabal-install
|
||||
];
|
||||
|
||||
# i686-linux: dotnet-sdk not available
|
||||
doCheck = stdenv.buildPlatform.system != "i686-linux";
|
||||
nativeCheckInputs =
|
||||
[
|
||||
cargo
|
||||
gitMinimal
|
||||
glibcLocales
|
||||
go
|
||||
libiconv # For rust tests on Darwin
|
||||
perl
|
||||
pytest-env
|
||||
pytest-forked
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
re-assert
|
||||
cabal-install
|
||||
]
|
||||
++ lib.optionals (!i686Linux) [
|
||||
# coursier can be moved back to the main nativeCheckInputs list once we’re able to bootstrap a
|
||||
# JRE on i686-linux: <https://github.com/NixOS/nixpkgs/issues/314873>. When coursier gets
|
||||
# moved back to the main nativeCheckInputs list, don’t forget to re-enable the
|
||||
# coursier-related test that is currently disabled on i686-linux.
|
||||
coursier
|
||||
# i686-linux: dotnet-sdk not available
|
||||
dotnet-sdk
|
||||
# nodejs can be moved back to the main nativeCheckInputs list once this
|
||||
# issue is fixed: <https://github.com/NixOS/nixpkgs/issues/387658>. When nodejs gets
|
||||
# moved back to the main nativeCheckInputs list, don’t forget to re-enable the
|
||||
# Node.js-related tests that are currently disabled on i686-linux.
|
||||
nodejs
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pre_commit/resources/hook-tmpl \
|
||||
@@ -90,10 +102,12 @@ buildPythonApplication rec {
|
||||
export GIT_AUTHOR_NAME=test GIT_COMMITTER_NAME=test \
|
||||
GIT_AUTHOR_EMAIL=test@example.com GIT_COMMITTER_EMAIL=test@example.com \
|
||||
VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 LANG=en_US.UTF-8
|
||||
|
||||
''
|
||||
+ lib.optionalString (!i686Linux) ''
|
||||
# Resolve `.NET location: Not found` errors for dotnet tests
|
||||
export DOTNET_ROOT="${dotnet-sdk}/share/dotnet"
|
||||
|
||||
''
|
||||
+ ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
git init -b master
|
||||
@@ -106,70 +120,80 @@ buildPythonApplication rec {
|
||||
deactivate
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# ERROR: The install method you used for conda--probably either `pip install conda`
|
||||
# or `easy_install conda`--is not compatible with using conda as an application.
|
||||
"test_conda_"
|
||||
"test_local_conda_"
|
||||
disabledTests =
|
||||
[
|
||||
# ERROR: The install method you used for conda--probably either `pip install conda`
|
||||
# or `easy_install conda`--is not compatible with using conda as an application.
|
||||
"test_conda_"
|
||||
"test_local_conda_"
|
||||
|
||||
# /build/pytest-of-nixbld/pytest-0/test_install_ruby_with_version0/rbenv-2.7.2/libexec/rbenv-init:
|
||||
# /usr/bin/env: bad interpreter: No such file or directory
|
||||
"test_ruby_"
|
||||
# /build/pytest-of-nixbld/pytest-0/test_install_ruby_with_version0/rbenv-2.7.2/libexec/rbenv-init:
|
||||
# /usr/bin/env: bad interpreter: No such file or directory
|
||||
"test_ruby_"
|
||||
|
||||
# network
|
||||
"test_additional_dependencies_roll_forward"
|
||||
"test_additional_golang_dependencies_installed"
|
||||
"test_additional_node_dependencies_installed"
|
||||
"test_additional_rust_cli_dependencies_installed"
|
||||
"test_additional_rust_lib_dependencies_installed"
|
||||
"test_coursier_hook"
|
||||
"test_coursier_hook_additional_dependencies"
|
||||
"test_dart"
|
||||
"test_dart_additional_deps"
|
||||
"test_dart_additional_deps_versioned"
|
||||
"test_during_commit_all"
|
||||
"test_golang_default_version"
|
||||
"test_golang_hook"
|
||||
"test_golang_hook_still_works_when_gobin_is_set"
|
||||
"test_golang_infer_go_version_default"
|
||||
"test_golang_system"
|
||||
"test_golang_versioned"
|
||||
"test_language_version_with_rustup"
|
||||
"test_installs_rust_missing_rustup"
|
||||
"test_installs_without_links_outside_env"
|
||||
"test_local_golang_additional_deps"
|
||||
"test_lua"
|
||||
"test_lua_additional_dependencies"
|
||||
"test_node_additional_deps"
|
||||
"test_node_hook_versions"
|
||||
"test_perl_additional_dependencies"
|
||||
"test_r_hook"
|
||||
"test_r_inline"
|
||||
"test_r_inline_hook"
|
||||
"test_r_local_with_additional_dependencies_hook"
|
||||
"test_r_with_additional_dependencies_hook"
|
||||
"test_run_a_node_hook_default_version"
|
||||
"test_run_lib_additional_dependencies"
|
||||
"test_run_versioned_node_hook"
|
||||
"test_rust_cli_additional_dependencies"
|
||||
"test_swift_language"
|
||||
"test_run_example_executable"
|
||||
"test_run_dep"
|
||||
# network
|
||||
"test_additional_dependencies_roll_forward"
|
||||
"test_additional_golang_dependencies_installed"
|
||||
"test_additional_node_dependencies_installed"
|
||||
"test_additional_rust_cli_dependencies_installed"
|
||||
"test_additional_rust_lib_dependencies_installed"
|
||||
"test_coursier_hook"
|
||||
"test_coursier_hook_additional_dependencies"
|
||||
"test_dart"
|
||||
"test_dart_additional_deps"
|
||||
"test_dart_additional_deps_versioned"
|
||||
"test_during_commit_all"
|
||||
"test_golang_default_version"
|
||||
"test_golang_hook"
|
||||
"test_golang_hook_still_works_when_gobin_is_set"
|
||||
"test_golang_infer_go_version_default"
|
||||
"test_golang_system"
|
||||
"test_golang_versioned"
|
||||
"test_language_version_with_rustup"
|
||||
"test_installs_rust_missing_rustup"
|
||||
"test_installs_without_links_outside_env"
|
||||
"test_local_golang_additional_deps"
|
||||
"test_lua"
|
||||
"test_lua_additional_dependencies"
|
||||
"test_node_additional_deps"
|
||||
"test_node_hook_versions"
|
||||
"test_perl_additional_dependencies"
|
||||
"test_r_hook"
|
||||
"test_r_inline"
|
||||
"test_r_inline_hook"
|
||||
"test_r_local_with_additional_dependencies_hook"
|
||||
"test_r_with_additional_dependencies_hook"
|
||||
"test_run_a_node_hook_default_version"
|
||||
"test_run_lib_additional_dependencies"
|
||||
"test_run_versioned_node_hook"
|
||||
"test_rust_cli_additional_dependencies"
|
||||
"test_swift_language"
|
||||
"test_run_example_executable"
|
||||
"test_run_dep"
|
||||
|
||||
# i don't know why these fail
|
||||
"test_install_existing_hooks_no_overwrite"
|
||||
"test_installed_from_venv"
|
||||
"test_uninstall_restores_legacy_hooks"
|
||||
"test_dotnet_"
|
||||
"test_health_check_"
|
||||
# i don't know why these fail
|
||||
"test_install_existing_hooks_no_overwrite"
|
||||
"test_installed_from_venv"
|
||||
"test_uninstall_restores_legacy_hooks"
|
||||
"test_dotnet_"
|
||||
"test_health_check_"
|
||||
|
||||
# Expects `git commit` to fail when `pre-commit` is not in the `$PATH`,
|
||||
# but we use an absolute path so it's not an issue.
|
||||
"test_environment_not_sourced"
|
||||
# Expects `git commit` to fail when `pre-commit` is not in the `$PATH`,
|
||||
# but we use an absolute path so it's not an issue.
|
||||
"test_environment_not_sourced"
|
||||
|
||||
# Docker required
|
||||
"test_docker_"
|
||||
];
|
||||
# Docker required
|
||||
"test_docker_"
|
||||
]
|
||||
++ lib.optionals i686Linux [
|
||||
# From coursier_test.py:
|
||||
"test_error_if_no_deps_or_channel"
|
||||
# From node_test.py:
|
||||
"test_healthy_system_node"
|
||||
"test_unhealthy_if_system_node_goes_missing"
|
||||
"test_node_hook_system"
|
||||
"test_node_with_user_config_set"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pre_commit"
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "protonmail-bridge";
|
||||
version = "3.17.0";
|
||||
version = "3.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonMail";
|
||||
repo = "proton-bridge";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-h3CMSnNS4c7b/WASVytW/lTv2VXvECUMZPXs6ZRAFvA=";
|
||||
hash = "sha256-qLxIXAGa1nqLOroz5VYWktznId+vfOPvHpUT/oVPD8M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZDd36nrxi/BEuTitM3wmH5BOU3hjSlG403BX6vh5kn8=";
|
||||
vendorHash = "sha256-S08Vw/dLLVd6zFWmpG8wDVf7LOdSC29qo7pUscYHDyY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pywal16";
|
||||
version = "3.8.0";
|
||||
version = "3.8.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eylles";
|
||||
repo = "pywal16";
|
||||
tag = version;
|
||||
hash = "sha256-PWXAQEWLrjmxgMWqpwJtLvUhXERcBM1Bfg5extGd8+c=";
|
||||
hash = "sha256-3GowgiLZpQmAaR903sg+4MmzBkj5mS+D3556F6lxxfw=";
|
||||
};
|
||||
|
||||
build-system = [ python3.pkgs.setuptools ];
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "rcu";
|
||||
version = "2025.001r";
|
||||
version = "2025.001s";
|
||||
|
||||
format = "other";
|
||||
|
||||
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
|
||||
let
|
||||
src-tarball = requireFile {
|
||||
name = "rcu-d${version}-source.tar.gz";
|
||||
hash = "sha256-3pTfe0ytcvLnO65S0Uqrv/IBoidpEIQXqkcIG354hUU=";
|
||||
hash = "sha256-QC9ieulYAmE9pwt1/eZmyI5MZfRV0f24Pe5oKtuXNok=";
|
||||
url = "https://www.davisr.me/projects/rcu/";
|
||||
};
|
||||
in
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "roddhjav-apparmor-rules";
|
||||
version = "0-unstable-2025-02-17";
|
||||
version = "0-unstable-2025-03-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roddhjav";
|
||||
repo = "apparmor.d";
|
||||
rev = "af85db9148b17bb37b4d73454e78d4efec4c2db9";
|
||||
hash = "sha256-mCc1DQXQvzeeA+sq67zK5o18tKByaB5dITmC77j9uEM=";
|
||||
rev = "334b48749a67f97d2eab517ce8418807965390ea";
|
||||
hash = "sha256-UXgk7P41yeGYfMNfasAhtTqinmkJVltZHulfUdMIIW0=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "routinator";
|
||||
version = "0.14.1";
|
||||
version = "0.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NLnetLabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6wYNuGSB55ozzPEbptfEEp/euzh/IRfNrdREWF0xGTU=";
|
||||
hash = "sha256-itD9d+EqEdJ2bTJEpHxJCFFS8Mpc7AFQ1JgkNQxncV0=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ogeIPr98vlakpzNJWkfMU3DKVpVPkyVay/CrE616UXU=";
|
||||
cargoHash = "sha256-58EnGouq8iKkgsvyHqARoQ0u4QXjw0m6pv4Am4J9wlU=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "rpl";
|
||||
version = "1.17";
|
||||
version = "1.18";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bx+7e0ydAz/Jd1AYM9Mz1oo9SHmG27cXF50N1IYd4gE=";
|
||||
hash = "sha256-N4043ig/ZoL4XpNpU5bzRh1xl3jheoAT9kvYfX9nHX4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "simple64-netplay-server";
|
||||
version = "2025.02.3";
|
||||
version = "2025.03.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simple64";
|
||||
repo = "simple64-netplay-server";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mtyIGS7i4+HRpjE8Z3puoIOGhv21Th27iCXpO2LxtAg=";
|
||||
hash = "sha256-n+au4x6d50rZI5sH7B5jdlD6vXK65UM4TRAtzpPW6ws=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lcKOAPCyWKNg+l1YjziaMTn4DjLB0P+dz3FqyAy0sFk=";
|
||||
vendorHash = "sha256-E7vuGoCxCvJ/2bGDTz2NShlDjZbrPdTwLDydxop7Nio=";
|
||||
|
||||
meta = {
|
||||
description = "Dedicated server for simple64 netplay";
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "skate";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "skate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HwtBY4rtqyY+DMNq2Fu30/CsTlhhGOuJRrdM5zHUAIg=";
|
||||
hash = "sha256-Ihzcto41ltV5LQjLP9AF5XGl5b6QDbgZ/q4BMzfrDC8=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-nCT9PsRPxefjC4q4cr5UigTITUkx0JmQtdv7/ZXbXVI=";
|
||||
vendorHash = "sha256-H0j0za/+pNEYQAfTvLcECU7jt+2HJMJRcK+n/GbLNO0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
jre = openjdk21;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "smartgithg";
|
||||
version = "24.1.1";
|
||||
pname = "smartgit";
|
||||
version = "24.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${
|
||||
builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
|
||||
}.tar.gz";
|
||||
hash = "sha256-Lv5U/D1p5+Xiq/IeQJGDu3t6j6sP0r0vMYpfAEeExfI=";
|
||||
hash = "sha256-bPiPb/k5f9dRpwm4Wj+c2mhFhH9WOz2hzKeDfQLRLHQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook3 ];
|
||||
@@ -86,7 +86,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
icon = "smartgit";
|
||||
desktopName = "SmartGit";
|
||||
categories = [
|
||||
"Application"
|
||||
"Development"
|
||||
"RevisionControl"
|
||||
];
|
||||
@@ -101,7 +100,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "GUI for Git, Mercurial, Subversion";
|
||||
description = "Git GUI client";
|
||||
longDescription = ''
|
||||
SmartGit is a multi-platform Git GUI client, free to use for active Open Source developers and users from academic institutions.
|
||||
Command line Git is required.
|
||||
'';
|
||||
homepage = "https://www.syntevo.com/smartgit/";
|
||||
changelog = "https://www.syntevo.com/smartgit/changelog.txt";
|
||||
license = lib.licenses.unfree;
|
||||
@@ -14,7 +14,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
# list of all theoretically available targets
|
||||
targets = [
|
||||
"genode"
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz";
|
||||
hash = "sha256-w5ZEPxjplBTkedPN4yJN1A55HtItYjuwZA8UPFQBOw8=";
|
||||
hash = "sha256-aHCY/mrEn3tNXC6e1fzzLHcrzYkKzgF7t1qc3QtnaVE=";
|
||||
};
|
||||
|
||||
hardeningEnable = [ "pie" ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule {
|
||||
pname = "starlark";
|
||||
version = "0-unstable-2025-02-05";
|
||||
version = "0-unstable-2025-02-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "starlark-go";
|
||||
rev = "492d3672b3f4a001a9ad46d16bfdb1ad2f891912";
|
||||
hash = "sha256-zObkWX6IKXXsa4ZH9EjudeVgz2KK9eJn3uTa387HfKY=";
|
||||
rev = "0d3f41d403af5d6607cdf241f12b7e0572f2cb58";
|
||||
hash = "sha256-ZZR89U2+LhzAptNz/S2qMBKNGdf5xUbXLcLCHizhQ2A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo=";
|
||||
|
||||
+15
-10
@@ -1,44 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qtbase,
|
||||
qt6,
|
||||
cfitsio,
|
||||
gsl,
|
||||
wcslib,
|
||||
withTester ? false,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stellarsolver";
|
||||
version = "2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rlancaste";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
repo = "stellarsolver";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-6WDiHaBhi9POtXynGU/eTeuqZSK81JJeuZv4SxOeVoE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qt6.qtbase
|
||||
cfitsio
|
||||
gsl
|
||||
wcslib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TESTER=${if withTester then "on" else "off"}"
|
||||
(lib.strings.cmakeBool "BUILD_TESTER" withTester)
|
||||
(lib.strings.cmakeBool "USE_QT5" false)
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rlancaste/stellarsolver";
|
||||
description = "Astrometric plate solving library";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ hjones2199 ];
|
||||
maintainers = with maintainers; [
|
||||
hjones2199
|
||||
returntoreality
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -6,7 +6,7 @@
|
||||
installShellFiles,
|
||||
}:
|
||||
let
|
||||
version = "0.28.3";
|
||||
version = "0.28.5";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "step-cli";
|
||||
@@ -16,7 +16,7 @@ buildGoModule {
|
||||
owner = "smallstep";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vR/RwTfka0c5pBfX9i2e7wms6ApL+bAdDrjEcKm07XM=";
|
||||
hash = "sha256-cuD66Llk0789mYL0x17jKjSmAxCcCvwPEz3/BHXJ5NQ=";
|
||||
# this file change depending on git branch status (via .gitattributes)
|
||||
# https://github.com/NixOS/nixpkgs/issues/84312
|
||||
postFetch = ''
|
||||
@@ -35,7 +35,7 @@ buildGoModule {
|
||||
rm command/certificate/remote_test.go
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-+HDdrm7N8weEX/hMt2vsxEQq1CNZP9Jj2UKA+7JN1Io=";
|
||||
vendorHash = "sha256-iOtW5uioDDHR7ZJFX3pBdrQlWV6LnfjjHinQppmX5Fo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "subxt";
|
||||
version = "0.39.0";
|
||||
version = "0.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paritytech";
|
||||
repo = "subxt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Q+B+vB8V18vwDzWgRw+J6Xi2MWQehJ3M4FxQsnOGKFE=";
|
||||
hash = "sha256-U9gErJP+aex5vT3yy4kNad0/0ofdVtrN03tITVIEgzw=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-B8QHX65E9NVC3XVWER8cUhyvmaTYqz9TMQKRsWpr5b8=";
|
||||
cargoHash = "sha256-W1S6CPhfGvfQmlzLDiCxeWZoepNlClTmHOfJNo3f8oQ=";
|
||||
|
||||
# Only build the command line client
|
||||
cargoBuildFlags = [ "--bin" "subxt" ];
|
||||
|
||||
@@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
emilytrau
|
||||
aduh95
|
||||
];
|
||||
mainProgram = finalAttrs.pname;
|
||||
mainProgram = "tart";
|
||||
platforms = [
|
||||
"aarch64-darwin"
|
||||
"x86_64-darwin"
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "trunk";
|
||||
version = "0.21.7";
|
||||
version = "0.21.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trunk-rs";
|
||||
repo = "trunk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VAAGHM2GDrvZvOTRPkxSFs6pzDQGhi6vPpprKJSZKUw=";
|
||||
hash = "sha256-iuJpxLNdJCPFr5v0bXipOr9KzQM/JeUBQQ7qyMaQsoA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
||||
checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-IiKb8MD5QdGMkdX2dbcPkW1cUJq82+uDK1Ru+/otErc=";
|
||||
cargoHash = "sha256-fTKzfsmWX8AS3GPOfkRAfdVIj2q1orI1j2tfo8AAsXU=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/trunk-rs/trunk";
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libts";
|
||||
repo = finalAttrs.pname;
|
||||
repo = "tslib";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = finalAttrs.hash;
|
||||
};
|
||||
|
||||
Generated
-6748
File diff suppressed because it is too large
Load Diff
@@ -12,26 +12,19 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ukmm";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NiceneNerd";
|
||||
repo = "ukmm";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NZN+T2N+N+oxrjBRvVbRWbB2KY5im9SN7gPHzfvovl8=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"egui-aesthetix-0.2.4" = "sha256-6Nt+nx1pAkuehXINRLp8xgiXmq1PzWgtu/hVbcDm5iA=";
|
||||
"junction-0.2.0" = "sha256-6+pPp5wG1NoIj16Z+OvO4Pvy0jnQibn/A9cTaHAEVq4=";
|
||||
"msbt-0.1.1" = "sha256-PtBs60xgYrwS7yPnRzXpExwYUD3azIaqObRnnJEL5dE=";
|
||||
"msyt-1.2.1" = "sha256-aw5whCoQBhO0u9Fx2rTO1sRuPdGnAAlmPWv5q8CbQcI=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-eDYCF+bYh0T/SSrQKjCqZvSd28CSxvGkpHgmBCHLoig=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -48,12 +41,13 @@ rustPlatform.buildRustPackage rec {
|
||||
# Force linking to libEGL, which is always dlopen()ed, and to
|
||||
# libwayland-client & libxkbcommon, which is dlopen()ed based on the
|
||||
# winit backend.
|
||||
RUSTFLAGS = map (a: "-C link-arg=${a}") [
|
||||
"-Wl,--push-state,--no-as-needed"
|
||||
NIX_LDFLAGS = [
|
||||
"--push-state"
|
||||
"--no-as-needed"
|
||||
"-lEGL"
|
||||
"-lwayland-client"
|
||||
"-lxkbcommon"
|
||||
"-Wl,--pop-state"
|
||||
"--pop-state"
|
||||
];
|
||||
|
||||
cargoTestFlags = [
|
||||
@@ -79,11 +73,11 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "New mod manager for The Legend of Zelda: Breath of the Wild";
|
||||
homepage = "https://github.com/NiceneNerd/ukmm";
|
||||
changelog = "https://github.com/NiceneNerd/ukmm/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/NiceneNerd/ukmm/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ kira-bruneau ];
|
||||
platforms = platforms.linux;
|
||||
broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64;
|
||||
mainProgram = "ukmm";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Generated
-1638
File diff suppressed because it is too large
Load Diff
@@ -21,12 +21,8 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-7UbzE5VXycjo7KNpPe2oqwyZDT4Vk8rQZ6HXT1q9Cw4=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"trust-dns-proto-0.20.4" = "sha256-+oAjyyTXbKir8e5kn8CUmQy5qmzQ47ryvBBdZtzj1TY=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ShwFHLfDPc3P8J5gV5CFz/2vrQ5xR01C3sYIejyt860=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
buildPackages,
|
||||
|
||||
# Build inputs
|
||||
ApplicationServices,
|
||||
@@ -42,6 +43,9 @@
|
||||
openslide,
|
||||
pango,
|
||||
poppler,
|
||||
withIntrospection ?
|
||||
lib.meta.availableOn stdenv.hostPlatform gobject-introspection
|
||||
&& stdenv.hostPlatform.emulatorAvailable buildPackages,
|
||||
|
||||
# passthru
|
||||
testers,
|
||||
@@ -57,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"out"
|
||||
"man"
|
||||
"dev"
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "devdoc" ];
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) [ "devdoc" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libvips";
|
||||
@@ -79,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ninja
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) [
|
||||
gtk-doc
|
||||
];
|
||||
|
||||
@@ -128,8 +132,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
[
|
||||
(lib.mesonEnable "pdfium" false)
|
||||
(lib.mesonEnable "nifti" false)
|
||||
(lib.mesonEnable "introspection" withIntrospection)
|
||||
]
|
||||
++ lib.optional (!stdenv.hostPlatform.isDarwin) (lib.mesonBool "gtk_doc" true)
|
||||
++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) (
|
||||
lib.mesonBool "gtk_doc" true
|
||||
)
|
||||
++ lib.optional (imagemagick == null) (lib.mesonEnable "magick" false);
|
||||
|
||||
passthru = {
|
||||
|
||||
Generated
-1353
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user