Merge master into staging-next
This commit is contained in:
github-actions[bot]
+3
-3
@@ -220,10 +220,10 @@ rec {
|
||||
(if isList example then "${pkgsText}." + concatStringsSep "." example else example);
|
||||
});
|
||||
|
||||
/* Alias of mkPackageOption. Previously used to create options with markdown
|
||||
documentation, which is no longer required.
|
||||
/* Deprecated alias of mkPackageOption, to be removed in 25.05.
|
||||
Previously used to create options with markdown documentation, which is no longer required.
|
||||
*/
|
||||
mkPackageOptionMD = mkPackageOption;
|
||||
mkPackageOptionMD = lib.warn "mkPackageOptionMD is deprecated and will be removed in 25.05; please use mkPackageOption." mkPackageOption;
|
||||
|
||||
/* This option accepts anything, but it does not produce any result.
|
||||
|
||||
|
||||
@@ -11348,6 +11348,12 @@
|
||||
githubId = 1769386;
|
||||
name = "Liam Diprose";
|
||||
};
|
||||
liarokapisv = {
|
||||
email = "liarokapis.v@gmail.com";
|
||||
github = "liarokapisv";
|
||||
githubId = 19633626;
|
||||
name = "Alexandros Liarokapis";
|
||||
};
|
||||
liassica = {
|
||||
email = "git-commit.jingle869@aleeas.com";
|
||||
github = "Liassica";
|
||||
|
||||
@@ -150,6 +150,8 @@
|
||||
not the `hare` package, should be added to `nativeBuildInputs` when building
|
||||
Hare programs.
|
||||
|
||||
- [`lib.options.mkPackageOptionMD`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOptionMD) is now obsolete; use the identical [`lib.options.mkPackageOption`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOption) instead.
|
||||
|
||||
- To facilitate dependency injection, the `imgui` package now builds a static archive using vcpkg' CMake rules.
|
||||
The derivation now installs "impl" headers selectively instead of by a wildcard.
|
||||
Use `imgui.src` if you just want to access the unpacked sources.
|
||||
|
||||
@@ -9,7 +9,7 @@ in
|
||||
programs.screen = {
|
||||
enable = lib.mkEnableOption "screen, a basic terminal multiplexer";
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "screen" { };
|
||||
package = lib.mkPackageOption pkgs "screen" { };
|
||||
|
||||
screenrc = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
|
||||
@@ -35,7 +35,7 @@ in
|
||||
default = 5050;
|
||||
};
|
||||
|
||||
package = mkPackageOptionMD pkgs "pgadmin4" { };
|
||||
package = mkPackageOption pkgs "pgadmin4" { };
|
||||
|
||||
initialEmail = mkOption {
|
||||
description = "Initial email for the pgAdmin account";
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
cfg = config.services.desktopManager.plasma6;
|
||||
|
||||
inherit (pkgs) kdePackages;
|
||||
inherit (lib) literalExpression mkDefault mkIf mkOption mkPackageOptionMD types;
|
||||
inherit (lib) literalExpression mkDefault mkIf mkOption mkPackageOption types;
|
||||
|
||||
activationScript = ''
|
||||
# will be rebuilt automatically
|
||||
@@ -29,7 +29,7 @@ in {
|
||||
description = "Enable Qt 5 integration (theming, etc). Disable for a pure Qt 6 system.";
|
||||
};
|
||||
|
||||
notoPackage = mkPackageOptionMD pkgs "Noto fonts - used for UI by default" {
|
||||
notoPackage = mkPackageOption pkgs "Noto fonts - used for UI by default" {
|
||||
default = ["noto-fonts"];
|
||||
example = "noto-fonts-lgc-plus";
|
||||
};
|
||||
|
||||
@@ -36,7 +36,7 @@ in
|
||||
options = {
|
||||
enable = mkEnableOption "armagetronad";
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "armagetronad-dedicated" {
|
||||
package = lib.mkPackageOption pkgs "armagetronad-dedicated" {
|
||||
example = ''
|
||||
pkgs.armagetronad."0.2.9-sty+ct+ap".dedicated
|
||||
'';
|
||||
|
||||
@@ -95,7 +95,7 @@ in
|
||||
services.teeworlds = {
|
||||
enable = mkEnableOption "Teeworlds Server";
|
||||
|
||||
package = mkPackageOptionMD pkgs "teeworlds-server" { };
|
||||
package = mkPackageOption pkgs "teeworlds-server" { };
|
||||
|
||||
openPorts = mkOption {
|
||||
type = types.bool;
|
||||
|
||||
@@ -10,7 +10,7 @@ in {
|
||||
services.auto-epp = {
|
||||
enable = lib.mkEnableOption "auto-epp for amd active pstate";
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "auto-epp" {};
|
||||
package = lib.mkPackageOption pkgs "auto-epp" {};
|
||||
|
||||
settings = mkOption {
|
||||
type = types.submodule {
|
||||
|
||||
@@ -11,7 +11,7 @@ in
|
||||
options.services.ebusd = {
|
||||
enable = mkEnableOption "ebusd, a daemon for communication with eBUS heating systems";
|
||||
|
||||
package = mkPackageOptionMD pkgs "ebusd" { };
|
||||
package = mkPackageOption pkgs "ebusd" { };
|
||||
|
||||
device = mkOption {
|
||||
type = types.str;
|
||||
|
||||
@@ -19,7 +19,7 @@ in
|
||||
options.services.matter-server = with types; {
|
||||
enable = mkEnableOption "Matter-server";
|
||||
|
||||
package = mkPackageOptionMD pkgs "python-matter-server" { };
|
||||
package = mkPackageOption pkgs "python-matter-server" { };
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
|
||||
@@ -16,7 +16,7 @@ in {
|
||||
services.gns3-server = {
|
||||
enable = lib.mkEnableOption "GNS3 Server daemon";
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "gns3-server" { };
|
||||
package = lib.mkPackageOption pkgs "gns3-server" { };
|
||||
|
||||
auth = {
|
||||
enable = lib.mkEnableOption "password based HTTP authentication to access the GNS3 Server";
|
||||
@@ -88,17 +88,17 @@ in {
|
||||
|
||||
dynamips = {
|
||||
enable = lib.mkEnableOption ''Dynamips support'';
|
||||
package = lib.mkPackageOptionMD pkgs "dynamips" { };
|
||||
package = lib.mkPackageOption pkgs "dynamips" { };
|
||||
};
|
||||
|
||||
ubridge = {
|
||||
enable = lib.mkEnableOption ''uBridge support'';
|
||||
package = lib.mkPackageOptionMD pkgs "ubridge" { };
|
||||
package = lib.mkPackageOption pkgs "ubridge" { };
|
||||
};
|
||||
|
||||
vpcs = {
|
||||
enable = lib.mkEnableOption ''VPCS support'';
|
||||
package = lib.mkPackageOptionMD pkgs "vpcs" { };
|
||||
package = lib.mkPackageOption pkgs "vpcs" { };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -51,11 +51,11 @@ in
|
||||
|
||||
enable = mkEnableOption "xrdp, the Remote Desktop Protocol server";
|
||||
|
||||
package = mkPackageOptionMD pkgs "xrdp" { };
|
||||
package = mkPackageOption pkgs "xrdp" { };
|
||||
|
||||
audio = {
|
||||
enable = mkEnableOption "audio support for xrdp sessions. So far it only works with PulseAudio sessions on the server side. No PipeWire support yet";
|
||||
package = mkPackageOptionMD pkgs "pulseaudio-module-xrdp" {};
|
||||
package = mkPackageOption pkgs "pulseaudio-module-xrdp" {};
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
|
||||
@@ -19,7 +19,7 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkPackageOptionMD pkgs "hound" { };
|
||||
package = mkPackageOption pkgs "hound" { };
|
||||
|
||||
user = mkOption {
|
||||
default = "hound";
|
||||
|
||||
@@ -9,7 +9,7 @@ in {
|
||||
services.code-server = {
|
||||
enable = lib.mkEnableOption "code-server";
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "code-server" {
|
||||
package = lib.mkPackageOption pkgs "code-server" {
|
||||
example = ''
|
||||
pkgs.vscode-with-extensions.override {
|
||||
vscode = pkgs.code-server;
|
||||
|
||||
@@ -390,7 +390,7 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "http3-ytproxy" { };
|
||||
package = lib.mkPackageOption pkgs "http3-ytproxy" { };
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ in
|
||||
options.services.pretalx = {
|
||||
enable = lib.mkEnableOption "pretalx";
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "pretalx" {};
|
||||
package = lib.mkPackageOption pkgs "pretalx" {};
|
||||
|
||||
group = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
|
||||
@@ -14,7 +14,7 @@ in
|
||||
services.silverbullet = {
|
||||
enable = lib.mkEnableOption "Silverbullet, an open-source, self-hosted, offline-capable Personal Knowledge Management (PKM) web application";
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "silverbullet" { };
|
||||
package = lib.mkPackageOption pkgs "silverbullet" { };
|
||||
|
||||
openFirewall = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
|
||||
@@ -7,7 +7,7 @@ in {
|
||||
options.services.slskd = with lib; with types; {
|
||||
enable = mkEnableOption "slskd";
|
||||
|
||||
package = mkPackageOptionMD pkgs "slskd" { };
|
||||
package = mkPackageOption pkgs "slskd" { };
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
|
||||
@@ -11,7 +11,7 @@ in
|
||||
services.suwayomi-server = {
|
||||
enable = mkEnableOption "Suwayomi, a free and open source manga reader server that runs extensions built for Tachiyomi";
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "suwayomi-server" { };
|
||||
package = lib.mkPackageOption pkgs "suwayomi-server" { };
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.path;
|
||||
|
||||
@@ -37,11 +37,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tidal-hifi";
|
||||
version = "5.13.1";
|
||||
version = "5.14.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
|
||||
sha256 = "sha256-TnvVm0qjm41if90+f9YtO8wR6NYg6oUZbZd0RiUU33M=";
|
||||
sha256 = "sha256-3oVQyFtAFqlh4GOgavN2e2TVhCILg6Rhf5GZcot+aKo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
|
||||
|
||||
@@ -23,16 +23,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ludusavi";
|
||||
version = "0.23.0";
|
||||
version = "0.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtkennerly";
|
||||
repo = "ludusavi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3Z/v3+3mrmPV2Rb/5tM+h6UN+MEIF/aK07B93Zn38AA=";
|
||||
hash = "sha256-nRNXVJJcpZmAfZwDEBaEFlry1gbITWEw0khtsXnMdm0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bAap8eSXAPLrs5MEX1Pp6gKdp0iLxci4aX+2+ve6Wk0=";
|
||||
cargoHash = "sha256-E5TaE4TlRA0wmRUiwFqivs18X6oiBCmeXrPI1GxKFBI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "greetd";
|
||||
version = "0.10.0";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~kennylevinsen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-QFxE5c4XDOBa3rKpUFur6xOG+5m0NSCOWo7960ZWEow=";
|
||||
sha256 = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-w7V5ZBFy5MIEQKOPPgsc7XnrXsF5rEDNzUKeLPPy4P4=";
|
||||
cargoHash = "sha256-M52Kj14X+vMPKeGwi5pbEuh3F9/a3eVjhsbZI06Jkzs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
scdoc
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "notepad-next";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dail8859";
|
||||
repo = "NotepadNext";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-I2bS8oT/TGf6fuXpTwOKo2MaUo0jLFIU/DfW9h1toOk=";
|
||||
sha256 = "sha256-fwHTsTKcVaeIv0NQQBjzfXscGDfXr3X/yH07YnYh3fU=";
|
||||
# External dependencies - https://github.com/dail8859/NotepadNext/issues/135
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "texstudio";
|
||||
version = "4.8.0";
|
||||
version = "4.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "texstudio-org";
|
||||
repo = "texstudio";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-oPC0HJgBWCAGZ1pVTiHyDO3NQ3u/+1fA2KrxuBCB+IY=";
|
||||
hash = "sha256-gW7LXfXeZ0nXyWchVRyVDDJi725xa4tgYWYnSIhi5Bo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "walk";
|
||||
version = "1.8.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antonmedv";
|
||||
repo = "walk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xs9K8WrckkpyzHnjYlzRsicMW+o7nTMYCIZVWOwx4PU=";
|
||||
hash = "sha256-wGiRMNgp5NZVj8ILyQ2C/iqpjv4XgphRfWcF/CSMj48=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-p92H4JqklrV0c4vp9puAgDzBzMpwI40WPz9ix0e77l8=";
|
||||
vendorHash = "sha256-MTM7zR5OYHbzAm07FTLvXVnESARg50/BZrB2bl+LtXM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal file manager";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xv";
|
||||
version = "5.0.0";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jasper-software";
|
||||
repo = "xv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ATV/LxXQNJB6rjBmurx6a1gRPR8zNuILstvEJoQJhUs=";
|
||||
sha256 = "sha256-fqkGfK8Z6CxJIFhqS56fGF3PNACQRGEtTPcBDZpvUpE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "cobang";
|
||||
version = "0.12.0";
|
||||
version = "0.14.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hongquan";
|
||||
repo = "CoBang";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4INScFnYSwVnGjaohgDL3Sv/NeIwiiyLux8c9/Y/Wq4=";
|
||||
hash = "sha256-/8JtDoXFQGlM7tlwKd+WRIKpnKCD6OnMmbvElg7LbzU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "Collision";
|
||||
version = "3.8.0";
|
||||
version = "3.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GeopJr";
|
||||
repo = "Collision";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Bo/u0UYM/N7tLqdCs2OU5pdj2s9LXPooSR1PCGk9dSc=";
|
||||
hash = "sha256-55qCHc+snMAUFAT31Z8EPtJ/HLrnv1BveCEzjkn7N5g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
};
|
||||
gi-crystal = {
|
||||
url = "https://github.com/hugopl/gi-crystal.git";
|
||||
rev = "v0.22.2";
|
||||
sha256 = "0bpa1f8iaf97z2kbgjc7nc8km7nd7bppiwna319lm2hvm8m5pw15";
|
||||
rev = "v0.22.3";
|
||||
sha256 = "1xyj5bf3l2i1yzqxb8yyj0fc3kwi9nnd57n5dhs5xm9jxzcvw1kk";
|
||||
};
|
||||
gtk4 = {
|
||||
url = "https://github.com/hugopl/gtk4.cr.git";
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "fluidd";
|
||||
version = "1.30.0";
|
||||
version = "1.30.1";
|
||||
|
||||
src = fetchurl {
|
||||
name = "fluidd-v${version}.zip";
|
||||
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
|
||||
sha256 = "sha256-+nPVnKuZtYGFtqC48XNISSjay3lDAYR3l50kq026H3Q=";
|
||||
sha256 = "sha256-R8lCAZkClmCFkiNPf9KGlzj2td3KxCx/7UkdTJgDtwY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qcad";
|
||||
version = "3.30.0.0";
|
||||
version = "3.30.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "qcad-${version}-src";
|
||||
owner = "qcad";
|
||||
repo = "qcad";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KpY/GjagRx0XkH18dDJcf6JfkT/0V8ZHJ5DHtAEUaF4=";
|
||||
hash = "sha256-hZe1rTRkvdKC/row0Li6hsmOcLKkMULo9ScOvvjmWCA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "avalanchego";
|
||||
version = "1.11.7";
|
||||
version = "1.11.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pdfZMKsNKmQVUfYobaOdUqGgP99fatEpgn0AHt0bIBQ=";
|
||||
hash = "sha256-lb0kjPvpjqHQ+DUdrQmaSIaxEdwsOq29RTe3zL25NQc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CN+2+aOOPF7gouvp7lCfRIKA1quNCcrvzHg8lF6J4f8=";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
buildGoModule rec {
|
||||
pname = "bosh-cli";
|
||||
|
||||
version = "7.6.0";
|
||||
version = "7.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-buhRRgwCOVTnlVLzAL4T9ymgMTIcvelHyv6mfPK61eM=";
|
||||
sha256 = "sha256-A8IRxt6bEDKZwzLCh+O1Z4vwyee5rMCqrCoSplGkPIc=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZZkDc5INjUoNc9zcwbOa9WRIkkLr9bm3mohsSe3tKI4=";
|
||||
hash = "sha256-CqUAySELc9jMQD6+BCgnvajEDv8FjU4Ita7v0EFrPug=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ALRnccGjPGuAITtuz79Cao95NhvSczAzspSMXytlw+A=";
|
||||
|
||||
@@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec{
|
||||
pname = "pinniped";
|
||||
version = "0.30.0";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "pinniped";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tF4MIWHn9NvuZ94mwEujUNs34lvbnmH7oc7ur/jbd9c=";
|
||||
sha256 = "sha256-ypl8P66SEoHpaqAgFA90bJmiVvH4SvymCMVz1o9x9mQ=";
|
||||
};
|
||||
|
||||
subPackages = "cmd/pinniped";
|
||||
|
||||
vendorHash = "sha256-vqchVDAw63QyG8ZL2n+YGcMjVt8IUxkFUPHpWt0d/Qk=";
|
||||
vendorHash = "sha256-Tl5o/ytwdGT0bSa8ep7YSaSMM9rk8+Zx1SFgFGh9u6k=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "deck";
|
||||
version = "1.38.0";
|
||||
version = "1.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kong";
|
||||
repo = "deck";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9bEPkEeKOVFETSo5HEFWbuhx7+mWwogGm1jN18Vj/Sw=";
|
||||
hash = "sha256-9n8XAeSZn2HD8Vg2B8YmBUQ+VPBglgjN+QjrSOgn65Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -21,7 +21,7 @@ buildGoModule rec {
|
||||
];
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-eWDnZNNXgvIiDiKEpkVEL/JpEfy7WKtSAUA6riCrMdc=";
|
||||
vendorHash = "sha256-2lR2/jHOFmKm3s+EPNRFLlgJHIs+33YDt1YeHBWRin0=";
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd deck \
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signal-cli";
|
||||
version = "0.13.3";
|
||||
version = "0.13.4";
|
||||
|
||||
# Building from source would be preferred, but is much more involved.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
|
||||
hash = "sha256-JNDl/esJdY+L+CGCAauPSeUID5eAaKChHqMf+jl4HuQ=";
|
||||
hash = "sha256-R+ylymM0k9wvK12qo+S1Ezu2kheH1x4Ll3VFR7HKVXo=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "twitch-tui";
|
||||
version = "2.6.12";
|
||||
version = "2.6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Xithrius";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mEpeuopMzZhWOAikEP7Er8xcgNkGbCTkJJYrQr7GrBQ=";
|
||||
hash = "sha256-VEcBPiekjiDjXYTz/gqjES8N77GgwPdWRUJJ3twLmgU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-U9L4SrYTAUcQ9/2f8tD7jxByVQS9P6OXpra6QvbhNNg=";
|
||||
cargoHash = "sha256-uhm6Z4oJ8w1tN3VDtCNF2/pixNLCXnaEg8yyUSTJRnM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -16,11 +16,11 @@ assert lib.assertOneOf "sslLibrary" sslLibrary ["gnutls" "openssl" "no"];
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpop";
|
||||
version = "1.4.18";
|
||||
version = "1.4.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-YJmVAYT30JSngtHnq5gzc28SMI00pUSlm0aoRx2fhbc=";
|
||||
sha256 = "sha256-I8QeE8b/68qt4sNsn9RivyX2I+SBuwYnz+CT4DpVXIo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "wdt";
|
||||
version = "1.27.1612021-unstable-2024-05-21";
|
||||
version = "1.27.1612021-unstable-2024-06-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "wdt";
|
||||
rev = "6263fee3bebc8bb0012e095723170f70b99ff67d";
|
||||
sha256 = "sha256-CxwRfjPkR7d+Poe+8+TbBGcsK90EwupCyLqUkxUlITs=";
|
||||
rev = "aab22d7284dbc470df36146a8885335760b47b0c";
|
||||
sha256 = "sha256-nWdZfbwAIwyaOMsAE94MrkHHRmwrFyFZRmYno+2/5mQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "termius";
|
||||
version = "8.1.2";
|
||||
version = "8.12.9";
|
||||
|
||||
src = fetchurl {
|
||||
# find the latest version with
|
||||
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
|
||||
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r
|
||||
# and the sha512 with
|
||||
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_167.snap";
|
||||
hash = "sha512-M/cyLfSnoCFJcdGXlA5/kH/MuyRpYcfBoyp6y6KSsTyh8Goq6niGZAQcCdIjNX8KVUvmcTWISsx8so4W5BrkCw==";
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_194.snap";
|
||||
hash = "sha512-48SHa0KQzbDRD9Z6qb63jH+8/jcjGefSjqsCK52Ob2vnzDDBdsmrRLmFDs/K/FBIjzFV4GAjQx61v9jQtvAsmA==";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
let
|
||||
pname = "jbrowse";
|
||||
version = "2.11.2";
|
||||
version = "2.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage";
|
||||
sha256 = "sha256-7kZsK3vYgxubgtoIG1dByHgEBOlh9GUq+i3u/1eo0/o=";
|
||||
sha256 = "sha256-dnvs+niNo8VPuOk9uODezLxdghwutLuhgG5Jyxi8mW0=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -27,14 +27,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "boinc";
|
||||
version = "8.0.3";
|
||||
version = "8.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "${pname}-${version}-src";
|
||||
owner = "BOINC";
|
||||
repo = "boinc";
|
||||
rev = "client_release/${lib.versions.majorMinor version}/${version}";
|
||||
hash = "sha256-kkEEJp7NTpHwbo03BGjjJAraFQIJcoNyV+oDsCZlzPQ=";
|
||||
hash = "sha256-e0zEdiN3QQHj6MNGd1pfaZf3o9rOpCTmuNSJQb3sss4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shotcut";
|
||||
version = "24.04.28";
|
||||
version = "24.06.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mltframework";
|
||||
repo = "shotcut";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-iMg2XrTrLFZXXvnJ7lMdkxf/LTaL9bh9Nc2jsPOS0eo=";
|
||||
hash = "sha256-zqP3xGaNx6z3DdEyKZTauXGTY16dZPL/2+gKtgdx4Y8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
|
||||
|
||||
@@ -6,16 +6,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "stratovirt";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitee.com/openeuler/stratovirt.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-f5710f7Lz7ul1DYrC0CAfDR+7e1NrE9ESPdB8nlVUKw=";
|
||||
sha256 = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI=";
|
||||
};
|
||||
patches = [ ./micro_vm-allow-SYS_clock_gettime.patch ];
|
||||
|
||||
cargoSha256 = "sha256-prs7zkPAKQ99gjW7gy+4+CgEgGhaTTCLPTbLk/ZHdts=";
|
||||
cargoSha256 = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From c5ef87eb831f7f77c0564dd1dce92a579e7c4747 Mon Sep 17 00:00:00 2001
|
||||
From: Astro <astro@spaceboyz.net>
|
||||
Date: Sun, 18 Jun 2023 23:10:23 +0200
|
||||
Subject: [PATCH] micro_vm: allow SYS_clock_gettime
|
||||
|
||||
---
|
||||
machine/src/micro_vm/syscall.rs | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/machine/src/micro_vm/syscall.rs b/machine/src/micro_vm/syscall.rs
|
||||
index c37d3f4e..f9e7cce2 100644
|
||||
--- a/machine/src/micro_vm/syscall.rs
|
||||
+++ b/machine/src/micro_vm/syscall.rs
|
||||
@@ -125,6 +125,8 @@ pub fn syscall_whitelist() -> Vec<BpfRule> {
|
||||
BpfRule::new(libc::SYS_readlink),
|
||||
BpfRule::new(libc::SYS_getrandom),
|
||||
BpfRule::new(libc::SYS_fallocate),
|
||||
+ #[cfg(target_env = "gnu")]
|
||||
+ BpfRule::new(libc::SYS_clock_gettime),
|
||||
madvise_rule(),
|
||||
]
|
||||
}
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@@ -68,7 +68,7 @@ linkDLLsInfolder() {
|
||||
markFileAsDone "$file"
|
||||
if [ ! -e "./$file" ]; then
|
||||
local pathsFound
|
||||
readarray -d '' pathsFound < <(find "${searchPaths[@]}" -name "$file" -type f -print0)
|
||||
readarray -d '' pathsFound < <(find -L "${searchPaths[@]}" -name "$file" -type f -print0)
|
||||
if [ ${#pathsFound[@]} -eq 0 ]; then continue; fi
|
||||
local dllPath
|
||||
dllPath="${pathsFound[0]}"
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-swift";
|
||||
version = "0.6.1";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antoniusnaumann";
|
||||
repo = "cargo-swift";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hTlgIPXXdhxFtK/acXITwitIg1DGgF4cCVaAxogWPrk=";
|
||||
hash = "sha256-2jKu1Hl+2HnlZWu+mLmrhrhzH1Q/S9ej+SJyjeMr4CI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6F4CX9uiCfPbgFRZ0hC/s5xT42S2V5ZgGQ+O2bHb9vg=";
|
||||
cargoHash = "sha256-PQkV2Gz1whIM772bGAEC0TQO9w4DaWSrtCejgVCFTpA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo plugin to easily build Swift packages from Rust code";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdecl";
|
||||
version = "17.0";
|
||||
version = "17.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paul-j-lucas";
|
||||
repo = "cdecl";
|
||||
rev = "refs/tags/cdecl-${finalAttrs.version}";
|
||||
hash = "sha256-ElMmsFD4VXF6BFjFuuWmgFJaqCPCxpQB7S9tLkeGmMY=";
|
||||
hash = "sha256-hzsTtUlxyG5dKmKZKR9lxPHczI0jd06d1RGvb9crbyE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -13,10 +13,10 @@ let
|
||||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-38ESKfQXHqHdP+vu/ynCByIPYHcvt8w8SJ/NTmCpm8o=";
|
||||
aarch64-linux = "sha256-W00MyiBPQa8vClIjDynDgYEeigjWtBuDfNzZKMEzifg=";
|
||||
x86_64-darwin = "sha256-CkKuEuYfq/vUv8uc4mhKpjqAfGM/B8goJ5EPAsA1gnI=";
|
||||
aarch64-darwin = "sha256-aX70EfrRzEz2DJIcSEXrd0T0ptHzie21CQx4g6dU7g0=";
|
||||
x86_64-linux = "sha256-uihbLR6JEhj99jz4++7E5z1INBtCskGmZjsTucGznlQ=";
|
||||
aarch64-linux = "sha256-N/YklwW8T2+Go9kQDZPdGYmgiHHEs4yoOmdPEoH8iqU=";
|
||||
x86_64-darwin = "sha256-NLv4lZCQ5jFvQdS9c37/bXcCANzXrIsobhZEWxeK4XY=";
|
||||
aarch64-darwin = "sha256-mLcvgVe9VF9eta7m/jrGgDQx56uDDsOKPTi5Pp6nS3g=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
bin = "$out/bin/codeium_language_server";
|
||||
@@ -24,7 +24,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "codeium";
|
||||
version = "1.8.61";
|
||||
version = "1.8.69";
|
||||
src = fetchurl {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
|
||||
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
|
||||
|
||||
@@ -8,15 +8,18 @@
|
||||
rustPlatform,
|
||||
|
||||
cups,
|
||||
ffmpeg,
|
||||
firefox-unwrapped,
|
||||
libcanberra-gtk3,
|
||||
libglvnd,
|
||||
libnotify,
|
||||
libpulseaudio,
|
||||
libva,
|
||||
mesa,
|
||||
nixosTests,
|
||||
openssl,
|
||||
pciutils,
|
||||
pipewire,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
udev,
|
||||
@@ -68,11 +71,14 @@ rustPlatform.buildRustPackage rec {
|
||||
libs =
|
||||
lib.optionals stdenv.isLinux [
|
||||
cups
|
||||
ffmpeg
|
||||
libglvnd
|
||||
libnotify
|
||||
libpulseaudio
|
||||
libva
|
||||
mesa
|
||||
pciutils
|
||||
pipewire
|
||||
udev
|
||||
xorg.libXScrnSaver
|
||||
]
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "igir";
|
||||
version = "2.7.0";
|
||||
version = "2.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emmercm";
|
||||
repo = "igir";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tfwXvLUcueGnImzmfUTV7l00+peLlJsxhreejoSVPPo=";
|
||||
hash = "sha256-EKY9vzN4JYq+ydcjNZPHSqh5Tf6bLeDh1bwkPw01oK8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-MpTGG/ySZ6xw+bW+AEFQqEFbN2FutopkLXtx0VlqmjE=";
|
||||
npmDepsHash = "sha256-7d/aMaKo3gsQ8PI8pSqRrv07k8+xBIpaHL+DPxAGTio=";
|
||||
|
||||
# I have no clue why I have to do this
|
||||
postPatch = ''
|
||||
|
||||
@@ -27,7 +27,7 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "jellyfin-web";
|
||||
version = "10.9.6";
|
||||
version = "10.9.7";
|
||||
|
||||
src =
|
||||
assert version == jellyfin.version;
|
||||
@@ -35,10 +35,10 @@ buildNpmPackage' rec {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-web";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cKMKcT2roah35Pv36KJqYIhwoYXaT1yYfvOsxbt+EfE=";
|
||||
hash = "sha256-vjp96NTcSY1Uj1PeEOPIdZuMFNcO3ZyjRvYYT0AQCrk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-9uAFWlbzDzd8f8G/v/eLWJ3Is4aO5mqEd4o/YZXDkTQ=";
|
||||
npmDepsHash = "sha256-CKUssg4YWZd2Gzz7FtO5zA4ngQeLXkFu0VskXrFNwjM=";
|
||||
|
||||
npmBuildScript = [ "build:production" ];
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "jellyfin";
|
||||
version = "10.9.6"; # ensure that jellyfin-web has matching version
|
||||
version = "10.9.7"; # ensure that jellyfin-web has matching version
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ze1KO+Rx4sz8qdKa1U2g096Ck/Qc+JdQj4MNqaJRhb8=";
|
||||
sha256 = "sha256-jxOFbmYrgxP6jbjnWubajqXInLXu7TO4vssU4E1oeoc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sqlite ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "leetgo";
|
||||
version = "1.4.1";
|
||||
version = "1.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "j178";
|
||||
repo = "leetgo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LbY7GGPu2ZwcclCmsE9V421FUi+foR7CXyFHF7GrjQo=";
|
||||
hash = "sha256-K/PaQakX0ZLu2Uh906kZ4p8J+GV7ewAeSVFMMQiKYBA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GG9IfM50uVhsQVjXhUrYxuEbPlbsEsFubmUUSMr5SD4=";
|
||||
vendorHash = "sha256-4QSfZzYLjPdGKLySP57fK9n6WXdCYzb3sWibfP85jLE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "makejinja";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirkolenz";
|
||||
repo = "makejinja";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sH4m+rcHA6nW21xEJon10lS7e5QiFwUyvV49NZ3UY+s=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-F56y+TxDD/B67ncnBTOd0FZGmXO/zjXitwbk/5aiekM=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ poetry-core ];
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mercure";
|
||||
version = "0.16.0";
|
||||
version = "0.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dunglas";
|
||||
repo = "mercure";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HHErk1KX8HgAt4UrBuchK6ysNsxEsrf5uBzzvSNz+to=";
|
||||
hash = "sha256-HqeF/Wr5ngf6hpFrZAL8kdHcMuxUslWsjtlOq4+C48s=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/caddy";
|
||||
|
||||
vendorHash = "sha256-aO0EvxZNOCAaqEWN1VIdPpS+y8KcsuXo7o8msicspNE=";
|
||||
vendorHash = "sha256-mRyzih46M635uQ9kIQ1vIe/ToN92xlvUcxQ7Bw/Qxiw=";
|
||||
|
||||
subPackages = [ "mercure" ];
|
||||
excludedPackages = [ "../cmd/mercure" ];
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "namespace-cli";
|
||||
version = "0.0.377";
|
||||
version = "0.0.380";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "namespacelabs";
|
||||
repo = "foundation";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GQPur1Rc0o7WyCNwXLiu7w3sntQQ/B7WhKHCKVmqH/8=";
|
||||
hash = "sha256-DAOSkWT+fe0av0EpjK8HxgIei6urgFJrNeMdZfrDqDM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-72cHswoTZszo42NOrPNuokDlqoJ3/YEhGe+rQSKvgAw=";
|
||||
vendorHash = "sha256-y+mXUzkY5w2hYECtfcBBUCWsRwhip6IhX617lRX698Q=";
|
||||
|
||||
subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"];
|
||||
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{ stdenv
|
||||
, cmake
|
||||
, python3
|
||||
, writeTextFile
|
||||
, protobuf
|
||||
, src
|
||||
, version
|
||||
}:
|
||||
let
|
||||
pyproject_toml = writeTextFile {
|
||||
name = "pyproject.toml";
|
||||
text = ''
|
||||
[build-system]
|
||||
requires = ["setuptools"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[tool.setuptools]
|
||||
include-package-data = true
|
||||
|
||||
[tool.setuptools.packages.find]
|
||||
where = ["src"]
|
||||
|
||||
[tool.setuptools.package-data]
|
||||
"*" = ["nanopb.proto"]
|
||||
|
||||
[project]
|
||||
name = "nanopb"
|
||||
version = "${version}"
|
||||
dependencies = [
|
||||
"setuptools",
|
||||
"protobuf",
|
||||
"six"
|
||||
]
|
||||
'';
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "nanopb-generator-out";
|
||||
inherit src version;
|
||||
|
||||
nativeBuildInputs = [ cmake protobuf python3 ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-Dnanopb_BUILD_RUNTIME=OFF"
|
||||
"-Dnanopb_BUILD_GENERATOR=ON"
|
||||
"-Dnanopb_PYTHON_INSTDIR_OVERRIDE=$out/lib/python/site-packages"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
cmakeFlags+=" -Dnanopb_PYTHON_INSTDIR_OVERRIDE=$out/lib/python/site-packages"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/include
|
||||
rm -rf $out/lib/cmake
|
||||
ln -s $out/lib/python/site-packages $out/src
|
||||
ln -s ${pyproject_toml} $out/pyproject.toml
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
{ python3
|
||||
, stdenvNoCC
|
||||
, protobuf
|
||||
, version
|
||||
, generator-out
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "nanopb-generator";
|
||||
inherit version;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.wrapPython ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
protobuf
|
||||
python3.pkgs.nanopb-proto
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp ${generator-out}/bin/protoc-gen-nanopb $out/bin/
|
||||
cp ${generator-out}/bin/nanopb_generator $out/bin/
|
||||
wrapPythonPrograms
|
||||
cp ${generator-out}/bin/nanopb_generator.py $out/bin/
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,122 @@
|
||||
{ stdenvNoCC
|
||||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, buildPackages
|
||||
, lib
|
||||
, enableMalloc ? false
|
||||
, noPackedStructs ? false
|
||||
, maxRequiredFields ? null
|
||||
, field32bit ? false
|
||||
, noErrmsg ? false
|
||||
, bufferOnly ? false
|
||||
, systemHeader ? null
|
||||
, without64bit ? false
|
||||
, encodeArraysUnpacked ? false
|
||||
, convertDoubleFloat ? false
|
||||
, validateUtf8 ? false
|
||||
, littleEndian8bit ? false
|
||||
, c99StaticAssert ? false
|
||||
, noStaticAssert ? false
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (self:
|
||||
let
|
||||
generator-out = buildPackages.callPackage ./generator-out.nix { inherit (self) src version; };
|
||||
python-module = buildPackages.callPackage ./python-module.nix {
|
||||
inherit (self) version;
|
||||
inherit (self.passthru) generator-out;
|
||||
};
|
||||
python3 = buildPackages.python3.override {
|
||||
packageOverrides = _: _: {
|
||||
nanopb-proto = self.passthru.python-module;
|
||||
};
|
||||
};
|
||||
generator = buildPackages.callPackage ./generator.nix {
|
||||
inherit python3;
|
||||
inherit (self) version;
|
||||
inherit (self.passthru) generator-out;
|
||||
};
|
||||
runtime = callPackage ./runtime.nix {
|
||||
inherit python3;
|
||||
inherit (self) src version;
|
||||
inherit
|
||||
enableMalloc
|
||||
noPackedStructs
|
||||
maxRequiredFields
|
||||
field32bit
|
||||
noErrmsg
|
||||
bufferOnly
|
||||
systemHeader
|
||||
without64bit
|
||||
encodeArraysUnpacked
|
||||
convertDoubleFloat
|
||||
validateUtf8
|
||||
littleEndian8bit
|
||||
c99StaticAssert
|
||||
noStaticAssert;
|
||||
};
|
||||
in
|
||||
{
|
||||
pname = "nanopb";
|
||||
version = "0.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nanopb";
|
||||
repo = "nanopb";
|
||||
rev = self.version;
|
||||
hash = "sha256-LfARVItT+7dczg2u08RlXZLrLR7ScvC44tgmcy/Zv48=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
dontUnpack = true;
|
||||
|
||||
propagatedNativeBuildInputs = [ generator ];
|
||||
|
||||
propagatedBuildInputs = [ runtime ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out
|
||||
ln -s ${generator}/bin $out/bin
|
||||
ln -s ${runtime}/include $out/include
|
||||
ln -s ${runtime}/lib $out/lib
|
||||
mkdir -p $out/share/nanopb/generator/proto
|
||||
ln -s ${self.src}/generator/proto/nanopb.proto $out/share/nanopb/generator/proto/nanopb.proto
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit runtime generator-out python-module generator;
|
||||
tests = {
|
||||
simple-proto2 = callPackage ./test-simple-proto2 { };
|
||||
simple-proto3 = callPackage ./test-simple-proto3 { };
|
||||
message-with-annotations = callPackage ./test-message-with-annotations { };
|
||||
message-with-options = callPackage ./test-message-with-options { };
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
platforms = platforms.all;
|
||||
|
||||
description = "Protocol Buffers with small code size";
|
||||
homepage = "https://jpa.kapsi.fi/nanopb/";
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ kalbasit liarokapisv ];
|
||||
|
||||
longDescription = ''
|
||||
Nanopb is a small code-size Protocol Buffers implementation in ansi C. It
|
||||
is especially suitable for use in microcontrollers, but fits any memory
|
||||
restricted system.
|
||||
|
||||
- Homepage: jpa.kapsi.fi/nanopb
|
||||
- Documentation: jpa.kapsi.fi/nanopb/docs
|
||||
- Downloads: jpa.kapsi.fi/nanopb/download
|
||||
- Forum: groups.google.com/forum/#!forum/nanopb
|
||||
|
||||
In order to use the nanopb options in your proto files, you'll need to
|
||||
tell protoc where to find the nanopb.proto file.
|
||||
You can do so with the --proto_path (-I) option to add the directory
|
||||
''${nanopb}/share/nanopb/generator/proto like so:
|
||||
|
||||
protoc --proto_path=. --proto_path=''${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=''${nanopb}/bin/protoc-gen-nanopb --nanopb_out=out file.proto
|
||||
'';
|
||||
};
|
||||
})
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
{ python3
|
||||
, version
|
||||
, generator-out
|
||||
}:
|
||||
python3.pkgs.buildPythonPackage {
|
||||
pname = "nanopb-python-module";
|
||||
inherit version;
|
||||
src = generator-out;
|
||||
pyproject = true;
|
||||
pythonImportsCheck = [ "nanopb" ];
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
protobuf
|
||||
six
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
{ cmake
|
||||
, lib
|
||||
, stdenv
|
||||
, protobuf
|
||||
, python3
|
||||
, src
|
||||
, version
|
||||
, enableMalloc
|
||||
, noPackedStructs
|
||||
, maxRequiredFields
|
||||
, field32bit
|
||||
, noErrmsg
|
||||
, bufferOnly
|
||||
, systemHeader
|
||||
, without64bit
|
||||
, encodeArraysUnpacked
|
||||
, convertDoubleFloat
|
||||
, validateUtf8
|
||||
, littleEndian8bit
|
||||
, c99StaticAssert
|
||||
, noStaticAssert
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation
|
||||
({
|
||||
pname = "nanopb-runtime";
|
||||
inherit src version;
|
||||
|
||||
nativeBuildInputs = [ cmake protobuf python3 ];
|
||||
|
||||
patchPhase =
|
||||
let
|
||||
compile_definitions = target: ''
|
||||
target_compile_definitions(${target}
|
||||
PUBLIC
|
||||
${lib.concatStringsSep "\n\t" (map (x: "PB_${x.flag}")
|
||||
(builtins.filter (x: x.cond) [
|
||||
{ cond = enableMalloc; flag = "ENABLE_MALLOC=1"; }
|
||||
{ cond = noPackedStructs; flag = "NO_PACKED_STRUCTS=1"; }
|
||||
{ cond = maxRequiredFields != null; flag = "MAX_REQUIRED_FIELDS=${maxRequiredFields}"; }
|
||||
{ cond = field32bit; flag = "FIELD_32BIT=1"; }
|
||||
{ cond = noErrmsg; flag = "NO_ERRMSG=1"; }
|
||||
{ cond = bufferOnly; flag = "BUFFER_ONLY=1"; }
|
||||
{ cond = systemHeader != null; flag = "SYSTEM_HEADER=${systemHeader}"; }
|
||||
{ cond = without64bit; flag = "WITHOUT_64BIT=1"; }
|
||||
{ cond = encodeArraysUnpacked; flag = "ENCODE_ARRAYS_UNPACKED=1"; }
|
||||
{ cond = convertDoubleFloat; flag = "CONVERT_DOUBLE_FLOAT=1"; }
|
||||
{ cond = validateUtf8; flag = "VALIDATE_UTF8=1"; }
|
||||
{ cond = littleEndian8bit; flag = "LITTLE_ENDIAN_8BIT=1"; }
|
||||
{ cond = c99StaticAssert; flag = "C99_STATIC_ASSERT=1"; }
|
||||
{ cond = noStaticAssert; flag = "NO_STATIC_ASSERT=1"; }
|
||||
]))}
|
||||
)
|
||||
'';
|
||||
in
|
||||
''
|
||||
cat << EOF >> CMakeLists.txt
|
||||
${compile_definitions "protobuf-nanopb"}
|
||||
${compile_definitions "protobuf-nanopb-static"}
|
||||
EOF
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DBUILD_STATIC_LIBS=ON"
|
||||
"-Dnanopb_BUILD_GENERATOR=OFF"
|
||||
"-Dnanopb_BUILD_RUNTIME=ON"
|
||||
];
|
||||
})
|
||||
+4
-2
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, protobuf, nanopb }:
|
||||
{ lib, stdenv, nanopb }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nanopb-test-message-with-annotations";
|
||||
@@ -8,6 +8,8 @@ stdenv.mkDerivation {
|
||||
fileset = lib.fileset.unions [ ./withannotations.proto ];
|
||||
};
|
||||
|
||||
buildInputs = [ nanopb ];
|
||||
|
||||
# protoc requires any .proto file to be compiled to reside within it's
|
||||
# proto_path. By default the current directory is automatically added to the
|
||||
# proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did
|
||||
@@ -16,7 +18,7 @@ stdenv.mkDerivation {
|
||||
buildPhase = ''
|
||||
mkdir $out
|
||||
|
||||
${protobuf}/bin/protoc --proto_path=. --proto_path=${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withannotations.proto
|
||||
protoc --proto_path=. --proto_path=${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withannotations.proto
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
+4
-2
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, protobuf, nanopb }:
|
||||
{ lib, stdenv, nanopb }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nanopb-test-message-with-options";
|
||||
@@ -11,6 +11,8 @@ stdenv.mkDerivation {
|
||||
];
|
||||
};
|
||||
|
||||
buildInputs = [ nanopb ];
|
||||
|
||||
# protoc requires any .proto file to be compiled to reside within it's
|
||||
# proto_path. By default the current directory is automatically added to the
|
||||
# proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did
|
||||
@@ -19,7 +21,7 @@ stdenv.mkDerivation {
|
||||
buildPhase = ''
|
||||
mkdir $out
|
||||
|
||||
${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withoptions.proto
|
||||
protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withoptions.proto
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
+4
-2
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, protobuf, nanopb }:
|
||||
{ lib, stdenv, nanopb }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nanopb-test-simple-proto2";
|
||||
@@ -8,6 +8,8 @@ stdenv.mkDerivation {
|
||||
fileset = lib.fileset.unions [ ./simple.proto ];
|
||||
};
|
||||
|
||||
buildInputs = [ nanopb ];
|
||||
|
||||
# protoc requires any .proto file to be compiled to reside within it's
|
||||
# proto_path. By default the current directory is automatically added to the
|
||||
# proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did
|
||||
@@ -16,7 +18,7 @@ stdenv.mkDerivation {
|
||||
buildPhase = ''
|
||||
mkdir $out
|
||||
|
||||
${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out simple.proto
|
||||
protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out simple.proto
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
+5
-2
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, protobuf, nanopb }:
|
||||
{ lib, stdenv, nanopb }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nanopb-test-simple-proto3";
|
||||
@@ -7,6 +7,9 @@ stdenv.mkDerivation {
|
||||
root = ./.;
|
||||
fileset = lib.fileset.unions [ ./simple.proto ];
|
||||
};
|
||||
|
||||
buildInputs = [ nanopb ];
|
||||
|
||||
# protoc requires any .proto file to be compiled to reside within it's
|
||||
# proto_path. By default the current directory is automatically added to the
|
||||
# proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did
|
||||
@@ -15,7 +18,7 @@ stdenv.mkDerivation {
|
||||
buildPhase = ''
|
||||
mkdir $out
|
||||
|
||||
${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out simple.proto
|
||||
protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out simple.proto
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "oelint-adv";
|
||||
version = "5.6.0";
|
||||
version = "5.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oelint_adv";
|
||||
hash = "sha256-8y+7FUxsw5nxyCYdukigyQDkCgcHYLFSoIVmr0P/IVs=";
|
||||
hash = "sha256-Ivlab7l+aNojHICAHHAhojx8RXI8h3jMnl7ehFDkLW0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
Generated
+85
-88
@@ -76,9 +76,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-query"
|
||||
version = "1.0.3"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
|
||||
checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
|
||||
dependencies = [
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
@@ -95,12 +95,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-broadcast"
|
||||
version = "0.7.0"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb"
|
||||
checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
|
||||
dependencies = [
|
||||
"event-listener 5.3.1",
|
||||
"event-listener-strategy 0.5.2",
|
||||
"event-listener",
|
||||
"event-listener-strategy",
|
||||
"futures-core",
|
||||
"pin-project-lite",
|
||||
]
|
||||
@@ -112,7 +112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
|
||||
dependencies = [
|
||||
"concurrent-queue",
|
||||
"event-listener-strategy 0.5.2",
|
||||
"event-listener-strategy",
|
||||
"futures-core",
|
||||
"pin-project-lite",
|
||||
]
|
||||
@@ -143,9 +143,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-io"
|
||||
version = "2.3.2"
|
||||
version = "2.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
|
||||
checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
|
||||
dependencies = [
|
||||
"async-lock",
|
||||
"cfg-if",
|
||||
@@ -162,20 +162,31 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-lock"
|
||||
version = "3.3.0"
|
||||
version = "3.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
|
||||
checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
|
||||
dependencies = [
|
||||
"event-listener 4.0.3",
|
||||
"event-listener-strategy 0.4.0",
|
||||
"event-listener",
|
||||
"event-listener-strategy",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-process"
|
||||
version = "2.2.2"
|
||||
name = "async-net"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d"
|
||||
checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
|
||||
dependencies = [
|
||||
"async-io",
|
||||
"blocking",
|
||||
"futures-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-process"
|
||||
version = "2.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"async-io",
|
||||
@@ -184,7 +195,7 @@ dependencies = [
|
||||
"async-task",
|
||||
"blocking",
|
||||
"cfg-if",
|
||||
"event-listener 5.3.1",
|
||||
"event-listener",
|
||||
"futures-lite",
|
||||
"rustix",
|
||||
"tracing",
|
||||
@@ -204,9 +215,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-signal"
|
||||
version = "0.2.6"
|
||||
version = "0.2.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda"
|
||||
checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d"
|
||||
dependencies = [
|
||||
"async-io",
|
||||
"async-lock",
|
||||
@@ -251,9 +262,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
|
||||
|
||||
[[package]]
|
||||
name = "backtrace"
|
||||
version = "0.3.72"
|
||||
version = "0.3.73"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
|
||||
checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
|
||||
dependencies = [
|
||||
"addr2line",
|
||||
"cc",
|
||||
@@ -330,9 +341,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.98"
|
||||
version = "1.0.99"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
|
||||
checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
@@ -371,9 +382,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.4"
|
||||
version = "4.5.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
|
||||
checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
@@ -381,9 +392,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.2"
|
||||
version = "4.5.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
|
||||
checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@@ -393,9 +404,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.5.4"
|
||||
version = "4.5.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
|
||||
checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
@@ -405,9 +416,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.7.0"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
|
||||
checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
|
||||
|
||||
[[package]]
|
||||
name = "colorchoice"
|
||||
@@ -475,9 +486,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
|
||||
|
||||
[[package]]
|
||||
name = "enumflags2"
|
||||
version = "0.7.9"
|
||||
version = "0.7.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d"
|
||||
checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
|
||||
dependencies = [
|
||||
"enumflags2_derive",
|
||||
"serde",
|
||||
@@ -485,9 +496,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "enumflags2_derive"
|
||||
version = "0.7.9"
|
||||
version = "0.7.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
|
||||
checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -510,17 +521,6 @@ dependencies = [
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-listener"
|
||||
version = "4.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
|
||||
dependencies = [
|
||||
"concurrent-queue",
|
||||
"parking",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-listener"
|
||||
version = "5.3.1"
|
||||
@@ -532,23 +532,13 @@ dependencies = [
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-listener-strategy"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
|
||||
dependencies = [
|
||||
"event-listener 4.0.3",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-listener-strategy"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
|
||||
dependencies = [
|
||||
"event-listener 5.3.1",
|
||||
"event-listener",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
@@ -692,6 +682,12 @@ version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
|
||||
|
||||
[[package]]
|
||||
name = "hex"
|
||||
version = "0.4.3"
|
||||
@@ -819,9 +815,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.7.2"
|
||||
version = "2.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
|
||||
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
@@ -834,9 +830,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.7.3"
|
||||
version = "0.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
|
||||
checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
|
||||
dependencies = [
|
||||
"adler",
|
||||
]
|
||||
@@ -972,15 +968,15 @@ version = "1.16.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"hermit-abi 0.3.9",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "object"
|
||||
version = "0.35.0"
|
||||
version = "0.36.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
|
||||
checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
@@ -993,12 +989,13 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||
|
||||
[[package]]
|
||||
name = "oo7"
|
||||
version = "0.3.2"
|
||||
version = "0.3.3"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"async-fs",
|
||||
"async-io",
|
||||
"async-lock",
|
||||
"async-net",
|
||||
"blocking",
|
||||
"cbc",
|
||||
"cipher",
|
||||
@@ -1027,7 +1024,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "oo7-cli"
|
||||
version = "0.3.2"
|
||||
version = "0.3.3"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"clap",
|
||||
@@ -1038,7 +1035,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "oo7-portal"
|
||||
version = "0.3.2"
|
||||
version = "0.3.3"
|
||||
dependencies = [
|
||||
"futures-channel",
|
||||
"futures-util",
|
||||
@@ -1137,9 +1134,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||
|
||||
[[package]]
|
||||
name = "piper"
|
||||
version = "0.2.2"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf"
|
||||
checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
|
||||
dependencies = [
|
||||
"atomic-waker",
|
||||
"fastrand",
|
||||
@@ -1154,13 +1151,13 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
|
||||
|
||||
[[package]]
|
||||
name = "polling"
|
||||
version = "3.7.0"
|
||||
version = "3.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3"
|
||||
checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"concurrent-queue",
|
||||
"hermit-abi",
|
||||
"hermit-abi 0.4.0",
|
||||
"pin-project-lite",
|
||||
"rustix",
|
||||
"tracing",
|
||||
@@ -1184,9 +1181,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.84"
|
||||
version = "1.0.85"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"
|
||||
checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
@@ -1455,9 +1452,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.37.0"
|
||||
version = "1.38.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
|
||||
checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"bytes",
|
||||
@@ -1474,9 +1471,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tokio-macros"
|
||||
version = "2.2.0"
|
||||
version = "2.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
|
||||
checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -1588,9 +1585,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
|
||||
|
||||
[[package]]
|
||||
name = "utf8parse"
|
||||
version = "0.2.1"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
|
||||
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
||||
|
||||
[[package]]
|
||||
name = "valuable"
|
||||
@@ -1851,19 +1848,19 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "xdg-home"
|
||||
version = "1.1.0"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e"
|
||||
checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"winapi",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zbus"
|
||||
version = "4.2.2"
|
||||
version = "4.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f"
|
||||
checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5"
|
||||
dependencies = [
|
||||
"async-broadcast",
|
||||
"async-executor",
|
||||
@@ -1876,7 +1873,7 @@ dependencies = [
|
||||
"async-trait",
|
||||
"blocking",
|
||||
"enumflags2",
|
||||
"event-listener 5.3.1",
|
||||
"event-listener",
|
||||
"futures-core",
|
||||
"futures-sink",
|
||||
"futures-util",
|
||||
@@ -1900,9 +1897,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zbus_macros"
|
||||
version = "4.2.2"
|
||||
version = "4.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1"
|
||||
checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d"
|
||||
dependencies = [
|
||||
"proc-macro-crate",
|
||||
"proc-macro2",
|
||||
|
||||
@@ -1,22 +1,23 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, oo7
|
||||
, openssl
|
||||
, pkg-config
|
||||
, testers
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
oo7,
|
||||
openssl,
|
||||
pkg-config,
|
||||
testers,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oo7";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bilelmoussaoui";
|
||||
repo = "oo7";
|
||||
rev = version;
|
||||
hash = "sha256-oNzDjPMPM8opINSHC8T4ivQ6mfRVmN2VXPZAFkBZS8U=";
|
||||
hash = "sha256-KoceqJCxb61EF29Fw9UU2LCHxDR0ExR3lnt85Nqg6tg=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@@ -27,13 +28,9 @@ rustPlatform.buildRustPackage rec {
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 portal/data/oo7-portal.portal $out/share/xdg-desktop-portal/portals/oo7.portal
|
||||
@@ -43,17 +40,21 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.testVersion = testers.testVersion {
|
||||
package = oo7;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
tests.testVersion = testers.testVersion { package = oo7; };
|
||||
|
||||
# TODO: re-enable this when upstream adds a Cargo.lock
|
||||
# updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "James Bond went on a new mission as a Secret Service provider";
|
||||
homepage = "https://github.com/bilelmoussaoui/oo7";
|
||||
changelog = "https://github.com/bilelmoussaoui/oo7/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ getchoo Scrumplex ];
|
||||
maintainers = with maintainers; [
|
||||
getchoo
|
||||
Scrumplex
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "oo7-cli";
|
||||
};
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "orchard";
|
||||
version = "0.19.1";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-q1PKmC5sMBO7dJ1Ne9JWnnepFRr/Ty8K/gJIgachDeI=";
|
||||
hash = "sha256-wmIC5Vzne0fe42lCBj+7kNIDG777meUuehJpgmYnPuw=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -19,7 +19,7 @@ buildGoModule rec {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-icV4MOVzPSCGhFTIixWA02Jcf/7qhQwG4sBx1kRoJks=";
|
||||
vendorHash = "sha256-Irpqg+orQsDv9iof+tGC/Out6hIOmlf3sdHGY80zxdE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
cmark,
|
||||
darwin,
|
||||
extra-cmake-modules,
|
||||
gamemode,
|
||||
ghc_filesystem,
|
||||
jdk17,
|
||||
kdePackages,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
stripJavaArchivesHook,
|
||||
tomlplusplus,
|
||||
zlib,
|
||||
|
||||
msaClientID ? null,
|
||||
gamemodeSupport ? stdenv.isLinux,
|
||||
}:
|
||||
|
||||
let
|
||||
libnbtplusplus = fetchFromGitHub {
|
||||
owner = "PrismLauncher";
|
||||
repo = "libnbtplusplus";
|
||||
rev = "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f";
|
||||
hash = "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug=";
|
||||
};
|
||||
in
|
||||
|
||||
assert lib.assertMsg (
|
||||
gamemodeSupport -> stdenv.isLinux
|
||||
) "gamemodeSupport is only available on Linux.";
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prismlauncher-unwrapped";
|
||||
version = "8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrismLauncher";
|
||||
repo = "PrismLauncher";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-460hB91M2hZm+uU1tywJEj20oRd5cz/NDvya8/vJdSA=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
rm -rf source/libraries/libnbtplusplus
|
||||
ln -s ${libnbtplusplus} source/libraries/libnbtplusplus
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
extra-cmake-modules
|
||||
jdk17
|
||||
stripJavaArchivesHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
cmark
|
||||
ghc_filesystem
|
||||
kdePackages.qtbase
|
||||
kdePackages.quazip
|
||||
tomlplusplus
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
|
||||
++ lib.optional gamemodeSupport gamemode;
|
||||
|
||||
hardeningEnable = lib.optionals stdenv.isLinux [ "pie" ];
|
||||
|
||||
cmakeFlags =
|
||||
[
|
||||
# downstream branding
|
||||
(lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs")
|
||||
]
|
||||
++ lib.optionals (msaClientID != null) [
|
||||
(lib.cmakeFeature "Launcher_MSA_CLIENT_ID" (toString msaClientID))
|
||||
]
|
||||
++ lib.optionals (lib.versionOlder kdePackages.qtbase.version "6") [
|
||||
(lib.cmakeFeature "Launcher_QT_VERSION_MAJOR" "5")
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
# we wrap our binary manually
|
||||
(lib.cmakeFeature "INSTALL_BUNDLE" "nodeps")
|
||||
# disable built-in updater
|
||||
(lib.cmakeFeature "MACOSX_SPARKLE_UPDATE_FEED_URL" "''")
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/")
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Free, open source launcher for Minecraft";
|
||||
longDescription = ''
|
||||
Allows you to have multiple, separate instances of Minecraft (each with
|
||||
their own mods, texture packs, saves, etc) and helps you manage them and
|
||||
their associated options with a simple interface.
|
||||
'';
|
||||
homepage = "https://prismlauncher.org/";
|
||||
changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
minion3665
|
||||
Scrumplex
|
||||
getchoo
|
||||
];
|
||||
mainProgram = "prismlauncher";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,151 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
symlinkJoin,
|
||||
prismlauncher-unwrapped,
|
||||
addOpenGLRunpath,
|
||||
flite,
|
||||
gamemode,
|
||||
glfw,
|
||||
glfw-wayland-minecraft,
|
||||
glxinfo,
|
||||
jdk8,
|
||||
jdk17,
|
||||
jdk21,
|
||||
kdePackages,
|
||||
libGL,
|
||||
libpulseaudio,
|
||||
libusb1,
|
||||
makeWrapper,
|
||||
openal,
|
||||
pciutils,
|
||||
udev,
|
||||
vulkan-loader,
|
||||
xorg,
|
||||
|
||||
additionalLibs ? [ ],
|
||||
additionalPrograms ? [ ],
|
||||
controllerSupport ? stdenv.isLinux,
|
||||
gamemodeSupport ? stdenv.isLinux,
|
||||
jdks ? [
|
||||
jdk21
|
||||
jdk17
|
||||
jdk8
|
||||
],
|
||||
msaClientID ? null,
|
||||
textToSpeechSupport ? stdenv.isLinux,
|
||||
|
||||
# Adds `glfw-wayland-minecraft` to `LD_LIBRARY_PATH`
|
||||
# when launched on wayland, allowing for the game to be run natively.
|
||||
# Make sure to enable "Use system installation of GLFW" in instance settings
|
||||
# for this to take effect
|
||||
#
|
||||
# Warning: This build of glfw may be unstable, and the launcher
|
||||
# itself can take slightly longer to start
|
||||
withWaylandGLFW ? false,
|
||||
}:
|
||||
|
||||
assert lib.assertMsg (
|
||||
controllerSupport -> stdenv.isLinux
|
||||
) "controllerSupport only has an effect on Linux.";
|
||||
|
||||
assert lib.assertMsg (
|
||||
textToSpeechSupport -> stdenv.isLinux
|
||||
) "textToSpeechSupport only has an effect on Linux.";
|
||||
|
||||
assert lib.assertMsg (
|
||||
withWaylandGLFW -> stdenv.isLinux
|
||||
) "withWaylandGLFW is only available on Linux.";
|
||||
|
||||
let
|
||||
prismlauncher' = prismlauncher-unwrapped.override { inherit msaClientID gamemodeSupport; };
|
||||
in
|
||||
|
||||
symlinkJoin {
|
||||
name = "prismlauncher-${prismlauncher'.version}";
|
||||
|
||||
paths = [ prismlauncher' ];
|
||||
|
||||
nativeBuildInputs =
|
||||
[ kdePackages.wrapQtAppsHook ]
|
||||
# purposefully using a shell wrapper here for variable expansion
|
||||
# see https://github.com/NixOS/nixpkgs/issues/172583
|
||||
++ lib.optional withWaylandGLFW makeWrapper;
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
kdePackages.qtbase
|
||||
kdePackages.qtsvg
|
||||
]
|
||||
++ lib.optional (
|
||||
lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.isLinux
|
||||
) kdePackages.qtwayland;
|
||||
|
||||
env = {
|
||||
waylandPreExec = lib.optionalString withWaylandGLFW ''
|
||||
if [ -n "$WAYLAND_DISPLAY" ]; then
|
||||
export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
postBuild =
|
||||
lib.optionalString withWaylandGLFW ''
|
||||
qtWrapperArgs+=(--run "$waylandPreExec")
|
||||
''
|
||||
+ ''
|
||||
wrapQtAppsHook
|
||||
'';
|
||||
|
||||
qtWrapperArgs =
|
||||
let
|
||||
runtimeLibs =
|
||||
[
|
||||
# lwjgl
|
||||
glfw
|
||||
libpulseaudio
|
||||
libGL
|
||||
openal
|
||||
stdenv.cc.cc.lib
|
||||
|
||||
vulkan-loader # VulkanMod's lwjgl
|
||||
|
||||
udev # oshi
|
||||
|
||||
xorg.libX11
|
||||
xorg.libXext
|
||||
xorg.libXcursor
|
||||
xorg.libXrandr
|
||||
xorg.libXxf86vm
|
||||
]
|
||||
++ lib.optional textToSpeechSupport flite
|
||||
++ lib.optional gamemodeSupport gamemode.lib
|
||||
++ lib.optional controllerSupport libusb1
|
||||
++ additionalLibs;
|
||||
|
||||
runtimePrograms = [
|
||||
glxinfo
|
||||
pciutils # need lspci
|
||||
xorg.xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
|
||||
] ++ additionalPrograms;
|
||||
|
||||
in
|
||||
[ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
"--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
|
||||
"--prefix PATH : ${lib.makeBinPath runtimePrograms}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
inherit (prismlauncher'.meta)
|
||||
description
|
||||
longDescription
|
||||
homepage
|
||||
changelog
|
||||
license
|
||||
maintainers
|
||||
mainProgram
|
||||
platforms
|
||||
;
|
||||
};
|
||||
}
|
||||
@@ -8,11 +8,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "proton-pass";
|
||||
version = "1.17.5";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb";
|
||||
hash = "sha256-2dnR/4LpLiQlJebv74/F7L/a5lYPh+AMPqQVIBHvxcg=";
|
||||
hash = "sha256-dP6mXa5KOK35T3LCL/51/wi/dScqNj6bNYFOl4lCbcY=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -1,36 +1,63 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, dpkg
|
||||
, electron
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
dpkg,
|
||||
electron,
|
||||
unzip,
|
||||
}:
|
||||
|
||||
let
|
||||
mainProgram = "proton-mail";
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "protonmail-desktop";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/proton-mail_${version}_amd64.deb";
|
||||
hash = "sha256-opavVpXQmA/VDZ+K/k0NJFwQHUUJhg+bUm/w8Ertopw=";
|
||||
};
|
||||
src =
|
||||
{
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/proton-mail_${version}_amd64.deb";
|
||||
hash = "sha256-KY/rjiJozOQW27FYljy5N1VKuKroJz3V485DPaH01JY=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/Proton.Mail-darwin-x64-${version}.zip";
|
||||
hash = "sha256-I5Yj1JR3DaAmC6WKI4X/d/q9rvmsck9SE3Mx3AY6yvU=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/Proton.Mail-darwin-arm64-${version}.zip";
|
||||
hash = "sha256-j1F8hhLSq/C1WQXGrYnvFK8nNz4qwoA1ohNzPsS3tiY=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system};
|
||||
|
||||
sourceRoot = lib.optionalString stdenv.isDarwin ".";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
] ++ lib.optional stdenv.isLinux dpkg ++ lib.optional stdenv.isDarwin unzip;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r usr/share/ $out/
|
||||
cp -r usr/lib/proton-mail/resources/app.asar $out/share/
|
||||
runHook postInstall
|
||||
'';
|
||||
installPhase =
|
||||
lib.optionalString stdenv.isLinux ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r usr/share/ $out/
|
||||
cp -r usr/lib/proton-mail/resources/app.asar $out/share/
|
||||
runHook postInstall
|
||||
''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/{Applications,bin}
|
||||
cp -r "Proton Mail.app" $out/Applications/
|
||||
makeWrapper $out/Applications/"Proton Mail.app"/Contents/MacOS/Proton\ Mail $out/bin/protonmail-desktop
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
preFixup = lib.optionalString stdenv.isLinux ''
|
||||
makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \
|
||||
--add-flags $out/share/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
@@ -43,10 +70,13 @@ in stdenv.mkDerivation rec {
|
||||
description = "Desktop application for Mail and Calendar, made with Electron";
|
||||
homepage = "https://github.com/ProtonMail/inbox-desktop";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ rsniezek sebtm ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [
|
||||
rsniezek
|
||||
sebtm
|
||||
matteopacini
|
||||
];
|
||||
platforms = [ "x86_64-linux" ] ++ platforms.darwin;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
inherit mainProgram;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "release-plz";
|
||||
version = "0.3.73";
|
||||
version = "0.3.74";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MarcoIeni";
|
||||
repo = "release-plz";
|
||||
rev = "release-plz-v${version}";
|
||||
hash = "sha256-QRKXg/6hiF7P3yQ6wFZ5JG2aRaGX7rQU0DB2L97LKsg=";
|
||||
hash = "sha256-6Cj23OlIVWnuJC4jpmd7o5L4pUSUkTycZbpu8CzSVM0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aDm4hWosaeAI21iw2Uo315u01kjXCK+LaBwt9jlwgYw=";
|
||||
cargoHash = "sha256-YAijOHu59BWIsS5cYFYbG4zGG0l+x9cqHfEGu3oL5l0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config perl ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
renode.overrideAttrs (finalAttrs: _: {
|
||||
pname = "renode-unstable";
|
||||
version = "1.15.1+20240615gitdd55f8ea4";
|
||||
version = "1.15.1+20240623git05720ced1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
|
||||
hash = "sha256-CxV92sGxRlITi0jhi/O0J/FwLGyJVS7niIzlO3s3pis=";
|
||||
hash = "sha256-xqAkOBdG1tC7uFDxxG6DzQMs9NqG2QtBXACzEGN44u8=";
|
||||
};
|
||||
|
||||
passthru.updateScript =
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sendme";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n0-computer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9ea0HZErwZ1PZwl1jlC3vafm/QnfhFRLYoFIOhxfY/g=";
|
||||
hash = "sha256-hqhUtMZ3x4zePEjglHgQbzyqxijZX4q45Q4nsPwSeWc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4SAvx1G5hBi0il7zmlXFSBAxzqLE7Vezo1ZuVccqhms=";
|
||||
cargoHash = "sha256-Pux0Cqw9ZUrP98ydw7sI0vPZ7w7bcWKTM2FpDv3uzAQ=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks; [
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sploitscan";
|
||||
version = "0.9.1";
|
||||
version = "0.10.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xaitax";
|
||||
repo = "SploitScan";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-l2nLqQoM5TuOezobipBV+s/nXTw37xhop/xpipLL1Bs=";
|
||||
hash = "sha256-UsCGmOjrfk5qsSsnWHEbS3boiC2RFb0Za++yBcCfdJY=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tpnote";
|
||||
version = "1.24.2";
|
||||
version = "1.24.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getreu";
|
||||
repo = "tp-note";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uNW1gb4zmLjOZFtxaBBEQGRGc9C2M8cSARZBa3+FC2k=";
|
||||
hash = "sha256-otV00Lq3xen2kf90EonTbI4SPUob9M+el+5VaHeDPCw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pOiIQU/5z/g4NbdwoYaDdxTfTkxEdddVsmuH54pCOBM=";
|
||||
cargoHash = "sha256-zkq1yho9K4WUyGbf8zsb5abP4jJPv1+RZi2kAlp9BCU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -33,11 +33,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unciv";
|
||||
version = "4.11.16";
|
||||
version = "4.11.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
hash = "sha256-hvWXqPT+GeMaBa7so0S1KjsH5fpnbcbEIWsq6KUbFTk=";
|
||||
hash = "sha256-qKLRn9QmB8lZv8vGGX8JS72IRLEDJV5Zj1MVsPr+iSI=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "vcpkg";
|
||||
version = "2024.05.24";
|
||||
version = "2024.06.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "vcpkg";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-R9iQIEmraXOzPi6rOd7wVV9BMC/wDDEveLIRJmAVISI=";
|
||||
hash = "sha256-eDpMGDtC44eh0elLWV0r1H/WbpVdZ5qMedKh7Ct50Cs=";
|
||||
};
|
||||
|
||||
installPhase = let
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wayidle";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~whynothugo";
|
||||
repo = "wayidle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6wULrwGnXLdrX/THanJThbykKjNKpGukw9dj0jX0/dM=";
|
||||
hash = "sha256-7hFk/YGOQ5+gQy6pT5DRgMLThQ1vFAvUvdHekTyzIRU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zF2s3XSXnN7jVtv/0axzHiIJd/cb6wMYAOQILXp1U5U=";
|
||||
cargoHash = "sha256-PohfLmUoK+2a7Glnje4Rbym2rvzydUJAYW+edOj7qeo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Execute a program when a Wayland compositor reports being N seconds idle";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wideriver";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alex-courtis";
|
||||
repo = "wideriver";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-Jn3DfflDlMSZMlSRBfzQeEUKgYLctd/PiQRWH8uwtlU=";
|
||||
hash = "sha256-D1JHfMnq6u057FrBqgZ4UlfeOlkTWKkKzFYM29+vIJo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Generated
+5
@@ -10,6 +10,8 @@
|
||||
(fetchNuGet { pname = "goaaats.Steamworks"; version = "2.3.4"; sha256 = "1khxkkjvh6af60rxc13bacxn85amdfzr8z0b9a6gfg6m1fnmlkss"; })
|
||||
(fetchNuGet { pname = "ImGui.NET"; version = "1.87.2"; sha256 = "0rv0n18fvz1gbh45crhzn1f8xw8zkc8qyiyj91vajjcry8mq1x7q"; })
|
||||
(fetchNuGet { pname = "KeySharp"; version = "1.0.5"; sha256 = "1ic10v0a174fw6w89iyg4yzji36bsj15573y676cj5n09n6s75d4"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.31"; sha256 = "0hki4z9x60vzcg53s8cxnig4g1xnpqcj629r2cg5q1xw0sknfp5d"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "050dzfy49c4jwcm8dfrz2lqbbyhmgnq485zdhpcnc3w08z0ppbs6"; })
|
||||
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.3"; sha256 = "1z6x0d8lpcfjr3sxy25493i17vvcg5bsay6c03qan6mnj5aqzw2k"; })
|
||||
@@ -20,6 +22,9 @@
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
|
||||
(fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.3"; sha256 = "020214swxm0hip1d9gjskrzmqzjnji7c6l5b3xcch8vp166066m9"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.3"; sha256 = "0dpyjp0hy9kkvk2dd4dclfmb10yq5avsw2a6v8nra9g6ii2p1nla"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.31"; sha256 = "10s0p30qzfn9zibp1ldnqar87hqs47ni3rwqpvwx4jn3589cl9sn"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.31"; sha256 = "19a4ainxj8jxij7ckglbmlnvrjxp72xfgx0r6lbglzh9dhsakwm7"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "0pw2n3j6vbmbghda1cvkhi3c39a49xk0a4w059mfya017adl6kac"; })
|
||||
(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.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
, useSteamRun ? true }:
|
||||
|
||||
let
|
||||
rev = "1.0.8";
|
||||
rev = "1.0.9";
|
||||
in
|
||||
buildDotnetModule rec {
|
||||
pname = "XIVLauncher";
|
||||
@@ -13,7 +13,7 @@ in
|
||||
owner = "goatcorp";
|
||||
repo = "XIVLauncher.Core";
|
||||
inherit rev;
|
||||
hash = "sha256-x4W5L4k+u0MYKDWJu82QcXARW0zjmqqwGiueR1IevMk=";
|
||||
hash = "sha256-UOKJMQPule0swwm5p6OPcOt1SYHji2J4MWvN6nGkj/M=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -24,6 +24,10 @@ in
|
||||
projectFile = "src/XIVLauncher.Core/XIVLauncher.Core.csproj";
|
||||
nugetDeps = ./deps.nix; # File generated with `nix-build -A xivlauncher.passthru.fetch-deps`
|
||||
|
||||
# please do not unpin these even if they match the defaults, xivlauncher is sensitive to .NET versions
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_6_0;
|
||||
|
||||
dotnetFlags = [
|
||||
"-p:BuildHash=${rev}"
|
||||
"-p:PublishSingleFile=false"
|
||||
@@ -31,7 +35,7 @@ in
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace lib/FFXIVQuickLauncher/src/XIVLauncher.Common/Game/Patch/Acquisition/Aria/AriaHttpPatchAcquisition.cs \
|
||||
--replace 'ariaPath = "aria2c"' 'ariaPath = "${aria2}/bin/aria2c"'
|
||||
--replace-fail 'ariaPath = "aria2c"' 'ariaPath = "${aria2}/bin/aria2c"'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -17,7 +17,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "${name}-bin";
|
||||
version = "30.1.1";
|
||||
version = "30.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
|
||||
|
||||
@@ -1,93 +1,93 @@
|
||||
# This file was autogenerated. DO NOT EDIT!
|
||||
{
|
||||
Iosevka = "0ymq4p5chaczhns24n4xal44ppay566pg95zkkkq51ck52f3zf44";
|
||||
IosevkaAile = "1v35phx8ki3yjg43s0fk8snpyc59pa8kg26q56hayxsfrj1dsmck";
|
||||
IosevkaCurly = "0d7sp0w7ryh8wwz4hxyhwimhw3ly668ygm4jcwf2amd3r4xxis5k";
|
||||
IosevkaCurlySlab = "1lajfma7jdwi453jgd3pq1vdgz5zn3f01j502dfiaskqzfan89cb";
|
||||
IosevkaEtoile = "0agg1gg3ymljln8msfask398w58p1wyy5bnzxc0pmmc7ivdajmh4";
|
||||
IosevkaSlab = "1rfzij1p3rybxrq461h3ykpq41hqrgaiwjd7x36dzm4bcm7mga9q";
|
||||
IosevkaSS01 = "0qhzmk8c0npisxqwn2qicxlad2awmnnvik91daidnndwhw4ylq8y";
|
||||
IosevkaSS02 = "15ipbca4c15vs7n62463asl58xshwsrqirhbp23gpr4ixmx2vrmy";
|
||||
IosevkaSS03 = "0nw7jx2smkn8aihcmwkmcqlzs0dhm54qmxrm9102vlsf61dawkpj";
|
||||
IosevkaSS04 = "1bk18a712xjngmv28fzkw6fs560k928b3ahp9w7cvq1xvji5g3qb";
|
||||
IosevkaSS05 = "1xgrbfg1am48j3ps7bnjryyy0pjnx6ahz75zaqwf35cwjb3f5wvf";
|
||||
IosevkaSS06 = "1wk1scyz34dc3dcq1af2c3nla1lh56zbgzx1xinf8qwypb6m01dw";
|
||||
IosevkaSS07 = "1z8gg8h2kbgq7d4lglfl4awbkmzxpjwcqa1xrxxpcpmxa04ppcfq";
|
||||
IosevkaSS08 = "1wid8y6wavxff7b62cxm00y93mjfc3zzjd76g4vgrb7r7ql9kd06";
|
||||
IosevkaSS09 = "06hwzhg4qb8cha7zl32pwzbcnzg1dv8432aq7hzfa0jq2jmvpxax";
|
||||
IosevkaSS10 = "1p8s2lfvr50pacs941gwxp211j4fn9rzxxvprz03swqklvwadir7";
|
||||
IosevkaSS11 = "15izq605ggr2lnc8lljk6lvwkdc87ilx53zw5j7cfdfq8bc6fv6k";
|
||||
IosevkaSS12 = "1xnbap1cm125pdg9x8dbc5lm691fr244k5vblj9mqhaqvbq9pqjs";
|
||||
IosevkaSS13 = "1l98yjgq4zbxnq5xwhlql9m864n2ha0d46xk0b5w32srnaq09ipb";
|
||||
IosevkaSS14 = "0rmd6gc624k3kls98wlz3v407xdq7cynjb06p9zhwxwfy3l9wpwl";
|
||||
IosevkaSS15 = "04qnx6lgp1g3vnwsgbxibjjia2fip1vhf5854kp9dx37qi8qzf7g";
|
||||
IosevkaSS16 = "13xx1s5gv1gly3pnc5rq6zx93rhllmga3k9ik3p86h3kd1valsvb";
|
||||
IosevkaSS17 = "00rc87a09j2v7f1s4spisqgrmlhf67gvvjy14dbmlv7s434z7ap2";
|
||||
IosevkaSS18 = "1fdpsqya1gn939v6b7iwj1sjpskbbxr5ypf0l5rvldxfqisx7zj4";
|
||||
SGr-Iosevka = "0raiapwifmf02560ibic8g47mal8w91wfdcivh8yh7g2ldf5hchr";
|
||||
SGr-IosevkaCurly = "1sg9prv501sa9iy9j4664qsp99d47lmfwn5hqms51kijliplfyfy";
|
||||
SGr-IosevkaCurlySlab = "1g216l92khl22w7833pmwaphvr94zjing3sx8ldnj4py26nvvfqp";
|
||||
SGr-IosevkaFixed = "0f0jk2fhqb4ch5gm6ndip04brchrz20kvs9ja4yarkmild3j1vmg";
|
||||
SGr-IosevkaFixedCurly = "10ayxf5v2yyclpb2gnd06jgkbqvqy0sq5n8vmkjmjb6fx5v0yl7f";
|
||||
SGr-IosevkaFixedCurlySlab = "14iyjj2i29bp084yi7ja1xxh3cl95xiyj29jcwgd6ndzv3xf8ir8";
|
||||
SGr-IosevkaFixedSlab = "0zvm0qy7bjlj9c3gqzip3ldg9lnm3003fdd1s4ks2zvaz6xwk9sy";
|
||||
SGr-IosevkaFixedSS01 = "09npaina3c9rsg84rlm1hadqd64v8i1rjcgbi6d8y5xs01dwn6jg";
|
||||
SGr-IosevkaFixedSS02 = "0r67l52pk1wlqdmfn2wbjkcd4szmpj4d24jcgy5b83gjr3hgmcr4";
|
||||
SGr-IosevkaFixedSS03 = "1dpj0hv1qghwhxqsymvk0xjhjnwxd9av23hr90bi5h10k7rx3nqy";
|
||||
SGr-IosevkaFixedSS04 = "1ffpj0g0jh72x12ibw6mrfkgh87jzhbz4ak15c0yh21rz3bya71a";
|
||||
SGr-IosevkaFixedSS05 = "1q6gw659p5fwgbqb20lzw89px8b0k2p65iasway0a4rihb7am18x";
|
||||
SGr-IosevkaFixedSS06 = "0axqqhlk0811yxnk34kq8a1ayl4cpykjqd7ma9z52y8a1kgdilx2";
|
||||
SGr-IosevkaFixedSS07 = "1jcwwp3w2j1chnn92r2whrq15ka3hfzw96w4ffppwk715s1kc63h";
|
||||
SGr-IosevkaFixedSS08 = "0f5xyr8dgbmgw21z9g12admbj4037lgid9agl6djiavljdn3xwlz";
|
||||
SGr-IosevkaFixedSS09 = "09xi1rrddivsqr2ddw3g10v2y4ybvbwa7p05jl7hz6kwgr1qrqwd";
|
||||
SGr-IosevkaFixedSS10 = "0m6qwkb7svjgskc391dri8vciydzjgx1s91bbsax8gy18mqh3vd7";
|
||||
SGr-IosevkaFixedSS11 = "1l04gmzdpccz1xmjqgn0jhpwxvq1axyqnrmkyafd116q4qszbayf";
|
||||
SGr-IosevkaFixedSS12 = "1i5jx8cffsl1zpjxvyb3m73r82vfh71z4s4dzg55svzh4lkkdfyc";
|
||||
SGr-IosevkaFixedSS13 = "013d0a2kli353vxlrrs5mgwdf1fipv3vsv626izp6whfxfg6pk6h";
|
||||
SGr-IosevkaFixedSS14 = "07n4hkrayr5chy46pa0d86srfaprm8kw56x86wndqj2blk5ydvh6";
|
||||
SGr-IosevkaFixedSS15 = "16lglz0ri7ww68whf8q009qq6kzaygy6lhbps5lmags34jhc9fa5";
|
||||
SGr-IosevkaFixedSS16 = "15j5b2w54bsq8mbi6swq6vd2xvvnnd0j0c3d4dcp4kbhr766841q";
|
||||
SGr-IosevkaFixedSS17 = "14j3miv97mk6hg3q7mafqc57m7z5sg6k7gap53v367793gkz6096";
|
||||
SGr-IosevkaFixedSS18 = "1iylhw0c05gdp48rx8417khs0yih0q917xx8k81bh5xdg0idyjim";
|
||||
SGr-IosevkaSlab = "1wyasyf0ydvh2q0akqvn7bzl66m7kyf2v9p3ry0lgcwv0flrwrpi";
|
||||
SGr-IosevkaSS01 = "1hs0pvamx149l2drvciqnwry75165sq2nvl7g0f4jazclfb4af3c";
|
||||
SGr-IosevkaSS02 = "05pl8asc5zqm1x4lcj00al27da1m301g96zyijsfxx2vybpw53jd";
|
||||
SGr-IosevkaSS03 = "0c60585ss53mzb0swf08r54673a426wq8mamxgnc733yinbsffwx";
|
||||
SGr-IosevkaSS04 = "0yml0y535kl2bid1qflkx3rrq2rq81nxpba18kk7xpscsg04ghjn";
|
||||
SGr-IosevkaSS05 = "03hxlchn96m0ll47rn8lg092c776b1v99pcrsmrlx3x8gslpdlka";
|
||||
SGr-IosevkaSS06 = "04cnymhvm5wi0hb956afi7029acqfqr0djhc1blhpkmldz8pzsn6";
|
||||
SGr-IosevkaSS07 = "1v4khps1z16k59snwxffwwn1y1yj2mp8k4fjkrxli7lb5mrn8lwl";
|
||||
SGr-IosevkaSS08 = "0pvy39fs5carcb0mh3ak8f5hkfjyk2pkmj7nfcaxdgkcgkys2ixn";
|
||||
SGr-IosevkaSS09 = "0cibn02752b2nfjgg12lb10hgigz3a4zcrsc76bh0r9dsgjphscn";
|
||||
SGr-IosevkaSS10 = "165snqk5livrkhpwcssb5b221f6gwwirm5rlsmx8d72y7rlc2vb0";
|
||||
SGr-IosevkaSS11 = "0czb0gxd2cq329123zcmz9axkfpza43kqhn6bi1rq8dgjh4qn0fx";
|
||||
SGr-IosevkaSS12 = "1ycqxpjm5k421a9iwiziab3j69frdgjiz7cwx1k7djqyshqn98k0";
|
||||
SGr-IosevkaSS13 = "18wiv124c868h7qaw6qvdy8xhgh4grfhqri8q2mi8zj5gadkh5yb";
|
||||
SGr-IosevkaSS14 = "1y2cfivf1zg03c2dn9xg5i29zmi4j3mj5diz3kyd68ih4csrzyla";
|
||||
SGr-IosevkaSS15 = "0ghg5f2ay6i2fzbw4xq28hcpbvwjzqvi1pz2nfvd2i2n61960xpr";
|
||||
SGr-IosevkaSS16 = "1132nf2xlsab8mhl5k1fvg8j9j6s1iy1avh5mj7jjb1z2i03z3fb";
|
||||
SGr-IosevkaSS17 = "155vfg5p114vdl722mqdfap3cm25wxydmhldd88n488yr3yviicv";
|
||||
SGr-IosevkaSS18 = "1y76pzsz5gfm0jjw8fa11aajf3zk188xr5fvsf3v89zdzk1ixzgj";
|
||||
SGr-IosevkaTerm = "0rkyy77cdcpf74kw59kbz3l7fs0xl2l0m2zwv8nl4i1x4dbxjj9x";
|
||||
SGr-IosevkaTermCurly = "09r4ag6madsc8889y1r12wk2763pjginrrykrj7w41j11bcvra39";
|
||||
SGr-IosevkaTermCurlySlab = "0bjm43znavfjni7bmi48g4j90v6fp7fg62h32wjvfcpldhycqw8m";
|
||||
SGr-IosevkaTermSlab = "0p4wvgp0nw70gdjn00dqh6vwwsl2fxcl11hf41s0hzr6cj8j0s93";
|
||||
SGr-IosevkaTermSS01 = "1m8n32qs5jlcbfvzjnhm9lafdc1vg2cjya3hb7sphgiiqqjdgkf1";
|
||||
SGr-IosevkaTermSS02 = "14fznvapw4pi3djhfr512pmmlb2air03jkik7d8rw8h69nnragb7";
|
||||
SGr-IosevkaTermSS03 = "14386dbd8yah6j74cp4pddp9cjwi175wg4mq62mi0pxkm1fla578";
|
||||
SGr-IosevkaTermSS04 = "038c4bkcfn8pd18dikipfbv7mqvils3v4fdrhyfmf83770qvkrf0";
|
||||
SGr-IosevkaTermSS05 = "10k49rgwiymbzys8sswfr5ryn1547i1hrg8phb71lbzwxhc4z5m3";
|
||||
SGr-IosevkaTermSS06 = "1pxyydwqbv1f51pdg36pvz5pj45nw28yc0vadj2q3617f2jb2n2h";
|
||||
SGr-IosevkaTermSS07 = "1p1aqqa5h4m6r97q00qf32myfli2fm7lg692aqw45baxxw8sn52l";
|
||||
SGr-IosevkaTermSS08 = "0r7hxaigz66cfgvci88hl0g55177kz3sbb8lji47h1v5r4xhzfl3";
|
||||
SGr-IosevkaTermSS09 = "1ah9kbw9zc0nzfnsyxkbv7wnlaaywyvlkmdv5bfi3ds06w2kjphk";
|
||||
SGr-IosevkaTermSS10 = "08b1l13g4j55sh10pfa6p7z72cvk4r694lml1m9vl4h4ail8w1ml";
|
||||
SGr-IosevkaTermSS11 = "1bqa6d95ga9309m2vr3xzyrhf92dhw3hd3n5awpxip2mfr2k1fbp";
|
||||
SGr-IosevkaTermSS12 = "00949ajl9xzpq7q045wb4hm8hfl94zpyp3fdjx0im7v4k2akzkjp";
|
||||
SGr-IosevkaTermSS13 = "1cdwxb3bykxkr3ifprmh4pwc33cbyrn26d2h1hix9xsjw5nw99c6";
|
||||
SGr-IosevkaTermSS14 = "1k0gwla5xkn8z70m36mhlhs7zm1sj7q33j68mb2wm783lapbll7v";
|
||||
SGr-IosevkaTermSS15 = "1gjac767vi97qs8hqdklzqqb75dz0yx0z9pjr2lribfv0dvxvhss";
|
||||
SGr-IosevkaTermSS16 = "0f738zydh51gvs68f0csax36bf2pi94pqbp0yjjqyrpx5c9m4pq0";
|
||||
SGr-IosevkaTermSS17 = "1rmdb0nbdy47q8v3b7mpb1df5x9yfv7ijs26xwv64aas75hjf8vk";
|
||||
SGr-IosevkaTermSS18 = "0jyidsr9aaccrc9bs7k8m5rj11p6vsxdrl2mslgc2bfwcarg89cm";
|
||||
Iosevka = "16pmskxrr94cgjlqs4rsqqb9mqfaz5m79m6pch3lmivnjrvivg7g";
|
||||
IosevkaAile = "1sxm7lbcxvfadasqq17n379gnbivsmgxkkh8fhdymajzk71y6vhn";
|
||||
IosevkaCurly = "1na30nz2drdig4gvj8l76j2yhz3xggz8vhhmgjxbhq21qwv3lp6m";
|
||||
IosevkaCurlySlab = "0h58sj249nlwsi97mxs27mqn3brqcfg4ph7z8xlyxnxvgc76yz88";
|
||||
IosevkaEtoile = "1nvk1gk0jawnf1v0smrffy1f9v1jwkvg5ah86szwakjmlb4mqr81";
|
||||
IosevkaSlab = "0farri44jsrb0jjj2vlgc5p17nsz9agfa89xpnjw0njccipd95nj";
|
||||
IosevkaSS01 = "0ar951n923nfgyh4d040m0jkyks0csrvcgkbr2ki32qgijz1kf26";
|
||||
IosevkaSS02 = "13f20484xjc28ihx8705ms904n78qp5qq41jmlllbmgdycipba2z";
|
||||
IosevkaSS03 = "1kb7z5bcisx3k02wa682ikynh4s2vv5w7y1zs6qk7gy4gmhaxrhn";
|
||||
IosevkaSS04 = "0ga88f71y517qjb6dskhr8zdhflkl5bvafhv79wgbfffmqk4vpi5";
|
||||
IosevkaSS05 = "0fly6i9irqk092q89irg4yld3s5dx6k03yvibkkrybf369mjzx2h";
|
||||
IosevkaSS06 = "1j8j75468bncksfyf724yc00q5kcddp6q7kmjhnalxg69qjrpkzr";
|
||||
IosevkaSS07 = "03nm4rci5iscrlhncqdhcfcqkvgglg4hxh49yz5n5jcihci10q51";
|
||||
IosevkaSS08 = "0wd8bfra1da2g0c46qxjrjgx25c6mln4a0dxmal8bn1jk3glq1cb";
|
||||
IosevkaSS09 = "0sdw5s1ajbm6fd59xy5ap04s1g89sci2kvq5xfv695744g47lf4m";
|
||||
IosevkaSS10 = "1a9mfrszmv0vlwmjaznwdjgj8c3nippbj6n8py8ld72krs19l8hd";
|
||||
IosevkaSS11 = "0nnvaijqxh8qw88xw1i6migx8skqmq4rs5kls9kwjzy44wvgyly1";
|
||||
IosevkaSS12 = "06jrc9x3z43bdl3wmlfn4ai085p1ymv4wcb85qljzqq12c6adgy5";
|
||||
IosevkaSS13 = "1b18liyi90jy8ca5b9f6p2j8vvl1d8dvvhcxdi30km27s84i8psc";
|
||||
IosevkaSS14 = "15vnsnw21a09y4pzc37x5xizcyc68wj7vr4x6k33iv341m357149";
|
||||
IosevkaSS15 = "1vi4fkzk412g3qn1ba5g9r69k36i66n8xgymf14lf8y1wah46020";
|
||||
IosevkaSS16 = "0cj0j4kjz0fs629pimmhg1jqsxmmsr2m143j0m7nyjf4y4pdkpnm";
|
||||
IosevkaSS17 = "15v6m9wnkr366v1d9cbf9w7zz56x7qrz3265minaslx97lkplv1c";
|
||||
IosevkaSS18 = "0syh5lb9mymvmzn2sv0msncqblg8xx3akarbn2gdv5nb41p3d0hq";
|
||||
SGr-Iosevka = "1k76yvjr7ydzhl4vv4vp5qbchz0dj88s3d87rz6axsrc188xrbak";
|
||||
SGr-IosevkaCurly = "0wajxb8n3i0xr2figxx9p5anc6azqww6n374m301n6b6ln51bvcd";
|
||||
SGr-IosevkaCurlySlab = "05p38bzsqi5ip0y4rzg9fn79dximw0b1657ji956hw0kc37qqbr3";
|
||||
SGr-IosevkaFixed = "1g7asaiwzd26rpfnbg1ndbfljigbpw38fc4fyjdww3388fq82x3m";
|
||||
SGr-IosevkaFixedCurly = "0zwbpk1gm5s4shw8drx45hy31vzkgkcdqky4pw9n6vm61nc9sn1l";
|
||||
SGr-IosevkaFixedCurlySlab = "0rrl3pw8kcipbxib6z45scwnhxjg6b6yqmdrdsah8bl90xlrc1lz";
|
||||
SGr-IosevkaFixedSlab = "0rb009pd2q0azyla974s3a8knlvqq6v8kipsms6s99f7d9x9r9rq";
|
||||
SGr-IosevkaFixedSS01 = "1i9ph67brswkszr0fd7h5najrcy5nf1qap926z8gkcj45c4gqb84";
|
||||
SGr-IosevkaFixedSS02 = "0qfxad184zisq31y60h6y2wdxvnlb3ln0s4290bb1j3hwzvdb595";
|
||||
SGr-IosevkaFixedSS03 = "1d47z3ibpb3qdp5hxvbh8dw9h1mz5b2a6xk2m6rgansml2wzg193";
|
||||
SGr-IosevkaFixedSS04 = "15m34521y7w33qn7mxw6kvng6i0pbz5sldh0m2hj114ikdzsh5av";
|
||||
SGr-IosevkaFixedSS05 = "0pkq6w7riy7hgq2h0m12vnbn8qawsjn6bb613wdl3cnnqfnsh9lw";
|
||||
SGr-IosevkaFixedSS06 = "0bkdc3kc92s2nqqpd56j1llb9wlv11kj4dvw86n0646y18cg4g1r";
|
||||
SGr-IosevkaFixedSS07 = "1vg393dzmhypl4qwx519y9ybwy8m8222chdw4cjhhv9kay6n6mak";
|
||||
SGr-IosevkaFixedSS08 = "0f7l5qpwqwvy2lryv0vhq2zi06f5z9cbgq55ax40vqgaic2jygpr";
|
||||
SGr-IosevkaFixedSS09 = "08a7b72lkpzyvzn2wari2hsp3r69hhb48dpq83c1vyi9sh3vw4wz";
|
||||
SGr-IosevkaFixedSS10 = "1z72krj7cpyqnvbls3k30x68qff5rh5qm5fghw19kcsi6czvfqfd";
|
||||
SGr-IosevkaFixedSS11 = "0nr95yz5rkqw6a5bal83qkc5hdfs7x3vbz382hwci3wlid9iwrn4";
|
||||
SGr-IosevkaFixedSS12 = "1nhjwlxdxjafcsnqgrl8nrbccfmvhmc6is79zhh9lwqi0kjnim58";
|
||||
SGr-IosevkaFixedSS13 = "0mwmf6q3krwzff1wqwky8csylslh109axl2k1rdra2skvpyaiv0h";
|
||||
SGr-IosevkaFixedSS14 = "1nd5b829qg90wg393m6b1681lbn7fmcszssm2zv1bwwyz07j9s6r";
|
||||
SGr-IosevkaFixedSS15 = "02bfbj52bx2jy15n0dzqifcfg44qb9gx41qpz07rd52j7dscdxzh";
|
||||
SGr-IosevkaFixedSS16 = "1w9p08dcxj6mhym1hg0mphm3qiw72a25a6czzys9wdgzkhd0iy0r";
|
||||
SGr-IosevkaFixedSS17 = "0j10k0j3chnv0gmwx82nl13rdixfrbqdkjdhlx6lkfn8ifxwgd6p";
|
||||
SGr-IosevkaFixedSS18 = "0w3c35jjyyaf6983d3rsgawbymk7qy721r7g8diwgasxh73cbr3q";
|
||||
SGr-IosevkaSlab = "0jd5zhmrw6mpa198zrn4hlisi88caz36g2vs0b8dy5ivnmda852v";
|
||||
SGr-IosevkaSS01 = "1228z9vnqsmzjdbp4ym8hqqx2iis7cf2jw2nir04sd8vzjyxj8jy";
|
||||
SGr-IosevkaSS02 = "170xvgis66ikrf5ss2q32k22xfsfqh20fkg80g68dqfigy61mzp6";
|
||||
SGr-IosevkaSS03 = "0ld2k9krg5xr4zn7fnbvf08md4kbm0b2lv5vzvjn68n10jmhhyf5";
|
||||
SGr-IosevkaSS04 = "1a9d5nihfx2jydi986g8l0nlds3i0vk3c4av2jjyz5d1igfbibiw";
|
||||
SGr-IosevkaSS05 = "15m90fc038k74qrqa5cwxj8mkny056ry16az9m1ysqp20mficf94";
|
||||
SGr-IosevkaSS06 = "0qf7k6r5g1hqljkz3wswh7fqamxz67fn9afiaaaxq811lpp4430w";
|
||||
SGr-IosevkaSS07 = "118gnf2ybx7zy87am00z2lpgis2zy1bq95c7a6whcf8xmfcf8a8a";
|
||||
SGr-IosevkaSS08 = "15ab04a6k2g1lzn0lgar4pl8jalirhvq31w8sn66h8xjlwbazij4";
|
||||
SGr-IosevkaSS09 = "0fa6krkj6fz132b80yshxa28yprbkm0mdj5wzlbm043qldnv4rl4";
|
||||
SGr-IosevkaSS10 = "1ks28j176r59vj8ic30hzb8kqyr50sphlmmj52qn4xa7kyljbzav";
|
||||
SGr-IosevkaSS11 = "1lc4rc067r4ayacxrg9hx4xxaxg1yfmvl0cy0z9h5b8d2p8ybr29";
|
||||
SGr-IosevkaSS12 = "1sm75ssbximnk5yjczyvvmv664lf2qw9nqskw91mhp1bmr6jysms";
|
||||
SGr-IosevkaSS13 = "0s3f8rzmzaf1qrb3ydr6f6mm0avmagksrlqna83vrr8lmj3010v3";
|
||||
SGr-IosevkaSS14 = "13wc6nrndwzg31djsc2zhh98m16l6fw65h8i8kksqq2f5yn2dcps";
|
||||
SGr-IosevkaSS15 = "13sfr8lg6xwjb3vrd89lgc267ymjg785y0m6kayrjwzy03cr60hl";
|
||||
SGr-IosevkaSS16 = "040gn02mk4nbrna4p7ygkcjass61v9k3yvhskgyxyi8jj7zv9lps";
|
||||
SGr-IosevkaSS17 = "1sa5gki3qgj9x2xqyixj7kwy1sr04x3q0d3bk6dlxkx5vm4q1ikr";
|
||||
SGr-IosevkaSS18 = "00j5wag0db13s257iny7wf107409agr7w2wkqgnzdp17b0d0y93y";
|
||||
SGr-IosevkaTerm = "02dig9zq2xlpjwn4qkxs13i3pbz9wxf0jcp5cl5lx3dyl6s0yz5w";
|
||||
SGr-IosevkaTermCurly = "1r2zl2yxw2kdz015350p920i794r6d7jikg2x7vmxam6qdr235b7";
|
||||
SGr-IosevkaTermCurlySlab = "10smqh4wpqrayyy231fqqa69ycwvd1zkx69gpyxmksxp6vz1a92k";
|
||||
SGr-IosevkaTermSlab = "11qcg9k1lh6v9gbyb20qxqmp945r884zqhfvn5i56lfbhk8s5kv8";
|
||||
SGr-IosevkaTermSS01 = "1i0qdhk120dxp7wrp49vpill9dp8gw5jj9k3bfwvxs9169dac9a2";
|
||||
SGr-IosevkaTermSS02 = "0rlmn86kf2rjk3fg6znw92chfvkyw2cxiixwkyv04ghwad2wfj5w";
|
||||
SGr-IosevkaTermSS03 = "1njmx0vz7d9k911fmbl2bpdx8z1nxl724lfq4vi485yqpin0r2m6";
|
||||
SGr-IosevkaTermSS04 = "1s5j2hnl9ni5vc79rbaif5vad8mdqym7cws46jkk13a7r7fm4v2i";
|
||||
SGr-IosevkaTermSS05 = "1sr4x3jq2j2z5g1jh8qbxdlx5m35h23akyrh8prisqv4v5l0q4xr";
|
||||
SGr-IosevkaTermSS06 = "1wx2dqd8y4823jb9hq7gigam15jxidclsy5syqpr1a7h9ylx54jh";
|
||||
SGr-IosevkaTermSS07 = "021nmgixl6cbl4mh5r0w5zahn2nh6jpk06x57yqapzdvgx4fww8w";
|
||||
SGr-IosevkaTermSS08 = "1vc9632dqsvy8ffpi1a3bgc40ng4sczwvjax0gdkvfshwc2bxf9x";
|
||||
SGr-IosevkaTermSS09 = "0k55yj8vq0q9v5rl62brj3zwfrmz16yxdy3k2wg1vsh3ysa8ih6p";
|
||||
SGr-IosevkaTermSS10 = "0v628akln3ij6wcwkhfdsrhxgn05ilkprwif88bxyxrrlxwj1d0n";
|
||||
SGr-IosevkaTermSS11 = "10h9cyk532xjmnlaaaj7l82gvvmdh6p9gvmjz0cr15s6mmzp5l9z";
|
||||
SGr-IosevkaTermSS12 = "1ha0hi9zkl6khyjka99ix1c7wsfdc3ar33312x9pk89zha7sc5gh";
|
||||
SGr-IosevkaTermSS13 = "0157y4wdnb7vrqk4qgbchvxrh8986xqpf2af9h4dh6nbvyai6dpf";
|
||||
SGr-IosevkaTermSS14 = "10dsldq9gh8h2402xy4hx86715r6l7y8jfww65721jlwf081fqkn";
|
||||
SGr-IosevkaTermSS15 = "1h68804jn7wyggqz8bn7cfjjkp16ay0ywhffnprgnj4z33dv1431";
|
||||
SGr-IosevkaTermSS16 = "1lrclnhwzq1nlfrfhrsh1zkika7170y7c5miywra7wzzvjhsciwh";
|
||||
SGr-IosevkaTermSS17 = "109gnqymr98bb8bpckk0j205wp8b36zv4956z2x4lwqn1qxxq80r";
|
||||
SGr-IosevkaTermSS18 = "19al3fw5iayssikilk9x5apya74b63q84yyfz03ikss01z6170gm";
|
||||
}
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
let version = "3.4.2"; in
|
||||
let version = "3.4.4"; in
|
||||
{ fetchurl }: {
|
||||
versionUsed = version;
|
||||
"${version}-x86_64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
|
||||
sha256 = "1xg2pqmn268yi3b1hc6qky0fzhx38785x70v77px5x3fhzjvh5rs";
|
||||
sha256 = "1j7rh2kh8r67ywr4259zqwpkbj3g2isbf6piyh8j6fpgjsqbx9zx";
|
||||
};
|
||||
"${version}-aarch64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
|
||||
sha256 = "1ybbxg6hkwdqva2xjl9srifrfryy6vacgv20lvmkhrqn59yl7m66";
|
||||
sha256 = "05y3gfgcplnwsg1m3vgjhk0hg8sk7i92zch7zg08h3zywca04xfa";
|
||||
};
|
||||
"${version}-aarch64-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
|
||||
sha256 = "1pnh2jm29n0hvsj1gp4abm3dcq2mqagcf489ghbx6my1mhif232f";
|
||||
sha256 = "0ih3yx0bjigfbv5dfc262rw3y4ps5pzdilps4k1scb1xhs8y9kml";
|
||||
};
|
||||
"${version}-x86_64-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
|
||||
sha256 = "0hsrzgl3xn3lmps5cnp1yr8fvzzy19gj7pgdn22dabx52lx0x9j3";
|
||||
sha256 = "1nv7vvqcf6qsp4faqk2pqffr9kv6d5gic813k9zk20i8w6gcqs0r";
|
||||
};
|
||||
"${version}-i686-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
|
||||
sha256 = "05ldjy3vhl8bhkyjmyq6yxwd503i0jk4vzkd2jk201yzwzwkjpvf";
|
||||
sha256 = "00prc4fry3kh42lz9w34phdn07v1dm1qkkp52nph3jakg5y5dkm2";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inform6";
|
||||
version = "6.42-r1";
|
||||
version = "6.42-r2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz";
|
||||
sha256 = "sha256-JZaMhA4M+fDgk52tWCJokG9J/a1+FQHL7+VxAT4PgQo=";
|
||||
sha256 = "sha256-zNm7z2nJlxaHRcZ7Ad8t1jZW999o9WFHrEnqlOJLdk0=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
@@ -9,8 +9,13 @@
|
||||
, libffi
|
||||
, makeWrapper
|
||||
, config
|
||||
, cudaPackages
|
||||
, rocmPackages_5
|
||||
, ompSupport ? true
|
||||
, openclSupport ? false
|
||||
, rocmSupport ? config.rocmSupport
|
||||
, cudaSupport ? config.cudaSupport
|
||||
, autoAddDriverRunpath
|
||||
}:
|
||||
let
|
||||
inherit (llvmPackages_15) stdenv;
|
||||
@@ -31,6 +36,9 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
] ++ lib.optionals cudaSupport [
|
||||
autoAddDriverRunpath
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -43,11 +51,19 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optionals rocmSupport [
|
||||
rocmPackages.clr
|
||||
rocmPackages.rocm-runtime
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_cudart
|
||||
(lib.getOutput "stubs" cudaPackages.cuda_cudart)
|
||||
];
|
||||
|
||||
# opensycl makes use of clangs internal headers. Its cmake does not successfully discover them automatically on nixos, so we supply the path manually
|
||||
cmakeFlags = [
|
||||
"-DCLANG_INCLUDE_PATH=${llvmPackages_15.libclang.dev}/include"
|
||||
(lib.cmakeBool "WITH_CPU_BACKEND" ompSupport)
|
||||
(lib.cmakeBool "WITH_CUDA_BACKEND" cudaSupport)
|
||||
(lib.cmakeBool "WITH_ROCM_BACKEND" rocmSupport)
|
||||
] ++ lib.optionals (lib.versionAtLeast version "24") [
|
||||
(lib.cmakeBool "WITH_OPENCL_BACKEND" openclSupport)
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ivy";
|
||||
version = "0.2.10";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "robpike";
|
||||
repo = "ivy";
|
||||
hash = "sha256-6rZfBx6jKNOEnG+cmrzgvjUoCHQe+olPeX11qX8ep38=";
|
||||
hash = "sha256-/Q929ZXv3F6MZ+FdWKfbThNDT3JpvQw7WLGnbmitdOg=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mujs";
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mujs.com/downloads/mujs-${version}.tar.gz";
|
||||
hash = "sha256-wBVHWID2o4LnBhaclDcafdbMIgeIMvbghlr4KJwu9Cs=";
|
||||
hash = "sha256-eKMRrkIkQAd0ywnvW6omM8JpcVE/i5MdMiSg64WxPgs=";
|
||||
};
|
||||
|
||||
buildInputs = [ readline ];
|
||||
|
||||
+1
-1
@@ -284,7 +284,7 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t
|
||||
if _get_attr_value(f"{attr_path}.src.leaveDotGit"):
|
||||
git_fetcher_args.append("--leave-dotGit")
|
||||
|
||||
if git_fetcher_args:
|
||||
if git_fetcher_args or _get_attr_value(f"{attr_path}.src.fetcher").endswith("nix-prefetch-git"):
|
||||
algorithm = "sha256"
|
||||
cmd = [
|
||||
"nix-prefetch-git",
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user