mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
49523dec15
223 changed files with 3775 additions and 1318 deletions
|
|
@ -3701,6 +3701,12 @@
|
|||
githubId = 490965;
|
||||
name = "Craig Swank";
|
||||
};
|
||||
ctron = {
|
||||
email = "ctron@dentrassi.de";
|
||||
github = "ctron";
|
||||
githubId = 202474;
|
||||
name = "Jens Reimann";
|
||||
};
|
||||
cust0dian = {
|
||||
email = "serg@effectful.software";
|
||||
github = "cust0dian";
|
||||
|
|
@ -3968,7 +3974,7 @@
|
|||
};
|
||||
davidarmstronglewis = {
|
||||
email = "davidlewis@mac.com";
|
||||
github = "davidarmstronglewis";
|
||||
github = "oceanlewis";
|
||||
githubId = 6754950;
|
||||
name = "David Armstrong Lewis";
|
||||
};
|
||||
|
|
@ -11035,12 +11041,6 @@
|
|||
githubId = 4708337;
|
||||
name = "Marcelo A. de L. Santos";
|
||||
};
|
||||
maxhille = {
|
||||
email = "mh@lambdasoup.com";
|
||||
github = "maxhille";
|
||||
githubId = 693447;
|
||||
name = "Max Hille";
|
||||
};
|
||||
maximsmol = {
|
||||
email = "maximsmol@gmail.com";
|
||||
github = "maximsmol";
|
||||
|
|
@ -15134,15 +15134,6 @@
|
|||
}];
|
||||
name = "Rahul Butani";
|
||||
};
|
||||
rs0vere = {
|
||||
email = "rs0vere@proton.me";
|
||||
github = "rs0vere";
|
||||
githubId = 140035635;
|
||||
keys = [{
|
||||
fingerprint = "C6D8 B5C2 FA79 901B DCCF 95E1 FEC4 5C5A ED00 C58D";
|
||||
}];
|
||||
name = "Red Star Over Earth";
|
||||
};
|
||||
rski = {
|
||||
name = "rski";
|
||||
email = "rom.skiad+nix@gmail.com";
|
||||
|
|
@ -15398,7 +15389,7 @@
|
|||
};
|
||||
SamirTalwar = {
|
||||
email = "lazy.git@functional.computer";
|
||||
github = "SamirTalwar";
|
||||
github = "abstracte";
|
||||
githubId = 47852;
|
||||
name = "Samir Talwar";
|
||||
};
|
||||
|
|
@ -17813,12 +17804,6 @@
|
|||
githubId = 10110;
|
||||
name = "Travis B. Hartwell";
|
||||
};
|
||||
travisdavis-ops = {
|
||||
email = "travisdavismedia@gmail.com";
|
||||
github = "TravisDavis-ops";
|
||||
githubId = 52011418;
|
||||
name = "Travis Davis";
|
||||
};
|
||||
traxys = {
|
||||
email = "quentin+dev@familleboyer.net";
|
||||
github = "traxys";
|
||||
|
|
|
|||
|
|
@ -13,12 +13,15 @@ STDOUT->autoflush(1);
|
|||
|
||||
my $ua = LWP::UserAgent->new();
|
||||
|
||||
if (!defined $ENV{GH_TOKEN}) {
|
||||
die "Set GH_TOKEN before running this script";
|
||||
}
|
||||
|
||||
keys %$maintainers_json; # reset the internal iterator so a prior each() doesn't affect the loop
|
||||
while(my($k, $v) = each %$maintainers_json) {
|
||||
my $current_user = %$v{'github'};
|
||||
if (!defined $current_user) {
|
||||
print "$k has no github handle\n";
|
||||
next;
|
||||
}
|
||||
my $github_id = %$v{'githubId'};
|
||||
if (!defined $github_id) {
|
||||
|
|
@ -37,13 +40,16 @@ while(my($k, $v) = each %$maintainers_json) {
|
|||
sleep($ratelimit_reset - time() + 5);
|
||||
}
|
||||
if ($resp->code != 200) {
|
||||
print $current_user . " likely deleted their github account\n";
|
||||
print "$k likely deleted their github account\n";
|
||||
next;
|
||||
}
|
||||
my $resp_json = from_json($resp->content);
|
||||
my $api_user = %$resp_json{"login"};
|
||||
if (lc($current_user) ne lc($api_user)) {
|
||||
print $current_user . " is now known on github as " . $api_user . ". Editing maintainer-list.nix…\n";
|
||||
if (!defined $current_user) {
|
||||
print "$k is known on github as $api_user.\n";
|
||||
}
|
||||
elsif (lc($current_user) ne lc($api_user)) {
|
||||
print "$k is now known on github as $api_user. Editing maintainer-list.nix…\n";
|
||||
my $file = path($maintainers_list_nix);
|
||||
my $data = $file->slurp_utf8;
|
||||
$data =~ s/github = "$current_user";$/github = "$api_user";/m;
|
||||
|
|
|
|||
|
|
@ -100,6 +100,8 @@
|
|||
|
||||
- [netclient](https://github.com/gravitl/netclient), an automated WireGuard® Management Client. Available as [services.netclient](#opt-services.netclient.enable).
|
||||
|
||||
- [trunk-ng](https://github.com/ctron/trunk), A fork of `trunk`: Build, bundle & ship your Rust WASM application to the web
|
||||
|
||||
## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
|
||||
|
||||
- `network-online.target` has been fixed to no longer time out for systems with `networking.useDHCP = true` and `networking.useNetworkd = true`.
|
||||
|
|
@ -441,6 +443,8 @@ The module update takes care of the new config syntax and the data itself (user
|
|||
|
||||
- `python3.pkgs.flitBuildHook` has been removed. Use `flit-core` and `format = "pyproject"` instead.
|
||||
|
||||
- The `extend` function of `llvmPackages` has been removed due it coming from the `tools` attrset thus only extending the `tool` attrset. A possible replacement is to construct the set from `libraries` and `tools`, or patch nixpkgs.
|
||||
|
||||
- The `qemu-vm.nix` module now supports disabling overriding `fileSystems` with
|
||||
`virtualisation.fileSystems`. This enables the user to boot VMs from
|
||||
"external" disk images not created by the qemu-vm module. You can stop the
|
||||
|
|
|
|||
|
|
@ -203,10 +203,8 @@ in
|
|||
default = [
|
||||
"/ip4/0.0.0.0/tcp/4001"
|
||||
"/ip6/::/tcp/4001"
|
||||
"/ip4/0.0.0.0/udp/4001/quic"
|
||||
"/ip4/0.0.0.0/udp/4001/quic-v1"
|
||||
"/ip4/0.0.0.0/udp/4001/quic-v1/webtransport"
|
||||
"/ip6/::/udp/4001/quic"
|
||||
"/ip6/::/udp/4001/quic-v1"
|
||||
"/ip6/::/udp/4001/quic-v1/webtransport"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -365,6 +365,7 @@ in
|
|||
};
|
||||
|
||||
xkb = mkOption {
|
||||
default = { };
|
||||
description = "X keyboard extension (XKB) configuration";
|
||||
type = types.submodule {
|
||||
options = {
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wvkbd";
|
||||
version = "0.12";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jjsullivan5196";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5m4aeuCqSJNgerQKyP9M6Qf7P4ijCtCY4Efew6E09Bc=";
|
||||
sha256 = "sha256-a1VOSLpvSKiEkR73V/Q3Es9irueDihMKcQvO9alPCqo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, buildDotnetModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, dotnetCorePackages
|
||||
, dbus
|
||||
, fontconfig
|
||||
|
|
@ -22,6 +23,19 @@ buildDotnetModule rec {
|
|||
hash = "sha256-/+hlL2sj/juzWrDcb5dELp8Zdg688XK8OnjKz20rx/M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Needed until stakira/OpenUtau#836 is merged and released to fix crashing issues. See stakira/OpenUtau#822
|
||||
(fetchpatch {
|
||||
name = "openutau-update-avalonia-to-11.0.4.patch";
|
||||
url = "https://github.com/stakira/OpenUtau/commit/0130d7387fb626a72850305dc61d7c175caccc0f.diff";
|
||||
hash = "sha256-w9PLnfiUtiKY/8+y4qqINeEul4kP72nKEVc5c8p2g7c=";
|
||||
# It looks like fetched files use CRLF but patch comes back with LF
|
||||
decode = "sed -e 's/$/\\r/'";
|
||||
})
|
||||
];
|
||||
# Needs binary for above patch due to CRLF shenanigans otherwise being ignored
|
||||
patchFlags = [ "-p1" "--binary" ];
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_7_0;
|
||||
|
||||
|
|
@ -47,8 +61,8 @@ buildDotnetModule rec {
|
|||
# needed until upstream bumps to dotnet 7
|
||||
postPatch = ''
|
||||
substituteInPlace OpenUtau/OpenUtau.csproj OpenUtau.Test/OpenUtau.Test.csproj --replace \
|
||||
"<TargetFramework>net6.0</TargetFramework>" \
|
||||
"<TargetFramework>net7.0</TargetFramework>"
|
||||
'<TargetFramework>net6.0</TargetFramework>' \
|
||||
'<TargetFramework>net7.0</TargetFramework>'
|
||||
'';
|
||||
|
||||
# need to make sure proprietary worldline resampler is copied
|
||||
|
|
|
|||
30
pkgs/applications/audio/openutau/deps.nix
generated
30
pkgs/applications/audio/openutau/deps.nix
generated
|
|
@ -3,22 +3,22 @@
|
|||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "AsyncIO"; version = "0.1.69"; sha256 = "1anby58bs94gf338vmn6vvwxw0kcz6y8yap57vgh8dgm9vysl0i5"; })
|
||||
(fetchNuGet { pname = "Avalonia"; version = "11.0.0-rc1.1"; sha256 = "15gn6qbbx6zars37fvfdsyvqg9303zr8dsx7k1v6a4mzm190xhmm"; })
|
||||
(fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; })
|
||||
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; })
|
||||
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.19"; sha256 = "1vlhyjb2g98hh5gnisg4bdl9p93x8lmnkc97d24hpxgflcd7szs7"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0-rc1.1"; sha256 = "0nflr62lywmgby1lc6zasn24rinkq72imkazhv77wnj28ayid3bx"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0-rc1.1"; sha256 = "088xz8llm8298agk4dkpzrb1bqyksgvzhj3pw1s4r1fcdfl0z64j"; })
|
||||
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0-rc1.1"; sha256 = "06580q0il62f3464vq2113gbv0yng4jqm79k2wvn3brzl82pyhvq"; })
|
||||
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0-rc1.1"; sha256 = "1jia97djk33za7spfr9276plvx8mybm7i3ckp1wprlnmh5b6nykp"; })
|
||||
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0-rc1.1"; sha256 = "1mpm34lgxcxh5hglyq2fpggdf18cadzx9030kxax5ilp69mk93df"; })
|
||||
(fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0-rc1.1"; sha256 = "0hzk1gb4zh9n5k3wv2n8nw9qcgyj9pvwysph3shg9m8wwrdhkiy5"; })
|
||||
(fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0-rc1.1"; sha256 = "08116ixw118i2v11dylhwkj1ilgkpk29cp9n7zqj3zk7pxkln2f7"; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0-rc1.1"; sha256 = "1m3r05b14vw4mn1m9ak91j00q0ppnkysb6m7w86sacqjfhpl8faa"; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0-rc1.1"; sha256 = "0a8xvqd0hgi8bynjipvvhg0cm9qr63p0h3ji1wbn3y9vrysliykh"; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.0-rc1.1"; sha256 = "03lp3m40hwbpasa4q6gykj1y5772lpzzr59y5k1nbi54k2n3fl3k"; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0-rc1.1"; sha256 = "0bgz8djfmb17qrf44bivcyf9hwdfccl5f8hgyq158y7ag4a313sn"; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0-rc1.1"; sha256 = "1zslv10kcmclx5ajd74yi6j1f8p3a9iy2r0w4k8kwkc56d5jg30c"; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0-rc1.1"; sha256 = "0b4bmza84bv8hbh6jmy1kxxp9pnz4q4wq6bw8jc30w4jkdhp588r"; })
|
||||
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; })
|
||||
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; })
|
||||
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; })
|
||||
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; })
|
||||
(fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; })
|
||||
(fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.4"; sha256 = "1hs29qvbhm5qdhys0j3d89c37qfalx1pcpxl3hh9adz11wc0nb3b"; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.4"; sha256 = "03zdixi6m9g4mcxmp24z8dzamzqqy9i0wg069m4gl5p3wcvfbqla"; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; })
|
||||
(fetchNuGet { pname = "BunLabs.NAudio.Flac"; version = "2.0.1"; sha256 = "1ps7fs451ydsaz5g4j7bhcfawp8fys6vcah3rsrl36g7ni0dwf3v"; })
|
||||
(fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })
|
||||
(fetchNuGet { pname = "Concentus.Oggfile"; version = "1.0.4"; sha256 = "12n5bcg1i91daqgnl7q6d55phbkv1srkrvk2k7k8vxpyv231yb6v"; })
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "praat";
|
||||
version = "6.3.16";
|
||||
version = "6.3.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praat";
|
||||
repo = "praat";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-0g16EblefuUU99RgcwtGrPWniGGlOt6GjVjyNdzN3GY=";
|
||||
hash = "sha256-HArWXUYoIjJmvh0GOcdGyBHfqC5r4ZEuvXyQ1x5iOt0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -39,12 +39,11 @@ snap_info=($(
|
|||
# just for human consumption. Revision is just an integer that gets increased
|
||||
# by one every (stable or unstable) release.
|
||||
revision="${snap_info[0]}"
|
||||
sha512="${snap_info[1]}"
|
||||
# We need to escape the slashes
|
||||
hash="$(nix-hash --to-sri --type sha512 ${snap_info[1]} | sed 's|/|\\/|g')"
|
||||
upstream_version="${snap_info[2]}"
|
||||
last_updated="${snap_info[3]}"
|
||||
|
||||
echo "Latest $channel release is $upstream_version from $last_updated."
|
||||
|
||||
#
|
||||
# read the current spotify version from the currently *committed* nix expression
|
||||
#
|
||||
|
|
@ -70,7 +69,7 @@ echo "Updating from ${current_nix_version} to ${upstream_version}, released on $
|
|||
# search-and-replace revision, hash and version
|
||||
sed --regexp-extended \
|
||||
-e 's/rev\s*=\s*"[0-9]+"\s*;/rev = "'"${revision}"'";/' \
|
||||
-e 's/sha512\s*=\s*"[^"]*"\s*;/sha512 = "'"${sha512}"'";/' \
|
||||
-e 's/hash\s*=\s*"[^"]*"\s*;/hash = "'"${hash}"'";/' \
|
||||
-e 's/version\s*=\s*".*"\s*;/version = "'"${upstream_version}"'";/' \
|
||||
-i "$spotify_nix"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ergo";
|
||||
version = "5.0.13";
|
||||
version = "5.0.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
|
||||
sha256 = "sha256-ZnWiP6Mk6EnrqPT+apSQ0igIEVHy+B8QVbsXRna7up0=";
|
||||
sha256 = "sha256-YcFjnDs1hAmkYmJlq3yvY/IP6P9SPVGknbzapl5C2B4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -145,6 +145,9 @@ in
|
|||
--replace '@node@' ${nodejs} \
|
||||
--replace './lib/quarto' ${quartoSrc}
|
||||
|
||||
substituteInPlace src/cpp/conf/rsession-dev.conf \
|
||||
--replace '@node@' ${nodejs}
|
||||
|
||||
substituteInPlace src/cpp/core/libclang/LibClang.cpp \
|
||||
--replace '@libclang@' ${llvmPackages.libclang.lib} \
|
||||
--replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so
|
||||
|
|
|
|||
|
|
@ -1,5 +1,33 @@
|
|||
diff --git a/src/cpp/conf/rsession-dev.conf b/src/cpp/conf/rsession-dev.conf
|
||||
index d18362b..98cdd4c 100644
|
||||
--- a/src/cpp/conf/rsession-dev.conf
|
||||
+++ b/src/cpp/conf/rsession-dev.conf
|
||||
@@ -39,7 +39,7 @@ external-mathjax-path=${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}
|
||||
external-pandoc-path=${RSTUDIO_DEPENDENCIES_PANDOC_DIR}
|
||||
external-quarto-path=${RSTUDIO_DEPENDENCIES_QUARTO_DIR}
|
||||
external-libclang-path=${RSTUDIO_DEPENDENCIES_DIR}/common/libclang
|
||||
-external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/16.14.0/bin/node
|
||||
+external-node-path=@node@/bin/node
|
||||
|
||||
# enable copilot
|
||||
copilot-enabled=1
|
||||
diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt
|
||||
index 30dd638..cb4a645 100644
|
||||
--- a/src/cpp/server/CMakeLists.txt
|
||||
+++ b/src/cpp/server/CMakeLists.txt
|
||||
@@ -250,10 +250,6 @@ if (UNIX AND NOT APPLE)
|
||||
DESTINATION ${RSERVER_SYSTEMD_DIR})
|
||||
|
||||
# install node
|
||||
- install(
|
||||
- DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_NODE_VERSION}/"
|
||||
- DESTINATION "${RSTUDIO_INSTALL_BIN}/node"
|
||||
- USE_SOURCE_PERMISSIONS)
|
||||
|
||||
elseif(APPLE)
|
||||
|
||||
diff --git a/src/gwt/build.xml b/src/gwt/build.xml
|
||||
index 83e9433..f1ee63d 100644
|
||||
index 033d605..f1ee63d 100644
|
||||
--- a/src/gwt/build.xml
|
||||
+++ b/src/gwt/build.xml
|
||||
@@ -87,29 +87,7 @@
|
||||
|
|
|
|||
|
|
@ -36,10 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
wrapQtApp "$out/bin/fs-uae-launcher" \
|
||||
--set PYTHONPATH "$PYTHONPATH"
|
||||
|
||||
# fs-uae-launcher search side by side for fs-uae
|
||||
# fs-uae-launcher search side by side for executables and shared files
|
||||
# see $src/fsgs/plugins/pluginexecutablefinder.py#find_executable
|
||||
ln -s ${fsuae}/bin/fs-uae $out/bin
|
||||
ln -s ${fsuae}/bin/fs-uae-device-helper $out/bin
|
||||
ln -s ${fsuae}/share/fs-uae $out/share/fs-uae
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.1012"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.1044"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "e6700b314f1384f015666767baf9ea1d8411e330";
|
||||
sha256 = "1szgmvwril7zwfbvqz850xavrk70i56i1yyqfh9mxpxlc3n9xxzr";
|
||||
rev = "7afae8c69947f7a5fa9a55cee36381aef372dfba";
|
||||
sha256 = "1kf95sbb4p50b6bah75sd95660kk2a7cbjwgvqv4c4cal6c126g7";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
|
|
|
|||
70
pkgs/applications/emulators/ryujinx/deps.nix
generated
70
pkgs/applications/emulators/ryujinx/deps.nix
generated
|
|
@ -2,35 +2,33 @@
|
|||
# Please dont edit it manually, your changes might get overwritten!
|
||||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "Avalonia"; version = "11.0.3"; sha256 = "1ig635386glxgfv9l894dqp98l93ymsylml649xm42lc9a9f1khc"; })
|
||||
(fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; })
|
||||
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; })
|
||||
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0"; sha256 = "06wgzhxkivlaxkn8p61wainsprml2g1q4jmvy9fpn64qnfywjdn7"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.3"; sha256 = "0xcxwc588lc2ify2d3m53pmwjgf7p9lwz5q11hn8p5c9zh01iai9"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.3"; sha256 = "1kls0v2rjimcv7k0dvqd3l694xdg9nf8wdzcz1cadi4qvj0bx7l4"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.0"; sha256 = "1qxw096av0n4ks0jixh7xxrzgsn9fshp1ypy3vvij7r0a1sk7y1q"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.0-rc2.1"; sha256 = "0pmc0fi2abn9qaqwx9lvqnd1a5a8lzp8zin72d3k3xjsh1w1g0n8"; })
|
||||
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.3"; sha256 = "0g8hzvkf2rrfnpmm56m2miwpdw14l04rr0q8xz03j220fy9xk5fm"; })
|
||||
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.3"; sha256 = "1rificg9ikf8m2550ylrqavkkvihf8xb22agmdrbz07v7s93v731"; })
|
||||
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.3"; sha256 = "0w8qc45phfz4mnnx1mfxi042qmq31shmjmz5inb4maw9xha0yr3c"; })
|
||||
(fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "11.0.3"; sha256 = "09g4flx6sg2b2mkwbqrwl51q87xzy0d43j2xjxvnwc8vwhr1h8gs"; })
|
||||
(fetchNuGet { pname = "Avalonia.Native"; version = "11.0.3"; sha256 = "1gi3y2cdfcjkwjldavahyx09a1n91jpvx8szwrfgr3kk4ycc5lyn"; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; sha256 = "1b5031k8slwiz7bncih67fjl6ny234yd4skqxk611l9zp5snjic2"; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.3"; sha256 = "0syh20a6892pip4qz32kgc5w77ig40yjgwbcknivhjr8arc3126r"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.4"; sha256 = "1p7mz33a6dn6ghvwajxdghq15mn5f6isvvqzxcjbnhh3m5c1zhrz"; })
|
||||
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; })
|
||||
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; })
|
||||
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; })
|
||||
(fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "11.0.4"; sha256 = "1yxand1h0ybwbykn12ixdanbp74rd5spcz8xifmzjmvisjzglvsi"; })
|
||||
(fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; sha256 = "1ra1kd0kkblppr5zy7rzdbwllggrzvp9lkxblf9mg3y8rnp6fk83"; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.3"; sha256 = "0089z8ml8pblq6hispj1nf7lvf6zplrrlix22jcd87pm13232pg2"; })
|
||||
(fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0"; sha256 = "1xmgaj2wnjdl16x4y6rmfp3q9faca5na90zlb8j62rxcwf1v3lkr"; })
|
||||
(fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0"; sha256 = "0cd8w9pm7lpifdzjmsnmjlzdqgq3qw653mcj3adczb5ycqqbd8p3"; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.3"; sha256 = "0zkm0asxcbsybswxs0p6ybsiq6j1l1j02h0xfxzsmhcimm3y92kk"; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.3"; sha256 = "14pj98057fmfgafq0pni7pw79ls0lsf3jaydfjmdjyw5x2b2x51q"; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.3"; sha256 = "0pb41fpiwndcf34r53apxf92qgqxavc4zfl1xy847pz3kj1vsclp"; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; })
|
||||
(fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0.2"; sha256 = "0b07rszfp87lj08bsni6vjynqcpfdwr8cqxpwy68620qki8w953l"; })
|
||||
(fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0.2"; sha256 = "12bqmm0sdc5a1xxz1hffvpgpjc5m64cn7w45bd67wnapz2w943rv"; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; })
|
||||
(fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
|
||||
(fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })
|
||||
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; sha256 = "0maw0yd6xgwy0cgk593z3zva0r5j267zpdmmpq8avj3zbna6n4x1"; })
|
||||
(fetchNuGet { pname = "DynamicData"; version = "7.14.2"; sha256 = "07k79w4702masq71rk865mi3h1kaxamyp7dgl08ny4n22gg8482k"; })
|
||||
(fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; })
|
||||
(fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; })
|
||||
(fetchNuGet { pname = "FluentAvaloniaUI"; version = "2.0.1"; sha256 = "12w6rk3qgn6i2zk06appf98pgdf89pw10865qcwn5xpjwm7487k2"; })
|
||||
(fetchNuGet { pname = "FluentAvaloniaUI"; version = "2.0.4"; sha256 = "1xizjlk34xi4z837j6lbv4mc5vfb8gimkxicxcz0012wkzlmmzb1"; })
|
||||
(fetchNuGet { pname = "FSharp.Core"; version = "7.0.200"; sha256 = "1ji816r8idwjmxk8bzyq1z32ybz7xdg3nb0a7pnvqr8vys11bkgb"; })
|
||||
(fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; })
|
||||
|
|
@ -45,31 +43,30 @@
|
|||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.6.0"; sha256 = "0qvkwkbqz4dhkxsisanax1lwm3nzyyb4kgb40qczxbl8g251cjp2"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.7.0"; sha256 = "1zj4wwsad2j7y1byigm3c386rv56xr05mwxjlgqh0h0n5w5yjc4w"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.6.0"; sha256 = "1yfvwygx795c9lswpiv8q19zydifarzljdmvv67vjmi559cm8b1q"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.7.0"; sha256 = "1lz3ha3pp58hd4y031z64slcf9rh7g1cgkrlrbhi4vpa67xhynnh"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.3"; sha256 = "1xxzd2yxlbq2h4k6flp7lvffmmwrjlyha2z1yvrxxymiyyggk2zg"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.7.2"; sha256 = "09mf5kpxn1a1m8ciwklhh6ascx0yqpcs5r2hvmfj80j44n3qrwhm"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
|
||||
(fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.31.0"; sha256 = "0l1y4q5syl6kcnk6yrjphdj3clfjnmlnxrkvmfjffvfnl9slsh9m"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.31.0"; sha256 = "0vfrrrvz6axfg41pcnwlhqh7gkxl1vrm8hbxjkzkw5a5ijh0i4pc"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.31.0"; sha256 = "0dbvi7ifsl6gdsa1hc4bvma9qyr63gvgamwndy0k7wyvvh492rhm"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.31.0"; sha256 = "0yrsysxgjfwrh1n2mplpm4jwm0ws4p49pdd3zcsql7kjjhs525lv"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.0.0"; sha256 = "0sc96z969qfybq5njsqm8hwhqv8jj6gysyjq7n9r9km1nqnhazmi"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.0"; sha256 = "12xa4yx19j5q7nbisl57jla8x6pby964cr9xkv0qm4834x4zdd3h"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.0"; sha256 = "0hv1qb51v6frvhybwcn6m3haq768jgdx59p17jn217fbjiprq14s"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.0"; sha256 = "0cjdbi3ximvfz2nyp2vlxqskmscxw8drjighvy7dna3mi749isrh"; })
|
||||
(fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "2.3.2"; sha256 = "115bm7dljchr7c02hiv1r3l21r22wpml1j26fyn2amaflaihpq4l"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.3"; sha256 = "1f2b9ljc3l6lk2qq3ps6pzb5r4dvqvs9j1xav8kj2yy52i2dbz7r"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.7.2"; sha256 = "08g9dpp766racnh90s1sy3ncl291majgq6v2604hfw1f6zkmbjqh"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.3"; sha256 = "0czzs36ybgipn9bga2swkdd653vh0wvs5hsi2lgykhblimdmb947"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.3"; sha256 = "0yi0n8jxf4l6v8bscgi8ws9zf5i84213pf1qj5d7nwx4jb05m23l"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.2"; sha256 = "0xdjkdnrvnaxqgg38y5w1l3jbppigg68cc8q9jn0p21vn48bgrxq"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.7.2"; sha256 = "1szsg1iy77f0caxzkk0ihpp4ifbfnbdbn8k0wbbhbdprxj8pr356"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; })
|
||||
|
|
@ -141,7 +138,7 @@
|
|||
(fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.28.1-build28"; sha256 = "0kn7f6cgvb2rsybiif6g7xkw1srmfr306zpv029lvi264dv6aj6l"; })
|
||||
(fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; })
|
||||
(fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; })
|
||||
(fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0"; sha256 = "0gdsrzh8q8mxlm7sxvai7zshaz93a3dm1ha4cgs4845lfhpn8nhc"; })
|
||||
(fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.2"; sha256 = "0l28whcj3r8gmdg7vyb4sxbjdr12w5q9lqibclfrwrwhlx3rxhb0"; })
|
||||
(fetchNuGet { pname = "Silk.NET.Core"; version = "2.16.0"; sha256 = "1mkqc2aicvknmpyfry2v7jjxh3apaxa6dmk1vfbwxnkysl417x0k"; })
|
||||
(fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.16.0"; sha256 = "0sg5mxv7ga5pq6wc0lz52j07fxrcfmb0an30r4cxsxk66298z2wy"; })
|
||||
(fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; sha256 = "05918f6fl8byla2m7qjp7dvxww2rbpj2sqd4xq26rl885fmddfvf"; })
|
||||
|
|
@ -156,9 +153,9 @@
|
|||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; })
|
||||
(fetchNuGet { pname = "SPB"; version = "0.0.4-build28"; sha256 = "1ran6qwzlkv6xpvnp7n0nkva0zfrzwlcxj7zfzz9v8mpicqs297x"; })
|
||||
(fetchNuGet { pname = "Svg.Custom"; version = "1.0.0"; sha256 = "0bmvgaqy4iaxw9x88ifx3a2zz0vw3p9w6pj4bk3xfnf5p9vjx1mr"; })
|
||||
(fetchNuGet { pname = "Svg.Model"; version = "1.0.0"; sha256 = "0yrjcqcrlgqpdm3bi59nc3fppcqgrfc7jddjwxjj2q423gimip97"; })
|
||||
(fetchNuGet { pname = "Svg.Skia"; version = "1.0.0"; sha256 = "1bs2l9fjiqpip4qh0aw7x8f8m0ja0xlcj5vwd329knkww2jx1d3c"; })
|
||||
(fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.2"; sha256 = "0xkv2h80s4nz2yypiax30s1ws0yd6zdijf5rq1lqjcxaiggf6a7q"; })
|
||||
(fetchNuGet { pname = "Svg.Model"; version = "1.0.0.2"; sha256 = "0zdj69w5dxzwj4fqcsjfjjbc67x931f7qb32i1jsn2k91v904gsd"; })
|
||||
(fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.2"; sha256 = "1877z97c8qbsr1adbc0hvfls03icgmzh4j3pjp8cfnxflxrxql6a"; })
|
||||
(fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; })
|
||||
(fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; })
|
||||
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
|
||||
|
|
@ -183,7 +180,7 @@
|
|||
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
|
||||
(fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; })
|
||||
(fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; })
|
||||
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.31.0"; sha256 = "03bwmmznb4axcvlx8ql5cgigpbldjc1zrxnf5kj25r4drq8yp1cm"; })
|
||||
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.0.0"; sha256 = "15c717z4kspqxiwnia7dk1mj5gv7hg584q4x1xc7z1g0rnz28pwd"; })
|
||||
(fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; })
|
||||
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
|
||||
(fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; })
|
||||
|
|
@ -247,7 +244,6 @@
|
|||
(fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; })
|
||||
|
|
@ -261,9 +257,7 @@
|
|||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; })
|
||||
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; })
|
||||
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; })
|
||||
(fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; })
|
||||
(fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; })
|
||||
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; })
|
||||
(fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; })
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tunnelx";
|
||||
version = "2023-07-nix";
|
||||
version = "2023-09-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CaveSurveying";
|
||||
repo = "tunnelx";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-H6lHqc9on/pv/KihNcaHPwbWf4JXRkeRqNoYq6yVKqM=";
|
||||
hash = "sha256-4vTtmhVNDXUD7pCiugt+Yl/M3MFsUnzJfpcU9AxnGvA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tev";
|
||||
version = "1.23";
|
||||
version = "1.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tom94";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-NtnnZV/+8aUm8BkUz8Xm3aeSbOI2gNUPNfvYlwUl01Y=";
|
||||
sha256 = "sha256-6acFt0fyL0yStUwreGggJ+7Zi+0Fqburj/ytmf+Oi4w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ let
|
|||
name = "Anytype-${version}";
|
||||
nameExecutable = pname;
|
||||
src = fetchurl {
|
||||
url = "https://anytype-release.fra1.cdn.digitaloceanspaces.com/Anytype-${version}.AppImage";
|
||||
url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";
|
||||
name = "Anytype-${version}.AppImage";
|
||||
sha256 = "sha256-heS+3ucxv4WTiqegdmjpv8aWuC+3knxC00SDDg4R8iU=";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch2
|
||||
, cmake
|
||||
, ninja
|
||||
, extra-cmake-modules
|
||||
|
|
@ -26,6 +27,15 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-aAmpFKIIFZLPWUaOcf4V1d/wVQ7xRcnXFsqFjROsabg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# itemfakevim: fix build with qt 6.6.0
|
||||
# https://github.com/hluk/CopyQ/pull/2508
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/hluk/CopyQ/commit/a20bfff0d78296b334ff8cabb047ab5d842b7311.patch";
|
||||
hash = "sha256-F/6cQ8+O1Ttd4EFFxQas5ES6U+qxWdmYqUWRQLsVMa4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
let
|
||||
pname = "firefly-desktop";
|
||||
version = "2.1.5";
|
||||
version = "2.1.8";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/iotaledger/firefly/releases/download/desktop-${version}/${pname}-${version}.AppImage";
|
||||
sha256 = "sha256-33LQedZTfps7uAB5LGGXM/YB7SySTJLp70+yS5pMvIk=";
|
||||
sha256 = "sha256-MATMl5eEIauDQpz8/wqIzD7IugPVZ2HJAWCbDM4n+hA=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "klayout";
|
||||
version = "0.28.11";
|
||||
version = "0.28.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KLayout";
|
||||
repo = "klayout";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PEWb2QBWK3XMuOAkSI2nAk6UJronG+3+NBU92uWO5LQ=";
|
||||
hash = "sha256-QvEoXKJ9sH5WIarYPsYEWwoFwA/pZa2etegA+AD8rPo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,13 +1,21 @@
|
|||
{ lib, python3Packages, fetchPypi }:
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nhentai";
|
||||
version = "0.4.16";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2lzrQqUx3lPM+OAUO/SwT+fAuG7kWmUnTACNUiP7d1M=";
|
||||
version = "0.5.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RicterZ";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-SjWIctAyczjYGP4buXQBA/RcrdikMSuSBtfhORNmXMc=";
|
||||
};
|
||||
|
||||
# tests require a network connection
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
requests
|
||||
iso8601
|
||||
|
|
@ -21,6 +29,6 @@ python3Packages.buildPythonApplication rec {
|
|||
homepage = "https://github.com/RicterZ/nhentai";
|
||||
description = "nHentai is a CLI tool for downloading doujinshi from <http://nhentai.net>";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ travisdavis-ops ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://s3.hexcore.xyz/occ/linux/tar/ObinsKit_${version}_x64.tar.gz";
|
||||
sha256 = "1kcn41wmwcx6q70spa9a1qh7wfrj1sk4v4i58lbnf9kc6vasw41a";
|
||||
curlOptsList = [ "--header" "Referer: https://www.hexcore.xyz/" ];
|
||||
hash = "sha256-KhCu1TZsJmcXRSWSTaYOMjt+IA4qqavBwaYzXnkgls0=";
|
||||
};
|
||||
|
||||
unpackPhase = "tar -xzf $src";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, program ? "pdfstudio"
|
||||
, year ? "2022"
|
||||
, year ? "2023"
|
||||
, fetchurl
|
||||
, callPackage
|
||||
, jdk11
|
||||
|
|
@ -31,27 +31,23 @@ in
|
|||
{
|
||||
pdfstudioviewer = callPackage ./common.nix rec {
|
||||
inherit desktopName pname program year;
|
||||
version = "${year}.2.4";
|
||||
version = "${year}.0.3";
|
||||
longDescription = ''
|
||||
PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio.
|
||||
'';
|
||||
src = fetchurl {
|
||||
url = "https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb";
|
||||
sha256 = "sha256-QXNsH1T+ItV3s9r8CnwgRUo1mhVbe8LkEun9gUmlVQg=";
|
||||
sha256 = "sha256-JQx5yJLjwW4VRXLM+/VNDXFN8ZcHJxlxyKDIzc++hEs=";
|
||||
};
|
||||
jdk = jdk17;
|
||||
|
||||
# Bad hash, got sha256-afRhx9VCVRFUJoUnqs1bzF0yXpz3yEgLiFjMRB9xvsk=
|
||||
# Likely unstable.
|
||||
broken = true;
|
||||
};
|
||||
|
||||
pdfstudio2021 = callPackage ./common.nix rec {
|
||||
inherit desktopName longDescription pname program year;
|
||||
version = "${year}.2.1";
|
||||
version = "${year}.2.2";
|
||||
src = fetchurl {
|
||||
url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb";
|
||||
sha256 = "sha256-yELpza2C3HJJIP+ZQP7x3Tfez0Nl6ctCbHCmTmpX3jo=";
|
||||
sha256 = "sha256-HdkwRMqwquAaW6l3AukGReFtw2f5n36tZ8vXo6QiPvU=";
|
||||
};
|
||||
extraBuildInputs = [
|
||||
(lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1
|
||||
|
|
@ -61,14 +57,24 @@ in
|
|||
|
||||
pdfstudio2022 = callPackage ./common.nix rec {
|
||||
inherit desktopName longDescription pname program year;
|
||||
version = "${year}.2.4";
|
||||
version = "${year}.2.5";
|
||||
src = fetchurl {
|
||||
url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb";
|
||||
sha256 = "sha256-bti+WI8JdOmUsHq8ijfxGC4ZsWXwbwwM26kuBgPDUMQ=";
|
||||
sha256 = "sha256-3faZyWUnFe//S+gOskWhsZ6jzHw67FRsv/xP77R1jj4=";
|
||||
};
|
||||
extraBuildInputs = [
|
||||
(lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1
|
||||
];
|
||||
jdk = jdk17;
|
||||
};
|
||||
|
||||
pdfstudio2023 = callPackage ./common.nix rec {
|
||||
inherit desktopName longDescription pname program year;
|
||||
version = "${year}.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb";
|
||||
sha256 = "sha256-Po7BMmEWoC46rP7tUwZT9Ji/Wi8lKc6WN8x47fx2DXg=";
|
||||
};
|
||||
jdk = jdk17;
|
||||
};
|
||||
}.${pname}
|
||||
|
|
|
|||
|
|
@ -10,17 +10,19 @@
|
|||
, libpulseaudio
|
||||
, libmpdclient
|
||||
, libxkbcommon
|
||||
, alsa-lib
|
||||
, makeWrapper
|
||||
,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sfwbar";
|
||||
version = "1.0_beta11";
|
||||
version = "1.0_beta13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LBCrion";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "PmpiO5gvurpaFpoq8bQdZ53FYSVDnyjN8MxDpelMnAU=";
|
||||
hash = "sha256-7oiuTEqdXDReKdakJX6+HRaSi1XovM+MkHFkaFZtq64=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -30,14 +32,21 @@ stdenv.mkDerivation rec {
|
|||
libpulseaudio
|
||||
libmpdclient
|
||||
libxkbcommon
|
||||
alsa-lib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/sfwbar \
|
||||
--suffix XDG_DATA_DIRS : $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/LBCrion/sfwbar";
|
||||
description = "A flexible taskbar application for wayland compositors, designed with a stacking layout in mind";
|
||||
|
|
|
|||
|
|
@ -111,13 +111,13 @@ in {
|
|||
|
||||
application = mkSweetHome3D rec {
|
||||
pname = lib.toLower module + "-application";
|
||||
version = "7.0.2";
|
||||
version = "7.2";
|
||||
module = "SweetHome3D";
|
||||
description = "Design and visualize your future home";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip";
|
||||
sha256 = "sha256-9Jv/U7afG6+LwPB6IhqLePjQA67bPKelP+UcuvizBqo=";
|
||||
sha256 = "sha256-Io3HfussfSy6CLHE0JCAk0gjBAla/u+pS1Gan8BxozY=";
|
||||
};
|
||||
desktopName = "Sweet Home 3D";
|
||||
icons = {
|
||||
|
|
|
|||
|
|
@ -1,112 +0,0 @@
|
|||
{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook
|
||||
, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig
|
||||
, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid
|
||||
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
|
||||
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence
|
||||
, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
|
||||
, fetchurl, fetchFromGitHub, imagemagick, copyDesktopItems
|
||||
}:
|
||||
|
||||
let
|
||||
binaryName = "AetherP2P";
|
||||
aether-app-git = fetchFromGitHub {
|
||||
owner = "aethereans";
|
||||
repo = "aether-app";
|
||||
rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d";
|
||||
sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aether";
|
||||
version = "2.0.0-dev.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz";
|
||||
sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7";
|
||||
# % in the url / canonical filename causes an error
|
||||
name = "aether-tarball.tar.gz";
|
||||
};
|
||||
|
||||
# there is no logo in the tarball so we grab it from github and convert it in the build phase
|
||||
buildPhase = ''
|
||||
convert ${aether-app-git}/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
cups
|
||||
libdrm
|
||||
libuuid
|
||||
libXdamage
|
||||
libX11
|
||||
libXScrnSaver
|
||||
libXtst
|
||||
libxcb
|
||||
libxshmfence
|
||||
mesa
|
||||
nss
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
imagemagick
|
||||
autoPatchelfHook
|
||||
wrapGAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
exec = binaryName;
|
||||
icon = pname;
|
||||
desktopName = "Aether";
|
||||
genericName = meta.description;
|
||||
categories = [ "Network" ];
|
||||
mimeTypes = [ "x-scheme-handler/aether" ];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase =
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
libcxx systemd libpulseaudio libdrm mesa
|
||||
stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
|
||||
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
|
||||
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
|
||||
libXtst nspr nss libxcb pango systemd libXScrnSaver
|
||||
libappindicator-gtk3 libdbusmenu
|
||||
];
|
||||
in
|
||||
''
|
||||
mkdir -p $out/{bin,opt/${binaryName},share/icons/hicolor/512x512/apps}
|
||||
mv * $out/opt/${binaryName}
|
||||
|
||||
chmod +x $out/opt/${binaryName}/${binaryName}
|
||||
patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
|
||||
$out/opt/${binaryName}/${binaryName}
|
||||
|
||||
wrapProgram $out/opt/${binaryName}/${binaryName} \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}
|
||||
|
||||
ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
|
||||
|
||||
ln -s $out/opt/${binaryName}/aether.png $out/share/icons/hicolor/512x512/apps/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Peer-to-peer ephemeral public communities";
|
||||
homepage = "https://getaether.net/";
|
||||
downloadPage = "https://getaether.net/download/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ maxhille ];
|
||||
# other platforms could be supported by building from source
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -92,11 +92,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.58.137";
|
||||
version = "1.59.117";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "sha256-6vsdQU9NbEKFp/1A0bNQvutF4I+vI0zfrx70QvU1KV4=";
|
||||
sha256 = "sha256-yckxTKAgglk6YRXist9RZufZdI22iitecmb01NmYPGQ=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "click";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "click";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rwS08miRpc+Q9DRuspr21NMYpEYmmscvzarDnjyVe5c=";
|
||||
hash = "sha256-tYSbyDipZg6Qj/CWk1QVUT5AG8ncTt+5V1+ekpmsKXA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WNITVYTS7JWrBBwxlQuVTmLddWLbDJACizEsRiustGg=";
|
||||
cargoHash = "sha256-fcJTxZX9mdF4oFl/Cn1egczRy+yhWt2zLKsdLKz6Q+s=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k8sgpt";
|
||||
version = "0.3.15";
|
||||
version = "0.3.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k8sgpt-ai";
|
||||
repo = "k8sgpt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mWdSyP1Gcs1FC0HUX2p84PK0n1Xnd2LrD48luN4+OVs=";
|
||||
hash = "sha256-vSytBicpYWs7MqVts+3d6qVZ19nrM1oi00YRPmCQb/I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-y+oF9sqYVEQSukLkfz0JXFpKtUKP/1DzHIivkL2wBwk=";
|
||||
vendorHash = "sha256-UFXESGdipfM/TI/9ZSVwoUPsd3LVeEmTFB6sVqkkzQo=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "23.9.4";
|
||||
sha256 = "1hjhbkwn44i1gsc7llxc9mrdjf5xc1nl4dxqgnxgks3hzkch6qqc";
|
||||
vendorHash = "sha256-OzHl9QhNLaTCBCWpCmqzPkdWMwygKXSkYTczQD5KVh8=";
|
||||
version = "23.10.1";
|
||||
sha256 = "1m4inwim5iyahwza3i4zwz4iaja9p93vfacq324r9w8gciyvc26s";
|
||||
vendorHash = "sha256-wjICOdn/YqRmWHZQYB/WS0fxJ+OQsnas6BphUC2C9go=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pluto";
|
||||
version = "5.18.4";
|
||||
version = "5.18.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FairwindsOps";
|
||||
repo = "pluto";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/8ZJXy5FErLnnXpED0UL+xqOo4QZtmR1hpcSpVsE8mw=";
|
||||
hash = "sha256-zdfzGmEL1ZsU3g3jmkgOfxcIGyffkC9UeiU18jPOr7Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ysMRE/OwMf4rBnlkpkW9K8ZHEEbHpQ02RXNwLLSr0nY=";
|
||||
vendorHash = "sha256-8ZOYp/vM16PugmE+3QK7ZRDwIwRCMEwD0NRyiOBlh14=";
|
||||
|
||||
ldflags = [
|
||||
"-w" "-s"
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "velero";
|
||||
version = "1.11.1";
|
||||
version = "1.12.0";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "velero";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-G1+zdzHj8fDKVEVQpBEH3o/em+gxCyQmrpSXj8bE/P4=";
|
||||
sha256 = "sha256-NrOdnsdKxobJkMUGxdWQyzqB+2fDCjvTjnIt5S9fL0U=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -20,7 +20,7 @@ buildGoModule rec {
|
|||
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-WkJk+46+9U4TegDnGtQ+EoqqV/D7githz2pJvxCbV4c=";
|
||||
vendorHash = "sha256-mPRBmCqyQWCbWArORXL9sF8B4AlXHtA7Zs9NZD0TqoE=";
|
||||
|
||||
excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,19 +6,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "coreth";
|
||||
version = "0.12.4";
|
||||
version = "0.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AcU/1/TBS0nT7bXYguM8KI4mBUQzvSTVwuQkzq3t3EY=";
|
||||
hash = "sha256-jHJubqNmU0OkKmWNCkucmv+IM19x3nfyDkfBpRihh7Y=";
|
||||
};
|
||||
|
||||
# go mod vendor has a bug, see: golang/go#57529
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-GVSI3yv7YzW2QPC26gA2C3TqjBnTxyiPzmW+hsGGdaQ=";
|
||||
vendorHash = "sha256-GKAGBEHP09NJ/GLq349K9VwFGt8rCvoHu8BB8TzN4CU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ stdenv.mkDerivation rec {
|
|||
# Fix the desktop link and fix showing application icon in tray
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace "/opt/${dir}/${pname}" $out/bin/${pname} \
|
||||
--replace "bin/signal-desktop" "bin/signal-desktop --use-tray-icon"
|
||||
${if pname == "signal-desktop" then "--replace \"bin/signal-desktop\" \"bin/signal-desktop --use-tray-icon\"" else ""}
|
||||
|
||||
autoPatchelf --no-recurse -- "$out/lib/${dir}/"
|
||||
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node"
|
||||
|
|
|
|||
|
|
@ -94,6 +94,13 @@ stdenv.mkDerivation rec {
|
|||
url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch";
|
||||
hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y=";
|
||||
})
|
||||
# lib_base: Add missing include for Qt 6.6
|
||||
(fetchpatch {
|
||||
url = "https://github.com/desktop-app/lib_base/commit/5ca91dbb811c84591780236abc31431e313faf39.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "Telegram/lib_base/";
|
||||
hash = "sha256-eZkyMnPaAmUFYXiCmPhLRTw2Xdx0lylY+UVOckCsiaA=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubo";
|
||||
version = "0.22.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
version = "0.23.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
rev = "v${version}";
|
||||
|
||||
passthru.repoVersion = "14"; # Also update kubo-migrator when changing the repo version
|
||||
passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version
|
||||
|
||||
# Kubo makes changes to its source tarball that don't match the git source.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
||||
hash = "sha256-TX5ZM8Kyj3LZ12Ro7MsHRd+P5XLk/mU7DUxZaopSEV0=";
|
||||
hash = "sha256-ycXn8h8sFGJXVMldneN51lZgXoPaZ/XeXLtqqJ4w6H0=";
|
||||
};
|
||||
|
||||
# tarball contains multiple files/directories
|
||||
|
|
@ -37,9 +37,9 @@ buildGoModule rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace 'misc/systemd/ipfs.service' \
|
||||
--replace '/usr/bin/ipfs' "$out/bin/ipfs"
|
||||
--replace '/usr/local/bin/ipfs' "$out/bin/ipfs"
|
||||
substituteInPlace 'misc/systemd/ipfs-hardened.service' \
|
||||
--replace '/usr/bin/ipfs' "$out/bin/ipfs"
|
||||
--replace '/usr/local/bin/ipfs' "$out/bin/ipfs"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ let
|
|||
systemd
|
||||
];
|
||||
|
||||
version = "2023.4";
|
||||
version = "2023.5";
|
||||
|
||||
selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
|
|
@ -74,8 +74,8 @@ let
|
|||
};
|
||||
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-7NoifrX1/3pUJHTYK+2dVos/oFsKiYwyhCGi07SsEhM=";
|
||||
aarch64-linux = "sha256-e0lp+SpBUmtYBcJPvql8ALeCkVtneZ1Cd3IFMVX6R2Q=";
|
||||
x86_64-linux = "sha256-FpVruI80PmpBo2JrMvgvOg7ou6LceTeit9HbWKgcPa4=";
|
||||
aarch64-linux = "sha256-NlYh8K5Xbad4xSoZ02yC5fh3SrQzyNyS9uoA73REcpo=";
|
||||
};
|
||||
in
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nali";
|
||||
version = "0.7.3";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zu1k";
|
||||
repo = "nali";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZKLxsq7ybom96NKWkioROAVXUoY20zFBZn7ksk4XvT4=";
|
||||
sha256 = "sha256-JIP0QX1okCfDj2Y6wZ5TaV3QH0WP3oU3JjaKK6vMfWY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-l3Fs1Hd0kXI56uotic1407tb4ltkCSMzqqozFpvobH8=";
|
||||
vendorHash = "sha256-wIp/ShUddz+RIcsEuKWUfxsV/wNB2X1jZtIltBZ0ROM=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -49,9 +49,11 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uhd";
|
||||
# UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
|
||||
# and xxx.yyy.zzz. Hrmpf... style keeps changing
|
||||
version = "4.4.0.0";
|
||||
# NOTE: Use the following command to update the package, and the uhdImageSrc attribute:
|
||||
#
|
||||
# nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true
|
||||
#
|
||||
version = "4.5.0.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -59,14 +61,24 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "EttusResearch";
|
||||
repo = "uhd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-khVOHlvacZc4EMg4m55rxEqPvLY1xURpAfOW905/3jg=";
|
||||
# The updateScript relies on the `src` using `hash`, and not `sha256. To
|
||||
# update the correct hash for the `src` vs the `uhdImagesSrc`
|
||||
hash = "sha256-0EqMBaQiNr8PE542YNkPvX3o1HhnhrO0Kz1euphY6Ps=";
|
||||
};
|
||||
# Firmware images are downloaded (pre-built) from the respective release on Github
|
||||
uhdImagesSrc = fetchurl {
|
||||
url = "https://github.com/EttusResearch/uhd/releases/download/v${finalAttrs.version}/uhd-images_${finalAttrs.version}.tar.xz";
|
||||
sha256 = "V8ldW8bvYWbrDAvpWpHcMeLf9YvF8PIruDAyNK/bru4=";
|
||||
# Please don't convert this to a hash, in base64, see comment near src's
|
||||
# hash.
|
||||
sha256 = "13cn41wv7vldk4vx7vy3jbb3wb3a5vpfg3ay893klpi6vzxc1dly";
|
||||
};
|
||||
passthru = {
|
||||
updateScript = [
|
||||
./update.sh
|
||||
# Pass it this file name as argument
|
||||
(builtins.unsafeGetAttrPos "pname" finalAttrs.finalPackage).file
|
||||
];
|
||||
};
|
||||
# TODO: Add passthru.updateScript that will update both of the above hashes...
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_LIBUHD=ON"
|
||||
|
|
|
|||
27
pkgs/applications/radio/uhd/update.sh
Executable file
27
pkgs/applications/radio/uhd/update.sh
Executable file
|
|
@ -0,0 +1,27 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p jq nix nix-prefetch-github
|
||||
|
||||
set -euo pipefail
|
||||
echoerr() { echo "$@" 1>&2; }
|
||||
|
||||
fname="$1"
|
||||
echoerr got fname $fname
|
||||
shift
|
||||
latest_release=$(curl --silent https://api.github.com/repos/EttusResearch/uhd/releases/latest)
|
||||
version=$(jq -r '.tag_name' <<<"$latest_release" | cut -c2-)
|
||||
# Update version, if needed
|
||||
if grep -q 'version = "'$version $fname; then
|
||||
echoerr Current version $version is the latest available
|
||||
exit 0;
|
||||
fi
|
||||
echoerr got version $version
|
||||
sed -i -E 's/(version = ").*(";)/\1'$version'\2/g' $fname
|
||||
# Verify the sed command above did not fail
|
||||
grep -q $version $fname
|
||||
# Update srcHash
|
||||
srcHash="$(nix-prefetch-github EttusResearch uhd --rev v${version} | jq --raw-output .hash)"
|
||||
sed -i -E 's#(hash = ").*(";)#\1'$srcHash'\2#g' $fname
|
||||
grep -q $srcHash $fname
|
||||
imageHash="$(nix-prefetch-url https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz)"
|
||||
sed -i -E 's#(sha256 = ").*(";)#\1'$imageHash'\2#g' $fname
|
||||
grep -q $imageHash $fname
|
||||
|
|
@ -21,10 +21,10 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gwyddion";
|
||||
version = "2.61";
|
||||
version = "2.63";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz";
|
||||
sha256 = "sha256-rDhYVMDTH9mSu90HZAX8ap4HF//8fYhW/ozzJdIrUgo=";
|
||||
sha256 = "sha256-FSs/Dbnr1shEw/W51DhUFPb61tM+0atc6wxY81EiTdM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config file ];
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marvin";
|
||||
version = "23.4.0";
|
||||
version = "23.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "marvin-${version}.deb";
|
||||
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
|
||||
sha256 = "sha256-+jzGcuAcbXOwsyAL+Hr9Fas2vO2S8ZKSaZeCf/bnl7A=";
|
||||
hash = "sha256-5ycOteXcdgZaeDl3WQ95H2lD0OnnobCbmnVlfYwVdeI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch2
|
||||
, obs-studio
|
||||
, cmake
|
||||
, zlib
|
||||
|
|
@ -27,6 +28,16 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with qt 6.6.0
|
||||
# treewide: replace deprecated qAsConst with std::as_const()
|
||||
# https://github.com/univrsal/tuna/pull/176
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/univrsal/tuna/commit/0d570e771f8d8e6ae7c85bd2b86bbf59c264789e.patch";
|
||||
hash = "sha256-A5idhMiM9funqhTm5XMIBqwy+FO1SaNPtgZjo+Vws6k=";
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/lib $out/share
|
||||
mv $out/obs-plugins/64bit $out/lib/obs-plugins
|
||||
|
|
|
|||
1563
pkgs/applications/video/youtube-tui/Cargo.lock
generated
Normal file
1563
pkgs/applications/video/youtube-tui/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -7,24 +7,29 @@
|
|||
, stdenv
|
||||
, python3
|
||||
, libsixel
|
||||
, mpv
|
||||
, CoreFoundation
|
||||
, Security
|
||||
, AppKit
|
||||
,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "youtube-tui";
|
||||
version = "0.7.4";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Siriusmart";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UN70V+RGYlYJxCQGPH8cnQDSqpihGuwzETYEhbG6Ggo=";
|
||||
hash = "sha256-FOiK3yQcQuwdCEjBtRPW4iBd+8uNsvZ6l5tclHVzL+M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kAhxsSFIJAoKlmN7hVUoTSSHQ2G23f21rEvxcIRQ+kw=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"libmpv-2.0.1" = "sha256-efbXk0oXkzlIqgbP4wKm7sWlVZBT2vzDSN3iwsw2vL0=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
@ -35,6 +40,7 @@ rustPlatform.buildRustPackage rec {
|
|||
openssl
|
||||
xorg.libxcb
|
||||
libsixel
|
||||
mpv
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreFoundation
|
||||
Security
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ fetchurl, lib, stdenv }:
|
||||
|
||||
let
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
# nixpkgs-update: no auto update
|
||||
|
||||
suffix = {
|
||||
|
|
@ -23,8 +23,8 @@ stdenv.mkDerivation {
|
|||
|
||||
sourceRoot = ".";
|
||||
src = dlbin {
|
||||
x86_64-linux = "sha256-WSa8fd0OSPo1HFkH6i8cGMNH1df88xI6PCx39ONb73c=";
|
||||
aarch64-linux = "sha256-eOsO/nbwKT50tC5g6INPELh2yVb5C3EGqNLQLT7IGBs=";
|
||||
x86_64-linux = "sha256-TzNPWcLDKOv12eJ9PHckdJ7tfdlozPoXj2fbdOzHfAk=";
|
||||
aarch64-linux = "sha256-cHNMfcoHCBw+BnWx9USny8jyvH97gXCCJW1aKvPXgCs=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
@ -50,6 +50,8 @@ stdenv.mkDerivation {
|
|||
meta = with lib; {
|
||||
description = "Secure, fast, minimal micro-container virtualization";
|
||||
homepage = "http://firecracker-microvm.io";
|
||||
changelog = "https://github.com/firecracker-microvm/firecracker/releases/tag/v${version}";
|
||||
mainProgram = "firecracker";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ thoughtpolice endocrimes ];
|
||||
|
|
|
|||
33
pkgs/by-name/cl/clarity-city/package.nix
Normal file
33
pkgs/by-name/cl/clarity-city/package.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "clarity-city";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware";
|
||||
repo = "clarity-city";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-1POSdd2ICnyNNmGadIujezNK8qvARD0kkLR4yWjs5kA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 TrueType/*.ttf -t $out/share/fonts/truetype
|
||||
install -Dm644 OpenType/*.otf -t $out/share/fonts/opentype
|
||||
install -Dm644 Webfonts/EOT/*.eot -t $out/share/fonts/eot
|
||||
install -Dm644 Webfonts/WOFF/*.woff -t $out/share/fonts/woff
|
||||
install -Dm644 Webfonts/WOFF2/*.woff2 -t $out/share/fonts/woff2
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open source sans-serif typeface";
|
||||
homepage = "https://github.com/vmware/clarity-city";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ sagikazarmark ];
|
||||
};
|
||||
})
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://www.nongnu.org/lzip/clzip.html";
|
||||
description = "C language version of lzip";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ rs0vere ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://github.com/AmokHuginnsson/replxx";
|
||||
description = "A readline and libedit replacement that supports UTF-8, syntax highlighting, hints and Windows and is BSD licensed";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ rs0vere ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,16 +1,23 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, pkg-config
|
||||
, desktopToDarwinBundle
|
||||
, xorg
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, libxkbcommon
|
||||
, libglvnd
|
||||
, mpv
|
||||
, glfw3
|
||||
, darwin
|
||||
, waylandSupport ? false
|
||||
}:
|
||||
|
||||
assert waylandSupport -> stdenv.isLinux;
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supersonic" + lib.optionalString waylandSupport "-wayland";
|
||||
version = "0.5.2";
|
||||
|
|
@ -27,6 +34,8 @@ buildGoModule rec {
|
|||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
pkg-config
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
desktopToDarwinBundle
|
||||
];
|
||||
|
||||
# go-glfw doesn't support both X11 and Wayland in single build
|
||||
|
|
@ -35,9 +44,25 @@ buildGoModule rec {
|
|||
buildInputs = [
|
||||
libglvnd
|
||||
mpv
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
xorg.libXxf86vm
|
||||
xorg.libX11
|
||||
] ++ (glfw3.override { inherit waylandSupport; }).buildInputs;
|
||||
] ++ lib.optionals (stdenv.isLinux && !waylandSupport) [
|
||||
xorg.libXrandr
|
||||
xorg.libXinerama
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXext
|
||||
] ++ lib.optionals (stdenv.isLinux && waylandSupport) [
|
||||
wayland
|
||||
wayland-protocols
|
||||
libxkbcommon
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.Cocoa
|
||||
darwin.apple_sdk_11_0.frameworks.Kernel
|
||||
darwin.apple_sdk_11_0.frameworks.OpenGL
|
||||
darwin.apple_sdk_11_0.frameworks.UserNotifications
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for dimension in 128 256 512;do
|
||||
|
|
@ -66,7 +91,7 @@ buildGoModule rec {
|
|||
mainProgram = "supersonic" + lib.optionalString waylandSupport "-wayland";
|
||||
description = "A lightweight cross-platform desktop client for Subsonic music servers";
|
||||
homepage = "https://github.com/dweymouth/supersonic";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ zane sochotnicky ];
|
||||
};
|
||||
|
|
|
|||
31
pkgs/by-name/tr/trunk-ng/package.nix
Normal file
31
pkgs/by-name/tr/trunk-ng/package.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config
|
||||
, openssl, libiconv, CoreServices, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "trunk-ng";
|
||||
version = "0.17.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ctron";
|
||||
repo = "trunk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ycZIqDBZccPapOK0ZI9Cvq94tRxChrsWX1rhyWh0S2c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = if stdenv.isDarwin
|
||||
then [ libiconv CoreServices Security ]
|
||||
else [ openssl ];
|
||||
|
||||
# requires network
|
||||
checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
|
||||
|
||||
cargoHash = "sha256-URHArTog34JcuxXHzTQBjQOFMffarNb51d9sUOfjm6c=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ctron/trunk";
|
||||
description = "Build, bundle & ship your Rust WASM application to the web";
|
||||
maintainers = with maintainers; [ ctron ];
|
||||
license = with licenses; [ asl20 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch2
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, pkg-config
|
||||
|
|
@ -30,6 +31,16 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
hash = "sha256-s1FaazHVtWE697BO0hIOgZVowdkq68R9x327ZnJRnlo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with qt 6.6.0
|
||||
# treewide: replace deprecated qAsConst with std::as_const()
|
||||
# https://github.com/zealdocs/zeal/pull/1565
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/zealdocs/zeal/commit/d50a0115d58df2b222ede4c3a76b9686f4716465.patch";
|
||||
hash = "sha256-Ub6RCZGpLSOjvK17Jrm+meZuZGXcC4kI3QYl5HbsLWU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'ZEAL_VERSION_SUFFIX "-dev"' 'ZEAL_VERSION_SUFFIX ""'
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@ in
|
|||
hash = "sha256-LL9zWFC+76wH74nqKszPQf2ZDfXq8BiH6tuiK43wYHA=";
|
||||
};
|
||||
v5 = font-awesome {
|
||||
version = "5.15.3";
|
||||
hash = "sha256-CFXGsl70o/gXUCEKu8Wkv4EBRhrrcMIq8NpfWzcxEus=";
|
||||
version = "5.15.4";
|
||||
hash = "sha256-gd23ZplNY56sm1lfkU3kPXUOmNmY5SRnT0qlQZRNuBo=";
|
||||
};
|
||||
v6 = font-awesome {
|
||||
version = "6.1.1";
|
||||
hash = "sha256-rujqhKI33Pi2xugMKGoTJDkPkCDK407+Da6yNJP2yAc=";
|
||||
version = "6.4.2";
|
||||
hash = "sha256-/utIhn7CWxlWXshcCUj57WuObRmLTGhTfQo7L6FDHqA=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,13 +67,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell";
|
||||
version = "44.4";
|
||||
version = "44.5";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "HdUebujZL7y5XObd8Ruf7OiNImIsAQFf+pNgFpzUGGY=";
|
||||
sha256 = "wWr84Dgd1ZNCfXCER6nR+sdInrApRe+zfpBMp0qSSjU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -66,13 +66,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "44.4";
|
||||
version = "44.5";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "M3IKWGywqacyr1oH7RPj89MqGml4EjURQKVLygBrlAw=";
|
||||
sha256 = "8kfg7WXrYvKwd1RtUoPtbUf0Ar2mpDFkE1AdjK7Slnk=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ispc";
|
||||
version = "1.21.0";
|
||||
version = "1.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:029rlkh7vh8hxg8ygpspxb9hvw5q97m460zbxwb7xnx1jnq8msh4";
|
||||
sha256 = "sha256-QnGD27f1GWcuyFxFtzm1f7U/ng7VHZKSeSTcKINO/SA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ];
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, asttokens
|
||||
, pycryptodome
|
||||
, importlib-metadata
|
||||
, cbor2
|
||||
, recommonmark
|
||||
, semantic-version
|
||||
, sphinx
|
||||
|
|
@ -28,14 +29,14 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "vyper";
|
||||
version = "0.3.9";
|
||||
version = "0.3.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-4UBSH4qRBgsy+VO9XzosWedM65R1lTo9ml2C95T9OAA=";
|
||||
hash = "sha256-jcH1AcqrQX+wzpxoppRFh/AUfsfMfTiJzzpFwZRm5Ik=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -55,6 +56,7 @@ buildPythonPackage rec {
|
|||
pycryptodome
|
||||
semantic-version
|
||||
importlib-metadata
|
||||
cbor2
|
||||
|
||||
# docs
|
||||
recommonmark
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nmrpflash";
|
||||
version = "0.9.20";
|
||||
version = "0.9.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jclehner";
|
||||
repo = "nmrpflash";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xfKZXaKzSTnCOC8qt6Zc/eidc1bnrKZOJPw/wwMoCaM=";
|
||||
sha256 = "sha256-nW+VD2a0vmgODbJi4H8Esnq502bEkeCKjXQi23DfdqA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moarvm";
|
||||
version = "2023.08";
|
||||
version = "2023.09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moarvm";
|
||||
repo = "moarvm";
|
||||
rev = version;
|
||||
hash = "sha256-oYdXzbT+2L/nDySKq8ZYVuVfNgzLDiskwacOM1L4lzw=";
|
||||
hash = "sha256-/78Qr/Td+dIBlzK0kYa2E4duxEjMj2haefw9Uia+3EA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
stdenv.mkDerivation rec
|
||||
{
|
||||
pname = "alembic";
|
||||
version = "1.8.5";
|
||||
version = "1.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alembic";
|
||||
repo = "alembic";
|
||||
rev = version;
|
||||
sha256 = "sha256-wJVx0rwK0Qk07jlP0DyEAZUrAD+47qcVXSnTh5ngZG8=";
|
||||
sha256 = "sha256-MND1GtnIGUtRrtyUX1eR9UoGGtuTPtVEIIET3QQ6blA=";
|
||||
};
|
||||
|
||||
# note: out is unused (but required for outputDoc anyway)
|
||||
|
|
|
|||
|
|
@ -5,18 +5,18 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "alkimia";
|
||||
version = "8.1.1";
|
||||
version = "8.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-lXrcY8C+VN1DPjJoo3MjvlRW5auE7OJ/c6FhapLbhtU=";
|
||||
sha256 = "sha256-z4Ru6HucxjD1jgvdIzNCloELo7zBdR/i9HIhYYl+4zo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ];
|
||||
|
||||
# qtwebengine is not a mandatory dependency, but it adds some features
|
||||
# we might need for alkimia's dependents. See:
|
||||
# https://github.com/KDE/alkimia/blob/v8.1.1/CMakeLists.txt#L124
|
||||
# https://github.com/KDE/alkimia/blob/v8.1.2/CMakeLists.txt#L124
|
||||
buildInputs = [ qtbase qtwebengine kdelibs4support plasma-framework knewstuff kpackage ];
|
||||
propagatedBuildInputs = [ mpir ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, pkg-config
|
||||
, gobject-introspection
|
||||
, buildPackages
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, gsettings-desktop-schemas
|
||||
, makeWrapper
|
||||
, dbus
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ callPackage, fetchpatch, lib, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
baseVersion = "3.1";
|
||||
revision = "1";
|
||||
sha256 = "sha256-MMhP6RmTapj+9TMfJGxiqiwOTSCFstRREgf2ogr6Oms=";
|
||||
baseVersion = "3.2";
|
||||
revision = "0";
|
||||
sha256 = "BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM=";
|
||||
# reconsider removing this platform marking, when MacOS uses Clang 14.0+ by default.
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
, lib
|
||||
, testers
|
||||
, buildPackages
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -158,6 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 artturin ]);
|
||||
pkgConfigModules = [ "gobject-introspection-1.0" ];
|
||||
platforms = platforms.unix;
|
||||
badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ];
|
||||
license = with licenses; [ gpl2 lgpl2 ];
|
||||
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, glib
|
||||
, gobject-introspection
|
||||
, buildPackages
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, meson
|
||||
, ninja
|
||||
# just for passthru
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
, at-spi2-atk
|
||||
, gobject-introspection
|
||||
, buildPackages
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, fribidi
|
||||
, xorg
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, ninja
|
||||
, gobject-introspection
|
||||
, buildPackages
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, icu
|
||||
, graphite2
|
||||
, harfbuzz # The icu variant uses and propagates the non-icu one.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, nixosTests
|
||||
, pkg-config
|
||||
, gettext
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, buildPackages
|
||||
, gobject-introspection
|
||||
, gi-docgen
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A Fast and Reliable ARQ Protocol";
|
||||
homepage = "https://github.com/skywind3000/kcp";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rs0vere ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcouchbase";
|
||||
version = "3.3.8";
|
||||
version = "3.3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "couchbase";
|
||||
repo = "libcouchbase";
|
||||
rev = version;
|
||||
sha256 = "sha256-4484PH2+4uvCSSPw9vecoCeGda8ELxoOW6mtIfuUC+U=";
|
||||
sha256 = "sha256-dvXRbAdgb1WmKLijYkx6+js60ZxK1Tl2aTFSF7EpN74=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgpiod";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
|
||||
hash = "sha256-tu2lU1YWCo5zkG49SOlZ74EpZ4fXZJdbEPJX6WYGaOk=";
|
||||
hash = "sha256-NTLh26/9wsWWWnYaB1DyaR7kmq0nPdu9k6z2pyextlw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, vala
|
||||
, gobject-introspection
|
||||
, buildPackages
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, bash-completion
|
||||
, bash
|
||||
, buildPackages
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withDocs ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
, gdk-pixbuf
|
||||
, gnome
|
||||
, buildPackages
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
, libmbim
|
||||
, libqrtr-glib
|
||||
, buildPackages
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withMan ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
, gnome
|
||||
, vala
|
||||
, writeScript
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, buildPackages
|
||||
, gobject-introspection
|
||||
, _experimental-update-script-combinators
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
, libgcrypt
|
||||
, gobject-introspection
|
||||
, buildPackages
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, vala
|
||||
, gi-docgen
|
||||
, gnome
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, glib-networking
|
||||
, buildPackages
|
||||
, gobject-introspection
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, vala
|
||||
, libpsl
|
||||
, python3
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
, sqlite
|
||||
, glib-networking
|
||||
, buildPackages
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, libvirt
|
||||
, libxml2
|
||||
, buildPackages
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, gobject-introspection
|
||||
, withDocs ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, gtk-doc
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nco";
|
||||
version = "5.1.7";
|
||||
version = "5.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nco";
|
||||
repo = "nco";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-CdIZ0ql8QBM7UcEyTmt4P9gZyO8jrkLipAOsJUkpG8g=";
|
||||
hash = "sha256-ASZyvcP9XVFPf7nTsBx5E+D/7fWzUslPZrmhhNY5DzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ortp";
|
||||
version = "5.2.16";
|
||||
version = "5.2.109";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-zGguzrWXSjjrJdFnlAeC6U6w10BucXjeUg7/2D4OxM4=";
|
||||
hash = "sha256-EgUPICdKi8c/E6uonZB4DKyOZ3Od4JM5/bR2U6cq9ew=";
|
||||
};
|
||||
|
||||
# Do not build static libraries
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
, glib
|
||||
, python3
|
||||
, x11Support? !stdenv.isDarwin, libXft
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, buildPackages, gobject-introspection
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
, systemdMinimal
|
||||
, elogind
|
||||
, buildPackages
|
||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
# A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault).
|
||||
# Not yet investigated; it may be due to the "Make netgroup support optional"
|
||||
# patch not updating the tests correctly yet, or doing something wrong,
|
||||
|
|
|
|||
|
|
@ -49,11 +49,11 @@ let
|
|||
./patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch
|
||||
./patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch
|
||||
./patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch
|
||||
./patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch
|
||||
./patches/0008-qtbase-allow-translations-outside-prefix.patch
|
||||
./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch
|
||||
./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch
|
||||
./patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
|
||||
./patches/0007-qtbase-find-tools-in-PATH.patch
|
||||
./patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
|
||||
./patches/0009-qtbase-allow-translations-outside-prefix.patch
|
||||
./patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch
|
||||
./patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch
|
||||
];
|
||||
};
|
||||
env = callPackage ./qt-env.nix { };
|
||||
|
|
@ -65,6 +65,7 @@ let
|
|||
qtdatavis3d
|
||||
qtdeclarative
|
||||
qtdoc
|
||||
qtgraphs
|
||||
qtgrpc
|
||||
qthttpserver
|
||||
qtimageformats
|
||||
|
|
@ -105,15 +106,8 @@ let
|
|||
qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { };
|
||||
qtdeclarative = callPackage ./modules/qtdeclarative.nix { };
|
||||
qtdoc = callPackage ./modules/qtdoc.nix { };
|
||||
qtgrpc = callPackage ./modules/qtgrpc.nix {
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
# fix compatibility with protobuf 23
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/5cfb8728ca626af41d5dc2b1f642d026c011ec56/protobuf-23.patch";
|
||||
hash = "sha256-msVQEAt0DewOnZIgymGijJEpIXbfmMUkdbIyJ0ZNuok=";
|
||||
})
|
||||
];
|
||||
};
|
||||
qtgraphs = callPackage ./modules/qtgraphs.nix { };
|
||||
qtgrpc = callPackage ./modules/qtgrpc.nix { };
|
||||
qthttpserver = callPackage ./modules/qthttpserver.nix { };
|
||||
qtimageformats = callPackage ./modules/qtimageformats.nix { };
|
||||
qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { };
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.3/submodules/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/ -A '*.tar.xz' )
|
||||
|
|
|
|||
16
pkgs/development/libraries/qt-6/modules/qtgraphs.nix
Normal file
16
pkgs/development/libraries/qt-6/modules/qtgraphs.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{ qtModule
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
, qtquick3d
|
||||
, qtquicktimeline
|
||||
}:
|
||||
|
||||
qtModule {
|
||||
pname = "qtgraphs";
|
||||
qtInputs = [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtquick3d
|
||||
qtquicktimeline
|
||||
];
|
||||
}
|
||||
|
|
@ -3,12 +3,10 @@
|
|||
, qtdeclarative
|
||||
, protobuf
|
||||
, grpc
|
||||
, patches ? []
|
||||
}:
|
||||
|
||||
qtModule {
|
||||
pname = "qtgrpc";
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ];
|
||||
buildInputs = [ protobuf grpc ];
|
||||
inherit patches;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
qtModule rec {
|
||||
pname = "qtmqtt";
|
||||
version = "6.5.3";
|
||||
version = "6.6.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "qt";
|
||||
repo = "qtmqtt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F0rq72Cvnwy2cJmw3wUL9t8ZsnI61HBRMMWRwKdSEs8=";
|
||||
hash = "sha256-rFi1w0Z4jLvHvhu0/VOIT0MWmKjy51jSK5M56qLs0gI=";
|
||||
};
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, libmng
|
||||
, zlib
|
||||
, pkg-config
|
||||
, fetchpatch2
|
||||
}:
|
||||
|
||||
qtModule {
|
||||
|
|
@ -12,4 +13,13 @@ qtModule {
|
|||
propagatedBuildInputs = [ qtbase ];
|
||||
buildInputs = [ libwebp jasper libmng zlib ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
patches = [
|
||||
# Fix nullptr dereference with invalid SVG
|
||||
# https://bugreports.qt.io/projects/QTBUG/issues/QTBUG-117944
|
||||
(fetchpatch2 {
|
||||
name = "QTBUG-117944.patch";
|
||||
url = "https://code.qt.io/cgit/qt/qtsvg.git/patch/?id=edc8ca7f";
|
||||
hash = "sha256-kBQYlQqPb0QkRhatQyaGdxE1Y5zHd6/ZEd5zn0gRVoM=";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,13 @@ qtModule {
|
|||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-DNIX_OUTPUT_OUT=\"${placeholder "out"}\""
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace \
|
||||
src/qdoc/catch/CMakeLists.txt \
|
||||
src/qdoc/catch_generators/CMakeLists.txt \
|
||||
src/qdoc/catch_conversions/CMakeLists.txt \
|
||||
--replace ''\'''${CMAKE_INSTALL_INCLUDEDIR}' "$out/include"
|
||||
'';
|
||||
postInstall = ''
|
||||
mkdir -p "$dev"
|
||||
ln -s "$out/bin" "$dev/bin"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 69d9faa9e4420d3cb0d1466c1b95ceadb2cd75f3 Mon Sep 17 00:00:00 2001
|
||||
From afbe4002948e60ee3b27cb9be9e549ae416373f8 Mon Sep 17 00:00:00 2001
|
||||
From: Nick Cao <nickcao@nichi.co>
|
||||
Date: Thu, 13 Apr 2023 23:42:29 +0800
|
||||
Subject: [PATCH 1/6] qtbase: qmake: always use libname instead of absolute
|
||||
Subject: [PATCH 01/11] qtbase: qmake: always use libname instead of absolute
|
||||
path in qmake files
|
||||
|
||||
In generated qmake files, absolute paths to qt libraries are embedded
|
||||
|
|
@ -46,5 +46,5 @@ index 3ffe354fd8d..441332d4582 100644
|
|||
else()
|
||||
list(APPEND out_list "${library_path}")
|
||||
--
|
||||
2.39.2
|
||||
2.42.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 41e32c41f781261726722628122c924abb532575 Mon Sep 17 00:00:00 2001
|
||||
From 8d3f5ee63ed29fe41927b904aa1e2b40f90c8ef4 Mon Sep 17 00:00:00 2001
|
||||
From: Nick Cao <nickcao@nichi.co>
|
||||
Date: Fri, 14 Apr 2023 21:43:04 +0800
|
||||
Subject: [PATCH 2/6] qtbase: qmake: fix mkspecs for darwin
|
||||
Subject: [PATCH 02/11] qtbase: qmake: fix mkspecs for darwin
|
||||
|
||||
---
|
||||
mkspecs/common/mac.conf | 2 +-
|
||||
|
|
@ -26,7 +26,7 @@ index 61bea952b22..9909dae7260 100644
|
|||
|
||||
QMAKE_LFLAGS_REL_RPATH =
|
||||
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
|
||||
index 4acf3b19d5c..aadfce875e2 100644
|
||||
index f364716717c..3b40328304d 100644
|
||||
--- a/mkspecs/features/mac/default_post.prf
|
||||
+++ b/mkspecs/features/mac/default_post.prf
|
||||
@@ -1,9 +1,5 @@
|
||||
|
|
@ -39,7 +39,7 @@ index 4acf3b19d5c..aadfce875e2 100644
|
|||
contains(TEMPLATE, .*app) {
|
||||
!macx-xcode:if(isEmpty(BUILDS)|build_pass) {
|
||||
# Detect changes to the platform SDK
|
||||
@@ -15,37 +11,6 @@ contains(TEMPLATE, .*app) {
|
||||
@@ -15,269 +11,10 @@ contains(TEMPLATE, .*app) {
|
||||
|
||||
QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk)
|
||||
}
|
||||
|
|
@ -77,9 +77,6 @@ index 4acf3b19d5c..aadfce875e2 100644
|
|||
}
|
||||
|
||||
!no_objective_c:CONFIG += objective_c
|
||||
@@ -73,234 +38,6 @@ qt {
|
||||
}
|
||||
}
|
||||
|
||||
-# Add the same default rpaths as Xcode does for new projects.
|
||||
-# This is especially important for iOS/tvOS/watchOS where no other option is possible.
|
||||
|
|
@ -486,5 +483,5 @@ index df191eb13c4..e69de29bb2d 100644
|
|||
-
|
||||
-load(toolchain)
|
||||
--
|
||||
2.39.2
|
||||
2.42.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
From f52f3c2cb1703592eaeb43e80f585a24ce8402d7 Mon Sep 17 00:00:00 2001
|
||||
From 8ce66fca339d9daf6bd132771c2ea582a461f31c Mon Sep 17 00:00:00 2001
|
||||
From: Nick Cao <nickcao@nichi.co>
|
||||
Date: Fri, 14 Apr 2023 09:34:46 +0800
|
||||
Subject: [PATCH 3/6] qtbase: qmake: fix includedir in generated pkg-config
|
||||
Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config
|
||||
|
||||
---
|
||||
qmake/generators/makefile.cpp | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
|
||||
index cc985a878b4..4e3b383d812 100644
|
||||
index 11d2f0ff7df..c78ed0d3485 100644
|
||||
--- a/qmake/generators/makefile.cpp
|
||||
+++ b/qmake/generators/makefile.cpp
|
||||
@@ -3403,8 +3403,7 @@ MakefileGenerator::writePkgConfigFile()
|
||||
@@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile()
|
||||
<< varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ")
|
||||
// << varGlue("DEFINES","-D"," -D"," ")
|
||||
;
|
||||
|
|
@ -22,5 +22,5 @@ index cc985a878b4..4e3b383d812 100644
|
|||
&& libDir != QLatin1String("/Library/Frameworks")) {
|
||||
t << " -F${libdir}";
|
||||
--
|
||||
2.39.2
|
||||
2.42.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
From dd0dfc9cf87966f5d7493a943ec04c665be83cb6 Mon Sep 17 00:00:00 2001
|
||||
From b1533ac42718835499ec633ffb3b1bed0d040719 Mon Sep 17 00:00:00 2001
|
||||
From: Nick Cao <nickcao@nichi.co>
|
||||
Date: Fri, 14 Apr 2023 09:35:25 +0800
|
||||
Subject: [PATCH 4/6] qtbase: fix locating tzdir on NixOS
|
||||
Subject: [PATCH 04/11] qtbase: fix locating tzdir on NixOS
|
||||
|
||||
---
|
||||
src/corelib/time/qtimezoneprivate_tz.cpp | 27 +++++++++++++++---------
|
||||
1 file changed, 17 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
|
||||
index 960a0944185..a5186acbd91 100644
|
||||
index e702a5d6b43..2ac88c1cd10 100644
|
||||
--- a/src/corelib/time/qtimezoneprivate_tz.cpp
|
||||
+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
|
||||
@@ -51,7 +51,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
|
||||
// Parse zone.tab table, assume lists all installed zones, if not will need to read directories
|
||||
@@ -56,7 +56,11 @@ static bool isTzFile(const QString &name);
|
||||
// zone1970.tab).
|
||||
static QTzTimeZoneHash loadTzTimeZones()
|
||||
{
|
||||
- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
|
||||
|
|
@ -24,7 +24,7 @@ index 960a0944185..a5186acbd91 100644
|
|||
if (!QFile::exists(path))
|
||||
path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
|
||||
|
||||
@@ -730,18 +734,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)
|
||||
@@ -773,18 +777,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)
|
||||
if (!tzif.open(QIODevice::ReadOnly))
|
||||
return ret;
|
||||
} else {
|
||||
|
|
@ -56,5 +56,5 @@ index 960a0944185..a5186acbd91 100644
|
|||
}
|
||||
}
|
||||
--
|
||||
2.39.2
|
||||
2.42.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 4e8c14f1af9c332826e0454f4fd63e541edbaf5c Mon Sep 17 00:00:00 2001
|
||||
From 880fe5653a86d8091f3f577977f8af93552c48fd Mon Sep 17 00:00:00 2001
|
||||
From: Nick Cao <nickcao@nichi.co>
|
||||
Date: Tue, 21 Mar 2023 15:48:49 +0800
|
||||
Subject: [PATCH 5/6] qtbase: deal with a font face at index 0 as Regular for
|
||||
Subject: [PATCH 05/11] qtbase: deal with a font face at index 0 as Regular for
|
||||
Variable fonts
|
||||
|
||||
Reference: https://bugreports.qt.io/browse/QTBUG-111994
|
||||
|
|
@ -22,5 +22,5 @@ index 474644b871f..c7a117fd134 100644
|
|||
FcObjectSetDestroy(os);
|
||||
FcPatternDestroy(pattern);
|
||||
--
|
||||
2.39.2
|
||||
2.42.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 61ae6e04388dd40e11c214d56f22f8f2007bf35f Mon Sep 17 00:00:00 2001
|
||||
From 7f573f00fb850a08017d9f1e3c73b4d7efeb84f2 Mon Sep 17 00:00:00 2001
|
||||
From: Nick Cao <nickcao@nichi.co>
|
||||
Date: Wed, 12 Apr 2023 10:13:50 +0800
|
||||
Subject: [PATCH 6/6] qtbase: qt-cmake: always use cmake from path
|
||||
Subject: [PATCH 06/11] qtbase: qt-cmake: always use cmake from path
|
||||
|
||||
The generated qt-cmake scripts embeds the absolute path of cmake used
|
||||
during the build of qtbase, bloating the runtime closure of qtbase.
|
||||
|
|
@ -28,5 +28,5 @@ index f719257f602..571ffe788fa 100755
|
|||
toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake"
|
||||
|
||||
--
|
||||
2.39.2
|
||||
2.42.0
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue