mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
3f7284c556
|
|
@ -7,9 +7,7 @@ with lib; let
|
|||
cfg = config.programs.hyprland;
|
||||
|
||||
finalPortalPackage = cfg.portalPackage.override {
|
||||
hyprland-share-picker = pkgs.hyprland-share-picker.override {
|
||||
hyprland = cfg.finalPackage;
|
||||
};
|
||||
hyprland = cfg.finalPackage;
|
||||
};
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@ in
|
|||
startAt = "*:0/5";
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = config.ids.uids.cfdyndns;
|
||||
Group = config.ids.gids.cfdyndns;
|
||||
LoadCredential = lib.optional (cfg.apiTokenFile != null) "CLOUDFLARE_APITOKEN_FILE:${cfg.apiTokenFile}";
|
||||
DynamicUser = true;
|
||||
};
|
||||
environment = {
|
||||
CLOUDFLARE_RECORDS="${concatStringsSep "," cfg.records}";
|
||||
|
|
@ -72,23 +72,10 @@ in
|
|||
export CLOUDFLARE_EMAIL="${cfg.email}"
|
||||
''}
|
||||
${optionalString (cfg.apiTokenFile != null) ''
|
||||
export CLOUDFLARE_APITOKEN="$(cat ${escapeShellArg cfg.apiTokenFile})"
|
||||
export CLOUDFLARE_APITOKEN=$(${pkgs.systemd}/bin/systemd-creds cat CLOUDFLARE_APITOKEN_FILE)
|
||||
''}
|
||||
${pkgs.cfdyndns}/bin/cfdyndns
|
||||
'';
|
||||
};
|
||||
|
||||
users.users = {
|
||||
cfdyndns = {
|
||||
group = "cfdyndns";
|
||||
uid = config.ids.uids.cfdyndns;
|
||||
};
|
||||
};
|
||||
|
||||
users.groups = {
|
||||
cfdyndns = {
|
||||
gid = config.ids.gids.cfdyndns;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,13 +60,13 @@ in
|
|||
options = {
|
||||
services.mobilizon = {
|
||||
enable = mkEnableOption
|
||||
"Mobilizon federated organization and mobilization platform";
|
||||
(lib.mdDoc "Mobilizon federated organization and mobilization platform");
|
||||
|
||||
nginx.enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether an <literal>nginx</literal> virtual host should be
|
||||
description = lib.mdDoc ''
|
||||
Whether an Nginx virtual host should be
|
||||
set up to serve Mobilizon.
|
||||
'';
|
||||
};
|
||||
|
|
@ -87,10 +87,10 @@ in
|
|||
"Mobilizon.Web.Endpoint" = {
|
||||
url.host = mkOption {
|
||||
type = elixirTypes.str;
|
||||
defaultText = literalExpression ''
|
||||
defaultText = lib.literalMD ''
|
||||
''${settings.":mobilizon".":instance".hostname}
|
||||
'';
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
Your instance's hostname for generating URLs throughout the app
|
||||
'';
|
||||
};
|
||||
|
|
@ -99,14 +99,14 @@ in
|
|||
port = mkOption {
|
||||
type = elixirTypes.port;
|
||||
default = 4000;
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
The port to run the server
|
||||
'';
|
||||
};
|
||||
ip = mkOption {
|
||||
type = elixirTypes.tuple;
|
||||
default = settingsFormat.lib.mkTuple [ 0 0 0 0 0 0 0 1 ];
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
The IP address to listen on. Defaults to [::1] notated as a byte tuple.
|
||||
'';
|
||||
};
|
||||
|
|
@ -115,7 +115,7 @@ in
|
|||
has_reverse_proxy = mkOption {
|
||||
type = elixirTypes.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
Whether you use a reverse proxy
|
||||
'';
|
||||
};
|
||||
|
|
@ -124,14 +124,14 @@ in
|
|||
":instance" = {
|
||||
name = mkOption {
|
||||
type = elixirTypes.str;
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
The fallback instance name if not configured into the admin UI
|
||||
'';
|
||||
};
|
||||
|
||||
hostname = mkOption {
|
||||
type = elixirTypes.str;
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
Your instance's hostname
|
||||
'';
|
||||
};
|
||||
|
|
@ -141,7 +141,7 @@ in
|
|||
defaultText = literalExpression ''
|
||||
noreply@''${settings.":mobilizon".":instance".hostname}
|
||||
'';
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
The email for the From: header in emails
|
||||
'';
|
||||
};
|
||||
|
|
@ -151,7 +151,7 @@ in
|
|||
defaultText = literalExpression ''
|
||||
''${email_from}
|
||||
'';
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
The email for the Reply-To: header in emails
|
||||
'';
|
||||
};
|
||||
|
|
@ -161,7 +161,7 @@ in
|
|||
socket_dir = mkOption {
|
||||
type = types.nullOr elixirTypes.str;
|
||||
default = postgresqlSocketDir;
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
Path to the postgres socket directory.
|
||||
|
||||
Set this to null if you want to connect to a remote database.
|
||||
|
|
@ -171,14 +171,14 @@ in
|
|||
|
||||
If connecting to a remote database, please follow the
|
||||
instructions on how to setup your database:
|
||||
<link xlink:href="https://docs.joinmobilizon.org/administration/install/release/#database-setup"/>
|
||||
<https://docs.joinmobilizon.org/administration/install/release/#database-setup>
|
||||
'';
|
||||
};
|
||||
|
||||
username = mkOption {
|
||||
type = types.nullOr elixirTypes.str;
|
||||
default = user;
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
User used to connect to the database
|
||||
'';
|
||||
};
|
||||
|
|
@ -186,7 +186,7 @@ in
|
|||
database = mkOption {
|
||||
type = types.nullOr elixirTypes.str;
|
||||
default = "mobilizon_prod";
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
Name of the database
|
||||
'';
|
||||
};
|
||||
|
|
@ -196,9 +196,9 @@ in
|
|||
};
|
||||
default = { };
|
||||
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
Mobilizon Elixir documentation, see
|
||||
<link xlink:href="https://docs.joinmobilizon.org/administration/configure/reference/"/>
|
||||
<https://docs.joinmobilizon.org/administration/configure/reference/>
|
||||
for supported values.
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,10 +16,6 @@
|
|||
|
||||
virtualisation.anbox.enable = true;
|
||||
boot.kernelPackages = pkgs.linuxPackages_5_15;
|
||||
|
||||
# The AArch64 anbox image will not start.
|
||||
# Meanwhile the postmarketOS images work just fine.
|
||||
virtualisation.anbox.image = pkgs.anbox.postmarketos-image;
|
||||
virtualisation.memorySize = 2500;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -17,11 +17,12 @@
|
|||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip",
|
||||
"232.9559.28": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip"
|
||||
"232.9559.28": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip",
|
||||
"232.9921.42": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip"
|
||||
},
|
||||
"name": "ideavim"
|
||||
},
|
||||
|
|
@ -30,7 +31,7 @@
|
|||
"idea-ultimate"
|
||||
],
|
||||
"builds": {
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/631/381773/python-232.9559.62.zip"
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/631/395438/python-232.9921.47.zip"
|
||||
},
|
||||
"name": "python"
|
||||
},
|
||||
|
|
@ -54,8 +55,9 @@
|
|||
"232.9559.28": null,
|
||||
"232.9559.58": null,
|
||||
"232.9559.61": null,
|
||||
"232.9559.62": null,
|
||||
"232.9559.64": null
|
||||
"232.9559.64": null,
|
||||
"232.9921.42": null,
|
||||
"232.9921.47": null
|
||||
},
|
||||
"name": "kotlin"
|
||||
},
|
||||
|
|
@ -79,8 +81,9 @@
|
|||
"232.9559.28": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip",
|
||||
"232.9921.42": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip"
|
||||
},
|
||||
"name": "ini"
|
||||
},
|
||||
|
|
@ -90,8 +93,8 @@
|
|||
"phpstorm"
|
||||
],
|
||||
"builds": {
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/7219/382408/Symfony_Plugin-2022.1.255.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/7219/382408/Symfony_Plugin-2022.1.255.zip"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/7219/389222/Symfony_Plugin-2022.1.256.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/7219/389222/Symfony_Plugin-2022.1.256.zip"
|
||||
},
|
||||
"name": "symfony-support"
|
||||
},
|
||||
|
|
@ -101,8 +104,8 @@
|
|||
"phpstorm"
|
||||
],
|
||||
"builds": {
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip"
|
||||
},
|
||||
"name": "php-annotations"
|
||||
},
|
||||
|
|
@ -116,8 +119,8 @@
|
|||
"builds": {
|
||||
"232.9559.28": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip"
|
||||
},
|
||||
"name": "python-community-edition"
|
||||
},
|
||||
|
|
@ -141,10 +144,11 @@
|
|||
"232.9559.28": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
|
||||
"232.9921.42": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip"
|
||||
},
|
||||
"name": "rust"
|
||||
"name": "-deprecated-rust"
|
||||
},
|
||||
"8182-beta": {
|
||||
"compatible": [
|
||||
|
|
@ -166,10 +170,11 @@
|
|||
"232.9559.28": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||
"232.9921.42": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip"
|
||||
},
|
||||
"name": "rust-beta"
|
||||
"name": "-deprecated-rust-beta"
|
||||
},
|
||||
"8554": {
|
||||
"compatible": [
|
||||
|
|
@ -183,8 +188,8 @@
|
|||
],
|
||||
"builds": {
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip"
|
||||
},
|
||||
"name": "ide-features-trainer"
|
||||
},
|
||||
|
|
@ -208,8 +213,9 @@
|
|||
"232.9559.28": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
||||
"232.9921.42": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip"
|
||||
},
|
||||
"name": "nixidea"
|
||||
},
|
||||
|
|
@ -218,7 +224,7 @@
|
|||
"idea-ultimate"
|
||||
],
|
||||
"builds": {
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/9568/383671/go-plugin-232.9559.65.zip"
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/9568/390449/go-plugin-232.9921.28.zip"
|
||||
},
|
||||
"name": "go"
|
||||
},
|
||||
|
|
@ -242,8 +248,9 @@
|
|||
"232.9559.28": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
|
||||
"232.9921.42": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip"
|
||||
},
|
||||
"name": "csv-editor"
|
||||
},
|
||||
|
|
@ -267,8 +274,9 @@
|
|||
"232.9559.28": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
||||
"232.9921.42": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip"
|
||||
},
|
||||
"name": "vscode-keymap"
|
||||
},
|
||||
|
|
@ -292,8 +300,9 @@
|
|||
"232.9559.28": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
||||
"232.9921.42": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip"
|
||||
},
|
||||
"name": "eclipse-keymap"
|
||||
},
|
||||
|
|
@ -317,8 +326,9 @@
|
|||
"232.9559.28": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
||||
"232.9921.42": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip"
|
||||
},
|
||||
"name": "visual-studio-keymap"
|
||||
},
|
||||
|
|
@ -342,8 +352,9 @@
|
|||
"232.9559.28": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"232.9921.42": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
|
||||
},
|
||||
"name": "darcula-pitch-black"
|
||||
},
|
||||
|
|
@ -363,12 +374,13 @@
|
|||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/17718/377609/github-copilot-intellij-1.2.21.2995.zip",
|
||||
"232.9559.28": "https://plugins.jetbrains.com/files/17718/377609/github-copilot-intellij-1.2.21.2995.zip",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/17718/377609/github-copilot-intellij-1.2.21.2995.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/17718/377609/github-copilot-intellij-1.2.21.2995.zip",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/17718/377609/github-copilot-intellij-1.2.21.2995.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/17718/377609/github-copilot-intellij-1.2.21.2995.zip"
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip",
|
||||
"232.9559.28": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip",
|
||||
"232.9921.42": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip"
|
||||
},
|
||||
"name": "github-copilot"
|
||||
},
|
||||
|
|
@ -392,8 +404,9 @@
|
|||
"232.9559.28": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"232.9559.58": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"232.9559.61": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"232.9559.62": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
|
||||
"232.9559.64": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"232.9921.42": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"232.9921.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
|
||||
},
|
||||
"name": "netbeans-6-5-keymap"
|
||||
}
|
||||
|
|
@ -409,20 +422,22 @@
|
|||
"https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=",
|
||||
"https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
|
||||
"https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip": "sha256-2dM/r79XT+1MHDeRAUnZw6WO3dmw7MZfx9alHmBqMk0=",
|
||||
"https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip": "sha256-dI+Oh6Z+OuqiS8yJI/PbelZdg2YCmoGw9NGotvKc0no=",
|
||||
"https://plugins.jetbrains.com/files/17718/377609/github-copilot-intellij-1.2.21.2995.zip": "sha256-jbnhHbEz78dhOH24VyuJRYLAMIiiqdViQlAELg3wypg=",
|
||||
"https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip": "sha256-eFKMFSkzQ0rJKuTUjFo8Yj5Z/mdGoF6REtpSqg/WkNc=",
|
||||
"https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip": "sha256-SXzP1lg/FRroeaNQ4q5ePpDI+AiVF+dOE8tRWfm+sGk=",
|
||||
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
|
||||
"https://plugins.jetbrains.com/files/631/381773/python-232.9559.62.zip": "sha256-SWEwk+Q83y9EwGgEu45yyQn1M1eMqCw9ROsFPsEsxnQ=",
|
||||
"https://plugins.jetbrains.com/files/631/395438/python-232.9921.47.zip": "sha256-+2ow+tbZUipK92SKp0AegcRwUL1OSQuGE4FlZPOAGSk=",
|
||||
"https://plugins.jetbrains.com/files/6954/381727/kotlin-plugin-223-1.9.10-release-459-IJ8836.35.zip": "sha256-gHkNQyWh6jtY1986aI7Qo6ZNrniPy+Yq4XLLA0pKJkA=",
|
||||
"https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip": "sha256-XJoRZ3ExKHkUZljuuMjMzMCcFw0A+vOyJAwtf+soHU4=",
|
||||
"https://plugins.jetbrains.com/files/7219/382408/Symfony_Plugin-2022.1.255.zip": "sha256-qj0HyYC5Sey7a66Y1xGdKwZCh87wowvl+/FZoqOgyfs=",
|
||||
"https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip": "sha256-oUb3W64ZpXep3MsbL+/DG0kVzBQYEv6LG7jghb2aUQQ=",
|
||||
"https://plugins.jetbrains.com/files/7219/389222/Symfony_Plugin-2022.1.256.zip": "sha256-PeaqtFldh89x6wMGSM1RUR2PLSnXa7mKSojOkrFM2R8=",
|
||||
"https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=",
|
||||
"https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip": "sha256-wyqNQO4fFU9fJVbHbde/NWtY/RVOF/71o+TgWfS7VuM=",
|
||||
"https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip": "sha256-2oRXtVv9ima8W6vywkDX4IeUGwfVNEo4rsqYBmmWhKc=",
|
||||
"https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=",
|
||||
"https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=",
|
||||
"https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip": "sha256-NeAF3umfaSODjpd6J1dT8Ei5hF8g8OA+sgk7VjBodoU=",
|
||||
"https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip": "sha256-HpdQdWJLTWuoYnHFmDB8JIlcuiu+hVfvUsRwvMcQqzw=",
|
||||
"https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip": "sha256-pq9gFDjNmgZAXe11f6SNdN6g0xu18h/06J5L2lxUwgk=",
|
||||
"https://plugins.jetbrains.com/files/9568/383671/go-plugin-232.9559.65.zip": "sha256-OPYHmkjCElQckxvXX+y6PjC8vXD58B5U6nQnuu6F98c="
|
||||
"https://plugins.jetbrains.com/files/9568/390449/go-plugin-232.9921.28.zip": "sha256-NgF2KFglAczb2Aw5NMlbzFBylGW9LDWpNvnZlX+Pt3o="
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
|
||||
"version": "2023.2.1",
|
||||
"sha256": "3dad580f2d4b40815c64da602e37d874bef03bdf50bd70ce63efb4005006cf19",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.2.1.tar.gz",
|
||||
"build_number": "232.9559.58"
|
||||
"version": "2023.2.2",
|
||||
"sha256": "941036313c618dcfc62cc36b605ce680a36add52a7e37ee9b1981e52e35e52a3",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.2.2.tar.gz",
|
||||
"build_number": "232.9921.42"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
|
|
@ -43,18 +43,18 @@
|
|||
"idea-community": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
|
||||
"version": "2023.2.1",
|
||||
"sha256": "2a11cd6d8f245e4afb99286255e50b7b84a55dbbfaba3bdb7c0f7027803a0e8d",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.2.1.tar.gz",
|
||||
"build_number": "232.9559.62"
|
||||
"version": "2023.2.2",
|
||||
"sha256": "cf647137394e27b3011072e463dc2e4bcdd54dc6ea9406e487a47648fc77bd26",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.2.2.tar.gz",
|
||||
"build_number": "232.9921.47"
|
||||
},
|
||||
"idea-ultimate": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
|
||||
"version": "2023.2.1",
|
||||
"sha256": "8ac0a30e2a063f606e0fcfcd49ab59f9c851c3daed942134c81886bca35212d9",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.2.1.tar.gz",
|
||||
"build_number": "232.9559.62"
|
||||
"version": "2023.2.2",
|
||||
"sha256": "8a0dc4c495b8547fafa90eb81b6fdfc4a9fbbc7b5806d20ebb2f6538330cd3a5",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.2.2.tar.gz",
|
||||
"build_number": "232.9921.47"
|
||||
},
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
|
|
@ -118,10 +118,10 @@
|
|||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
|
||||
"version": "2023.2.1",
|
||||
"sha256": "170ab58942894ff483419329501b000b69ce01895b36d8ed2b1b7587af25538d",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.2.1.dmg",
|
||||
"build_number": "232.9559.58"
|
||||
"version": "2023.2.2",
|
||||
"sha256": "a4049fd02a9ebe459634ceb47f389a6f8536fcdeb162587d6896991b94023c3f",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.2.2.dmg",
|
||||
"build_number": "232.9921.42"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
|
|
@ -158,18 +158,18 @@
|
|||
"idea-community": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
|
||||
"version": "2023.2.1",
|
||||
"sha256": "6c1eb5c4ef27c2cb16643befd11497b280ca782109748c9fa1a9badbd9a519ca",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.2.1.dmg",
|
||||
"build_number": "232.9559.62"
|
||||
"version": "2023.2.2",
|
||||
"sha256": "a59590af2bef95562f3b7a066016d22f347d59b71e136d3dd739d626f1594636",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.2.2.dmg",
|
||||
"build_number": "232.9921.47"
|
||||
},
|
||||
"idea-ultimate": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
|
||||
"version": "2023.2.1",
|
||||
"sha256": "f9f27923136f89acb2401dd13d2d26b195ccc7506679117e11135d931935ef4d",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.2.1.dmg",
|
||||
"build_number": "232.9559.62"
|
||||
"version": "2023.2.2",
|
||||
"sha256": "f420cc60d925415a7059b3283176b4aafef3555c06746b9617cf50edef62fe69",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.2.2.dmg",
|
||||
"build_number": "232.9921.47"
|
||||
},
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
|
|
@ -233,10 +233,10 @@
|
|||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
|
||||
"version": "2023.2.1",
|
||||
"sha256": "a90477becb838162cd4cb3df9975f4d763897de959b9da84b086b99343aeb858",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.2.1-aarch64.dmg",
|
||||
"build_number": "232.9559.58"
|
||||
"version": "2023.2.2",
|
||||
"sha256": "2820b59efbb028a861c3912b83a659fc22a136396a7199dd887f7dc28d6fba61",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.2.2-aarch64.dmg",
|
||||
"build_number": "232.9921.42"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
|
|
@ -273,18 +273,18 @@
|
|||
"idea-community": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
|
||||
"version": "2023.2.1",
|
||||
"sha256": "f168e3d751f3f638a38ab9f9d974ca721e21a23e52e928ef297fc7a5026a30c6",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.2.1-aarch64.dmg",
|
||||
"build_number": "232.9559.62"
|
||||
"version": "2023.2.2",
|
||||
"sha256": "b3c126636d2096933672d1c1359fe32ad04d35057090363ad1812951f2ada7d9",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.2.2-aarch64.dmg",
|
||||
"build_number": "232.9921.47"
|
||||
},
|
||||
"idea-ultimate": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
|
||||
"version": "2023.2.1",
|
||||
"sha256": "7f2f1113c1056fb7f6bfbe66f685b74b4e5546ad518820371ac6d50ead994cdf",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.2.1-aarch64.dmg",
|
||||
"build_number": "232.9559.62"
|
||||
"version": "2023.2.2",
|
||||
"sha256": "b649cb8c82190ca8682bad9b37da93f10981d35850f501c196ad106edf96cd44",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.2.2-aarch64.dmg",
|
||||
"build_number": "232.9921.47"
|
||||
},
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "goldendict-ng";
|
||||
version = "23.07.23";
|
||||
version = "23.09.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xiaoyifang";
|
||||
repo = "goldendict-ng";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZKbrO5L4KFmr2NsGDihRWBeW0OXHoPRwZGj6kt1Anc8=";
|
||||
rev = "v${finalAttrs.version}-WhiteDew.54c8bd56";
|
||||
hash = "sha256-X9xqodCqHjppz1zIHLnb87NiDE4FWlXiQufhDu/rJq4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook ];
|
||||
|
|
@ -83,8 +83,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://xiaoyifang.github.io/goldendict-ng/";
|
||||
description = "Advanced multi-dictionary lookup program.";
|
||||
description = "An advanced multi-dictionary lookup program";
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "goldendict";
|
||||
maintainers = with maintainers; [ slbtty ];
|
||||
license = licenses.gpl3Plus;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.50.14";
|
||||
version = "0.50.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jPRSwq7pLFG56NB+HaP2GP2GdK1wsOeM+y396o70Q3A=";
|
||||
hash = "sha256-YhPn1DTw4/hdDksD2epV7JsD5Jj+pWIh/Uwn79r0mh4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wQ5jxOTuYkiW5zHcduByKZ+vHPKn/1ELL3DskKze+UI=";
|
||||
vendorHash = "sha256-HWcm8y8bySMV3ue1RpxiXfYyV33cXGFII1/d+XD2Iro=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.9.7";
|
||||
version = "3.9.9";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
|
|
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-UDh5rEcnuoiXjxYZqh0KJXi02M3xjwXGNKhrEBrLtCs=";
|
||||
hash = "sha256-kZ+RHkqmmRd7Ew5u8/SQADzOUa9YwCsj+nmtthCDlDw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, pkgsBuildBuild
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, SDL
|
||||
|
|
@ -110,12 +111,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
lua5
|
||||
perl
|
||||
pkg-config
|
||||
removeReferencesTo
|
||||
unzip
|
||||
wrapGAppsHook
|
||||
]
|
||||
++ optional chromecastSupport protobuf
|
||||
++ optionals withQt5 [ wrapQtAppsHook ]
|
||||
++ optionals waylandSupport [
|
||||
wayland
|
||||
|
|
@ -204,7 +207,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
env = {
|
||||
# vlc depends on a c11-gcc wrapper script which we don't have so we need to
|
||||
# set the path to the compiler
|
||||
BUILDCC = "${stdenv.cc}/bin/gcc";
|
||||
BUILDCC = "${pkgsBuildBuild.stdenv.cc}/bin/gcc";
|
||||
PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER = "wayland-scanner";
|
||||
} // lib.optionalAttrs (!stdenv.hostPlatform.isAarch) {
|
||||
LIVE555_PREFIX = live555;
|
||||
};
|
||||
|
|
@ -227,6 +231,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
postPatch = ''
|
||||
substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \
|
||||
/usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype
|
||||
'' + lib.optionalString (!stdenv.hostPlatform.canExecute stdenv.buildPlatform) ''
|
||||
# Upstream luac can't cross compile, so we have to install the lua
|
||||
# sources, not bytecode:
|
||||
# https://www.lua.org/wshop13/Jericke.pdf#page=39
|
||||
substituteInPlace share/Makefile.am --replace $'.luac \\\n' $'.lua \\\n'
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -240,9 +249,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# - Touch plugins (plugins cache keyed off mtime and file size:
|
||||
# https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830
|
||||
# - Remove references to the Qt development headers (used in error messages)
|
||||
#
|
||||
# pkgsBuildBuild is used here because buildPackages.libvlc somehow
|
||||
# depends on a qt5.qttranslations that doesn't build, even though it
|
||||
# should be the same as pkgsBuildBuild.qt5.qttranslations.
|
||||
postFixup = ''
|
||||
find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';'
|
||||
$out/lib/vlc/vlc-cache-gen $out/vlc/plugins
|
||||
${if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else pkgsBuildBuild.libvlc}/lib/vlc/vlc-cache-gen $out/vlc/plugins
|
||||
'' + optionalString withQt5 ''
|
||||
remove-references-to -t "${qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -40,22 +40,18 @@ assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renam
|
|||
assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland" + lib.optionalString debug "-debug";
|
||||
version = "unstable-2023-08-15";
|
||||
version = "0.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "91e28bbe9df85e2e94fbcc0137106362aea14ab5";
|
||||
hash = "sha256-1vLms49ZgDOC9y1uTjfph3WrUpatKRLnKAvFmSNre20=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-j9ypIwZkotNZMyk8R/W002OzDHd0C0OHSKE7uOFpf2k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# make meson use the provided dependencies instead of the git submodules
|
||||
"${finalAttrs.src}/nix/patches/meson-build.patch"
|
||||
# look into $XDG_DESKTOP_PORTAL_DIR instead of /usr; runtime checks for conflicting portals
|
||||
# NOTE: revert back to the patch inside SRC on the next version bump
|
||||
# "${finalAttrs.src}/nix/patches/portals.patch"
|
||||
./portals.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ wlroots.overrideAttrs
|
|||
domain = "gitlab.freedesktop.org";
|
||||
owner = "wlroots";
|
||||
repo = "wlroots";
|
||||
rev = "e8d545a9770a2473db32e0a0bfa757b05d2af4f3";
|
||||
hash = "sha256-gv5kjss6REeQG0BmvK2gTx7jHLRdCnP25po6It6I6N8=";
|
||||
rev = "717ded9bb0191ea31bf4368be32e7a15fe1b8294";
|
||||
hash = "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=";
|
||||
};
|
||||
|
||||
pname =
|
||||
|
|
|
|||
|
|
@ -1,55 +1,76 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wayland-scanner
|
||||
, makeWrapper
|
||||
, wrapQtAppsHook
|
||||
, hyprland-protocols
|
||||
, hyprland-share-picker
|
||||
, inih
|
||||
, libdrm
|
||||
, libuuid
|
||||
, mesa
|
||||
, pipewire
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtwayland
|
||||
, sdbus-cpp
|
||||
, systemd
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
, hyprland
|
||||
, slurp
|
||||
}:
|
||||
let
|
||||
source = import ./source.nix { inherit lib fetchFromGitHub wayland; };
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "xdg-desktop-portal-hyprland";
|
||||
inherit (source) src version meta;
|
||||
version = "unstable-2023-09-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "xdg-desktop-portal-hyprland";
|
||||
rev = "aca51609d4c415b30e88b96c6f49f0142cbcdae7";
|
||||
hash = "sha256-RF6LXm4J6mBF3B8VcQuABuU4g4tCPHgMYJQSoJ3DW+8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
makeWrapper
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
hyprland-protocols
|
||||
inih
|
||||
libdrm
|
||||
libuuid
|
||||
mesa
|
||||
pipewire
|
||||
qtbase
|
||||
qttools
|
||||
qtwayland
|
||||
sdbus-cpp
|
||||
systemd
|
||||
wayland
|
||||
wayland-protocols
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dsd-bus-provider=libsystemd"
|
||||
];
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/libexec/xdg-desktop-portal-hyprland --prefix PATH ":" ${lib.makeBinPath [hyprland-share-picker]}
|
||||
wrapProgramShell $out/bin/hyprland-share-picker \
|
||||
"''${qtWrapperArgs[@]}" \
|
||||
--prefix PATH ":" ${lib.makeBinPath [slurp hyprland]}
|
||||
|
||||
wrapProgramShell $out/libexec/xdg-desktop-portal-hyprland \
|
||||
--prefix PATH ":" ${lib.makeBinPath [(placeholder "out")]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/hyprwm/xdg-desktop-portal-hyprland";
|
||||
description = "xdg-desktop-portal backend for Hyprland";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fufexan ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qtbase
|
||||
, makeShellWrapper
|
||||
, wrapQtAppsHook
|
||||
, hyprland
|
||||
, grim
|
||||
, slurp
|
||||
, wayland
|
||||
}:
|
||||
let
|
||||
source = import ./source.nix { inherit lib fetchFromGitHub wayland; };
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "hyprland-share-picker";
|
||||
inherit (source) version;
|
||||
|
||||
src = "${source.src}/hyprland-share-picker";
|
||||
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook makeShellWrapper ];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgramShell $out/bin/hyprland-share-picker \
|
||||
"''${qtWrapperArgs[@]}" \
|
||||
--prefix PATH ":" ${lib.makeBinPath [grim slurp hyprland]}
|
||||
'';
|
||||
|
||||
meta = source.meta // {
|
||||
description = "Helper program for xdg-desktp-portal-hyprland";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, wayland
|
||||
}:
|
||||
let
|
||||
version = "0.5.0";
|
||||
in
|
||||
{
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "xdg-desktop-portal-hyprland";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-C5AO0KnyAFJaCkOn+5nJfWm0kyiPn/Awh0lKTjhgr7Y=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "xdg-desktop-portal backend for Hyprland";
|
||||
homepage = "https://github.com/hyprwm/xdg-desktop-portal-hyprland";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fufexan ];
|
||||
platforms = wayland.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +1,19 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "4th";
|
||||
version = "3.64.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sourceforge.net/projects/forth-4th/files/${pname}-${version}/${pname}-${version}-unix.tar.gz";
|
||||
url = "https://sourceforge.net/projects/forth-4th/files/4th-${finalAttrs.version}/4th-${finalAttrs.version}-unix.tar.gz";
|
||||
hash = "sha256-+W6nTNsqrf3Dvr+NbSz3uJdrXVbBI3OHR5v/rs7en+M=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
patches = [
|
||||
# Fix install manual; report this patch to upstream
|
||||
./001-install-manual-fixup.diff
|
||||
|
|
@ -23,24 +28,25 @@ stdenv.mkDerivation rec {
|
|||
|
||||
preInstall = ''
|
||||
install -d ${placeholder "out"}/bin \
|
||||
${placeholder "out"}/lib \
|
||||
${placeholder "out"}/share/doc/${pname} \
|
||||
${placeholder "out"}/share/man
|
||||
${placeholder "out"}/lib \
|
||||
${placeholder "out"}/share/doc/4th \
|
||||
${placeholder "man"}/share/man
|
||||
'';
|
||||
|
||||
installFlags = [
|
||||
"BINARIES=${placeholder "out"}/bin"
|
||||
"LIBRARIES=${placeholder "out"}/lib"
|
||||
"DOCDIR=${placeholder "out"}/share/doc"
|
||||
"MANDIR=${placeholder "out"}/share/man"
|
||||
"MANDIR=${placeholder "man"}/share/man"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://thebeez.home.xs4all.nl/4tH/index.html";
|
||||
description = "A portable Forth compiler";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
mainProgram = "4th";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
# TODO: set Makefile according to platform
|
||||
44
pkgs/by-name/hy/hyprkeys/package.nix
Normal file
44
pkgs/by-name/hy/hyprkeys/package.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hyprkeys";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprland-community";
|
||||
repo = "Hyprkeys";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-u2NTSth9gminIEcbxgGm/2HHyzuwf/YPNQV4VzR14Kk=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=v${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
vendorHash = "sha256-JFvC9V0xS8SZSdLsOtpyTrFzXjYAOaPQaJHdcnJzK3s=";
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd hyprkeys \
|
||||
--bash <($out/bin/hyprkeys completion bash) \
|
||||
--fish <($out/bin/hyprkeys completion fish) \
|
||||
--zsh <($out/bin/hyprkeys completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple, scriptable keybind retrieval utility for Hyprland";
|
||||
homepage = "https://github.com/hyprland-community/Hyprkeys";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ NotAShelf donovanglover ];
|
||||
mainProgram = "hyprkeys";
|
||||
};
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -87,6 +87,12 @@ let
|
|||
fi
|
||||
done
|
||||
|
||||
# Copy the source so it can be used by dependent packages. For example,
|
||||
# phoenix applications need the source of phoenix and phoenix_html to
|
||||
# build javascript and css assets.
|
||||
mkdir -p $out/src
|
||||
cp -r $src/* "$out/src"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -81,6 +81,27 @@ stdenv.mkDerivation (overridable // {
|
|||
# Phoenix projects for example will need compile.phoenix
|
||||
mix deps.compile --no-deps-check --skip-umbrella-children
|
||||
|
||||
# Symlink dependency sources. This is needed for projects that require
|
||||
# access to the source of their dependencies. For example, Phoenix
|
||||
# applications need javascript assets to build asset bundles.
|
||||
${lib.optionalString (mixNixDeps != { }) ''
|
||||
mkdir -p deps
|
||||
|
||||
${lib.concatMapStringsSep "\n" (dep: ''
|
||||
dep_name=$(basename ${dep} | cut -d '-' -f2)
|
||||
dep_path="deps/$dep_name"
|
||||
if [ -d "${dep}/src" ]; then
|
||||
ln -s ${dep}/src $dep_path
|
||||
fi
|
||||
'') (builtins.attrValues mixNixDeps)}
|
||||
''}
|
||||
|
||||
# Symlink deps to build root. Similar to above, but allows for mixFodDeps
|
||||
# Phoenix projects to find javascript assets.
|
||||
${lib.optionalString (mixFodDeps != null) ''
|
||||
ln -s ../deps ./
|
||||
''}
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "kaptan";
|
||||
version = "0.5.12";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1abd1f56731422fce5af1acc28801677a51e56f5d3c3e8636db761ed143c3dd2";
|
||||
sha256 = "sha256-EBMwpE/e3oiFhvMBC9FFwOxIpIBrxWQp+lSHpndAIfg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.20.1";
|
||||
version = "0.20.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "mautrix";
|
||||
repo = "python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Byvwg6WW4b8kRWJkl6DG2Ioz4HYDaJyVEV98tS/ybXQ=";
|
||||
hash = "sha256-c6NSDFQGKtT8Otw+ivNUZ2+Qm/LEDGpZNs3FrYq+N1A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyaml";
|
||||
version = "23.9.3";
|
||||
version = "23.9.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-s/mzgzUyfTIUyIg0kwA3OGwP5EV+GuGXGcVvqiOSIr0=";
|
||||
sha256 = "sha256-Kyw5AXtxihJ775+WvFX4lBTZYIdmaNaYgKrmb0upiVc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-redis";
|
||||
version = "4.6.0.5";
|
||||
version = "4.6.0.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XxedEL08qZWoE0qvzd/D4S1SsghDfEUp7yfmisswHzg=";
|
||||
hash = "sha256-eGWoQ4ApN6st3KM1ecTiVb/nP4evhYJOrXpnKbqS/FI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,21 +1,31 @@
|
|||
{ fetchFromGitHub, lib, buildGoModule,
|
||||
makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep,
|
||||
nixosTests }:
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
, buildGoModule
|
||||
, makeWrapper
|
||||
, coreutils
|
||||
, git
|
||||
, openssh
|
||||
, bash
|
||||
, gnused
|
||||
, gnugrep
|
||||
, gitUpdater
|
||||
, nixosTests
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "buildkite-agent";
|
||||
version = "3.49.0";
|
||||
version = "3.50.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildkite";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gsGG0NljFBbqsuY0nk5PVpIPLgusE5C/ruxANl4F9Xg=";
|
||||
sha256 = "sha256-TO+JhzswqQp847M3sDwS8/X9QgMr/6gP+IeewshncIA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Gz7A0pbbLuxzNIfcUh5ki2EiSJY/qtBeWxv0Y6pQkTc=";
|
||||
vendorHash = "sha256-tWz9yCzekPQ0c58X4H0Git5knIU4SEKc1UPhiO9xUro=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
|
||||
substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -31,8 +41,11 @@ buildGoModule rec {
|
|||
--prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
smoke-test = nixosTests.buildkite-agents;
|
||||
passthru = {
|
||||
tests.smoke-test = nixosTests.buildkite-agents;
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -46,7 +59,7 @@ buildGoModule rec {
|
|||
'';
|
||||
homepage = "https://buildkite.com/docs/agent";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pawelpacana zimbatm rvl techknowlogick ];
|
||||
maintainers = with maintainers; [ pawelpacana zimbatm jsoo1 techknowlogick ];
|
||||
platforms = with platforms; unix ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clickhouse-backup";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexAkulov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ngLDKAwdrX385BIPYlQAYkA0Ty73wWwEesKQuC6+cvo=";
|
||||
sha256 = "sha256-NX2687jG0TAt3rOV5XEmgHYiNhuBoWbnUEFnf3w5k6A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NOQV7c930kutXmgi1eaETu1JMJerKNK2Ns4YBRaoBUw=";
|
||||
|
|
|
|||
|
|
@ -142,13 +142,13 @@ rec {
|
|||
headers = "03mb1v5xzn2lp317r0mik9dx2nnxc7m26imygk13dgmafydd6aah";
|
||||
};
|
||||
|
||||
electron_22-bin = mkElectron "22.3.22" {
|
||||
armv7l-linux = "763af3af1bd80be535c49e22e8f2a1a7f6377e6c6e3e4f754ccf351e971b775f";
|
||||
aarch64-linux = "8ab1f1cf0008e7624ed38837b611187642e711a8975dd4fa89aaf44f7d6f85f4";
|
||||
x86_64-linux = "782008ad1633637991230ded3bd897b7b664a9b63977e65c7b00c69edf5510b0";
|
||||
x86_64-darwin = "e0bdff8d045e9bc1e972a82aecd7bc60c8b79e9f75a4752a706b8c6b3753143f";
|
||||
aarch64-darwin = "f27834bf1b83f3ffce018fcb232b8593082100d35d27dbdfd55c5ebe4c0ec81b";
|
||||
headers = "0r7vyvnbarvm718r9s2r8wspqrl86dbmav4r3f2jialkacrk36vq";
|
||||
electron_22-bin = mkElectron "22.3.24" {
|
||||
armv7l-linux = "bf986ec2e04c1f81a753dc17d71d231e16e0903d9114b1a73b1df0f18281d549";
|
||||
aarch64-linux = "055776ed281fa2db76a9e663677155b9631e4c6ac57c1e86938c789913c72fe7";
|
||||
x86_64-linux = "0c48912ff2bcbfe7e7c80eae76b82e2ba1e03cc872c0c6817faa560155447edd";
|
||||
x86_64-darwin = "a2adc99b44fbded082cbb5f1c49eceaf0c6f678c5ba951332b2c902b4fa7f63e";
|
||||
aarch64-darwin = "2ac36fdd664cb53c6cbc8ac67ac66e95e6418db4009636fbb865df97b711c818";
|
||||
headers = "1817viv29v1lgph9rcknm6rz64x6w2l8p0ng681644cv4m5gjsq1";
|
||||
};
|
||||
|
||||
electron_23-bin = mkElectron "23.3.13" {
|
||||
|
|
@ -160,22 +160,22 @@ rec {
|
|||
headers = "04k25z0d6xs2ar5mbbnr0phcs97kvxg28df3njhaniws6wf6qcmg";
|
||||
};
|
||||
|
||||
electron_24-bin = mkElectron "24.8.1" {
|
||||
armv7l-linux = "ea4881fc28c05d0023607a785baf1fc1d04d3f7721f4828dec3165a667c98dfd";
|
||||
aarch64-linux = "0da70bdc89ea7fefa1d22a06444281463a9b93aa930a3785082c8d112f65b699";
|
||||
x86_64-linux = "2405d30b841cf5130c00820467565763c7d4b4af6deb61882316a65dae191f66";
|
||||
x86_64-darwin = "41e4eb5e4fa921bda8c4138c5d5f614d01c6a7e50977cce151a24b7c26bd6f97";
|
||||
aarch64-darwin = "12f461f6bcfee2f07c5063ae9c2da6f364bb5e7f0c1773ac224483824eb5f19f";
|
||||
headers = "1n7i77rrwa94gzk31gn6rsalzbjwyaycv5j8a9qxf3xsizr59nz5";
|
||||
electron_24-bin = mkElectron "24.8.3" {
|
||||
armv7l-linux = "93dc26ce72b2b4cafaf1c09091c23c764294a95da040b515963c5a269fc4112a";
|
||||
aarch64-linux = "6684c37e427335818db146bb7b9c860be72ea582064fad349a54c62042676439";
|
||||
x86_64-linux = "fcc2754fecdc6ffb814938ae7c806c8ab7d68c748d5906ae3e4b0f3d90eda2e1";
|
||||
x86_64-darwin = "73f1913a9594057a47d473ff697c36ebb3d7d2fa012a24d301624af15fe9f251";
|
||||
aarch64-darwin = "1b276595078b2733c33570a0d27309117711d176629580c09bd31e5e3edb21f2";
|
||||
headers = "1rd0nww6gxvdzw6ja17gv5kd0wszjs9bcfspkp0iamsp5d9ixjf8";
|
||||
};
|
||||
|
||||
electron_25-bin = mkElectron "25.7.0" {
|
||||
armv7l-linux = "832a68cddb20eb847aca982b89f89e145f50dd483c71c8a705bbb9248fb7c665";
|
||||
aarch64-linux = "19e1e2c7ea1ab024f069e3dad6a26605e14b2c605e134484196343118fccf925";
|
||||
x86_64-linux = "002641e8103b77060e23b9c77c51ffb942372d01306210cdc3d32fc6ae5d112b";
|
||||
x86_64-darwin = "dea726ae9adc1c36206ce8d20ce32f630bcd684b869e0cb302f97c8bd26616d6";
|
||||
aarch64-darwin = "76a415165d212a345a5689de83078adc715fc10562bfaa35d7323094780ba683";
|
||||
headers = "1v7ap1v520hhghw358k41aahpnaif54qbg6a9dwgmg1di0qwn735";
|
||||
electron_25-bin = mkElectron "25.8.1" {
|
||||
armv7l-linux = "dd3390de2426a1cea9d3176e404b8fb250844a9b0e48cf01822fa66f3c3c4a48";
|
||||
aarch64-linux = "931208419f859f528e19805ae14b5b075213bc40dd20da9e03d8b71d849c147d";
|
||||
x86_64-linux = "de556aef0a80a8fe7b2b39d74ab0bdecc65d72bba3b7349460d18ef2a22fa323";
|
||||
x86_64-darwin = "fe61a3221d4c5dc9415dc2cce81010db61bb4a5ab5021d1023f48786dbaf0b28";
|
||||
aarch64-darwin = "985f4beee009ef6dbe7af75009a1b281aff591b989ee544bd4d2c814f9c4428d";
|
||||
headers = "1kkkxida3cbril65lmm0lkps787mhrrylzvp0j35rc1ip32b7sda";
|
||||
};
|
||||
|
||||
electron_26-bin = mkElectron "26.2.1" {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.19.2";
|
||||
version = "0.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U/CAuLl+I3wNPXYcXr9r6DdT9fywvOTt25Vyu3OKG84=";
|
||||
hash = "sha256-asumFkpJ9B9jrzQEKaYhGO4MzkCFS1hb4sjybFNFJ+M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-expand";
|
||||
version = "1.0.68";
|
||||
version = "1.0.70";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-j1Gq0mK5Gcn66QBiLFkUrIe2EfL3jwx3dRlYKyco77s=";
|
||||
sha256 = "sha256-Fnxe53YOoCiW9hIPU7dWpJoA/PnfnvRPkHiWM+4yMu8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-R4S765CjVLfeGg8Mmd0RJAtERIWj3opLbuWXcdOTFTc=";
|
||||
cargoHash = "sha256-zbn3pfU8r3p3Czetjg2ueItaMtYyPhksNIe7EdxJdLU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
imgroot = "https://build.anbox.io/android-images";
|
||||
in
|
||||
{
|
||||
armv7l-linux = fetchurl {
|
||||
url = imgroot + "/2017/06/12/android_1_armhf.img";
|
||||
sha256 = "1za4q6vnj8wgphcqpvyq1r8jg6khz7v6b7h6ws1qkd5ljangf1w5";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = imgroot + "/2017/08/04/android_1_arm64.img";
|
||||
sha256 = "02yvgpx7n0w0ya64y5c7bdxilaiqj9z3s682l5s54vzfnm5a2bg5";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = imgroot + "/2018/07/19/android_amd64.img";
|
||||
sha256 = "1jlcda4q20w30cm9ikm6bjq01p547nigik1dz7m4v0aps4rws13b";
|
||||
};
|
||||
}.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}")
|
||||
|
|
@ -154,9 +154,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) anbox; };
|
||||
|
||||
passthru.image = callPackage ./postmarketos-image.nix { };
|
||||
passthru.postmarketos-image = callPackage ./anbox-image.nix { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://anbox.io";
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@ let
|
|||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "6.5.2"; #zen
|
||||
version = "6.5.3"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "0rvf07i80cfrlpd7mfbba6dhzznh47zjw1pmiw04104z9lm84faq"; #zen
|
||||
sha256 = "0jc50cb30dzysqdhm91ykcg5xhy062dc69gwak6q33bn56n7dw3m"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "6.4.14"; #lqx
|
||||
version = "6.4.15"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "1f85g081ijv2f1yclnhyci69ad8n1amcv9ccg3ma6mkf1n3qw6kk"; #lqx
|
||||
sha256 = "1xhm73z074niz1dd0w24q5lxlpma6xraqil5kzp3j4qsyr5wg8hz"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "starcharts";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "caarlos0";
|
||||
repo = "starcharts";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XlR3AZgxp3ZljDR4H/BANeCqfR/G0a1KXo789GqNN8Y=";
|
||||
hash = "sha256-B5w6S3qNLdUayYpF03cnxpLzyRBaC9jhaYnNqDZ2AsU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ki+LaJ3dgN/cPA5zpbV/LiWIjuTKqojjpdRZ8VCZ0Kk=";
|
||||
vendorHash = "sha256-sZS3OA1dTLLrL5csXV6nWbY/TLiqJUH1UQnJUEva7Jk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib
|
||||
, beam
|
||||
, callPackage
|
||||
, writeShellScriptBin
|
||||
, writeText
|
||||
, beamPackages
|
||||
, yarn2nix
|
||||
, mix2nix
|
||||
, fetchFromGitLab
|
||||
|
|
@ -16,9 +16,6 @@
|
|||
}:
|
||||
|
||||
let
|
||||
beamPackages = beam.packages.erlangR25.extend (self: super: {
|
||||
elixir = super.elixir_1_14;
|
||||
});
|
||||
inherit (beamPackages) mixRelease buildMix buildRebar3 fetchHex;
|
||||
common = callPackage ./common.nix { };
|
||||
in
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zsh-prezto";
|
||||
version = "unstable-2023-06-22";
|
||||
version = "unstable-2023-09-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sorin-ionescu";
|
||||
repo = "prezto";
|
||||
rev = "c9c716e9c11938a1aff2f30230d4dc1da38dc564";
|
||||
sha256 = "QwFWQMg9Q67eKkzGVz4zmcXtPcuLvFTUlagVxDN/2h4=";
|
||||
rev = "5ac930d96be3a51730f7d9d7330f28d9c9c36e0a";
|
||||
sha256 = "tyroeGADhBRCQ9/WqNSqMV7kvFUPdC2fcs/B5G5qYhI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -23,14 +23,14 @@ let
|
|||
in
|
||||
with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli2";
|
||||
version = "2.13.15"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.13.18"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cli";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wxuuEya2uUquRmRmh9M2wJ6dcvCx8kyzk71og9OAJ+c=";
|
||||
hash = "sha256-0YCJZgu8GZgHBzlfGmOo+qF/ux99N1SQ0HDpN14z+CA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,26 +1,26 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svg2pdf";
|
||||
version = "0.6.0";
|
||||
# This cargo package is usually a library, hence it does not track a
|
||||
# Cargo.lock by default so we use fetchCrate
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "sha256-RZpJ2HNqO1y6ZQjxdd7LEH2yS5QyjSqQFuyU4BwFA+4=";
|
||||
};
|
||||
cargoHash = "sha256-wJr1K/PUewScGjVLBmg9lpDKyn5CIUK2zac9/+JvnbE=";
|
||||
buildFeatures = [ "cli" ];
|
||||
version = "0.7.0";
|
||||
|
||||
doCheck = true;
|
||||
src = fetchFromGitHub {
|
||||
owner = "typst";
|
||||
repo = "svg2pdf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-X5L3UA/BJw8M2G35biCQjExYe68fB14meW4ILPEyesc=";
|
||||
};
|
||||
cargoHash = "sha256-zR4nKzbbCzSM1JVxj3nk6yQAfpPmfVQGabkU7lzLAi0=";
|
||||
buildFeatures = [ "cli" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert SVG files to PDFs";
|
||||
homepage = "https://github.com/typst/svg2pdf";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
changelog = "https://github.com/typst/svg2pdf/releases/tag/${src.rev}";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ doronbehar figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ symlinkJoin {
|
|||
--suffix PATH : "$out/bin" \
|
||||
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.flatten (map (x: x.extraLdLibraries or []) addons))}"
|
||||
|
||||
${lib.optionals withConfigtool ''
|
||||
${lib.optionalString withConfigtool ''
|
||||
# Configtool call libexec/fcitx5-qt5-gui-wrapper for gui addons in FCITX_ADDON_DIRS
|
||||
wrapProgram $out/bin/fcitx5-config-qt --prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5"
|
||||
''}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2023-08-15T23-03-09Z";
|
||||
version = "2023-09-07T22-48-55Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-vsCbmT6uWy+VA0qx8x9hx3pDSVKiDeXjnnrFRnhm4C8=";
|
||||
sha256 = "sha256-DW6G37SLYzXkh8EHXhczloIZxNQS2+ON2kXe5VsQSZg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xtGXYCmiT7xY9OL8x0tTBP9y8UfzlJ6ZR2DhKOwVgkM=";
|
||||
vendorHash = "sha256-NbqqvV34Bzv2AmMYlN133RI7jNh96Jmo8065D3RxClI=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
{
|
||||
"linux-386": {
|
||||
"sys": "linux-386",
|
||||
"url": "https://bin.equinox.io/a/n2sDPvWRHhg/ngrok-v3-3.3.0-linux-386",
|
||||
"sha256": "8f6da1ef234a20a0604ce2028bc44b7fa40791bd1adce0529ef256c6a89c5655",
|
||||
"version": "3.3.0"
|
||||
"url": "https://bin.equinox.io/a/3iiMKzJiBb/ngrok-v3-3.3.4-linux-386",
|
||||
"sha256": "e46b1bfa8afe28b2c5a7630773ab2d8fc1c91ac42e262356c1cec1197e754419",
|
||||
"version": "3.3.4"
|
||||
},
|
||||
"linux-amd64": {
|
||||
"sys": "linux-amd64",
|
||||
"url": "https://bin.equinox.io/a/6wTR9C5G1pu/ngrok-v3-3.3.0-linux-amd64",
|
||||
"sha256": "ebe08529ce7ea3ee9cc05a0966e8ee33f5a41d7deeb440a15a6ff80ae2aa4716",
|
||||
"version": "3.3.0"
|
||||
"url": "https://bin.equinox.io/a/99d4KobYYHN/ngrok-v3-3.3.4-linux-amd64",
|
||||
"sha256": "11536e5a001de5efa9a6d9d6f33b0ed2dc653216278fe0314f9ca98c20137a7f",
|
||||
"version": "3.3.4"
|
||||
},
|
||||
"linux-arm": {
|
||||
"sys": "linux-arm",
|
||||
"url": "https://bin.equinox.io/a/bbBqonHqRxm/ngrok-v3-3.3.0-linux-arm",
|
||||
"sha256": "ccd11d1319152ece16aa9f9e6edcac3ff9cd189d712b4da670bda2a79d4feae1",
|
||||
"version": "3.3.0"
|
||||
"url": "https://bin.equinox.io/a/2VZGKNPHQqs/ngrok-v3-3.3.4-linux-arm",
|
||||
"sha256": "08d7b27407005c9a34a850090527c1398e86a1a2fa090aea2caee40cb18902fe",
|
||||
"version": "3.3.4"
|
||||
},
|
||||
"linux-arm64": {
|
||||
"sys": "linux-arm64",
|
||||
"url": "https://bin.equinox.io/a/np93VBWWrMi/ngrok-v3-3.3.0-linux-arm64",
|
||||
"sha256": "b08e4ac6858b4179e987e15ecf5648c0e84716c9a17b3726df48c9ce213dc186",
|
||||
"version": "3.3.0"
|
||||
"url": "https://bin.equinox.io/a/2XmLxPHmx2B/ngrok-v3-3.3.4-linux-arm64",
|
||||
"sha256": "1e12cedb3378d25012c3cd94f960123b4d8b99301d52ad9c30df9e698ed1fa2d",
|
||||
"version": "3.3.4"
|
||||
},
|
||||
"darwin-amd64": {
|
||||
"sys": "darwin-amd64",
|
||||
"url": "https://bin.equinox.io/a/kbKhiLNGXpq/ngrok-v3-3.3.0-darwin-amd64",
|
||||
"sha256": "0810c5e3232766e9d02db884cb8bb48ef2bdad48b6863d7bd6c967a388e5431c",
|
||||
"version": "3.3.0"
|
||||
"url": "https://bin.equinox.io/a/mos87CnnNu3/ngrok-v3-3.3.4-darwin-amd64",
|
||||
"sha256": "700311045d531f603a5f472c7e4b8271810ac75e368c65430a62f5e178abe9dc",
|
||||
"version": "3.3.4"
|
||||
},
|
||||
"darwin-arm64": {
|
||||
"sys": "darwin-arm64",
|
||||
"url": "https://bin.equinox.io/a/7rqE6e5cN8r/ngrok-v3-3.3.0-darwin-arm64",
|
||||
"sha256": "618dc83411fc1d574112cd80f8337bdca64089d5c2245cfb81fe7e519f22b610",
|
||||
"version": "3.3.0"
|
||||
"url": "https://bin.equinox.io/a/ngMbyRxxdNN/ngrok-v3-3.3.4-darwin-arm64",
|
||||
"sha256": "e609d3d78d004ec4f795581cba35f38ba43e7b0b5ae1cd80aa21650402e531d0",
|
||||
"version": "3.3.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vault";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "vault";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-c3WoSowF1Z0E9L8DdfOeiluYJzVnzltujE3tKlrLvPQ=";
|
||||
sha256 = "sha256-J8ZHK9zOZIo61xund4VQ46LD609B9zWgCZcD1StEu/Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IUMBp+2TGtp55XnHo46aX7fYRUP/8+Vhe47KqR7zUws=";
|
||||
vendorHash = "sha256-8ytAT7qVXAIfoeMyTBMJ6DiWn74sRM1WrrOYaKTlKMo=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -5684,8 +5684,8 @@ with pkgs;
|
|||
hyprdim = callPackage ../applications/misc/hyprdim { };
|
||||
|
||||
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {
|
||||
wlroots = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { };
|
||||
udis86 = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { };
|
||||
wlroots = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { };
|
||||
udis86 = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { };
|
||||
};
|
||||
|
||||
hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { };
|
||||
|
|
@ -5694,8 +5694,6 @@ with pkgs;
|
|||
|
||||
hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { };
|
||||
|
||||
hyprland-share-picker = libsForQt5.callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix { };
|
||||
|
||||
hyprnome = callPackage ../applications/misc/hyprnome { };
|
||||
|
||||
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
|
||||
|
|
@ -15445,8 +15443,6 @@ with pkgs;
|
|||
|
||||
### DEVELOPMENT / COMPILERS
|
||||
|
||||
_4th = callPackage ../development/compilers/4th { };
|
||||
|
||||
temurin-bin-20 = javaPackages.compiler.temurin-bin.jdk-20;
|
||||
temurin-jre-bin-20 = javaPackages.compiler.temurin-bin.jre-20;
|
||||
|
||||
|
|
@ -36888,7 +36884,10 @@ with pkgs;
|
|||
|
||||
xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { };
|
||||
|
||||
xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland { };
|
||||
xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland {
|
||||
stdenv = gcc13Stdenv;
|
||||
inherit (qt6) qtbase qttools qtwayland wrapQtAppsHook;
|
||||
};
|
||||
|
||||
xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue