mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-20 15:41:16 +00:00
Merge master into staging-next
This commit is contained in:
@@ -4743,12 +4743,6 @@
|
||||
githubId = 52760912;
|
||||
name = "Cameron Brown";
|
||||
};
|
||||
ccellado = {
|
||||
email = "annplague@gmail.com";
|
||||
github = "ccellado";
|
||||
githubId = 44584960;
|
||||
name = "Denis Khalmatov";
|
||||
};
|
||||
ccicnce113424 = {
|
||||
email = "ccicnce113424@gmail.com";
|
||||
matrix = "@ccicnce113424:matrix.org";
|
||||
@@ -31137,6 +31131,13 @@
|
||||
{ fingerprint = "D2A8 A906 ACA7 B6D6 575E 9A2F 3A49 5054 6EA6 9E5C"; }
|
||||
];
|
||||
};
|
||||
yoquec = {
|
||||
email = "alvaro.viejo@yoquec.com";
|
||||
github = "yoquec";
|
||||
githubId = 59575696;
|
||||
name = "Alvaro Viejo";
|
||||
matrix = "@yoquec.com:matrix.org";
|
||||
};
|
||||
yorickvp = {
|
||||
email = "yorickvanpelt@gmail.com";
|
||||
matrix = "@yorickvp:matrix.org";
|
||||
|
||||
@@ -8,6 +8,7 @@ binaryheap,,,,,,vcunat
|
||||
bit32,,,,,5.1,lblasc
|
||||
busted,,,,,,
|
||||
busted-htest,,,,,,mrcjkb
|
||||
canola.nvim,,,,,,saadndm
|
||||
cassowary,,,,,,alerque
|
||||
cldr,,,,,,alerque
|
||||
commons.nvim,,,,,5.1,mrcjkb
|
||||
|
||||
|
@@ -460,7 +460,7 @@ in
|
||||
Group = cfg.group;
|
||||
TimeoutSec = "300";
|
||||
WorkingDirectory = "${cfg.package}/share/redmine";
|
||||
ExecStart = "${bundle} exec rails server -u webrick -e production -b ${toString cfg.address} -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'";
|
||||
ExecStart = "${bundle} exec rails server -u webrick -e production -b ${toString cfg.address} -p ${toString cfg.port}";
|
||||
RuntimeDirectory = "redmine";
|
||||
RuntimeDirectoryMode = "0750";
|
||||
AmbientCapabilities = "";
|
||||
|
||||
@@ -21,9 +21,9 @@ let
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.10/android-studio-quail1-patch2-linux.tar.gz";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2026.1.2.9"; # "Android Studio Quail 2 | 2026.1.2 RC 2"
|
||||
sha256Hash = "sha256-QzNhbE8Ryv0VGQY/VzhJhqeS0c6rrUpgXXVOoBV+NHE=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.9/android-studio-quail2-rc2-linux.tar.gz";
|
||||
version = "2026.1.3.5"; # "Android Studio Quail 3 | 2026.1.3 RC 1"
|
||||
sha256Hash = "sha256-P8YoUnG4YtCOPkbHLFBHfteZg8cJJeXuDgty+kmgbSw=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.3.5/android-studio-quail3-rc1-linux.tar.gz";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2026.1.4.1"; # "Android Studio Quail 4 | 2026.1.4 Canary 1"
|
||||
|
||||
@@ -9,6 +9,7 @@ let
|
||||
|
||||
luarocksPackageNames = [
|
||||
# # keep-sorted start case=no
|
||||
"canola-nvim"
|
||||
"fidget-nvim"
|
||||
"fzf-lua"
|
||||
"gitsigns-nvim"
|
||||
|
||||
@@ -13,18 +13,18 @@
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
let
|
||||
version = "0.9.6";
|
||||
version = "0.10.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmtrKovalenko";
|
||||
repo = "fff.nvim";
|
||||
repo = "fff";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JOoc4RDPIggZaoPtPEWhQ2msWfgOOuI4PPguFMczJls=";
|
||||
hash = "sha256-nrstsxOxHTeSKkqpvyxdzyypfHU6wZBQpvNnCfjh9s4=";
|
||||
};
|
||||
fff-nvim-lib = rustPlatform.buildRustPackage {
|
||||
pname = "fff-nvim-lib";
|
||||
inherit version src;
|
||||
|
||||
cargoHash = "sha256-nHVQccbKSfX9fZXh0aPRP33n4nHWhaRdz9k49apULME=";
|
||||
cargoHash = "sha256-Nlf2Bxwe5KvZF0unpeK/mMFmv4NM+IKPpFOopXoNRxU=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
@@ -108,7 +108,7 @@ vimUtils.buildVimPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Fast Fuzzy File Finder for Neovim";
|
||||
homepage = "https://github.com/dmtrKovalenko/fff.nvim";
|
||||
homepage = "https://github.com/dmtrKovalenko/fff";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
|
||||
@@ -19,7 +19,6 @@ fi
|
||||
for i in \
|
||||
"x86_64-linux linux-x64 tar.gz" \
|
||||
"aarch64-linux linux-arm64 tar.gz" \
|
||||
"armv7l-linux linux-armhf tar.gz" \
|
||||
"loongarch64-linux linux-loong64 tar.gz" \
|
||||
"aarch64-darwin darwin-arm64 zip"; do
|
||||
set -- $i
|
||||
|
||||
@@ -17,7 +17,6 @@ let
|
||||
x86_64-linux = "linux-x64";
|
||||
aarch64-linux = "linux-arm64";
|
||||
aarch64-darwin = "darwin-arm64";
|
||||
armv7l-linux = "linux-armhf";
|
||||
loongarch64-linux = "linux-loong64";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
@@ -26,11 +25,10 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-LJsGc11MH6zlcJNfSWjTWPn2Jp9dkjeBPQuCXH1woUM=";
|
||||
aarch64-linux = "sha256-mT5dvw8GOZ0GnZaKRS/TAzQDEEYDOgcj6w6lNLy5kQ0=";
|
||||
aarch64-darwin = "sha256-c8K17XKpRG1ji2mUfoyg2+cRF+qc1KVMYVkaQoUIz7Y=";
|
||||
armv7l-linux = "sha256-91ZHhEUDVoDiRBLwMHVLhzKmb9gWcPBUsVRZVLhCA4M=";
|
||||
loongarch64-linux = "sha256-7iUdsIyJkIi40Xn+/PWdCVgahQxbZtiMw0QLMisN+sg=";
|
||||
x86_64-linux = "sha256-rfNUjfBV0Y5HbN7oh0iLp0hrh5rZmjGlRsa1xf8pbCQ=";
|
||||
aarch64-linux = "sha256-c9h9RtTcII/hLASX3GB6qwpuK/My9UoLaCajoaoyvDQ=";
|
||||
aarch64-darwin = "sha256-8h7lJinrXjnAVdrqcBGLemBVxjmuzz2tBeGZeprYOsA=";
|
||||
loongarch64-linux = "sha256-p8hwOg5BbVvJGeQoBrgtd4gHsYmwEhsF/I+bk8gzIo4=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
@@ -41,8 +39,8 @@ buildVscode rec {
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.121.03429";
|
||||
vscodeVersion = "1.121.0";
|
||||
version = "1.126.04524";
|
||||
vscodeVersion = "1.126.0";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
@@ -88,7 +86,6 @@ buildVscode rec {
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
"armv7l-linux"
|
||||
"loongarch64-linux"
|
||||
];
|
||||
# requires libc.so.6 and other glibc specifics
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "fbneo";
|
||||
version = "0-unstable-2026-06-22";
|
||||
version = "0-unstable-2026-07-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fbneo";
|
||||
rev = "845a1fd30f895ab69669f03c97eb5cfbf0f8d97a";
|
||||
hash = "sha256-fy6LSeOlIQkrLGnMQhXSR4EwC+4crAirQKnWt+7S1cI=";
|
||||
rev = "63796c5d2d40010b5a495c748b74f5f8cd7d8b4d";
|
||||
hash = "sha256-Mv7NSw28O41iPEfaE5d7tAZPgUA7XmRFUODfatgTEiI=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame";
|
||||
version = "0-unstable-2026-06-16";
|
||||
version = "0-unstable-2026-07-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame";
|
||||
rev = "0108c5ef3a2261a20c54186ce76cfb4d9ea384a4";
|
||||
hash = "sha256-O/L6+JFCOZtRec40S4xMaKh7A8HteZ5L8GQjrhhRfUw=";
|
||||
rev = "e2f8a31819e9e510dd06ab11f0d387ca7789776e";
|
||||
hash = "sha256-LzN5rbo8kev8aogIMTQMLXseZBzx2XtDGGEUtABW92M=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xdg-desktop-portal-hyprland";
|
||||
version = "1.3.12";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "xdg-desktop-portal-hyprland";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-B7nwX0PE0KBo1/ZtuwJtA7dBG6gdPW5tSBb0skY8DHA=";
|
||||
hash = "sha256-nzm1lwk41EzFVYC6HX7YCFnjCGJ2Ac1n7xi47ajYu8Y=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
}:
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aquamarine";
|
||||
version = "0.12.1";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "aquamarine";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cUQENbJn0PHQUttXame5+PbGGew+BckHZFTfpb8XGI8=";
|
||||
hash = "sha256-zF1iJkBQSDWmRO4/LEeHR1SpKY0lqZaxkoQJpPS9K9U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bitrise";
|
||||
version = "2.40.7";
|
||||
version = "2.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitrise-io";
|
||||
repo = "bitrise";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-kVFsVXLPul/2EP0X0q+uSBIGx95dt6Q2olzWBtr+uHI=";
|
||||
hash = "sha256-aiN0fid5ysMpj0MJrlhaOD+LLUKBXVZcXNcWePmBzKM=";
|
||||
};
|
||||
|
||||
# many tests rely on writable $HOME/.bitrise and require network access
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
}:
|
||||
|
||||
maven.buildMavenPackage (finalAttrs: {
|
||||
version = "13.7.0";
|
||||
version = "13.8.0";
|
||||
pname = "checkstyle";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "checkstyle";
|
||||
repo = "checkstyle";
|
||||
tag = "checkstyle-${finalAttrs.version}";
|
||||
hash = "sha256-BrgjkqkVnLYMlouyopUoCTby2z4YWZl4UK7m3Ktm5bE=";
|
||||
hash = "sha256-Nhn65Y6iz55wucAQ/DiF9VWm15O7m7+ZhOM+X4rIHGQ=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-IKO61ugVjF03zA6pCwYKmwMVx/Ogy8hrt70ArOUm0NA=";
|
||||
mvnHash = "sha256-GhnxhSZX+plwQq9l4av6dqLEVp7HwT5aTVHKoTfaP8c=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
maven
|
||||
|
||||
@@ -10,22 +10,22 @@ let
|
||||
inherit (stdenv) hostPlatform;
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/lab/2026.06.26-7079533/linux/x64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-fZNlWkdPQsK12SfmKmG+VrxWA4Df7sAFQJ5DSToq+Eg=";
|
||||
url = "https://downloads.cursor.com/lab/2026.07.16-899851b/linux/x64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-EGrPazo3gc0nkDhyarxPefmHRJufUhmw9uYtlsiP7m0=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/lab/2026.06.26-7079533/linux/arm64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-WcMurHV8Pm/2Y1HvNJGZYqjgt3OzHwn5oW5W27egueE=";
|
||||
url = "https://downloads.cursor.com/lab/2026.07.16-899851b/linux/arm64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-jujK8/VKymxztowTwNZL25ibGmXftldEFNmwMNDRCRg=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/lab/2026.06.26-7079533/darwin/arm64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-UO8SRA6depwO9SNhvYl9uOy9Dp625vHVNiyfxtmq3c4=";
|
||||
url = "https://downloads.cursor.com/lab/2026.07.16-899851b/darwin/arm64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-wM17Y8AftjtE4zx6JhNDLo/YyxOIHacqwWE8nxQIEV8=";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "cursor-cli";
|
||||
version = "0-unstable-2026-06-26";
|
||||
version = "0-unstable-2026-07-16";
|
||||
|
||||
src = sources.${hostPlatform.system};
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dasel";
|
||||
version = "3.8.1";
|
||||
version = "3.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = "dasel";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/rQItj+nCr/IriT4Lgbxe+d9XfAyyZM+Q0nM0F3s//M=";
|
||||
hash = "sha256-F7oNs65AsokIgYjaPqgSbtsZ5JwSFJ/A6Edm+LzQqgU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oqGUHPnfCxgUTueB1zEJ8/h0L+2oxoVQHI+oJm3HcPo=";
|
||||
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
|
||||
doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
if [[ $($out/bin/dasel version) == "v${finalAttrs.version}" ]]; then
|
||||
if [[ $($out/bin/dasel version) == "${finalAttrs.version}" ]]; then
|
||||
echo '{ "my": { "favourites": { "colour": "blue" } } }' \
|
||||
| $out/bin/dasel -i json 'my.favourites.colour = "red"' \
|
||||
| grep "red"
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "diskwatch";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matthart1983";
|
||||
repo = "diskwatch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8tQXcbY/sguw42vE0p5Q8/psmwfYQihWcSIsApI4OmE=";
|
||||
hash = "sha256-CGt9954nwgVMcNJg6QjRLjhN8N9rQ6+bRuCzqQAUXGc=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
cargoHash = "sha256-kO6g5JJogNN5xqD5Qoj6Ncd6scA7PFAjg6y0AWnNhAM=";
|
||||
cargoHash = "sha256-YYCIPti5f1fSf3AcDAIDIRHcbnxJRc+Pv5IKFWgYeYM=";
|
||||
|
||||
nativeCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
@@ -18,17 +18,17 @@
|
||||
# files.
|
||||
|
||||
let
|
||||
version = "2.8.2";
|
||||
tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
tagFor = version: "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "expat";
|
||||
inherit version;
|
||||
version = "2.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
with finalAttrs;
|
||||
"https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz";
|
||||
"https://github.com/libexpat/libexpat/releases/download/${tagFor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-OtibhYjmZEvU5JmBSA1IshKJ7rvNTwoaSvscKfmbarQ=";
|
||||
};
|
||||
|
||||
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/libexpat/libexpat/blob/${tag}/expat/Changes";
|
||||
changelog = "https://github.com/libexpat/libexpat/blob/${tagFor finalAttrs.version}/expat/Changes";
|
||||
homepage = "https://libexpat.github.io/";
|
||||
description = "Stream-oriented XML parser library written in C";
|
||||
mainProgram = "xmlwf";
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.4.69";
|
||||
version = "0.4.71";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
@@ -22,11 +22,11 @@ buildGoModule rec {
|
||||
cd "$out"
|
||||
git rev-parse HEAD > COMMIT
|
||||
'';
|
||||
hash = "sha256-e06fahSSeKTsWGR4o7XZFzcv2MfUCKLo6PrZg2tgIGU=";
|
||||
hash = "sha256-dCgfmG3h/E+ADbwY2pHxIFNBahSJCNGBsn3XohJMWRk=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-BLlKOu1q73T2i+B64+sLkCYXaTlHbVJ5moEwqG2JoHo=";
|
||||
vendorHash = "sha256-xm5DDXo5es7JhYXBcaohz1bkJw6yGNZl/z9W5I8lutg=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
preferLocalBuild = true;
|
||||
pname = "freescout";
|
||||
version = "1.8.229";
|
||||
version = "1.8.230";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freescout-help-desk";
|
||||
repo = "freescout";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-oA/GWEhdqmXt7v6iRKqud75uUBj1a6nKN7EjaYF0USk=";
|
||||
hash = "sha256-QAMZj1tUSaErLTJR8IfzatNw5G8lznA4mNa+a4Bd5rQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -42,6 +42,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://hg.sr.ht/~scoopta/glpaper";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ccellado ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
git,
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule {
|
||||
pname = "golink";
|
||||
version = "1.0.0";
|
||||
version = "1.0.0-unstable-2026-07-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tailscale";
|
||||
repo = "golink";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cIml0ewF5j2cQySLHkMmV1rl7cVH8wuoPFeFDCARi1A=";
|
||||
rev = "30223ca66c2dad29356b6266254e1bf4af921f28";
|
||||
hash = "sha256-hp886p94NHA8u3021horHFf6tGa8x8gWdeNA1XnQZ6E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QIAkmqXWH3X2dIoWyVcqFXVHBwzyv1dNPfdkzD5LuSE=";
|
||||
vendorHash = "sha256-7Ykb2YPrHwwBrWuufFwGTT9mQFzIRkiBiNlLvqpr+wo=";
|
||||
|
||||
overrideModAttrs = old: {
|
||||
# netdb.go allows /etc/protocols and /etc/services to not exist and happily proceeds, but it panic()s if they exist but return permission denied.
|
||||
@@ -30,6 +30,8 @@ buildGoModule rec {
|
||||
"-w"
|
||||
];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Private shortlink service for tailnets";
|
||||
homepage = "https://github.com/tailscale/golink";
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
version = "0.2.7";
|
||||
version = "0.2.14";
|
||||
pname = "incus-spawn";
|
||||
|
||||
src =
|
||||
@@ -66,15 +66,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/incus-spawn-linux-amd64";
|
||||
hash = "sha256-jgdNuVfVshbg8piAGGpIy4cnJj5glbsGqOENDBoqpzI=";
|
||||
hash = "sha256-eyz54Ej1NJaTgVJuOPJTZb7zUHpHf5/yJa9RUkEjozs=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/incus-spawn-linux-aarch64";
|
||||
hash = "sha256-Y7OaNgQKAN/HVt75+tawrCtkyZdAHfAiUxx2a0eD5P8=";
|
||||
hash = "sha256-9qDDWimLb/sDtEbJrV4LbtTiWmbRI2jws0lreECbWp8=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/incus-spawn-macos-aarch64";
|
||||
hash = "sha256-Uv0v7LxIcB0oNEnW1vK9Iy6MOwxoUeqtszGfsS5wt6k=";
|
||||
hash = "sha256-ILGO6CGBWAeyVrkVVOnYZQOqoIYTzogfhk4NMkeY/a4=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
136
pkgs/by-name/ja/jackett/deps.json
generated
136
pkgs/by-name/ja/jackett/deps.json
generated
@@ -6,8 +6,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "AngleSharp",
|
||||
"version": "1.4.0",
|
||||
"hash": "sha256-xHpoMkhYSj7ejeMmI2e7ygef84QGZhttPjYOnLjITd0="
|
||||
"version": "1.5.2",
|
||||
"hash": "sha256-81rDtnwvR0SDXNNUnPirWIa782gwkgRlz1Fbzm2ywwc="
|
||||
},
|
||||
{
|
||||
"pname": "AngleSharp.Xml",
|
||||
@@ -61,53 +61,53 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Cryptography.Internal",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-UwBbUhfCxg5B3llggin1UtoaGYdy9ifoYs1MT3WiIJw="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-2sigYMwiq5w/E2EFTXf1D0IjWW4/1HQMH4HOYfYTYtw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.DataProtection",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-8bK7MDVhISTXmEFdcFcnJUleDaPAZkA8fWPAHV6XFeg="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-wLswQ5CrFv93sZ1ZKhxUW1FrWH2KBp96GTqZrozuBVI="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.DataProtection.Abstractions",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-YSVo0oww1xoG7Hef+roLwGNX6dQs7ZG10f3Ij7w6z1w="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-Rpas+cH+OSP80wwQ448h0rFUbUG74XJHNtQLL9fUcR4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Http",
|
||||
"version": "2.3.9",
|
||||
"hash": "sha256-XuOH9M6qd6XFz15TnWNnNCVd567B5BCb0wfl0Xoz5g4="
|
||||
"version": "2.3.11",
|
||||
"hash": "sha256-Wy+HphsrkH6r9ljPfQ+k1bgL/nsUKR5A9iCJ7DP33d4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Http.Abstractions",
|
||||
"version": "2.3.0",
|
||||
"hash": "sha256-NrAFzk5IcxmeRk3Zu+rLcq0+KKiAYfygJbAdIt2Zpfk="
|
||||
"version": "2.3.10",
|
||||
"hash": "sha256-TlgQug0JPR5vsFsxU0btpa4SbLSLLKZ2T8izyZpkZtM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Http.Features",
|
||||
"version": "2.3.0",
|
||||
"hash": "sha256-QkNFS3ScDLyt0XppATSogbF1raSQJN+wStcnAsSoUJw="
|
||||
"version": "2.3.9",
|
||||
"hash": "sha256-9VJKZ5adBKRrVp+XRWEQiazv9Q6jj7noT/X693djVgQ="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.JsonPatch",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-+AxAcxXNHLrELpW0KZd54TGMqPwe2bYaxUwNS64F8oQ="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-tKaK64BnFoj/J2DM4qSvO/zQ5alPLEasm6pr3+Tp3CM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-ephL6fJDFR+0rrebEH92IDpoMadJLef98L7mNKHTAUo="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-jbOBm5T8ZlBhips96MI7u7JBLhNT/dX5eHjUQ6cw+dI="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.WebUtilities",
|
||||
"version": "2.3.0",
|
||||
"hash": "sha256-oJMEP44Q9ClhbyZUPtSb9jqQyJJ/dD4DHElRvkYpIOo="
|
||||
"version": "2.3.10",
|
||||
"hash": "sha256-XuHgYt83oinCBcCfY1FJa1PWj/t5kvg/YPse0DlYiUA="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.WebUtilities",
|
||||
"version": "2.3.9",
|
||||
"hash": "sha256-B5iIW0O5K11GELwd7dc96SYTmFkvINhdodBDcL14+/w="
|
||||
"version": "2.3.11",
|
||||
"hash": "sha256-HAGuLuTRLkTTcP9oqRpqPYQmIzQTecUWHI/UTAJ2iMY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
@@ -126,8 +126,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-kCHVu7LDlMXlvDvFo9C3zbISV2t52s+iZMpp0/JX3iw="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-FscIiUzpg4lqoV4XU+qHKw1BipCPkC+twxRqcDDy4xo="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.TimeProvider",
|
||||
@@ -146,8 +146,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-wfj9Vp3innwgJGToOyGqhW2lyFe4vG3KW51vMJjGGoU="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-Th2ejKhzEMKV1FUoj+74zhJIg3jaFhWmtci2utqfIn8="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration.Abstractions",
|
||||
@@ -156,8 +156,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration.Abstractions",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-1968fW24KGyvpNU8gYIPEhXJVVusgCCBz4PkK9Rww0s="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-e0ABlyKnPhqtd875N0d04E4bdYWe5MOHK7YZzFM9nnY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection",
|
||||
@@ -171,23 +171,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-jTzy4tazMmC7magGRhm86yd2a7+2vRYWrC0QoOoDMSQ="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-xpAbVQ2HlbLiEETz+IHa0Sih68j0HARbUCk423SCdYg="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Diagnostics.Abstractions",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-U6ij4cMOc94qLfVxuPINg4/vqqbFcZgTuIC/c0RznTQ="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-Or2ZUfYxYXZ7DrLYCPnkRhsKed4u0/ZElHrg65eovqY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.FileProviders.Abstractions",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-T5LCT9yTrHvMaVP/4spQqCj27hXCbchTUdPMKKGBp3E="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-SSERP6+GvZld+YjmGeAuwt6STik/aA8dR1v/7/kTiHo="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Hosting.Abstractions",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-u62QeQqAhJ0Pa5JnxXQIyOGkuQZnYYmo3ADTB9f6L9o="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-VLWUfFSry5RZz+oA6xqaF751QiOQmHKQftDoFbiMzCs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging",
|
||||
@@ -201,8 +201,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-B5aTywrWdDbuAC5JBaueFtsA8VQAsejdMW9PSacELMM="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-wIfMBf7I1KuDIOyAuIML1Y9cZWkxYUdM3PercoEmSUM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.ObjectPool",
|
||||
@@ -221,8 +221,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Options",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-GkwkNAO87zn4tzOX7Z0oSpBhjIgkhAx5ApnY/PP5q/0="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-AqEIL9qf6OJ4nzZZ/GT/53nz4TQofShVrDQhru/RgZs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Primitives",
|
||||
@@ -231,13 +231,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Primitives",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-UqBlK5n0ZV8PlvwbholkIB6OU8mkT8bLDUv74a8pq5Y="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-4WejEhNikEJEmlYxjqM5DpAeGH5LiaK9TVtZIBU56ck="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Net.Http.Headers",
|
||||
"version": "2.3.8",
|
||||
"hash": "sha256-IgcqzFtv8NAmnb8uvr+lEKHWSehpK3eciCIZ/lcFyaI="
|
||||
"version": "2.3.10",
|
||||
"hash": "sha256-4LG06n+vo2bFpg9dQ9NSLvVf7rQfiD+k0FEq5S6tDsE="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NET.Test.Sdk",
|
||||
@@ -416,13 +416,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Polly",
|
||||
"version": "8.6.6",
|
||||
"hash": "sha256-0BrOttCw+HQYB24Y2uMy2vo0P5/txUlhELC8FlyLKps="
|
||||
"version": "8.7.0",
|
||||
"hash": "sha256-iMNusWW+4nuIvkNLUaoru23Roe9vpC140TOIHbLvewE="
|
||||
},
|
||||
{
|
||||
"pname": "Polly.Core",
|
||||
"version": "8.6.6",
|
||||
"hash": "sha256-y6/a4OWrUlRfe0J8qdhBRmYRDi6K2y+kwhEVCIUOjvU="
|
||||
"version": "8.7.0",
|
||||
"hash": "sha256-1AT4Xym9hn2Awgul9WErwXk2bBPN58P9XfRExrIPItg="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Collections",
|
||||
@@ -716,8 +716,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.EventLog",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-5+BaoVjBFX0MoVDsUGqNs+Pu3oIrqksrnT9W7Eqgrww="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-pJBU/x5x1qwEjtSjkuTwVB6z04gAxMPPXOSdUIgYe1M="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.Tools",
|
||||
@@ -786,8 +786,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Pipelines",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-ySSAdeOwjapOB53Fb3EU0QwLHw1pLCoP2NZ07E8rj7Q="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-JacrrdrxR6u7aVjeJiSDOptqAV/f3rcszgz/WdCMBkg="
|
||||
},
|
||||
{
|
||||
"pname": "System.Linq",
|
||||
@@ -971,8 +971,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.Pkcs",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-4IJgqiBVvHqLXr2LEC/m2sz4Z1ugU3YECsJHN2jvXqU="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-D16WfDikzmgkxmEspZqLa8m2UzyjgC3tivTAWCWZ87M="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.Primitives",
|
||||
@@ -986,8 +986,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.ProtectedData",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-dzULuNU8/MMI0iZ9k1vS9pU5tgiwn6e7vvzGyxNHZHA="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-JfLdZjyzoRDHV2a6jGwq/xwuGy3T0XZNGB3zK9IAPBE="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.X509Certificates",
|
||||
@@ -996,8 +996,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.Xml",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-1KFc+NUWOLCVj+KzrWVcrcL9Ph1roZ5qJuCfetHvQ8Q="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-OzwTTsPo8Gui1xs4+zlILwvZgbcxXJ97m3ejKqnebu4="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Principal.Windows",
|
||||
@@ -1011,8 +1011,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.ServiceProcess.ServiceController",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-s7mpGEfvvgw5PzpcQJpMtrPzezPUaeJ81vc0KBM9+/k="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-LGttR/XVbEu/ZKz9Np0hTjP0t1TP/3lkQfGxWrhhT10="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encoding",
|
||||
@@ -1021,8 +1021,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encoding.CodePages",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-llRnK9hMkLkFYP1OLNAfsr7GuIRP2OmbzfrIfCz2xv8="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-g5Ps501kdW4XXvSQrwb8qJq71I+P48+2T41uBkx42VA="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encoding.Extensions",
|
||||
@@ -1036,13 +1036,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encodings.Web",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-Vo9mC4wgTNXc2DGUjhykVuuIJO8gpPTpYQJBsY0X5Rw="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-DTjo1Iqkf8qIdwYPKKeddiiU78j/OCvrMITJ3vlPdhU="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "9.0.16",
|
||||
"hash": "sha256-GF3aOmsHlEjeWg/pkj1yFQktfd4PMNb2jKpMvUADOcQ="
|
||||
"version": "9.0.18",
|
||||
"hash": "sha256-tClFgkq64oP9F4UEZhi2SrvVCkgnOmjVn7p0sbpiwEw="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.RegularExpressions",
|
||||
@@ -1096,7 +1096,7 @@
|
||||
},
|
||||
{
|
||||
"pname": "YamlDotNet",
|
||||
"version": "16.3.0",
|
||||
"hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q="
|
||||
"version": "18.1.0",
|
||||
"hash": "sha256-Wf/mWt5nrZ2IYmf4d7Y0pFA2PLgblOGducpMNkYUFvY="
|
||||
}
|
||||
]
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "jackett";
|
||||
version = "0.24.2200";
|
||||
version = "0.24.2237";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jackett";
|
||||
repo = "jackett";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hmgv17zju1BnT6eapTUhY+3Do/lr2+Cu/ejlU0/vF/I=";
|
||||
hash = "sha256-wlKfaVE69SQiA1GVxHWPAs5XOUv899E5NDVmI84/b7U=";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kin-openapi";
|
||||
version = "0.141.0";
|
||||
version = "0.142.0";
|
||||
vendorHash = "sha256-uprdzJnaxd1UyEdZFFPvmo2Xu/QXJdheC1eqkyKY9Zc=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getkin";
|
||||
repo = "kin-openapi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1qyOCA5R+OWnPsEX0I5AJf/6ckWGz5dtMiKFCCA3TQY=";
|
||||
hash = "sha256-QNFHKleHRjta9juSPXLJ/0h/vMV/XbODQ/z4VFD5UK0=";
|
||||
};
|
||||
|
||||
checkFlags =
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "kingfisher";
|
||||
version = "1.106.0";
|
||||
version = "1.107.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "mongodb";
|
||||
repo = "kingfisher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HzS+ZNulmrhDstxleUztNhAscZZ5VqrBlzozH12Qz40=";
|
||||
hash = "sha256-PhrniOr2YRaWbCbI35bhdYzztgegnKVTw/rWX/BMwGQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-F5RgsrCWDkaLm+/5DsSQ3NMtPi6+e0oddHm+KhY2gNQ=";
|
||||
cargoHash = "sha256-bEPg0exoNFxk/CZgThn6SXXx6ELJcKvmXBqDVeZlKv4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -47,14 +47,14 @@ in
|
||||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limine";
|
||||
version = "12.4.2";
|
||||
version = "12.5.0";
|
||||
|
||||
# We don't use the Git source but the release tarball, as the source has a
|
||||
# `./bootstrap` script performing network access to download resources.
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-mrNz84nKqeY9wpintFr1NRrJpNAPgE9owcumGYZc2t4=";
|
||||
hash = "sha256-U9XLJ3LqigBuE37i4yDYTvlP98V/iApkDReH2S55/Oc=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pangolin-cli";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "cli";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-wJS60bG5eQIEsDdqKxfSVKPaW+EmmtiaW9gbH1wwBQ4=";
|
||||
hash = "sha256-YST8NQWUNd0nkaKF4K+tgXUMI1FcoceQyO6Kisf3WDc=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
36
pkgs/by-name/pe/pedantix/package.nix
Normal file
36
pkgs/by-name/pe/pedantix/package.nix
Normal file
@@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "pedantix";
|
||||
version = "1.0.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Swarsel";
|
||||
repo = "pedantix";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ibouDGnFOfkeUvM9oOL+0a9T93jSKqUfWCGY8CfpkTg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PwmWZEPQFknvBnK/Rtt9gl4wWq8c6hjfrcMfbhqldKw=";
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "The pedantic nix formatter";
|
||||
homepage = "https://github.com/Swarsel/pedantix";
|
||||
changelog = "https://github.com/Swarsel/pedantix/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ swarsel ];
|
||||
mainProgram = "pedantix";
|
||||
};
|
||||
})
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "perfect-dark-pc-port";
|
||||
repo = "perfect_dark";
|
||||
rev = "514bf7affd3259b7919165201342ff81a026d92c";
|
||||
hash = "sha256-J0n3hBxNZeLaFcR6NMIHO9QWEpKje5aORZOwn4vJG6M=";
|
||||
hash = "sha256-HjkVk7AJFTpWE2RqQTwEp6vUzocIjMp7xs8c6Az7CBo=";
|
||||
|
||||
postFetch = ''
|
||||
pushd $out
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
version = "1.82.1";
|
||||
version = "1.82.2";
|
||||
hashes = {
|
||||
linux-aarch_64 = "sha256-VTDKjBMzFj5CocdqK1EEIOBsdTIckXMrNGOlRyByCc8=";
|
||||
linux-ppcle_64 = "sha256-/NCzmrhbTDaYhJBntW6n6yA5tvtsvdVldMlK7WfV6RY=";
|
||||
linux-s390_64 = "sha256-Bk83rw8iGsniyNcivgQRjx/GOWB0kv4Wo01b4YTG0Pk=";
|
||||
linux-x86_32 = "sha256-Ai7h2w1ZGWlS/tAdiT/dpd6wt3VM4rpPiQuv5rDbfCY=";
|
||||
linux-x86_64 = "sha256-OnXRqIuP5E9KHVy48ixz+PzI1WOu2QV/9epISyLNry8=";
|
||||
osx-aarch_64 = "sha256-hm3WySlSQu/J5rg8pWlpOStcPnODqn1b7pKL1N5CkSQ=";
|
||||
osx-x86_64 = "sha256-hm3WySlSQu/J5rg8pWlpOStcPnODqn1b7pKL1N5CkSQ=";
|
||||
windows-x86_32 = "sha256-CWZAubE98Aftf7Mjd2caROxsWSxS+JQGf4YB+FEwiwo=";
|
||||
windows-x86_64 = "sha256-XmhjMhJ/djRizOkSh+i7PtZn2RL9jVV5PcBkgwpYw0o=";
|
||||
linux-aarch_64 = "sha256-RVdT8rpH1WHd5vQb+o3BP81ipuwFZ/Bv8Hr8BC7shwA=";
|
||||
linux-ppcle_64 = "sha256-Jcjpo21XWjCeCMcWmjM5tPtQYwd5JZ0pUsfFXMAF95Q=";
|
||||
linux-s390_64 = "sha256-Oe9brWzFO1aP3xcVhR8Uq40nJFTzyxDAtp0+3ErynjI=";
|
||||
linux-x86_32 = "sha256-AlnBc3VBeV+jMn6T0QFWurd+0hywSihi7snop81bO2E=";
|
||||
linux-x86_64 = "sha256-5SKpbtVprxNAXhzqODcPZ+I7U81RSjELWQKQ71/lYF4=";
|
||||
osx-aarch_64 = "sha256-LNFM4zTJiLO5XHWT/iaipbQWgN2HwyjNxTMps/XlzYo=";
|
||||
osx-x86_64 = "sha256-LNFM4zTJiLO5XHWT/iaipbQWgN2HwyjNxTMps/XlzYo=";
|
||||
windows-x86_32 = "sha256-yrbPXrPSn+iaI16zCPh1rteFh1Q18sQuR9UWo+xMToQ=";
|
||||
windows-x86_64 = "sha256-vfdo65O6o8ctW+qVdcWuH5sQDXypn4ktNHMCv6uJ0gw=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -99,7 +99,7 @@
|
||||
capstone,
|
||||
valgrindSupport ? false,
|
||||
valgrind-light,
|
||||
brlttySupport ? !minimal,
|
||||
brlttySupport ? !minimal && !stdenv.hostPlatform.isDarwin,
|
||||
brltty,
|
||||
pluginsSupport ? !stdenv.hostPlatform.isStatic,
|
||||
enableDocs ? !minimal || toolsOnly,
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
}:
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "qui";
|
||||
version = "1.22.0";
|
||||
version = "1.23.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "autobrr";
|
||||
repo = "qui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-psIkTzayXgK7OKEjRz8NJfQVVH6Xn5qp1GdRlEEPaxw=";
|
||||
hash = "sha256-RprALTd610Krh1q5yr0HIbNwb8TDbUvgbFfMMrsJT+E=";
|
||||
};
|
||||
|
||||
qui-web = stdenvNoCC.mkDerivation (finalAttrs': {
|
||||
@@ -44,7 +44,7 @@ buildGo126Module (finalAttrs: {
|
||||
;
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-53bj1QlfihIyKsQK5o3FsA9qWZJrNPWEJ441UK9nWR0=";
|
||||
hash = "sha256-aty/BRc3WqdnN3yynH4EbyledU3NtKu9E+3vP4KAdsk=";
|
||||
};
|
||||
|
||||
postBuild = ''
|
||||
@@ -56,7 +56,7 @@ buildGo126Module (finalAttrs: {
|
||||
'';
|
||||
});
|
||||
|
||||
vendorHash = "sha256-n+CCRQk46j/ljAfFap3mgwxs4JF9Qr/TLqZILghgbU4=";
|
||||
vendorHash = "sha256-6DX2s/y5nHYI5Jz2zs+ROGM+xk4K5yTwEwGkNiYhlcc=";
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${finalAttrs.qui-web}/* web/dist
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rustywind";
|
||||
version = "0.24.3";
|
||||
version = "0.25.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "avencera";
|
||||
repo = "rustywind";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qbOlU7kqVbB/sQg4b78CohOwQbraulZ8dRxeT+39rFk=";
|
||||
hash = "sha256-PeYKBLTQ7/fmNuWtIQiqC47omrdGuIlB55OPxBQJQiM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eXTdPtcsWhsABZU6kRzZ6eF1VaabouZwLAFI9KpAx98=";
|
||||
cargoHash = "sha256-76gC+nw/eV4j68O74XsJDaDFYAEdqZB9EzsRj5vdOvs=";
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
1136
pkgs/by-name/sm/smithy-language-server/deps.json
generated
Normal file
1136
pkgs/by-name/sm/smithy-language-server/deps.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
74
pkgs/by-name/sm/smithy-language-server/package.nix
Normal file
74
pkgs/by-name/sm/smithy-language-server/package.nix
Normal file
@@ -0,0 +1,74 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
jre,
|
||||
gradle,
|
||||
runCommand,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "smithy-language-server";
|
||||
version = "0.9.0";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smithy-lang";
|
||||
repo = "smithy-language-server";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-BnnZKADY9HiSy8mlwuh+e7g6Zz422l/rx1NTSRgexIU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gradle
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
gradleBuildTask = "installDist";
|
||||
|
||||
# NOTE: in 0.9.0, test ProjectLoaderTest.loadsProjectWithMavenDep() is failing.
|
||||
# Once the test is fixed, checking should be re-enabled.
|
||||
# doCheck = true;
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
inherit (finalAttrs) pname;
|
||||
data = ./deps.json;
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,share/smithy-language-server}
|
||||
cp -r build/install/smithy-language-server/lib $out/share/smithy-language-server/
|
||||
|
||||
makeWrapper ${lib.getExe jre} $out/bin/smithy-language-server \
|
||||
--set CLASSPATH "$out/share/smithy-language-server/lib/*" \
|
||||
--add-flags "software.amazon.smithy.lsp.Main"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
help = runCommand "${finalAttrs.pname}-help-test" { } ''
|
||||
${lib.getExe finalAttrs.finalPackage} --help &> $out
|
||||
grep "Run the Smithy Language Server" $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
mainProgram = "smithy-language-server";
|
||||
description = "Language server implementation for the Smithy IDL";
|
||||
homepage = "https://github.com/smithy-lang/smithy-language-server";
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # deps
|
||||
];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ yoquec ];
|
||||
inherit (jre.meta) platforms;
|
||||
};
|
||||
})
|
||||
@@ -11,6 +11,7 @@
|
||||
webkitgtk_6_0,
|
||||
blueprint-compiler,
|
||||
evolution-data-server-gtk4,
|
||||
glib-networking,
|
||||
gst_all_1,
|
||||
libportal-gtk4,
|
||||
libpsl,
|
||||
@@ -44,6 +45,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
evolution-data-server-gtk4
|
||||
glib-networking
|
||||
gst_all_1.gstreamer
|
||||
libadwaita
|
||||
libportal-gtk4
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "syswatch";
|
||||
version = "0.7.3";
|
||||
version = "0.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matthart1983";
|
||||
repo = "syswatch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6wdchl+m8rpMZSvEUu0CFymszo8oA+C5VeHfAMDB/vw=";
|
||||
hash = "sha256-fKMNnx5aBr2oSk2VJWz2TKHF7fJ1Lv2lRxnd89Vy4hA=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
cargoHash = "sha256-CtV74uU30SBZsBgrnN0P5V1zqR/HsbikuEZICuhiwDY=";
|
||||
cargoHash = "sha256-4wTyf+VsoQpPNCydr57Q3/zi2/Bvqt7tvkqYwjTZKMg=";
|
||||
|
||||
nativeCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
@@ -31,12 +31,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-pknZHHIIhjfOxdp+qCOOGvo0W5ByTHXRiIQzzN7Z6M4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
fftw
|
||||
fftwSinglePrec
|
||||
hdf5
|
||||
(hdf5.override {
|
||||
apiVersion = "v110";
|
||||
})
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
@@ -35,6 +35,6 @@ python3Packages.buildPythonPackage rec {
|
||||
description = "Last.FM scrobbler for MPD";
|
||||
mainProgram = "yams";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ ccellado ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -351,6 +351,36 @@ final: prev: {
|
||||
}
|
||||
) { };
|
||||
|
||||
canola-nvim = callPackage (
|
||||
{
|
||||
buildLuarocksPackage,
|
||||
fetchurl,
|
||||
fetchzip,
|
||||
luaOlder,
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "canola.nvim";
|
||||
version = "0.1.0-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/canola.nvim-0.1.0-1.rockspec";
|
||||
sha256 = "1aig4ndcqj7mliawckzvcv6gaigk9l2nqdfn96qd51jrmgy0ghyp";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/barrettruth/canola.nvim/archive/v0.1.0.zip";
|
||||
sha256 = "1ykdjz1ysbn1f9a2pmj595ishh2yzis5d1d0a51ny5j63fjic3p8";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/barrettruth/canola.nvim";
|
||||
license = lib.licenses.mit;
|
||||
description = "a refined oil.nvim";
|
||||
};
|
||||
}
|
||||
) { };
|
||||
|
||||
cassowary = callPackage (
|
||||
{
|
||||
buildLuarocksPackage,
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
whodap,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "asyncwhois";
|
||||
version = "1.1.12";
|
||||
version = "1.1.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pogzyb";
|
||||
repo = "asyncwhois";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bi8tBT6htxEgE/qoDID2GykCrHVfpe8EcH/Mbq9B0T4=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZokAOqnHmCNzMV45ZuniU0Bt36O+Kd29KK3FOOSpdFo=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -61,8 +61,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python module for retrieving WHOIS information";
|
||||
homepage = "https://github.com/pogzyb/asyncwhois";
|
||||
changelog = "https://github.com/pogzyb/asyncwhois/releases/tag/v${version}";
|
||||
changelog = "https://github.com/pogzyb/asyncwhois/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
nix-update-script,
|
||||
pydantic,
|
||||
uv-build,
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
@@ -39,8 +41,10 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
pythonImportsCheck = [ "caido_sdk_client" ];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -3,20 +3,23 @@
|
||||
fetchPypi,
|
||||
ply,
|
||||
lib,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "cppheaderparser";
|
||||
version = "2.7.4";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "CppHeaderParser";
|
||||
inherit version;
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-OCswQW2VsKXoUCshSBDcrCpWQykX4mUUR9Or4lPjzEI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ply ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ ply ];
|
||||
|
||||
pythonImportsCheck = [ "CppHeaderParser" ];
|
||||
|
||||
@@ -26,4 +29,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.bsdOriginal;
|
||||
maintainers = with lib.maintainers; [ pamplemousse ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fireworks-ai";
|
||||
version = "1.2.0-alpha.71";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -46,7 +46,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "fw-ai-external";
|
||||
repo = "python-sdk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-N5JjcYa3dRh1JTRjOIDpC8wykYzdj1rrMcU49UvWF7w=";
|
||||
hash = "sha256-hcJ32r4MnZFBPYf3aT2PhrtXDIYY3EBaE8Y5wH2Sxuw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "hier-config";
|
||||
version = "3.6.1";
|
||||
version = "3.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netdevops";
|
||||
repo = "hier_config";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-reOfBIl5+kEEqOT+ZS40FDsNA/xkhLGfcf1LEbIpVlI=";
|
||||
hash = "sha256-hE9W5f+RUDBu0AaqP++QjrTJo6biKIxUMSE18C++AVI=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202607181";
|
||||
version = "0.1.202607191";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-p9wgcA6POyOpEJk6DrtTRFsxnFFB3Szay+JVNSGAFnQ=";
|
||||
hash = "sha256-+IL1XRL+CnJw9dZVlQnC96JRDdPtxzXFdAr8WRPTPCw=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -7,17 +7,19 @@
|
||||
rope,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "nixpkgs-pytools";
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
sha256 = "11skcbi1lf9qcv9j5ikifb4pakhbbygqpcmv3390j7gxsa85cn19";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
jinja2
|
||||
setuptools
|
||||
rope
|
||||
@@ -32,4 +34,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
From 8a6c16fd79e78aaaf1223090e673bdbe11451abc Mon Sep 17 00:00:00 2001
|
||||
From: DavHau <hsngrmpf+github@gmail.com>
|
||||
Date: Wed, 22 Oct 2025 10:40:03 +0700
|
||||
From 7e2adf4811f9109f1bb35d8da46f1d0cb7e53183 Mon Sep 17 00:00:00 2001
|
||||
From: FlashOnFire_ <flashonfire@proton.me>
|
||||
Date: Thu, 9 Jul 2026 09:27:58 +0200
|
||||
Subject: [PATCH] Fix cross-compilation by checking target arch in build.rs
|
||||
|
||||
Previously, build.rs used #[cfg(target_arch)] attributes which check
|
||||
@@ -11,38 +11,49 @@ riscv64, leading to compilation errors.
|
||||
|
||||
Now uses CARGO_CFG_TARGET_ARCH environment variable to correctly
|
||||
detect the target architecture during cross-compilation.
|
||||
|
||||
Co-authored-by: DavHau <hsngrmpf+github@gmail.com>
|
||||
---
|
||||
build.rs | 7 ++++++--
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
build.rs | 13 +++++++++----
|
||||
1 file changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/build.rs b/build.rs
|
||||
index 49a9a9a4..0a99698d 100644
|
||||
index 09b723e..4093c9e 100644
|
||||
--- a/build.rs
|
||||
+++ b/build.rs
|
||||
@@ -11,6 +11,9 @@ fn main() {
|
||||
@@ -11,14 +11,20 @@ fn main() {
|
||||
#[allow(unused_variables)]
|
||||
let is_64_bit_python = matches!(python_config.pointer_width, Some(64));
|
||||
|
||||
|
||||
+ let target_arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap_or_default();
|
||||
+ let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
|
||||
+
|
||||
match python_config.implementation {
|
||||
pyo3_build_config::PythonImplementation::CPython => {
|
||||
println!("cargo:rustc-cfg=CPython");
|
||||
@@ -18,7 +21,7 @@ fn main() {
|
||||
println!("cargo:rustc-cfg=CPython");
|
||||
#[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
|
||||
- if is_64_bit_python {
|
||||
+ if (target_arch == "x86_64" || target_arch == "aarch64") && is_64_bit_python {
|
||||
if python_config.abi3 {
|
||||
println!("cargo:rustc-cfg=Py_LIMITED_ABI");
|
||||
}
|
||||
- #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
|
||||
- if is_64_bit_python && !python_config.abi3 {
|
||||
+
|
||||
+ if (target_arch == "x86_64" || target_arch == "aarch64")
|
||||
+ && is_64_bit_python
|
||||
+ && !python_config.abi3
|
||||
+ {
|
||||
println!("cargo:rustc-cfg=feature=\"inline_int\"");
|
||||
#[cfg(target_endian = "little")]
|
||||
println!("cargo:rustc-cfg=feature=\"inline_str\"");
|
||||
}
|
||||
@@ -50,7 +53,7 @@ fn main() {
|
||||
@@ -51,8 +57,7 @@ fn main() {
|
||||
println!("cargo:rustc-check-cfg=cfg(Py_LIMITED_ABI)");
|
||||
println!("cargo:rustc-check-cfg=cfg(PyPy)");
|
||||
|
||||
#[cfg(all(target_arch = "x86_64", not(target_os = "macos")))]
|
||||
|
||||
- #[cfg(all(target_arch = "x86_64", not(target_os = "macos")))]
|
||||
- if is_64_bit_python {
|
||||
+ if target_arch == "x86_64" && target_os != "macos" && is_64_bit_python {
|
||||
println!("cargo:rustc-cfg=feature=\"avx512\"");
|
||||
}
|
||||
|
||||
--
|
||||
2.54.0
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
patches = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
# fix architecture checks in build.rs to fix build for riscv
|
||||
# fix architecture checks in build.rs to fix build for non x86_64
|
||||
./cross-arch-compat.patch
|
||||
];
|
||||
|
||||
|
||||
@@ -3,21 +3,24 @@
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyskyqhub";
|
||||
version = "0.1.9";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RogerSelwyn";
|
||||
repo = "skyq_hub";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-yXqtABbsCh1yb96lsEA0gquikVenGLCo6J93AeXAC8k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ aiohttp ];
|
||||
|
||||
# Tests require physical hardware
|
||||
doCheck = false;
|
||||
@@ -30,4 +33,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -3,23 +3,26 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
requests,
|
||||
setuptools,
|
||||
websocket-client,
|
||||
xmltodict,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyskyqremote";
|
||||
version = "0.3.26";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RogerSelwyn";
|
||||
repo = "skyq_remote";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-aMgUwgKHgR+NQvRxiUV7GaXehjDIlJJJHwSmHDmzK08=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
websocket-client
|
||||
xmltodict
|
||||
@@ -33,8 +36,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python module for accessing SkyQ boxes";
|
||||
homepage = "https://github.com/RogerSelwyn/skyq_remote";
|
||||
changelog = "https://github.com/RogerSelwyn/skyq_remote/releases/tag/${version}";
|
||||
changelog = "https://github.com/RogerSelwyn/skyq_remote/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,21 +8,24 @@
|
||||
requests,
|
||||
requests-oauthlib,
|
||||
schedule,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pysmappee";
|
||||
version = "0.2.29";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smappee";
|
||||
repo = "pysmappee";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Ffi55FZsZUKDcS4qV46NpRK3VP6axzrL2BO+hYW7J9E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
cachetools
|
||||
paho-mqtt
|
||||
pytz
|
||||
@@ -42,4 +45,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -72,7 +72,6 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/libvips/pyvips/blob/v${version}/CHANGELOG.rst";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
ccellado
|
||||
anthonyroussel
|
||||
];
|
||||
};
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "rns";
|
||||
version = "1.3.8";
|
||||
version = "1.3.9";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "rns";
|
||||
version = finalAttrs.version;
|
||||
hash = "sha256-1cHzlJOqm3WrZ7g5l9StW9NX5n6dYp/6KU4xov/eNH0=";
|
||||
hash = "sha256-/TdFwauk3L+IM/qHoxV+yZAHRaMtbZa6Mw1iOpiTKhU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ttkbootstrap";
|
||||
version = "1.20.4";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "israel-dryer";
|
||||
repo = "ttkbootstrap";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1w9DFeJEJjcCaRkgvQAddUafYKHlFZRIT/BnyAQAKW4=";
|
||||
hash = "sha256-YegCKfT1KOZJ5ngNFFz8SQckyWQ4ywR71kqlOX9NWPQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -5,15 +5,15 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "types-docutils";
|
||||
version = "0.22.3.20260518";
|
||||
version = "0.22.3.20260712";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types_docutils";
|
||||
inherit version;
|
||||
hash = "sha256-LEW6Y6msZCRjNTWbaP6cJ2ApJkmcm2fK7DeAdF9qre4=";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-vtVKUBNsjnYTwD7hxR65WLQnVJFd+DU13jVrl0ygWHc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -35,4 +35,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
aioconsole,
|
||||
aiohttp,
|
||||
aiointercept,
|
||||
aioresponses,
|
||||
async-timeout,
|
||||
buildPythonPackage,
|
||||
@@ -15,14 +16,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "whirlpool-sixth-sense";
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abmantis";
|
||||
repo = "whirlpool-sixth-sense";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-uX1Q4F6pcc/mPdopPgyU63p4yeo9YPmUGbn0sxW09Yo=";
|
||||
hash = "sha256-zqdgZw3PAZ0tONwkdR5jgZNvSc8IiGj0Zr855ewsPpI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -36,6 +37,7 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
nativeCheckInputs = [
|
||||
aioresponses
|
||||
aiointercept
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "bm1549";
|
||||
domain = "frigidaire";
|
||||
version = "0.1.30";
|
||||
version = "0.1.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = "home-assistant-frigidaire";
|
||||
tag = version;
|
||||
hash = "sha256-asklW31IiHE7WGx3uxh8JgNpW4syePKAsqq8YxKgHhA=";
|
||||
hash = "sha256-wcJFtGd3FVSC/pyrhvxEy2j6KKmydnfZydVH4xN3wyU=";
|
||||
};
|
||||
|
||||
dependencies = [ frigidaire ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "xZetsubou";
|
||||
domain = "localtuya";
|
||||
version = "2025.11.0";
|
||||
version = "2026.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xZetsubou";
|
||||
repo = "hass-localtuya";
|
||||
tag = version;
|
||||
hash = "sha256-TISiZchkLZ3AaNh622nolIyBjDgdJBQrc30oBHN/INE=";
|
||||
hash = "sha256-gJk5AWNIk0d8Xdamk3VM7huxszN+QsQjo75bs2jZeM8=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6805,10 +6805,6 @@ with pkgs;
|
||||
inherit (llvmPackages) openmp;
|
||||
};
|
||||
|
||||
vigra = callPackage ../development/libraries/vigra {
|
||||
hdf5 = hdf5.override { apiVersion = "v110"; };
|
||||
};
|
||||
|
||||
vte-gtk4 = vte.override {
|
||||
gtkVersion = "4";
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user