Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
b56ce2853a
@ -171,6 +171,7 @@ let
|
||||
inherit src version;
|
||||
# nix will complain and tell you the right value to replace this with
|
||||
hash = lib.fakeHash;
|
||||
mixEnv = ""; # default is "prod", when empty includes all dependencies, such as "dev", "test".
|
||||
# if you have build time environment variables add them here
|
||||
MY_ENV_VAR="my_value";
|
||||
};
|
||||
|
||||
@ -76,7 +76,7 @@
|
||||
_0xB10C = {
|
||||
email = "nixpkgs@b10c.me";
|
||||
name = "0xB10C";
|
||||
github = "0xb10c";
|
||||
github = "0xB10C";
|
||||
githubId = 19157360;
|
||||
};
|
||||
_0xbe7a = {
|
||||
@ -817,7 +817,7 @@
|
||||
notbandali = {
|
||||
name = "Amin Bandali";
|
||||
email = "bandali@gnu.org";
|
||||
github = "notbandali";
|
||||
github = "bandali0";
|
||||
githubId = 1254858;
|
||||
keys = [{
|
||||
fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103";
|
||||
@ -932,6 +932,12 @@
|
||||
githubId = 106511;
|
||||
name = "Andrew Kelley";
|
||||
};
|
||||
andrewsmith = {
|
||||
email = "andrew@velvet.software";
|
||||
github = "andrewsmith";
|
||||
githubId = 29887;
|
||||
name = "Andrew Smith";
|
||||
};
|
||||
andsild = {
|
||||
email = "andsild@gmail.com";
|
||||
github = "andsild";
|
||||
@ -1760,7 +1766,7 @@
|
||||
benesim = {
|
||||
name = "Benjamin Isbarn";
|
||||
email = "benjamin.isbarn@gmail.com";
|
||||
github = "benesim";
|
||||
github = "BeneSim";
|
||||
githubId = 29384538;
|
||||
keys = [{
|
||||
fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02";
|
||||
@ -2382,6 +2388,12 @@
|
||||
github = "CaptainJawZ";
|
||||
githubId = 43111068;
|
||||
};
|
||||
CardboardTurkey = {
|
||||
name = "Kiran Ostrolenk";
|
||||
email = "kostrolenk@gmail.com";
|
||||
github = "CardboardTurkey";
|
||||
githubId = 34030186;
|
||||
};
|
||||
carlosdagos = {
|
||||
email = "m@cdagostino.io";
|
||||
github = "carlosdagos";
|
||||
@ -3130,7 +3142,7 @@
|
||||
cust0dian = {
|
||||
email = "serg@effectful.software";
|
||||
github = "cust0dian";
|
||||
githubId = 389387;
|
||||
githubId = 119854490;
|
||||
name = "Serg Nesterov";
|
||||
keys = [{
|
||||
fingerprint = "6E7D BA30 DB5D BA60 693C 3BE3 1512 F6EB 84AE CC8C";
|
||||
@ -3409,7 +3421,7 @@
|
||||
};
|
||||
davsanchez = {
|
||||
email = "davidslt+nixpkgs@pm.me";
|
||||
github = "davsanchez";
|
||||
github = "DavSanchez";
|
||||
githubId = 11422515;
|
||||
name = "David Sánchez";
|
||||
};
|
||||
@ -3902,6 +3914,7 @@
|
||||
name = "Davide Peressoni";
|
||||
email = "davide.peressoni@tuta.io";
|
||||
matrix = "@dpd-:matrix.org";
|
||||
github = "DPDmancul";
|
||||
githubId = 3186857;
|
||||
};
|
||||
dpercy = {
|
||||
@ -4332,7 +4345,7 @@
|
||||
};
|
||||
elnudev = {
|
||||
email = "elnu@elnu.com";
|
||||
github = "elnudev";
|
||||
github = "ElnuDev";
|
||||
githubId = 9874955;
|
||||
name = "Elnu";
|
||||
};
|
||||
@ -4620,7 +4633,7 @@
|
||||
};
|
||||
ewok = {
|
||||
email = "ewok@ewok.ru";
|
||||
github = "ewok";
|
||||
github = "ewok-old";
|
||||
githubId = 454695;
|
||||
name = "Artur Taranchiev";
|
||||
};
|
||||
@ -5751,7 +5764,7 @@
|
||||
};
|
||||
harrisonthorne = {
|
||||
email = "harrisonthorne@proton.me";
|
||||
github = "harrisonthorne";
|
||||
github = "muni-corn";
|
||||
githubId = 33523827;
|
||||
name = "Harrison Thorne";
|
||||
};
|
||||
@ -6986,7 +6999,7 @@
|
||||
};
|
||||
jkarlson = {
|
||||
email = "jekarlson@gmail.com";
|
||||
github = "jkarlson";
|
||||
github = "ethorsoe";
|
||||
githubId = 1204734;
|
||||
name = "Emil Karlson";
|
||||
};
|
||||
@ -7764,7 +7777,7 @@
|
||||
name = "Kid";
|
||||
};
|
||||
kidsan = {
|
||||
github = "kidsan";
|
||||
github = "Kidsan";
|
||||
githubId = 8798449;
|
||||
name = "kidsan";
|
||||
};
|
||||
@ -8661,6 +8674,8 @@
|
||||
loveisgrief = {
|
||||
name = "LoveIsGrief";
|
||||
email = "loveisgrief@tuta.io";
|
||||
github = "LoveIsGrief";
|
||||
githubId = 2829538;
|
||||
keys = [{
|
||||
fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB";
|
||||
}];
|
||||
@ -8812,7 +8827,7 @@
|
||||
};
|
||||
lux = {
|
||||
email = "lux@lux.name";
|
||||
github = "luxferresum";
|
||||
github = "luxzeitlos";
|
||||
githubId = 1208273;
|
||||
matrix = "@lux:ontheblueplanet.com";
|
||||
name = "Lux";
|
||||
@ -9285,7 +9300,7 @@
|
||||
};
|
||||
maxwell-lt = {
|
||||
email = "maxwell.lt@live.com";
|
||||
github = "maxwell-lt";
|
||||
github = "Maxwell-lt";
|
||||
githubId = 17859747;
|
||||
name = "Maxwell L-T";
|
||||
};
|
||||
@ -9924,7 +9939,7 @@
|
||||
name = "Mon Aaraj";
|
||||
email = "owo69uwu69@gmail.com";
|
||||
matrix = "@mon:tchncs.de";
|
||||
github = "MonAaraj";
|
||||
github = "ribosomerocker";
|
||||
githubId = 46468162;
|
||||
};
|
||||
monsieurp = {
|
||||
@ -10173,7 +10188,7 @@
|
||||
munksgaard = {
|
||||
name = "Philip Munksgaard";
|
||||
email = "philip@munksgaard.me";
|
||||
github = "munksgaard";
|
||||
github = "Munksgaard";
|
||||
githubId = 230613;
|
||||
matrix = "@philip:matrix.munksgaard.me";
|
||||
keys = [{
|
||||
@ -10790,7 +10805,7 @@
|
||||
};
|
||||
nrhelmi = {
|
||||
email = "helmiinour@gmail.com";
|
||||
github = "nrhelmi";
|
||||
github = "NRHelmi";
|
||||
githubId = 15707703;
|
||||
name = "Helmi Nour";
|
||||
};
|
||||
@ -11167,7 +11182,7 @@
|
||||
};
|
||||
paddygord = {
|
||||
email = "pgpatrickgordon@gmail.com";
|
||||
github = "paddygord";
|
||||
github = "avaunit02";
|
||||
githubId = 10776658;
|
||||
name = "Patrick Gordon";
|
||||
};
|
||||
@ -12217,7 +12232,7 @@
|
||||
};
|
||||
ratsclub = {
|
||||
email = "victor@freire.dev.br";
|
||||
github = "vtrf";
|
||||
github = "ratsclub";
|
||||
githubId = 25647735;
|
||||
name = "Victor Freire";
|
||||
};
|
||||
@ -12481,7 +12496,7 @@
|
||||
};
|
||||
rika = {
|
||||
email = "rika@paymentswit.ch";
|
||||
github = "NekomimiScience";
|
||||
github = "ScarletHg";
|
||||
githubId = 1810487;
|
||||
name = "Rika";
|
||||
};
|
||||
@ -13482,7 +13497,7 @@
|
||||
shreerammodi = {
|
||||
name = "Shreeram Modi";
|
||||
email = "shreerammodi10@gmail.com";
|
||||
github = "Shrimpram";
|
||||
github = "shrimpram";
|
||||
githubId = 67710369;
|
||||
keys = [{
|
||||
fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE";
|
||||
@ -13720,7 +13735,7 @@
|
||||
sno2wman = {
|
||||
name = "SnO2WMaN";
|
||||
email = "me@sno2wman.net";
|
||||
github = "sno2wman";
|
||||
github = "SnO2WMaN";
|
||||
githubId = 15155608;
|
||||
};
|
||||
snpschaaf = {
|
||||
@ -14474,7 +14489,7 @@
|
||||
};
|
||||
teozkr = {
|
||||
email = "teo@nullable.se";
|
||||
github = "teozkr";
|
||||
github = "nightkr";
|
||||
githubId = 649832;
|
||||
name = "Teo Klestrup Röijezon";
|
||||
};
|
||||
@ -14961,7 +14976,7 @@
|
||||
};
|
||||
tonyshkurenko = {
|
||||
email = "support@twingate.com";
|
||||
github = "tonyshkurenko";
|
||||
github = "antonshkurenko";
|
||||
githubId = 8597964;
|
||||
name = "Anton Shkurenko";
|
||||
};
|
||||
@ -15300,7 +15315,7 @@
|
||||
};
|
||||
uthar = {
|
||||
email = "galkowskikasper@gmail.com";
|
||||
github = "uthar";
|
||||
github = "Uthar";
|
||||
githubId = 15697697;
|
||||
name = "Kasper Gałkowski";
|
||||
};
|
||||
@ -16430,7 +16445,7 @@
|
||||
zebreus = {
|
||||
matrix = "@lennart:cicen.net";
|
||||
email = "lennarteichhorn+nixpkgs@gmail.com";
|
||||
github = "Zebreus";
|
||||
github = "zebreus";
|
||||
githubId = 1557253;
|
||||
name = "Lennart Eichhorn";
|
||||
};
|
||||
|
||||
@ -10,6 +10,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- Cinnamon has been updated to 5.6, see [the pull request](https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204) for what is changed.
|
||||
|
||||
- KDE Plasma has been updated to v5.27, see [the release notes](https://kde.org/announcements/plasma/5/5.27.0/) for what is changed.
|
||||
|
||||
- `nixos-rebuild` now supports an extra `--specialisation` option that can be used to change specialisation for `switch` and `test` commands.
|
||||
|
||||
## New Services {#sec-release-23.05-new-services}
|
||||
|
||||
@ -54,7 +54,7 @@ with lib;
|
||||
AmbientCapabilities = "CAP_SYS_NICE";
|
||||
StateDirectory = "clickhouse";
|
||||
LogsDirectory = "clickhouse";
|
||||
ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=${cfg.package}/etc/clickhouse-server/config.xml";
|
||||
ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=/etc/clickhouse-server/config.xml";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -11,6 +11,8 @@ let
|
||||
else lib.concatMapStrings (s: "\n ${generators.mkValueStringDefault {} s}") l;
|
||||
mkKeyValue = generators.mkKeyValueDefault {} ":";
|
||||
};
|
||||
|
||||
unifiedConfigDir = cfg.stateDir + "/config";
|
||||
in {
|
||||
options = {
|
||||
services.moonraker = {
|
||||
@ -30,11 +32,10 @@ in {
|
||||
};
|
||||
|
||||
configDir = mkOption {
|
||||
type = types.path;
|
||||
default = cfg.stateDir + "/config";
|
||||
defaultText = literalExpression ''config.${opt.stateDir} + "/config"'';
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
The directory containing client-writable configuration files.
|
||||
Deprecated directory containing client-writable configuration files.
|
||||
|
||||
Clients will be able to edit files in this directory via the API. This directory must be writable.
|
||||
'';
|
||||
@ -96,8 +97,18 @@ in {
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
warnings = optional (cfg.settings ? update_manager)
|
||||
''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.'';
|
||||
warnings = []
|
||||
++ optional (cfg.settings ? update_manager)
|
||||
''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.''
|
||||
++ optional (cfg.configDir != null)
|
||||
''
|
||||
services.moonraker.configDir has been deprecated upstream and will be removed.
|
||||
|
||||
Action: ${
|
||||
if cfg.configDir == unifiedConfigDir then "Simply remove services.moonraker.configDir from your config."
|
||||
else "Move files from `${cfg.configDir}` to `${unifiedConfigDir}` then remove services.moonraker.configDir from your config."
|
||||
}
|
||||
'';
|
||||
|
||||
assertions = [
|
||||
{
|
||||
@ -124,20 +135,20 @@ in {
|
||||
port = cfg.port;
|
||||
klippy_uds_address = cfg.klipperSocket;
|
||||
};
|
||||
machine = {
|
||||
validate_service = false;
|
||||
};
|
||||
} // (lib.optionalAttrs (cfg.configDir != null) {
|
||||
file_manager = {
|
||||
config_path = cfg.configDir;
|
||||
};
|
||||
database = {
|
||||
database_path = "${cfg.stateDir}/database";
|
||||
};
|
||||
};
|
||||
});
|
||||
fullConfig = recursiveUpdate cfg.settings forcedConfig;
|
||||
in format.generate "moonraker.cfg" fullConfig;
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -"
|
||||
"d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -"
|
||||
];
|
||||
] ++ lib.optional (cfg.configDir != null) "d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -";
|
||||
|
||||
systemd.services.moonraker = {
|
||||
description = "Moonraker, an API web server for Klipper";
|
||||
@ -147,9 +158,16 @@ in {
|
||||
|
||||
# Moonraker really wants its own config to be writable...
|
||||
script = ''
|
||||
cp /etc/moonraker.cfg ${cfg.configDir}/moonraker-temp.cfg
|
||||
chmod u+w ${cfg.configDir}/moonraker-temp.cfg
|
||||
exec ${pkg}/bin/moonraker -c ${cfg.configDir}/moonraker-temp.cfg
|
||||
config_path=${
|
||||
# Deprecated separate config dir
|
||||
if cfg.configDir != null then "${cfg.configDir}/moonraker-temp.cfg"
|
||||
# Config in unified data path
|
||||
else "${unifiedConfigDir}/moonraker-temp.cfg"
|
||||
}
|
||||
mkdir -p $(dirname "$config_path")
|
||||
cp /etc/moonraker.cfg "$config_path"
|
||||
chmod u+w "$config_path"
|
||||
exec ${pkg}/bin/moonraker -d ${cfg.stateDir} -c "$config_path"
|
||||
'';
|
||||
|
||||
# Needs `ip` command
|
||||
@ -184,5 +202,6 @@ in {
|
||||
meta.maintainers = with maintainers; [
|
||||
cab404
|
||||
vtuan10
|
||||
zhaofengli
|
||||
];
|
||||
}
|
||||
|
||||
@ -152,7 +152,7 @@ services.akkoma.config.":pleroma".":media_preview_proxy" = {
|
||||
|
||||
## Frontend management {#modules-services-akkoma-frontend-management}
|
||||
|
||||
Akkoma will be deployed with the `pleroma-fe` and `admin-fe` frontends by default. These can be
|
||||
Akkoma will be deployed with the `akkoma-fe` and `admin-fe` frontends by default. These can be
|
||||
modified by setting
|
||||
[{option}`services.akkoma.frontends`](options.html#opt-services.akkoma.frontends).
|
||||
|
||||
@ -160,7 +160,7 @@ The following example overrides the primary frontend’s default configuration u
|
||||
derivation.
|
||||
|
||||
```nix
|
||||
services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" {
|
||||
services.akkoma.frontends.primary.package = pkgs.runCommand "akkoma-fe" {
|
||||
config = builtins.toJSON {
|
||||
expertLevel = 1;
|
||||
collapseMessageWithSubject = false;
|
||||
@ -177,10 +177,10 @@ services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" {
|
||||
passAsFile = [ "config" ];
|
||||
} ''
|
||||
mkdir $out
|
||||
lndir ${pkgs.akkoma-frontends.pleroma-fe} $out
|
||||
lndir ${pkgs.akkoma-frontends.akkoma-fe} $out
|
||||
|
||||
rm $out/static/config.json
|
||||
jq -s add ${pkgs.akkoma-frontends.pleroma-fe}/static/config.json ${config} \
|
||||
jq -s add ${pkgs.akkoma-frontends.akkoma-fe}/static/config.json ${config} \
|
||||
>$out/static/config.json
|
||||
'';
|
||||
```
|
||||
|
||||
@ -51,13 +51,13 @@ let
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
description = mdDoc "Akkoma frontend package.";
|
||||
example = literalExpression "pkgs.akkoma-frontends.pleroma-fe";
|
||||
example = literalExpression "pkgs.akkoma-frontends.akkoma-fe";
|
||||
};
|
||||
|
||||
name = mkOption {
|
||||
type = types.nonEmptyStr;
|
||||
description = mdDoc "Akkoma frontend name.";
|
||||
example = "pleroma-fe";
|
||||
example = "akkoma-fe";
|
||||
};
|
||||
|
||||
ref = mkOption {
|
||||
@ -476,8 +476,8 @@ in {
|
||||
type = with types; attrsOf (submodule frontend);
|
||||
default = {
|
||||
primary = {
|
||||
package = pkgs.akkoma-frontends.pleroma-fe;
|
||||
name = "pleroma-fe";
|
||||
package = pkgs.akkoma-frontends.akkoma-fe;
|
||||
name = "akkoma-fe";
|
||||
ref = "stable";
|
||||
};
|
||||
admin = {
|
||||
@ -489,8 +489,8 @@ in {
|
||||
defaultText = literalExpression ''
|
||||
{
|
||||
primary = {
|
||||
package = pkgs.akkoma-frontends.pleroma-fe;
|
||||
name = "pleroma-fe";
|
||||
package = pkgs.akkoma-frontends.akkoma-fe;
|
||||
name = "akkoma-fe";
|
||||
ref = "stable";
|
||||
};
|
||||
admin = {
|
||||
|
||||
@ -79,7 +79,7 @@ in {
|
||||
(which can be opened e.g. by running `nixos-help`).
|
||||
'')
|
||||
(mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] ''
|
||||
Use services.nextcloud.nginx.enableImagemagick instead.
|
||||
Use services.nextcloud.enableImagemagick instead.
|
||||
'')
|
||||
];
|
||||
|
||||
|
||||
@ -316,7 +316,8 @@ in
|
||||
++ lib.optional config.services.colord.enable pkgs.colord-kde
|
||||
++ lib.optional config.services.hardware.bolt.enable pkgs.plasma5Packages.plasma-thunderbolt
|
||||
++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]
|
||||
++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet;
|
||||
++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet
|
||||
++ lib.optional config.services.flatpak.enable flatpak-kcm;
|
||||
|
||||
# Extra services for D-Bus activation
|
||||
services.dbus.packages = [
|
||||
|
||||
@ -495,7 +495,7 @@ in {
|
||||
|
||||
# If we are not booting a NixOS closure (e.g. init=/bin/sh),
|
||||
# we don't know what root to prepare so we don't do anything
|
||||
if ! [ -x "/sysroot$closure/prepare-root" ]; then
|
||||
if ! [ -x "/sysroot$(readlink "/sysroot$closure/prepare-root" || echo "$closure/prepare-root")" ]; then
|
||||
echo "NEW_INIT=''${initParam[1]}" > /etc/switch-root.conf
|
||||
echo "$closure does not look like a NixOS installation - not activating"
|
||||
exit 0
|
||||
|
||||
@ -7,7 +7,10 @@ let
|
||||
|
||||
podmanPackage = (pkgs.podman.override {
|
||||
extraPackages = cfg.extraPackages
|
||||
++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package;
|
||||
# setuid shadow
|
||||
++ [ "/run/wrappers" ]
|
||||
# include pkgs.zfs by default in the wrapped podman used by the module so it is cached
|
||||
++ (if (builtins.elem "zfs" config.boot.supportedFilesystems) then [ config.boot.zfs.package ] else [ pkgs.zfs ]);
|
||||
});
|
||||
|
||||
# Provides a fake "docker" binary mapping to podman
|
||||
@ -181,10 +184,6 @@ in
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
systemd.services.podman.serviceConfig = {
|
||||
ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ];
|
||||
};
|
||||
|
||||
systemd.services.podman-prune = {
|
||||
description = "Prune podman resources";
|
||||
|
||||
@ -205,10 +204,6 @@ in
|
||||
systemd.sockets.podman.wantedBy = [ "sockets.target" ];
|
||||
systemd.sockets.podman.socketConfig.SocketGroup = "podman";
|
||||
|
||||
systemd.user.services.podman.serviceConfig = {
|
||||
ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ];
|
||||
};
|
||||
|
||||
systemd.user.sockets.podman.wantedBy = [ "sockets.target" ];
|
||||
|
||||
systemd.tmpfiles.packages = [
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
{ system ? builtins.currentSystem
|
||||
, pkgs ? import ../../.. { inherit system; }
|
||||
, lib ? pkgs.lib
|
||||
}:
|
||||
let
|
||||
allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs;
|
||||
in
|
||||
{
|
||||
# Run a single node k3s cluster and verify a pod can run
|
||||
single-node = import ./single-node.nix { inherit system pkgs; };
|
||||
single-node = lib.mapAttrs (_: k3s: import ./single-node.nix { inherit system pkgs k3s; }) allK3s;
|
||||
# Run a multi-node k3s cluster and verify pod networking works across nodes
|
||||
multi-node = import ./multi-node.nix { inherit system pkgs; };
|
||||
multi-node = lib.mapAttrs (_: k3s: import ./multi-node.nix { inherit system pkgs k3s; }) allK3s;
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import ../make-test-python.nix ({ pkgs, lib, ... }:
|
||||
import ../make-test-python.nix ({ pkgs, lib, k3s, ... }:
|
||||
let
|
||||
imageEnv = pkgs.buildEnv {
|
||||
name = "k3s-pause-image-env";
|
||||
@ -39,7 +39,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
|
||||
tokenFile = pkgs.writeText "token" "p@s$w0rd";
|
||||
in
|
||||
{
|
||||
name = "k3s-multi-node";
|
||||
name = "${k3s.name}-multi-node";
|
||||
|
||||
nodes = {
|
||||
server = { pkgs, ... }: {
|
||||
@ -52,7 +52,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
|
||||
inherit tokenFile;
|
||||
enable = true;
|
||||
role = "server";
|
||||
package = pkgs.k3s;
|
||||
package = k3s;
|
||||
clusterInit = true;
|
||||
extraFlags = builtins.toString [
|
||||
"--disable" "coredns"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import ../make-test-python.nix ({ pkgs, lib, ... }:
|
||||
import ../make-test-python.nix ({ pkgs, lib, k3s, ... }:
|
||||
let
|
||||
imageEnv = pkgs.buildEnv {
|
||||
name = "k3s-pause-image-env";
|
||||
@ -24,7 +24,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
|
||||
'';
|
||||
in
|
||||
{
|
||||
name = "k3s";
|
||||
name = "${k3s.name}-single-node";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ euank ];
|
||||
};
|
||||
@ -38,7 +38,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
|
||||
|
||||
services.k3s.enable = true;
|
||||
services.k3s.role = "server";
|
||||
services.k3s.package = pkgs.k3s;
|
||||
services.k3s.package = k3s;
|
||||
# Slightly reduce resource usage
|
||||
services.k3s.extraFlags = builtins.toString [
|
||||
"--disable" "coredns"
|
||||
|
||||
@ -13,7 +13,7 @@ in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd }: {
|
||||
name = pkgs.lib.optionalString (!predictable) "un" + "predictable"
|
||||
+ pkgs.lib.optionalString withNetworkd "Networkd";
|
||||
value = makeTest {
|
||||
name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}";
|
||||
name = "${pkgs.lib.optionalString (!predictable) "un"}predictableInterfaceNames${pkgs.lib.optionalString withNetworkd "-with-networkd"}";
|
||||
meta = {};
|
||||
|
||||
nodes.machine = { lib, ... }: {
|
||||
|
||||
@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
|
||||
prePatch = ''
|
||||
sed -e s,/bin/ln,ln,g -i src/Makefile
|
||||
sed -e 's,^CXXFLAGS=-O2,CXXFLAGS=-O2 -D PATH_ESPEAK_DATA=\\\"$(DATADIR)\\\",' -i src/Makefile
|
||||
'' + (if portaudio.api_version == 19 then ''
|
||||
'' + (lib.optionalString (portaudio.api_version == 19) ''
|
||||
cp src/portaudio19.h src/portaudio.h
|
||||
'' else "");
|
||||
'');
|
||||
|
||||
configurePhase = ''
|
||||
cd src
|
||||
|
||||
@ -10,11 +10,11 @@ stdenv.mkDerivation {
|
||||
};
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ eigen ffmpeg ];
|
||||
fixupPhase = if stdenv.isDarwin then ''
|
||||
fixupPhase = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly
|
||||
install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly
|
||||
install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib
|
||||
'' else "";
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.musly.org";
|
||||
|
||||
@ -3,17 +3,25 @@
|
||||
, appimageTools
|
||||
}:
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
let
|
||||
pname = "sonixd";
|
||||
version = "0.15.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage";
|
||||
sha256 = "sha256-+4L3XAuR7T/z5a58SXre6yUiVi7TvSAs8vPgEC7hcIw=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
appimageTools.wrapType2 rec {
|
||||
inherit pname version src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/sonixd-${version} $out/bin/sonixd
|
||||
mv $out/bin/${pname}-${version} $out/bin/${pname}
|
||||
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
||||
|
||||
install -m 444 -D ${appimageContents}/${pname}.png \
|
||||
$out/share/icons/hicolor/1024x1024/apps/${pname}.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -134,8 +134,8 @@ stdenv.mkDerivation {
|
||||
ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so
|
||||
ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so
|
||||
|
||||
ln -s ${ffmpeg.out}/lib/libavcodec.so* $libdir
|
||||
ln -s ${ffmpeg.out}/lib/libavformat.so* $libdir
|
||||
ln -s ${ffmpeg.lib}/lib/libavcodec.so* $libdir
|
||||
ln -s ${ffmpeg.lib}/lib/libavformat.so* $libdir
|
||||
|
||||
rpath="$out/share/spotify:$libdir"
|
||||
|
||||
|
||||
@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
buildInputs = [ lightdm gtk3 glib ];
|
||||
|
||||
postUnpack = if conf != "" then ''
|
||||
postUnpack = lib.optionalString (conf != "") ''
|
||||
cp ${builtins.toFile "config.h" conf} source/config.h
|
||||
'' else "";
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p $out/bin $out/share/xgreeters
|
||||
|
||||
@ -10,8 +10,8 @@ let
|
||||
inherit tiling_wm;
|
||||
};
|
||||
stableVersion = {
|
||||
version = "2022.1.1.19"; # "Android Studio Electric Eel (2022.1.1)"
|
||||
sha256Hash = "luxE6a2C86JB28ezuIZV49TyE314S1RcNXQnCQamjUA=";
|
||||
version = "2022.1.1.20"; # "Android Studio Electric Eel (2022.1.1) Patch 1"
|
||||
sha256Hash = "sha256-UX7aOpTM23S7NBPNAz/fKEyK/dqWpok0NnpX9wck6p4=";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2022.2.1.12"; # "Android Studio Flamingo (2022.2.1) Beta 1"
|
||||
|
||||
@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.183.0";
|
||||
version = "1.184.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
hash = "sha256-hfOEL1Qkf8Sk6cNWUBwZXH/DSuo/ObyA5sRLOj9Iw3M=";
|
||||
hash = "sha256-bRe9yS9CMsBH04oefImSYkd1jUe3SnJU6JZETLwow/0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
4
pkgs/applications/editors/cudatext/deps.json
generated
4
pkgs/applications/editors/cudatext/deps.json
generated
@ -16,8 +16,8 @@
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.02.05",
|
||||
"hash": "sha256-V0mvSuiO5dTztXZ4uvteF0e7B21Ll1uq6o0UHPcZm1o="
|
||||
"rev": "2023.02.12",
|
||||
"hash": "sha256-PSRKxKJkX9GlV8JUACYzDZguv8M8jKVxlW7U4Mmla9o="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
|
||||
@ -27,18 +27,18 @@ rec {
|
||||
|
||||
postPatch = (if tex == null then ''
|
||||
gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -)
|
||||
'' else if extraFonts then ''
|
||||
'' else lib.optionalString extraFonts ''
|
||||
gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -)
|
||||
'' else "") +
|
||||
(if chineseFonts then ''
|
||||
'') +
|
||||
(lib.optionalString chineseFonts ''
|
||||
gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -)
|
||||
'' else "") +
|
||||
(if japaneseFonts then ''
|
||||
'') +
|
||||
(lib.optionalString japaneseFonts ''
|
||||
gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -)
|
||||
'' else "") +
|
||||
(if koreanFonts then ''
|
||||
'') +
|
||||
(lib.optionalString koreanFonts ''
|
||||
gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -)
|
||||
'' else "");
|
||||
'');
|
||||
|
||||
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -27,12 +27,12 @@
|
||||
};
|
||||
arduino = buildGrammar {
|
||||
language = "arduino";
|
||||
version = "c473c09";
|
||||
version = "257efff";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ObserverOfTime";
|
||||
repo = "tree-sitter-arduino";
|
||||
rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8";
|
||||
hash = "sha256-aAw1ZgKuMWozQzmENUhkdkHV0BjSGmTdH4Bna7EfDaQ=";
|
||||
rev = "257efffa387da3283a37816b71dedfecf4af5222";
|
||||
hash = "sha256-Yc3oFzOMyQwW2URyEzSIe6wBNAu9J2vPFIXk43sVUv8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
|
||||
};
|
||||
@ -115,23 +115,23 @@
|
||||
};
|
||||
c_sharp = buildGrammar {
|
||||
language = "c_sharp";
|
||||
version = "a29bac0";
|
||||
version = "18e4343";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-c-sharp";
|
||||
rev = "a29bac0681802139710b4d3875540901504d15cb";
|
||||
hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY=";
|
||||
rev = "18e434383a4582b4fd183a30e55022c2923764e1";
|
||||
hash = "sha256-ggvCj2yGDINuGr8Jb+aOoRxlKa5LaXCoiQC/Y5Hrcn0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
|
||||
};
|
||||
capnp = buildGrammar {
|
||||
language = "capnp";
|
||||
version = "740c757";
|
||||
version = "cb85cdd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-capnp";
|
||||
rev = "740c757b9585925b1ed27cef7d61ac39b7824304";
|
||||
hash = "sha256-0zCSWV3afsEIhN6XavMnn4LrLenjerhdnTfQ/EaL4aA=";
|
||||
rev = "cb85cddfdf398530110c807ba046822dbaee6afb";
|
||||
hash = "sha256-VB8fNF8EtTAkKBLIAByazczPHJYdBULCeoGQ1ZLLRhI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
|
||||
};
|
||||
@ -159,12 +159,12 @@
|
||||
};
|
||||
cmake = buildGrammar {
|
||||
language = "cmake";
|
||||
version = "a322653";
|
||||
version = "399605a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "uyha";
|
||||
repo = "tree-sitter-cmake";
|
||||
rev = "a32265307aa2d31941056d69e8b6633e61750b2f";
|
||||
hash = "sha256-LBd3SMem1dxZr/dOdJdEFTQxI6d+H8uYE46yN02E/6Y=";
|
||||
rev = "399605a02bcd5daa309ce63a6459c600dce3473f";
|
||||
hash = "sha256-7pzKyfR9RmfgzuX9/elUesmsdbLlwgrfiRP73YQu+gM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
|
||||
};
|
||||
@ -304,12 +304,12 @@
|
||||
};
|
||||
ebnf = buildGrammar {
|
||||
language = "ebnf";
|
||||
version = "ef241bc";
|
||||
version = "8e635b0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RubixDev";
|
||||
repo = "ebnf";
|
||||
rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c";
|
||||
hash = "sha256-N5TGYJnYNjYIdFXspGn+dDRm0wmJymXHY+Io43wSKlI=";
|
||||
rev = "8e635b0b723c620774dfb8abf382a7f531894b40";
|
||||
hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg=";
|
||||
};
|
||||
location = "crates/tree-sitter-ebnf";
|
||||
meta.homepage = "https://github.com/RubixDev/ebnf.git";
|
||||
@ -371,12 +371,12 @@
|
||||
};
|
||||
embedded_template = buildGrammar {
|
||||
language = "embedded_template";
|
||||
version = "a130858";
|
||||
version = "203f7bd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-embedded-template";
|
||||
rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df";
|
||||
hash = "sha256-JNyLOW/na8J0WEsLDv3BuC+UXxGpYMYvAlywq4z6Wzo=";
|
||||
rev = "203f7bd3c1bbfbd98fc19add4b8fcb213c059205";
|
||||
hash = "sha256-SaZkyy2wKYoK0+pdHLVpQrdXjEeX/uR5XxgahcAdwz0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template";
|
||||
};
|
||||
@ -426,12 +426,12 @@
|
||||
};
|
||||
fortran = buildGrammar {
|
||||
language = "fortran";
|
||||
version = "edcb337";
|
||||
version = "bfa6fd4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stadelmanma";
|
||||
repo = "tree-sitter-fortran";
|
||||
rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7";
|
||||
hash = "sha256-xZfWtRHWy3MQtkzN9jSwx+sAwLlcRiVLTJjYXyWEIs8=";
|
||||
rev = "bfa6fd4c4aa0bb9b39ad33daa004ad4637a91d20";
|
||||
hash = "sha256-5Lf/6jhgRPgSPNCHqiYT8OeI7UUnTfQqH8rzf8ggHj0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
|
||||
};
|
||||
@ -448,12 +448,12 @@
|
||||
};
|
||||
func = buildGrammar {
|
||||
language = "func";
|
||||
version = "88ee7d0";
|
||||
version = "f161cfe";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-func";
|
||||
rev = "88ee7d0f569af10ab8c78a12f37217a8d15a0ffa";
|
||||
hash = "sha256-SLI59AtprfCQr6VccCVr+2sazEtUSXnAwHcclWrkXxA=";
|
||||
rev = "f161cfe22452b386eeeab29ba0d2c14893f1a31f";
|
||||
hash = "sha256-Swyg5EdBWVT6P9vgS7h/fmK0ySRwiFlynJEZT9I10qg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-func";
|
||||
};
|
||||
@ -470,12 +470,12 @@
|
||||
};
|
||||
gdscript = buildGrammar {
|
||||
language = "gdscript";
|
||||
version = "4849e65";
|
||||
version = "5d43d78";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrestonKnopp";
|
||||
repo = "tree-sitter-gdscript";
|
||||
rev = "4849e657b98945cd040ffa7fd833d6130259dbab";
|
||||
hash = "sha256-Rs1W2jahp+J42JzICi+QLAqfHYXth47g4LjejJnJypo=";
|
||||
rev = "5d43d78c276570f76773685f08baf9e4ada09639";
|
||||
hash = "sha256-SNyZutgab3T1UaD/D6jnhF3QmAR/UVtlXTpNjYlf2+Y=";
|
||||
};
|
||||
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
|
||||
};
|
||||
@ -537,12 +537,12 @@
|
||||
};
|
||||
glimmer = buildGrammar {
|
||||
language = "glimmer";
|
||||
version = "c0bfd26";
|
||||
version = "40cfb72";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexlafroscia";
|
||||
repo = "tree-sitter-glimmer";
|
||||
rev = "c0bfd260cdcbe2976f4633547c218f09f7222a89";
|
||||
hash = "sha256-Goj900MJxO44KYkzD0UpGFEGHAwr6qhe2bmCzpx5BhE=";
|
||||
rev = "40cfb72a53654cbd666451ca04ffd500257c7b73";
|
||||
hash = "sha256-h9ZZz6mbkErLIG/BamNRRoRdqmuBO3v17W0uvmpbm7A=";
|
||||
};
|
||||
meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer";
|
||||
};
|
||||
@ -637,12 +637,12 @@
|
||||
};
|
||||
haskell = buildGrammar {
|
||||
language = "haskell";
|
||||
version = "aee3725";
|
||||
version = "3bdba07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-haskell";
|
||||
rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e";
|
||||
hash = "sha256-DmrrRht3g0hG+OsJCHRL+xW4jflLqtG57AuFf7zd26c=";
|
||||
rev = "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3";
|
||||
hash = "sha256-/aGUdyVxXqXCvjruI8rqiKzfTsyxzOKaXSAUG5xK4cE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
|
||||
};
|
||||
@ -835,12 +835,12 @@
|
||||
};
|
||||
jsonnet = buildGrammar {
|
||||
language = "jsonnet";
|
||||
version = "505f5bd";
|
||||
version = "fdc7757";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegraph";
|
||||
repo = "tree-sitter-jsonnet";
|
||||
rev = "505f5bd90053ae895aa3d6f2bac8071dd9abd8b2";
|
||||
hash = "sha256-XZqywAzM+UCKto/OFn50hhRpEyFVLpFV7Q1Z0NKoPsI=";
|
||||
rev = "fdc775714afa27fdef823adbaba6ab98f5ae66f2";
|
||||
hash = "sha256-KVpSB3LiC1qpF05Y1ScIglaXWIrAL+m7G4Q4/EVn0U8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet";
|
||||
};
|
||||
@ -857,12 +857,12 @@
|
||||
};
|
||||
kdl = buildGrammar {
|
||||
language = "kdl";
|
||||
version = "f83f394";
|
||||
version = "b50d6c8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-kdl";
|
||||
rev = "f83f3943568c7e7b4f5e0de1b04d722223bd4d80";
|
||||
hash = "sha256-BakY6V4A2N/ZZCkyr7KU04/DWeGTAkkJua5TyZ6uNW4=";
|
||||
rev = "b50d6c8b77d311639ecbf2b803ffb720c2b4cee2";
|
||||
hash = "sha256-dE2SqRSjy05Un3DPkrVDN0+na1ahddY57RYPMtaWynA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-kdl";
|
||||
};
|
||||
@ -956,24 +956,24 @@
|
||||
};
|
||||
markdown = buildGrammar {
|
||||
language = "markdown";
|
||||
version = "abea13b";
|
||||
version = "7e7aa9a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MDeiml";
|
||||
repo = "tree-sitter-markdown";
|
||||
rev = "abea13b86c404564991244b69b7afc4ca362d0c0";
|
||||
hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU=";
|
||||
rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979";
|
||||
hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0=";
|
||||
};
|
||||
location = "tree-sitter-markdown";
|
||||
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
|
||||
};
|
||||
markdown_inline = buildGrammar {
|
||||
language = "markdown_inline";
|
||||
version = "abea13b";
|
||||
version = "7e7aa9a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MDeiml";
|
||||
repo = "tree-sitter-markdown";
|
||||
rev = "abea13b86c404564991244b69b7afc4ca362d0c0";
|
||||
hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU=";
|
||||
rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979";
|
||||
hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0=";
|
||||
};
|
||||
location = "tree-sitter-markdown-inline";
|
||||
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
|
||||
@ -1126,12 +1126,12 @@
|
||||
};
|
||||
php = buildGrammar {
|
||||
language = "php";
|
||||
version = "973694f";
|
||||
version = "f860e59";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-php";
|
||||
rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9";
|
||||
hash = "sha256-upJ8WwosOe4Xv/H9LUFVUVThLSLS+5Htr71Lyc/ZTJo=";
|
||||
rev = "f860e598194f4a71747f91789bf536b393ad4a56";
|
||||
hash = "sha256-j4RJUBbp2zvCHsZwnz62t2Tf6Cy1LOKrhg/pi8cqzAs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
|
||||
};
|
||||
@ -1192,12 +1192,12 @@
|
||||
};
|
||||
pug = buildGrammar {
|
||||
language = "pug";
|
||||
version = "26f6ac8";
|
||||
version = "884e225";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zealot128";
|
||||
repo = "tree-sitter-pug";
|
||||
rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f";
|
||||
hash = "sha256-KUIjt8p4B3LrU9vRQGL9Pf3ZYMfdDrazC2kNwTpRAgg=";
|
||||
rev = "884e225b5ecca5d885ae627275f16ef648acd42e";
|
||||
hash = "sha256-qPfVSnsw9bDznq7rhzftGyv9cGi2OiF6DCh55Lxk8xA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/zealot128/tree-sitter-pug";
|
||||
};
|
||||
@ -1311,6 +1311,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb";
|
||||
};
|
||||
ron = buildGrammar {
|
||||
language = "ron";
|
||||
version = "049a3ef";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-ron";
|
||||
rev = "049a3ef4e271089107dd08e4aeb195abd1f77103";
|
||||
hash = "sha256-ITWls8kp/UvwWOBE19v1UWQ1/BEiDhsK5VIFHicJM84=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-ron";
|
||||
};
|
||||
rst = buildGrammar {
|
||||
language = "rst";
|
||||
version = "25e6328";
|
||||
@ -1434,12 +1445,12 @@
|
||||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "c508e60";
|
||||
version = "7be06f4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "c508e6044adf4298d7b321f966c90cbe32d75d23";
|
||||
hash = "sha256-Ed+6pwxwvwLKOVB9XVHF+IftEiO4bG0yZAe77xBcazI=";
|
||||
rev = "7be06f4d5eabace883dd45959c13dc740f1f1b98";
|
||||
hash = "sha256-Hi/4/Aou85MYCMMFqf5xqAyKECTzfeiaksJxdv9MVCU=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
@ -1538,12 +1549,12 @@
|
||||
};
|
||||
thrift = buildGrammar {
|
||||
language = "thrift";
|
||||
version = "634a73f";
|
||||
version = "763ae3d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "duskmoon314";
|
||||
repo = "tree-sitter-thrift";
|
||||
rev = "634a73fd2c80e169f302917ba665c07ec0b6ff7b";
|
||||
hash = "sha256-pB7zd48aonYYKdvD3+35zsD76+F/lqBYveFBxBQISvA=";
|
||||
rev = "763ae3d760b7a7719b57568bdf9ffae2d896680f";
|
||||
hash = "sha256-LXHXCaD76H9kWjOwCPfrpO2ZEv3mlq0IpWnwzV/qr2M=";
|
||||
};
|
||||
meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
|
||||
};
|
||||
@ -1560,12 +1571,12 @@
|
||||
};
|
||||
tlaplus = buildGrammar {
|
||||
language = "tlaplus";
|
||||
version = "6fd16d8";
|
||||
version = "6d2ec89";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlaplus-community";
|
||||
repo = "tree-sitter-tlaplus";
|
||||
rev = "6fd16d8469c6898317423d61738d97e2b3f5caf7";
|
||||
hash = "sha256-s5mYc/kPZ4wHhm1ZeC5WBjBfzTFnANPRAZeE8UOVE1I=";
|
||||
rev = "6d2ec894aef843fc89312c904e20c5f555aec4e3";
|
||||
hash = "sha256-5V4sMnjVsdSJdeYspxn0nYqq73lVHvz7eGRfD/orqo4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
|
||||
};
|
||||
@ -1639,12 +1650,12 @@
|
||||
};
|
||||
v = buildGrammar {
|
||||
language = "v";
|
||||
version = "719cf0c";
|
||||
version = "136f3a0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "vls";
|
||||
rev = "719cf0cd297f9b2f45ecfbeb0115379fb8cfa9c3";
|
||||
hash = "sha256-4xb5x/JZN1pFvPVqazcZMdZm8DTpBb5nW5AgOrB3YHc=";
|
||||
rev = "136f3a0ad91ab8a781c2d4eb419df0a981839f69";
|
||||
hash = "sha256-zmbR2Of/XEJuGvNmXAJ+C4aAMem51LVS3e1rSqjaSb0=";
|
||||
};
|
||||
location = "tree_sitter_v";
|
||||
meta.homepage = "https://github.com/vlang/vls";
|
||||
@ -1684,12 +1695,12 @@
|
||||
};
|
||||
vim = buildGrammar {
|
||||
language = "vim";
|
||||
version = "55ff1b0";
|
||||
version = "e39a7bb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vigoux";
|
||||
repo = "tree-sitter-viml";
|
||||
rev = "55ff1b080c09edeced9b748cf4c16d0b49d17fb9";
|
||||
hash = "sha256-bMh6RPP0+zpNkMS/mpbKTaug9EL6u4kTcztnEXaNGyA=";
|
||||
rev = "e39a7bbcfdcfc7900629962b785c7e14503ae590";
|
||||
hash = "sha256-f3UAHwCL5yerEjmuDp+guzX4/ik4h7ProH5P8AmdO10=";
|
||||
};
|
||||
meta.homepage = "https://github.com/vigoux/tree-sitter-viml";
|
||||
};
|
||||
@ -1750,12 +1761,12 @@
|
||||
};
|
||||
zig = buildGrammar {
|
||||
language = "zig";
|
||||
version = "b0693dd";
|
||||
version = "6b3f578";
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxxnino";
|
||||
repo = "tree-sitter-zig";
|
||||
rev = "b0693dd473efd91d6085acd8e0ff9c627d37e077";
|
||||
hash = "sha256-Jmz2XDI+mrBYE2TEhxPJZbICbhs5AOC0tyC4OOgT61U=";
|
||||
rev = "6b3f5788f38be900b45f5af5a753bf6a37d614b8";
|
||||
hash = "sha256-KwMo1gwre8/AXkXXwQqPHZIEPXM26PK8SI0p3tmkt24=";
|
||||
};
|
||||
meta.homepage = "https://github.com/maxxnino/tree-sitter-zig";
|
||||
};
|
||||
|
||||
@ -941,6 +941,10 @@ self: super: {
|
||||
dependencies = with self; [ telescope-nvim ];
|
||||
});
|
||||
|
||||
telescope-undo-nvim = super.telescope-undo-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ telescope-nvim ];
|
||||
});
|
||||
|
||||
telescope-z-nvim = super.telescope-z-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ telescope-nvim ];
|
||||
});
|
||||
@ -1088,7 +1092,7 @@ self: super: {
|
||||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-jpO26OXaYcWirQ5tTKIwlva7dHIfdmnruF4WdwSq0nI=";
|
||||
cargoSha256 = "sha256-JQwT7IFYC/K+t3YO34hoalxdt1TEsmEcBXtDKFVdles=";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
||||
@ -699,6 +699,7 @@ https://github.com/nvim-telescope/telescope-project.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-symbols.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-ui-select.nvim/,,
|
||||
https://github.com/fhill2/telescope-ultisnips.nvim/,,
|
||||
https://github.com/debugloop/telescope-undo.nvim/,HEAD,
|
||||
https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-z.nvim/,,
|
||||
https://github.com/jvgrootveld/telescope-zoxide/,,
|
||||
|
||||
@ -317,8 +317,8 @@ rec {
|
||||
lib.warnIf (wrapManual != null) ''
|
||||
vim.customize: wrapManual is deprecated: the manual is now included by default if `name == "vim"`.
|
||||
${if wrapManual == true && name != "vim" then "Set `standalone = false` to include the manual."
|
||||
else if wrapManual == false && name == "vim" then "Set `standalone = true` to get the *vim wrappers only."
|
||||
else ""}''
|
||||
else lib.optionalString (wrapManual == false && name == "vim") "Set `standalone = true` to get the *vim wrappers only."
|
||||
}''
|
||||
lib.warnIf (wrapGui != null)
|
||||
"vim.customize: wrapGui is deprecated: gvim is now automatically included if present"
|
||||
lib.throwIfNot (vimExecutableName == null && gvimExecutableName == null)
|
||||
@ -330,7 +330,7 @@ rec {
|
||||
else throw "at least one of vimrcConfig and vimrcFile must be specified";
|
||||
bin = runCommand "${name}-bin" { nativeBuildInputs = [ makeWrapper ]; } ''
|
||||
vimrc=${lib.escapeShellArg vimrc}
|
||||
gvimrc=${if gvimrcFile != null then lib.escapeShellArg gvimrcFile else ""}
|
||||
gvimrc=${lib.optionalString (gvimrcFile != null) (lib.escapeShellArg gvimrcFile)}
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
for exe in ${
|
||||
|
||||
@ -927,8 +927,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "gitlens";
|
||||
publisher = "eamodio";
|
||||
version = "2022.12.604";
|
||||
sha256 = "sha256-yfqGITviASp5ZDEJA+zyVz1LpPWV4FM/4fU4eq52Xng=";
|
||||
version = "2023.2.1204";
|
||||
sha256 = "sha256-FurYfkw+mOjyymR1VCGf0jJ2JCZJ8eGb1J7zD2peBjw=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
||||
@ -3089,6 +3089,22 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
zhwu95.riscv = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "riscv";
|
||||
publisher = "zhwu95";
|
||||
version = "0.0.8";
|
||||
sha256 = "sha256-PXaHSEXoN0ZboHIoDg37tZ+Gv6xFXP4wGBS3YS/53TY=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Basic RISC-V colorization and snippets support.";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=zhwu95.riscv";
|
||||
homepage = "https://github.com/zhuanhao-wu/vscode-riscv-support";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.CardboardTurkey ];
|
||||
};
|
||||
};
|
||||
|
||||
zxh404.vscode-proto3 = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-proto3";
|
||||
|
||||
101
pkgs/applications/emulators/c64-debugger/default.nix
Normal file
101
pkgs/applications/emulators/c64-debugger/default.nix
Normal file
@ -0,0 +1,101 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, alsa-lib
|
||||
, gtk3
|
||||
, libGL
|
||||
, libGLU
|
||||
, libX11
|
||||
, pkg-config
|
||||
, upx
|
||||
, xcbutil
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "c64-debugger";
|
||||
version = "0.64.58.6";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/c64-debugger/code";
|
||||
rev = "f97772e3f5c8b4fa99e8ed212ed1c4cb1e2389f1";
|
||||
sha256 = "sha256-3SR73AHQlYSEYpJLtQ/aJ1UITZGq7aA9tQKxBsn/yuc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
gtk3
|
||||
libGL
|
||||
libGLU
|
||||
pkg-config
|
||||
libX11
|
||||
xcbutil
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
upx
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Disable default definition of RUN_COMMODORE64
|
||||
sed -i 's|^#define RUN_COMMODORE64|//#define RUN_COMMODORE64|' MTEngine/Games/c64/C64D_Version.h
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
# Build C64 debugger
|
||||
make -C MTEngine \
|
||||
CFLAGS="-w -O2 -fcommon" \
|
||||
CXXFLAGS="-w -O2 --std=c++11" \
|
||||
DEFINES="-DRUN_COMMODORE64" \
|
||||
-j$NIX_BUILD_CORES
|
||||
mv MTEngine/c64debugger c64debugger
|
||||
make -C MTEngine clean
|
||||
|
||||
# Build 65XE debugger
|
||||
make -C MTEngine \
|
||||
CFLAGS="-w -O2 -fcommon" \
|
||||
CXXFLAGS="-w -O2 --std=c++11" \
|
||||
DEFINES="-DRUN_ATARI" \
|
||||
-j$NIX_BUILD_CORES
|
||||
mv MTEngine/c64debugger 65xedebugger
|
||||
make -C MTEngine clean
|
||||
|
||||
# Build NES debugger
|
||||
make -C MTEngine \
|
||||
CFLAGS="-w -O2 -fcommon" \
|
||||
CXXFLAGS="-w -O2 --std=c++11" \
|
||||
DEFINES="-DRUN_NES" \
|
||||
-j$NIX_BUILD_CORES
|
||||
mv MTEngine/c64debugger nesdebugger
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -d "$out/bin"
|
||||
install -d "$out/share/doc"
|
||||
install -m 755 c64debugger 65xedebugger nesdebugger "$out/bin"
|
||||
install -m 644 MTEngine/Assets/*.txt "$out/share/doc"
|
||||
install -m 644 MTEngine/Assets/*.pdf "$out/share/doc"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sourceforge.net/projects/c64-debugger";
|
||||
description = "Commodore 64, Atari XL/XE and NES code and memory debugger that works in real time";
|
||||
license = with licenses; [
|
||||
gpl3Only # c64-debugger
|
||||
mit # MTEngine
|
||||
# emulators included in c64-debugger
|
||||
gpl2Plus # VICE, atari800
|
||||
gpl2 # nestopiaue
|
||||
];
|
||||
mainProgram = "c64debugger";
|
||||
maintainers = [ maintainers.detegr ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,15 +1,10 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, SDL2_net
|
||||
, alsa-lib
|
||||
{ alsa-lib
|
||||
, copyDesktopItems
|
||||
, fetchFromGitHub
|
||||
, fluidsynth
|
||||
, glib
|
||||
, gtest
|
||||
, irr1
|
||||
, lib
|
||||
, libGL
|
||||
, libGLU
|
||||
, libjack2
|
||||
@ -25,17 +20,22 @@
|
||||
, ninja
|
||||
, opusfile
|
||||
, pkg-config
|
||||
, irr1
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, SDL2_net
|
||||
, speexdsp
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (self: {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dosbox-staging";
|
||||
version = "0.80.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dosbox-staging";
|
||||
repo = "dosbox-staging";
|
||||
rev = "v${self.version}";
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc=";
|
||||
};
|
||||
|
||||
@ -49,9 +49,6 @@ stdenv.mkDerivation (self: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
SDL2_image
|
||||
SDL2_net
|
||||
alsa-lib
|
||||
fluidsynth
|
||||
glib
|
||||
@ -66,6 +63,9 @@ stdenv.mkDerivation (self: {
|
||||
libslirp
|
||||
libsndfile
|
||||
opusfile
|
||||
SDL2
|
||||
SDL2_image
|
||||
SDL2_net
|
||||
speexdsp
|
||||
];
|
||||
|
||||
@ -91,17 +91,17 @@ stdenv.mkDerivation (self: {
|
||||
# original dosbox. Doing it this way allows us to work with frontends and
|
||||
# launchers that expect the binary to be named dosbox, but get out of the
|
||||
# way of vanilla dosbox if the user desires to install that as well.
|
||||
mv $out/bin/dosbox $out/bin/${self.pname}
|
||||
mv $out/bin/dosbox $out/bin/${pname}
|
||||
makeWrapper $out/bin/dosbox-staging $out/bin/dosbox
|
||||
|
||||
# Create a symlink to dosbox manual instead of merely copying it
|
||||
pushd $out/share/man/man1/
|
||||
mv dosbox.1.gz ${self.pname}.1.gz
|
||||
ln -s ${self.pname}.1.gz dosbox.1.gz
|
||||
mv dosbox.1.gz ${pname}.1.gz
|
||||
ln -s ${pname}.1.gz dosbox.1.gz
|
||||
popd
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://dosbox-staging.github.io/";
|
||||
description = "A modernized DOS emulator";
|
||||
longDescription = ''
|
||||
@ -110,14 +110,10 @@ stdenv.mkDerivation (self: {
|
||||
existing DOSBox codebase while leveraging modern development tools and
|
||||
practices.
|
||||
'';
|
||||
changelog = "https://github.com/dosbox-staging/dosbox-staging/releases/tag/v${self.version}";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [
|
||||
lib.maintainers.joshuafern
|
||||
lib.maintainers.AndersonTorres
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ joshuafern AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
priority = 101;
|
||||
};
|
||||
})
|
||||
# TODO: report upstream about not finding extra SDL2 libraries
|
||||
}
|
||||
# TODO: report upstream about not finding SDL2_net
|
||||
|
||||
@ -34,11 +34,11 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
wrapVifmMedia = "wrapProgram $out/share/vifm/vifm-media --prefix PATH : ${path}";
|
||||
in ''
|
||||
${if mediaSupport then wrapVifmMedia else ""}
|
||||
${lib.optionalString mediaSupport wrapVifmMedia}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}";
|
||||
description = "A vi-like file manager${lib.optionalString isFullPackage "; Includes support for optional features"}";
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = if mediaSupport then platforms.linux else platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, gnome
|
||||
, pkg-config
|
||||
, meson
|
||||
@ -40,6 +42,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-l/iv5SJTUhZUHrvx47VG0Spr6zio8OuF8m5naTSq1CU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with libraw 0.21, can be removed on next update
|
||||
# https://hydra.nixos.org/build/209327709/nixlog/1
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch";
|
||||
sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
desktop-file-utils
|
||||
|
||||
@ -87,10 +87,10 @@ stdenv.mkDerivation rec {
|
||||
'' else ''
|
||||
substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"'
|
||||
'') +
|
||||
(if hipSupport then ''
|
||||
(lib.optionalString hipSupport ''
|
||||
substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${hip}/lib/libamdhip64.so"'
|
||||
substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${hip}/bin"'
|
||||
'' else "");
|
||||
'');
|
||||
|
||||
cmakeFlags =
|
||||
[
|
||||
|
||||
@ -57,6 +57,11 @@ stdenv.mkDerivation rec {
|
||||
# Without patched plugin shebangs, some tests like t/rst.t fail
|
||||
# (with docutilsSupport enabled)
|
||||
patchShebangs plugins/*
|
||||
|
||||
# Creating shared git repo fails when running tests in Nix sandbox.
|
||||
# The error is: "fatal: Could not make /tmp/ikiwiki-test-git.2043/repo/branches/ writable by group".
|
||||
# Hopefully, not many people use `ikiwiki-makerepo` to create locally shared repositories these days.
|
||||
substituteInPlace ikiwiki-makerepo --replace "git --bare init --shared" "git --bare init"
|
||||
'';
|
||||
|
||||
configurePhase = "perl Makefile.PL PREFIX=$out";
|
||||
|
||||
@ -33,6 +33,14 @@ mkDerivation rec {
|
||||
sha256 = "sha256-q+hiupwlA0PfG+xtomCUp2zv6HQrGgmOd9CU193ucrY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# FIXME: backport GCC 12 build fix, remove for next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/maliit/framework/commit/86e55980e3025678882cb9c4c78614f86cdc1f04.diff";
|
||||
hash = "sha256-5R+sCI05vJX5epu6hcDSWWzlZ8ns1wKEJ+u8xC6d8Xo=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
|
||||
@ -32,15 +32,15 @@
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "111.0.5563.19",
|
||||
"sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w",
|
||||
"sha256bin64": "02aaqny23dcdp611n6jr7swkjnx1wd0lb8dgxq53b806f0s374cp",
|
||||
"version": "112.0.5582.0",
|
||||
"sha256": "139g5cpqxvh6bf2x3aqs4md379rwrx143f8lcsym8hgpqdwq5sfk",
|
||||
"sha256bin64": "1npksnnxcni62wx517xy64ysk3ja868gw48vgx4q8xc93g15n89c",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-12-12",
|
||||
"version": "2023-01-30",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8",
|
||||
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
|
||||
"rev": "84c8431f3e03cc6226c59dd49637c15ea31169a1",
|
||||
"sha256": "15dqiy1bf1cixqg23bqpfb8mrlcxqbarjwzajc5hjmivykrjn2s3"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -46,7 +46,7 @@ in writeScript "update-${pname}" ''
|
||||
grep "^[0-9]" | \
|
||||
sort --version-sort | \
|
||||
grep -v "funnelcake" | \
|
||||
grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \
|
||||
grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${lib.optionalString (not isBeta) "grep -v \"b\" |"} \
|
||||
tail -1`
|
||||
|
||||
curl --silent -o $HOME/shasums "$url$version/SHA256SUMS"
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
rec {
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "109.0.1";
|
||||
version = "110.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "58b21449a16a794152888f50e7fe9488c28739a7e067729acdc1de9f2e8384e6316cffdfe89f690f0d211189668d940825b4f8a26b8100468ae120772df99d72";
|
||||
sha512 = "52a37a8f59a694c4790c0a14cd81fba9e2c982f64e00191afd0897c39ae1d5e25f24cff16f74d0a0b5cdf8e93a9a0974b6042b0de605cf1a533ef4e6a3c0dcf9";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -29,11 +29,11 @@ rec {
|
||||
|
||||
firefox-esr-102 = buildMozillaMach rec {
|
||||
pname = "firefox-esr-102";
|
||||
version = "102.7.0esr";
|
||||
version = "102.8.0esr";
|
||||
applicationName = "Mozilla Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "2a9d212b5d15e1bf7a6156495126cbc9161d2057aeedea8f7a5a0670a19a9b00cf35044075935c8f3c788118856ba2cc00f9b297c5ac713f094857683f7cd13b";
|
||||
sha512 = "93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -70,7 +70,7 @@ let
|
||||
++ lib.optional libvaSupport libva
|
||||
++ [ gtk3 ];
|
||||
|
||||
suffix = if channel != "stable" then "-" + channel else "";
|
||||
suffix = lib.optionalString (channel != "stable") "-${channel}";
|
||||
|
||||
crashpadHandlerBinary = if lib.versionAtLeast version "94"
|
||||
then "chrome_crashpad_handler"
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "circumflex";
|
||||
version = "2.8";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bensadeh";
|
||||
repo = "circumflex";
|
||||
rev = version;
|
||||
hash = "sha256-knN+T/dmIwHLqT3MJBjQhGlSeAu0lE2ZOv6tLqkcwS0=";
|
||||
hash = "sha256-hFhK1/ck37lfZJ2wpk1MGCfYEANhh8qzTb8m1t7EoBo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Xwek2xlvdGO6C/T0a96RGuMcX7jCbvntEYBf10tvmAo=";
|
||||
vendorHash = "sha256-rwqY6illp5+h/oHOnVg6QfZ6tRFJOamwqJxQx/zlpyI=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -320,8 +320,7 @@ buildGoModule rec {
|
||||
# Fix-Me: Needs to be adapted specifically for 1.23
|
||||
# passthru.updateScript = ./update.sh;
|
||||
|
||||
# Fix-Me: Needs to be adapted specifically for 1.23
|
||||
# passthru.tests = { inherit (nixosTests) k3s-single-node k3s-single-node-docker; };
|
||||
passthru.tests = k3s.passthru.mkTests k3sVersion;
|
||||
|
||||
meta = baseMeta;
|
||||
}
|
||||
|
||||
@ -322,8 +322,7 @@ buildGoModule rec {
|
||||
# Fix-Me: Needs to be adapted specifically for 1.24
|
||||
# passthru.updateScript = ./update.sh;
|
||||
|
||||
# Fix-Me: Needs to be adapted specifically for 1.24
|
||||
# passthru.tests = nixosTests.k3s;
|
||||
passthru.tests = k3s.passthru.mkTests k3sVersion;
|
||||
|
||||
meta = baseMeta;
|
||||
}
|
||||
|
||||
@ -322,8 +322,7 @@ buildGoModule rec {
|
||||
# Fix-Me: Needs to be adapted specifically for 1.25
|
||||
# passthru.updateScript = ./update.sh;
|
||||
|
||||
# Fix-Me: Needs to be adapted specifically for 1.25
|
||||
# passthru.tests = nixosTests.k3s;
|
||||
passthru.tests = k3s.passthru.mkTests k3sVersion;
|
||||
|
||||
meta = baseMeta;
|
||||
}
|
||||
|
||||
@ -319,7 +319,14 @@ buildGoModule rec {
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
passthru.tests = nixosTests.k3s;
|
||||
passthru.mkTests = version:
|
||||
let k3s_version = "k3s_" + lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version);
|
||||
in {
|
||||
single-node = nixosTests.k3s.single-node.${k3s_version};
|
||||
multi-node = nixosTests.k3s.multi-node.${k3s_version};
|
||||
};
|
||||
passthru.tests = passthru.mkTests k3sVersion;
|
||||
|
||||
|
||||
meta = baseMeta;
|
||||
}
|
||||
|
||||
@ -364,11 +364,11 @@
|
||||
"vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo="
|
||||
},
|
||||
"exoscale": {
|
||||
"hash": "sha256-48msmXj7SFmi5TA0/QYm66oIETymWi5ayF+yExyp+hk=",
|
||||
"hash": "sha256-nkCpgreQ8mOLfGAlCDQYYA14Df1Lr6RzDCBWgQNVi6k=",
|
||||
"homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
|
||||
"owner": "exoscale",
|
||||
"repo": "terraform-provider-exoscale",
|
||||
"rev": "v0.44.0",
|
||||
"rev": "v0.45.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -438,24 +438,24 @@
|
||||
"vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-B/eXf31mRtWpl6TCv/hukPWfbb7Ne4W2FUMxiAbfsfI=",
|
||||
"hash": "sha256-z5Fi+ac7dcDr/eTTJWWfsIm9tJJ+NgcY2L08h317G7g=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.52.0",
|
||||
"rev": "v4.53.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o="
|
||||
"vendorHash": "sha256-glxBI4e5BN28GMGeixUSiCaDTIlr+8e4QHnzaDagyno="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-ISOhZqc6/RMqG4n63RjQluy0odkKATcCa52YpQW89xQ=",
|
||||
"hash": "sha256-0NCndgGz/xrYNvWjs49u//VXvndw0RFyAINnGUTKQ4s=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.52.0",
|
||||
"rev": "v4.53.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o="
|
||||
"vendorHash": "sha256-glxBI4e5BN28GMGeixUSiCaDTIlr+8e4QHnzaDagyno="
|
||||
},
|
||||
"googleworkspace": {
|
||||
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.5.22";
|
||||
version = "3.5.23";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-I+7fTSyw5oKrad6HMxhex2wI4JLXDtoxHL4pxO3w2l8=";
|
||||
hash = "sha256-VWpcXwiQHpQ3X/rmm6fWfPfuUoUmWQMfOq5A87nED3A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 2c126682aaabd7f486dfb2ff75fe29b5d8697060 Mon Sep 17 00:00:00 2001
|
||||
From 33d8de9ccce7eecb12542e0fc11131b5101e1aa8 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Sat, 26 Feb 2022 12:33:13 +0100
|
||||
Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD
|
||||
@ -8,10 +8,10 @@ Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index 799e782..caceaac 100644
|
||||
index ea3fea1..01e444d 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -83,6 +83,9 @@ static String getVersion() {
|
||||
@@ -82,6 +82,9 @@ static String getVersion() {
|
||||
|
||||
repositories {
|
||||
maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
|
||||
@ -21,16 +21,16 @@ index 799e782..caceaac 100644
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
@@ -104,6 +107,8 @@ dependencies {
|
||||
@@ -101,6 +104,8 @@ dependencies {
|
||||
implementation 'io.prometheus:simpleclient:0.16.0'
|
||||
implementation 'io.prometheus:simpleclient_hotspot:0.16.0'
|
||||
implementation 'io.prometheus:simpleclient_httpserver:0.16.0'
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
|
||||
implementation 'io.sentry:sentry:6.4.0'
|
||||
+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.1.0'
|
||||
+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3'
|
||||
+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10'
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
|
||||
}
|
||||
|
||||
@@ -171,4 +176,4 @@ allprojects {
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
|
||||
implementation 'io.sentry:sentry:6.11.0'
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
|
||||
@@ -170,4 +175,4 @@ allprojects {
|
||||
runtime {
|
||||
options = ['--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages']
|
||||
modules = ['java.base', 'java.management', 'java.naming', 'java.sql', 'java.xml', 'jdk.crypto.ec', 'jdk.httpserver', 'java.desktop', 'jdk.unsupported']
|
||||
@ -38,5 +38,5 @@ index 799e782..caceaac 100644
|
||||
\ No newline at end of file
|
||||
+}
|
||||
--
|
||||
2.36.2
|
||||
2.38.3
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From b068af1f3e49dedfb489e3ed957934ff651e98ee Mon Sep 17 00:00:00 2001
|
||||
From 4bf0aef4003f7494103a93ae1c2957b2cd32bb59 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Sat, 26 Feb 2022 12:36:15 +0100
|
||||
Subject: [PATCH 2/2] buildconfig/local deps fixes
|
||||
@ -8,7 +8,7 @@ Subject: [PATCH 2/2] buildconfig/local deps fixes
|
||||
1 file changed, 18 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index 799e782..6ecef3e 100644
|
||||
index ea3fea1..24415d8 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -10,11 +10,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal
|
||||
@ -35,7 +35,7 @@ index 799e782..6ecef3e 100644
|
||||
|
||||
compileJava.options.encoding = 'UTF-8'
|
||||
|
||||
@@ -83,7 +93,10 @@ static String getVersion() {
|
||||
@@ -82,7 +92,10 @@ static String getVersion() {
|
||||
|
||||
repositories {
|
||||
maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
|
||||
@ -47,16 +47,16 @@ index 799e782..6ecef3e 100644
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -104,6 +117,8 @@ dependencies {
|
||||
@@ -101,6 +114,8 @@ dependencies {
|
||||
implementation 'io.prometheus:simpleclient:0.16.0'
|
||||
implementation 'io.prometheus:simpleclient_hotspot:0.16.0'
|
||||
implementation 'io.prometheus:simpleclient_httpserver:0.16.0'
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
|
||||
implementation 'io.sentry:sentry:6.4.0'
|
||||
+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.1.0'
|
||||
+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3'
|
||||
+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10'
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
|
||||
}
|
||||
|
||||
@@ -167,8 +182,3 @@ allprojects {
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
|
||||
implementation 'io.sentry:sentry:6.11.0'
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
|
||||
@@ -166,8 +181,3 @@ allprojects {
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -67,5 +67,5 @@ index 799e782..6ecef3e 100644
|
||||
-}
|
||||
\ No newline at end of file
|
||||
--
|
||||
2.36.2
|
||||
2.38.3
|
||||
|
||||
|
||||
@ -2,15 +2,18 @@
|
||||
, makeWrapper, fetchpatch, substituteAll, jre_minimal
|
||||
}:
|
||||
|
||||
# NOTE: when updating the package, please check if some of the hacks in `deps.installPhase`
|
||||
# can be removed again!
|
||||
|
||||
let
|
||||
pname = "signald";
|
||||
version = "0.23.0";
|
||||
version = "0.23.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-RN0OYjOmVtHKeFkviep952uf3qWuBj8lhcaP1Lk/gDo=";
|
||||
sha256 = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA=";
|
||||
};
|
||||
|
||||
jre' = jre_minimal.override {
|
||||
@ -42,11 +45,30 @@ let
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
gradle --no-daemon build
|
||||
'';
|
||||
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
|
||||
installPhase = ''
|
||||
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
|
||||
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \
|
||||
| sh
|
||||
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
|
||||
| sh -x
|
||||
|
||||
# WARNING: don't try this at home and wear safety-goggles while working with this!
|
||||
# We patch around in the dependency tree to resolve some spurious dependency resolution errors.
|
||||
# Whenever this package gets updated, please check if some of these hacks are obsolete!
|
||||
|
||||
# Mimic existence of okio-3.2.0.jar. Originally known as okio-jvm-3.2.0 (and renamed),
|
||||
# but gradle doesn't detect such renames, only fetches the latter and then fails
|
||||
# in `signald.buildPhase` because it cannot find `okio-3.2.0.jar`.
|
||||
pushd $out/com/squareup/okio/okio/3.2.0 &>/dev/null
|
||||
cp -v ../../okio-jvm/3.2.0/okio-jvm-3.2.0.jar okio-3.2.0.jar
|
||||
popd &>/dev/null
|
||||
|
||||
# For some reason gradle fetches 2.14.1 instead of 2.14.0 here even though 2.14.0 is required
|
||||
# according to `./gradlew -q dependencies`, so we pretend to have 2.14.0 available here.
|
||||
# According to the diff in https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.14.0...jackson-dataformats-text-2.14.1
|
||||
# the only relevant change is in the code itself (and in the tests/docs), so this seems
|
||||
# binary-compatible.
|
||||
cp -v \
|
||||
$out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.1/jackson-dataformat-toml-2.14.1.jar \
|
||||
$out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.0/jackson-dataformat-toml-2.14.0.jar
|
||||
'';
|
||||
# Don't move info to share/
|
||||
forceShare = [ "dummy" ];
|
||||
@ -54,12 +76,12 @@ let
|
||||
outputHashMode = "recursive";
|
||||
# Downloaded jars differ by platform
|
||||
outputHash = {
|
||||
x86_64-linux = "sha256-ANiNDdTuCuDEH5zUPsrVF6Uegdq3zVsMv+uMtYRX0jE=";
|
||||
aarch64-linux = "sha256-V9zn4v/ZeLELAwFJ5y7OVAeJwZp4DmHm4KWxE6KpwGs=";
|
||||
x86_64-linux = "sha256-9DHykkvazVBN2kfw1Pbejizk/R18v5w8lRBHZ4aXL5Q=";
|
||||
aarch64-linux = "sha256-RgAiRbUojBc+9RN/HpAzzpTjkjZ6q+jebDsqvah5XBw=";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname src version;
|
||||
|
||||
patches = [
|
||||
@ -69,6 +91,11 @@ in stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
# Mostly for debugging purposes.
|
||||
inherit deps;
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
|
||||
@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-ews";
|
||||
version = "3.46.3";
|
||||
version = "3.46.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "BFnqQFY2OKWllPQt3BzHGRotOCLCEcz/+82LNtMmQCU=";
|
||||
sha256 = "bLYE99MKkh7MgxA9ZPKOj1+1VcFT9mHSQvayB/9Hy58=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -44,11 +44,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.46.3";
|
||||
version = "3.46.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "riIQdCXTDRejo0w1bNpfQKrXhG12vbYINEUYtdQpwfM=";
|
||||
sha256 = "eghCMc7SRaNLcT141Dp3Zgyso79S5qT1AwpqCAxpez0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -38,12 +38,12 @@
|
||||
|
||||
let
|
||||
pname = "pcloud";
|
||||
version = "1.10.0";
|
||||
code = "XZCy4sVZGb7r8VpDE4SCv2QI3OYx1HYChIvy";
|
||||
version = "1.10.1";
|
||||
code = "XZwHPTVZ7J1WFU374k8BqSWO2519y4aGFdAV";
|
||||
# Archive link's codes: https://www.pcloud.com/release-notes/linux.html
|
||||
src = fetchzip {
|
||||
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip";
|
||||
hash = "sha256-kzID1y/jVuqFfD/PIUR2TFa0AvxKVcfNQ4ZXiHx0gRk=";
|
||||
hash = "sha256-Mum1SL/EZ7iFK9e3o+T0CxkAQ0FkjSBy2FEUDonxtTI=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preBuild = ''
|
||||
sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h
|
||||
${if stdenv.cc.isClang then "sed -i 's|g++|clang++|g' Makefile.std" else ""}
|
||||
${lib.optionalString stdenv.cc.isClang "sed -i 's|g++|clang++|g' Makefile.std"}
|
||||
|
||||
makeFlagsArray+=(
|
||||
ZLIB=-lz
|
||||
|
||||
@ -25,14 +25,14 @@ let
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "14.32.83";
|
||||
version = "16.1.3";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
sha256 = "sha256-otvaDPdGRmtUfWfy7m+CJOyDOFuW/AExbskYnYEikY8=";
|
||||
sha256 = "sha256-k1F4OaER9vg8GIi4eqppeh2f0MtlcBSfd4zkewFp2As=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -76,11 +76,10 @@ stdenv.mkDerivation rec {
|
||||
# tagged releases don't have "unknown"
|
||||
# kicad nightlies use git describe --dirty
|
||||
# nix removes .git, so its approximated here
|
||||
postPatch = if (!stable) then ''
|
||||
postPatch = lib.optionalString (!stable) ''
|
||||
substituteInPlace cmake/KiCadVersion.cmake \
|
||||
--replace "unknown" "${builtins.substring 0 10 src.rev}"
|
||||
''
|
||||
else "";
|
||||
'';
|
||||
|
||||
makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ];
|
||||
|
||||
|
||||
@ -214,7 +214,7 @@ stdenv.mkDerivation rec {
|
||||
description = (if (stable)
|
||||
then "Open Source Electronics Design Automation suite"
|
||||
else "Open Source EDA suite, development build")
|
||||
+ (if (!with3d) then ", without 3D models" else "");
|
||||
+ (lib.optionalString (!with3d) ", without 3D models");
|
||||
homepage = "https://www.kicad.org/";
|
||||
longDescription = ''
|
||||
KiCad is an open source software suite for Electronic Design Automation.
|
||||
|
||||
@ -66,10 +66,10 @@ let
|
||||
buildIde = args.buildIde or (!coqAtLeast "8.14");
|
||||
ideFlags = optionalString (buildIde && !coqAtLeast "8.10")
|
||||
"-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt";
|
||||
csdpPatch = if csdp != null then ''
|
||||
csdpPatch = lib.optionalString (csdp != null) ''
|
||||
substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
|
||||
substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
|
||||
'' else "";
|
||||
'';
|
||||
ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages
|
||||
else with versions; switch coq-version [
|
||||
{ case = range "8.16" "8.17"; out = ocamlPackages_4_14; }
|
||||
@ -158,7 +158,7 @@ self = stdenv.mkDerivation {
|
||||
UNAME=$(type -tp uname)
|
||||
RM=$(type -tp rm)
|
||||
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
|
||||
${if !coqAtLeast "8.7" then "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\"" else ""}
|
||||
${lib.optionalString (!coqAtLeast "8.7") "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\""}
|
||||
${csdpPatch}
|
||||
'';
|
||||
|
||||
@ -196,7 +196,7 @@ self = stdenv.mkDerivation {
|
||||
categories = [ "Development" "Science" "Math" "IDE" "GTK" ];
|
||||
});
|
||||
|
||||
postInstall = let suffix = if coqAtLeast "8.14" then "-core" else ""; in optionalString (!coqAtLeast "8.17") ''
|
||||
postInstall = let suffix = optionalString (coqAtLeast "8.14") "-core"; in optionalString (!coqAtLeast "8.17") ''
|
||||
cp bin/votour $out/bin/
|
||||
'' + ''
|
||||
ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix}
|
||||
@ -227,12 +227,12 @@ if coqAtLeast "8.17" then self.overrideAttrs(_: {
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make dunestrap
|
||||
dune build -p coq-core,coq-stdlib,coq,coqide-server${if buildIde then ",coqide" else ""} -j $NIX_BUILD_CORES
|
||||
dune build -p coq-core,coq-stdlib,coq,coqide-server${lib.optionalString buildIde ",coqide"} -j $NIX_BUILD_CORES
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
dune install --prefix $out coq-core coq-stdlib coq coqide-server${if buildIde then " coqide" else ""}
|
||||
dune install --prefix $out coq-core coq-stdlib coq coqide-server${lib.optionalString buildIde " coqide"}
|
||||
runHook postInstall
|
||||
'';
|
||||
}) else self
|
||||
|
||||
@ -18,7 +18,7 @@ let
|
||||
src = sage-with-env.env.lib.src;
|
||||
runAllTests = files == null;
|
||||
testArgs = if runAllTests then "--all" else testFileList;
|
||||
patienceSpecifier = if longTests then "--long" else "";
|
||||
patienceSpecifier = lib.optionalString longTests "--long";
|
||||
timeSpecifier = if timeLimit == null then "" else "--short ${toString timeLimit}";
|
||||
relpathToArg = relpath: lib.escapeShellArg "${src}/${relpath}"; # paths need to be absolute
|
||||
testFileList = lib.concatStringsSep " " (map relpathToArg files);
|
||||
|
||||
@ -16,7 +16,7 @@ let
|
||||
# getAttr-like helper for optional append to string:
|
||||
# "Hello" + appendByAttr "a" " " {a = "world";} = "Hello world"
|
||||
# "Hello" + appendByAttr "a" " " {} = "Hello"
|
||||
appendByAttr = attr: sep: x: if hasAttr attr x then sep + (getAttr attr x) else "";
|
||||
appendByAttr = attr: sep: x: lib.optionalString (hasAttr attr x) (sep + (getAttr attr x));
|
||||
|
||||
# Are there any OM dependencies at all?
|
||||
ifDeps = length pkg.omdeps != 0;
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-credential-keepassxc";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Frederick888";
|
||||
repo = "git-credential-keepassxc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZpysJ+xs3IenqAdoswG0OkzxzuNPSKkqlutGxn4VRw8=";
|
||||
hash = "sha256-siVSZke+anVTaLiJVyDEKvgX+VmS0axa+4721nlgmiw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IPsMlVfgwoFEQlXmW4gnt16WNF5W6akobUVct/iF42E=";
|
||||
cargoHash = "sha256-QMAAKkjWgM/UiOfkNMLQxyGEYYmiSvE0Pd8fZXYyN48=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ];
|
||||
|
||||
|
||||
@ -10,7 +10,10 @@
|
||||
, openssl
|
||||
, libusb1
|
||||
, AppKit
|
||||
, git
|
||||
, openssh
|
||||
, testers
|
||||
, radicle-cli
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -50,11 +53,18 @@ rustPlatform.buildRustPackage rec {
|
||||
done
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ openssh ];
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
openssh
|
||||
];
|
||||
preCheck = ''
|
||||
eval $(ssh-agent)
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion { package = radicle-cli; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Command-line tooling for Radicle, a decentralized code collaboration network";
|
||||
homepage = "https://radicle.xyz";
|
||||
|
||||
@ -28,13 +28,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "jellyfin-media-player";
|
||||
version = "1.7.1";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-media-player";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-piMqI4qxcNUSNC+0JE2KZ/cvlNgtxUOnSfrcWnBVzC0=";
|
||||
sha256 = "sha256-/FqxZd0cFSfkeBQmZ2gU+5FUZZ+WbQ8c2IjaZ4/uGt8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "jellyfin-mpv-shim";
|
||||
version = "2.2.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0=";
|
||||
sha256 = "sha256-v5enaNcZ0aoyEcOFfkAsOIwEpVZ2oqYGMkLlDepBY7c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,8 +14,52 @@
|
||||
, go-md2man
|
||||
, nixosTests
|
||||
, python3
|
||||
, makeWrapper
|
||||
, symlinkJoin
|
||||
, extraPackages ? [ ]
|
||||
, runc
|
||||
, crun
|
||||
, conmon
|
||||
, slirp4netns
|
||||
, fuse-overlayfs
|
||||
, util-linux
|
||||
, iptables
|
||||
, iproute2
|
||||
, catatonit
|
||||
, gvproxy
|
||||
, aardvark-dns
|
||||
, netavark
|
||||
, testers
|
||||
, podman
|
||||
}:
|
||||
let
|
||||
# do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed
|
||||
|
||||
binPath = lib.makeBinPath ([
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
runc
|
||||
crun
|
||||
conmon
|
||||
slirp4netns
|
||||
fuse-overlayfs
|
||||
util-linux
|
||||
iptables
|
||||
iproute2
|
||||
] ++ extraPackages);
|
||||
|
||||
helpersBin = symlinkJoin {
|
||||
name = "podman-helper-binary-wrapper";
|
||||
|
||||
# this only works for some binaries, others may need to be be added to `binPath` or in the modules
|
||||
paths = [
|
||||
gvproxy
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
aardvark-dns
|
||||
catatonit # added here for the pause image and also set in `containersConf` for `init_path`
|
||||
netavark
|
||||
];
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "4.4.1";
|
||||
@ -36,9 +80,9 @@ buildGoModule rec {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
outputs = [ "out" "man" ] ++ lib.optionals stdenv.isLinux [ "rootlessport" ];
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config go-md2man installShellFiles python3 ];
|
||||
nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper python3 ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
btrfs-progs
|
||||
@ -50,13 +94,16 @@ buildGoModule rec {
|
||||
systemd
|
||||
];
|
||||
|
||||
HELPER_BINARIES_DIR = "${helpersBin}/bin";
|
||||
PREFIX = "${placeholder "out"}";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
patchShebangs .
|
||||
${if stdenv.isDarwin then ''
|
||||
make podman-remote # podman-mac-helper uses FHS paths
|
||||
'' else ''
|
||||
make bin/podman bin/rootlessport
|
||||
make bin/podman bin/rootlessport bin/quadlet
|
||||
''}
|
||||
make docs
|
||||
runHook postBuild
|
||||
@ -64,29 +111,28 @@ buildGoModule rec {
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p {$out/{bin,etc,lib,share},$man} # ensure paths exist for the wrapper
|
||||
${if stdenv.isDarwin then ''
|
||||
mv bin/{darwin/podman,podman}
|
||||
install bin/darwin/podman -Dt $out/bin
|
||||
'' else ''
|
||||
install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d
|
||||
for s in contrib/systemd/**/*.in; do
|
||||
substituteInPlace "$s" --replace "@@PODMAN@@" "podman" # don't use unwrapped binary
|
||||
done
|
||||
PREFIX=$out make install.systemd
|
||||
install -Dm555 bin/rootlessport -t $rootlessport/bin
|
||||
make install.bin install.systemd
|
||||
''}
|
||||
install -Dm555 bin/podman -t $out/bin
|
||||
PREFIX=$out make install.completions
|
||||
MANDIR=$man/share/man make install.man
|
||||
make install.completions install.man
|
||||
wrapProgram $out/bin/podman \
|
||||
--prefix PATH : ${lib.escapeShellArg binPath}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
RPATH=$(patchelf --print-rpath $out/bin/podman)
|
||||
patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/podman
|
||||
RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped)
|
||||
patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = podman;
|
||||
command = "HOME=$TMPDIR podman --version";
|
||||
};
|
||||
} // lib.optionalAttrs stdenv.isLinux {
|
||||
inherit (nixosTests) podman;
|
||||
# related modules
|
||||
inherit (nixosTests)
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
{ podman-unwrapped
|
||||
, runCommand
|
||||
, makeWrapper
|
||||
, symlinkJoin
|
||||
, lib
|
||||
, stdenv
|
||||
, extraPackages ? []
|
||||
, runc # Default container runtime
|
||||
, crun # Container runtime (default with cgroups v2 for podman/buildah)
|
||||
, conmon # Container runtime monitor
|
||||
, slirp4netns # User-mode networking for unprivileged namespaces
|
||||
, fuse-overlayfs # CoW for images, much faster than default vfs
|
||||
, util-linux # nsenter
|
||||
, iptables
|
||||
, iproute2
|
||||
, catatonit
|
||||
, gvproxy
|
||||
, aardvark-dns
|
||||
, netavark
|
||||
}:
|
||||
|
||||
# do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed
|
||||
|
||||
let
|
||||
binPath = lib.makeBinPath ([
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
runc
|
||||
crun
|
||||
conmon
|
||||
slirp4netns
|
||||
fuse-overlayfs
|
||||
util-linux
|
||||
iptables
|
||||
iproute2
|
||||
] ++ extraPackages);
|
||||
|
||||
helpersBin = symlinkJoin {
|
||||
name = "${podman-unwrapped.pname}-helper-binary-wrapper-${podman-unwrapped.version}";
|
||||
|
||||
# this only works for some binaries, others may need to be be added to `binPath` or in the modules
|
||||
paths = [
|
||||
gvproxy
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
aardvark-dns
|
||||
catatonit # added here for the pause image and also set in `containersConf` for `init_path`
|
||||
netavark
|
||||
podman-unwrapped.rootlessport
|
||||
];
|
||||
};
|
||||
|
||||
in runCommand podman-unwrapped.name {
|
||||
name = "${podman-unwrapped.pname}-wrapper-${podman-unwrapped.version}";
|
||||
inherit (podman-unwrapped) pname version passthru;
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
meta = builtins.removeAttrs podman-unwrapped.meta [ "outputsToInstall" ];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
} ''
|
||||
ln -s ${podman-unwrapped.man} $man
|
||||
|
||||
mkdir -p $out/bin
|
||||
ln -s ${podman-unwrapped}/etc $out/etc
|
||||
ln -s ${podman-unwrapped}/lib $out/lib
|
||||
ln -s ${podman-unwrapped}/share $out/share
|
||||
makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \
|
||||
--set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \
|
||||
--prefix PATH : ${lib.escapeShellArg binPath}
|
||||
''
|
||||
@ -63,8 +63,8 @@ stdenv.mkDerivation (self: {
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(
|
||||
XWAYLAND=${if enableXWayland then "-DXWAYLAND" else ""}
|
||||
XLIBS=${if enableXWayland then "xcb\\ xcb-icccm" else ""}
|
||||
XWAYLAND=${lib.optionalString enableXWayland "-DXWAYLAND"}
|
||||
XLIBS=${lib.optionalString enableXWayland "xcb\\ xcb-icccm"}
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@ -83,12 +83,12 @@ stdenv.mkDerivation {
|
||||
'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then ''
|
||||
patchelf --set-soname libblas${canonicalExtension} $out/lib/libblas${canonicalExtension}
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libblas${canonicalExtension}
|
||||
'' else if stdenv.hostPlatform.isDarwin then ''
|
||||
'' else lib.optionalString (stdenv.hostPlatform.isDarwin) ''
|
||||
install_name_tool \
|
||||
-id $out/lib/libblas${canonicalExtension} \
|
||||
-add_rpath ${lib.getLib blasProvider'}/lib \
|
||||
$out/lib/libblas${canonicalExtension}
|
||||
'' else "") + ''
|
||||
'') + ''
|
||||
|
||||
if [ "$out/lib/libblas${canonicalExtension}" != "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then
|
||||
ln -s $out/lib/libblas${canonicalExtension} "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
@ -115,12 +115,12 @@ EOF
|
||||
'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then ''
|
||||
patchelf --set-soname libcblas${canonicalExtension} $out/lib/libcblas${canonicalExtension}
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libcblas${canonicalExtension}
|
||||
'' else if stdenv.hostPlatform.isDarwin then ''
|
||||
'' else lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
install_name_tool \
|
||||
-id $out/lib/libcblas${canonicalExtension} \
|
||||
-add_rpath ${lib.getLib blasProvider'}/lib \
|
||||
$out/lib/libcblas${canonicalExtension}
|
||||
'' else "") + ''
|
||||
'') + ''
|
||||
if [ "$out/lib/libcblas${canonicalExtension}" != "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then
|
||||
ln -s $out/lib/libcblas${canonicalExtension} "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
fi
|
||||
|
||||
@ -54,10 +54,10 @@ stdenv.mkDerivation {
|
||||
cp -L "$liblapack" $out/lib/liblapack${canonicalExtension}
|
||||
chmod +w $out/lib/liblapack${canonicalExtension}
|
||||
|
||||
'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then ''
|
||||
'' + (lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") ''
|
||||
patchelf --set-soname liblapack${canonicalExtension} $out/lib/liblapack${canonicalExtension}
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider'}/lib" $out/lib/liblapack${canonicalExtension}
|
||||
'' else "") + ''
|
||||
'') + ''
|
||||
|
||||
if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then
|
||||
ln -s $out/lib/liblapack${canonicalExtension} "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
@ -83,10 +83,10 @@ EOF
|
||||
cp -L "$liblapacke" $out/lib/liblapacke${canonicalExtension}
|
||||
chmod +w $out/lib/liblapacke${canonicalExtension}
|
||||
|
||||
'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then ''
|
||||
'' + (lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") ''
|
||||
patchelf --set-soname liblapacke${canonicalExtension} $out/lib/liblapacke${canonicalExtension}
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider'}/lib" $out/lib/liblapacke${canonicalExtension}
|
||||
'' else "") + ''
|
||||
'') + ''
|
||||
|
||||
if [ -f "$out/lib/liblapacke.so.3" ]; then
|
||||
ln -s $out/lib/liblapacke.so.3 $out/lib/liblapacke.so
|
||||
|
||||
@ -92,9 +92,8 @@ let
|
||||
else "";
|
||||
|
||||
expand-response-params =
|
||||
if buildPackages ? stdenv && buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null"
|
||||
then import ../expand-response-params { inherit (buildPackages) stdenv; }
|
||||
else "";
|
||||
lib.optionalString (buildPackages ? stdenv && buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null")
|
||||
(import ../expand-response-params { inherit (buildPackages) stdenv; });
|
||||
|
||||
in
|
||||
|
||||
|
||||
@ -118,10 +118,10 @@ stdenv.mkDerivation (fBuildAttrs // {
|
||||
|
||||
# Remove all built in external workspaces, Bazel will recreate them when building
|
||||
rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker}
|
||||
${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""}
|
||||
${lib.optionalString removeRulesCC "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}"}
|
||||
rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker}
|
||||
${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\\@local_config_cc.marker}" else ""}
|
||||
${if removeLocal then "rm -rf $bazelOut/external/{local_*,\\@local_*.marker}" else ""}
|
||||
${lib.optionalString removeLocalConfigCc "rm -rf $bazelOut/external/{local_config_cc,\\@local_config_cc.marker}"}
|
||||
${lib.optionalString removeLocal "rm -rf $bazelOut/external/{local_*,\\@local_*.marker}"}
|
||||
|
||||
# Clear markers
|
||||
find $bazelOut/external -name '@*\.marker' -exec sh -c 'echo > {}' \;
|
||||
|
||||
@ -212,7 +212,7 @@ in stdenv.mkDerivation {
|
||||
cd $out
|
||||
${extraBuildCommands}
|
||||
cd $out
|
||||
${if isMultiBuild then extraBuildCommandsMulti else ""}
|
||||
${lib.optionalString isMultiBuild extraBuildCommandsMulti}
|
||||
'';
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }:
|
||||
{ stdenv, lib, buildEnv, writeText, pkgs, pkgsi686Linux }:
|
||||
|
||||
{ name
|
||||
, profile ? ""
|
||||
@ -237,7 +237,7 @@ in stdenv.mkDerivation {
|
||||
cd $out
|
||||
${extraBuildCommands}
|
||||
cd $out
|
||||
${if isMultiBuild then extraBuildCommandsMulti else ""}
|
||||
${lib.optionalString isMultiBuild extraBuildCommandsMulti}
|
||||
'';
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
|
||||
@ -59,9 +59,7 @@ let
|
||||
suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config;
|
||||
|
||||
expand-response-params =
|
||||
if (buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null"
|
||||
then import ../expand-response-params { inherit (buildPackages) stdenv; }
|
||||
else "";
|
||||
lib.optionalString ((buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null") (import ../expand-response-params { inherit (buildPackages) stdenv; });
|
||||
|
||||
useGccForLibs = isClang
|
||||
&& libcxx == null
|
||||
|
||||
@ -35,4 +35,4 @@ let
|
||||
({prefix, path}: "DOCKER_CREDENTIALS" == prefix)
|
||||
builtins.nixPath);
|
||||
in
|
||||
if (pathParts != []) then (builtins.head pathParts).path else ""
|
||||
lib.optionalString (pathParts != []) ((builtins.head pathParts).path)
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{stdenv, fossil, cacert}:
|
||||
{stdenv, lib, fossil, cacert}:
|
||||
|
||||
{name ? null, url, rev, sha256}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "fossil-archive" + (if name != null then "-${name}" else "");
|
||||
name = "fossil-archive" + (lib.optionalString (name != null) "-${name}");
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [fossil cacert];
|
||||
|
||||
|
||||
@ -7,9 +7,7 @@
|
||||
|
||||
short = builtins.substring 0 7 rev;
|
||||
|
||||
appendShort = if (builtins.match "[a-f0-9]*" rev) != null
|
||||
then "-${short}"
|
||||
else "";
|
||||
appendShort = lib.optionalString ((builtins.match "[a-f0-9]*" rev) != null) "-${short}";
|
||||
in "${if matched == null then base else builtins.head matched}${appendShort}";
|
||||
in
|
||||
{ url, rev ? "HEAD", md5 ? "", sha256 ? "", hash ? "", leaveDotGit ? deepClone
|
||||
|
||||
@ -12,13 +12,13 @@ if md5 != null then
|
||||
else
|
||||
# TODO: statically check if mercurial as the https support if the url starts woth https.
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "hg-archive" + (if name != null then "-${name}" else "");
|
||||
name = "hg-archive" + (lib.optionalString (name != null) "-${name}");
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [mercurial];
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
|
||||
subrepoClause = if fetchSubrepos then "S" else "";
|
||||
subrepoClause = lib.optionalString fetchSubrepos "S";
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
let
|
||||
args' = if relative != null then {
|
||||
stripLen = 1 + lib.length (lib.splitString "/" relative) + stripLen;
|
||||
extraPrefix = if extraPrefix != null then extraPrefix else "";
|
||||
extraPrefix = lib.optionalString (extraPrefix != null) extraPrefix;
|
||||
} else {
|
||||
inherit stripLen extraPrefix;
|
||||
};
|
||||
|
||||
@ -36,6 +36,6 @@ stdenvNoCC.mkDerivation {
|
||||
inherit perl;
|
||||
inherit (builtins) storeDir;
|
||||
shell = lib.getBin shell + (shell.shellPath or "");
|
||||
signingUtils = if darwinCodeSign then signingUtils else "";
|
||||
signingUtils = lib.optionalString darwinCodeSign signingUtils;
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
directory, so the Makefile of the package should support DESTDIR.
|
||||
*/
|
||||
|
||||
{ src, stdenv
|
||||
{ src, lib, stdenv
|
||||
, name ? "binary-tarball"
|
||||
, ... } @ args:
|
||||
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation (
|
||||
// args //
|
||||
|
||||
{
|
||||
name = name + (if src ? version then "-" + src.version else "");
|
||||
name = name + (lib.optionalString (src ? version) "-${src.version}");
|
||||
|
||||
postHook = ''
|
||||
mkdir -p $out/nix-support
|
||||
|
||||
@ -24,7 +24,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
|
||||
// removeAttrs args ["vmTools" "lib"] //
|
||||
|
||||
{
|
||||
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
|
||||
name = name + "-" + diskImage.name + (lib.optionalString (src ? version) "-${src.version}");
|
||||
|
||||
# !!! cut&paste from rpm-build.nix
|
||||
postHook = ''
|
||||
|
||||
@ -11,7 +11,7 @@ rec {
|
||||
makeSourceTarball = sourceTarball; # compatibility
|
||||
|
||||
binaryTarball = args: import ./binary-tarball.nix (
|
||||
{ inherit stdenv;
|
||||
{ inherit lib stdenv;
|
||||
} // args);
|
||||
|
||||
mvnBuild = args: import ./maven-build.nix (
|
||||
@ -38,7 +38,7 @@ rec {
|
||||
} // args);
|
||||
|
||||
rpmBuild = args: import ./rpm-build.nix (
|
||||
{ inherit vmTools;
|
||||
{ inherit lib vmTools;
|
||||
} // args);
|
||||
|
||||
debBuild = args: import ./debian-build.nix (
|
||||
|
||||
@ -22,7 +22,7 @@ in
|
||||
|
||||
stdenv.mkDerivation ( {
|
||||
inherit name src;
|
||||
phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase";
|
||||
phases = "setupPhase unpackPhase patchPhase mvnCompile ${lib.optionalString doTestCompile "mvnTestCompile mvnTestJar"} ${lib.optionalString doTest "mvnTest"} ${lib.optionalString doJavadoc "mvnJavadoc"} ${lib.optionalString doCheckstyle "mvnCheckstyle"} mvnJar mvnAssembly mvnRelease finalPhase";
|
||||
|
||||
setupPhase = ''
|
||||
runHook preSetupPhase
|
||||
@ -88,9 +88,9 @@ stdenv.mkDerivation ( {
|
||||
|
||||
echo "$releaseName" > $out/nix-support/hydra-release-name
|
||||
|
||||
${if doRelease then ''
|
||||
${lib.optionalString doRelease ''
|
||||
echo "file zip $out/release/$releaseName.zip" >> $out/nix-support/hydra-build-products
|
||||
'' else ""}
|
||||
''}
|
||||
'';
|
||||
|
||||
finalPhase = ''
|
||||
|
||||
@ -85,7 +85,7 @@ stdenv.mkDerivation (
|
||||
// removeAttrs args [ "lib" ] # Propagating lib causes the evaluation to fail, because lib is a function that can't be converted to a string
|
||||
|
||||
// {
|
||||
name = name + (if src ? version then "-" + src.version else "");
|
||||
name = name + (lib.optionalString (src ? version) "-${src.version}");
|
||||
|
||||
postHook = ''
|
||||
. ${./functions.sh}
|
||||
@ -167,7 +167,7 @@ stdenv.mkDerivation (
|
||||
|
||||
echo "building out of source tree, from \`$PWD'..."
|
||||
|
||||
${if preConfigure != null then preConfigure else ""}
|
||||
${lib.optionalString (preConfigure != null) preConfigure}
|
||||
'';
|
||||
}
|
||||
else {})
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
{ name ? "rpm-build"
|
||||
, diskImage
|
||||
, src, vmTools
|
||||
, src, lib, vmTools
|
||||
, ... } @ args:
|
||||
|
||||
vmTools.buildRPM (
|
||||
@ -11,7 +11,7 @@ vmTools.buildRPM (
|
||||
removeAttrs args ["vmTools"] //
|
||||
|
||||
{
|
||||
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
|
||||
name = name + "-" + diskImage.name + (lib.optionalString (src ? version) "-${src.version}");
|
||||
|
||||
preBuild = ''
|
||||
. ${./functions.sh}
|
||||
|
||||
@ -299,7 +299,7 @@ crate_: lib.makeOverridable
|
||||
);
|
||||
|
||||
libName = if crate ? libName then crate.libName else crate.crateName;
|
||||
libPath = if crate ? libPath then crate.libPath else "";
|
||||
libPath = lib.optionalString (crate ? libPath) crate.libPath;
|
||||
|
||||
# Seed the symbol hashes with something unique every time.
|
||||
# https://doc.rust-lang.org/1.0.0/rustc/metadata/loader/index.html#frobbing-symbols
|
||||
|
||||
@ -406,7 +406,7 @@ rec {
|
||||
eval "$origPostHook"
|
||||
'';
|
||||
|
||||
origPostHook = if attrs ? postHook then attrs.postHook else "";
|
||||
origPostHook = lib.optionalString (attrs ? postHook) attrs.postHook;
|
||||
|
||||
/* Don't run Nix-specific build steps like patchelf. */
|
||||
fixupPhase = "true";
|
||||
@ -1032,22 +1032,22 @@ rec {
|
||||
};
|
||||
|
||||
debian11i386 = {
|
||||
name = "debian-11.5-bullseye-i386";
|
||||
fullName = "Debian 11.5 Bullseye (i386)";
|
||||
name = "debian-11.6-bullseye-i386";
|
||||
fullName = "Debian 11.6 Bullseye (i386)";
|
||||
packagesList = fetchurl {
|
||||
url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-i386/Packages.xz";
|
||||
hash = "sha256-tHrWSd4K5TCwIaLTPqK/Rcon0O0r+Jsxb7OcchOo8Vo=";
|
||||
url = "https://snapshot.debian.org/archive/debian/20230131T034648Z/dists/bullseye/main/binary-i386/Packages.xz";
|
||||
hash = "sha256-z9eG7RlvelEnZAaeCfIO+XxTZVL3d+zTA7ShU43l/pw=";
|
||||
};
|
||||
urlPrefix = "mirror://debian";
|
||||
packages = commonDebianPackages;
|
||||
};
|
||||
|
||||
debian11x86_64 = {
|
||||
name = "debian-11.5-bullseye-amd64";
|
||||
fullName = "Debian 11.5 Bullseye (amd64)";
|
||||
name = "debian-11.6-bullseye-amd64";
|
||||
fullName = "Debian 11.6 Bullseye (amd64)";
|
||||
packagesList = fetchurl {
|
||||
url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-amd64/Packages.xz";
|
||||
hash = "sha256-whpBERKOPyhrWguVQ2QchrwRHU4tCkGwu42x6khF/2g=";
|
||||
url = "https://snapshot.debian.org/archive/debian/20230131T034648Z/dists/bullseye/main/binary-amd64/Packages.xz";
|
||||
hash = "sha256-mz0eCWdn6uWt40OxsSPheHzEnMeLE52yR/vpb48/VF0=";
|
||||
};
|
||||
urlPrefix = "mirror://debian";
|
||||
packages = commonDebianPackages;
|
||||
|
||||
@ -50,13 +50,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-data-server";
|
||||
version = "3.46.3";
|
||||
version = "3.46.4";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "CTjiJ55c+8IgR2bKnT/qVwkRaZsHwQy+AaymKn6LK+4=";
|
||||
sha256 = "pZslQUXFn6zXx7U4LbeNxfDtH2pum4/n1edZWfk8DMg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -298,7 +298,7 @@ index e61160c..b6553a4 100644
|
||||
G_CALLBACK (mi_user_headers_settings_changed_cb), NULL);
|
||||
G_UNLOCK (mi_user_headers);
|
||||
diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
|
||||
index 611d5c8..4790fca 100644
|
||||
index 28755e2..da8c40c 100644
|
||||
--- a/src/camel/providers/imapx/camel-imapx-server.c
|
||||
+++ b/src/camel/providers/imapx/camel-imapx-server.c
|
||||
@@ -5593,7 +5593,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store)
|
||||
|
||||
@ -45,11 +45,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-software";
|
||||
version = "43.3";
|
||||
version = "43.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "k+6AdHl4rSzALlrnPQo9Psgu6hNPx3niqpFpAbu1gJA=";
|
||||
sha256 = "6d8GDrq1n0lpfV7yYw7DbeYEVBadwZGvYNNINyCq2z4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, glib
|
||||
@ -29,6 +30,17 @@ mkDerivation rec {
|
||||
sha256 = "WgrcHM4iJLZsJO2obqSkjHHMB+/kcadQArkcXC5FB24=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# FIXME: backport Plasma 5.27 build fix, remove for next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lxqt/lxqt-config/commit/6add4e4f0040693e7c4242fbae48c9d32007686c.diff";
|
||||
hash = "sha256-Tir4KeGhBnD9dYmB1FAjuf4R4V+rn12MOxsRwTdE0Sc=";
|
||||
})
|
||||
];
|
||||
|
||||
# FIXME: required to build with Plasma 5.27, which uses std::optional
|
||||
cmakeFlags = ["-DCMAKE_CXX_STANDARD=17"];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@ -51,9 +51,9 @@ let
|
||||
mirror = "mirror://kde";
|
||||
};
|
||||
|
||||
mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) { };
|
||||
qtStdenv = libsForQt5.callPackage ({ stdenv }: stdenv) {};
|
||||
|
||||
packages = self: with self;
|
||||
packages = self:
|
||||
let
|
||||
|
||||
propagate = out:
|
||||
@ -98,6 +98,7 @@ let
|
||||
|
||||
defaultSetupHook = if hasBin && hasDev then propagateBin else null;
|
||||
setupHook = args.setupHook or defaultSetupHook;
|
||||
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ libsForQt5.wrapQtAppsHook ];
|
||||
|
||||
meta =
|
||||
let meta = args.meta or { }; in
|
||||
@ -109,8 +110,8 @@ let
|
||||
broken = meta.broken or broken;
|
||||
};
|
||||
in
|
||||
mkDerivation (args // {
|
||||
inherit pname version meta outputs setupHook src;
|
||||
(args.stdenv or qtStdenv).mkDerivation (args // {
|
||||
inherit pname version meta outputs setupHook src nativeBuildInputs;
|
||||
});
|
||||
};
|
||||
|
||||
@ -123,6 +124,7 @@ let
|
||||
breeze-grub = callPackage ./breeze-grub.nix { };
|
||||
breeze-plymouth = callPackage ./breeze-plymouth { };
|
||||
discover = callPackage ./discover.nix { };
|
||||
flatpak-kcm = callPackage ./flatpak-kcm.nix { };
|
||||
kactivitymanagerd = callPackage ./kactivitymanagerd.nix { };
|
||||
kde-cli-tools = callPackage ./kde-cli-tools.nix { };
|
||||
kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; };
|
||||
@ -162,6 +164,7 @@ let
|
||||
plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { };
|
||||
plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { };
|
||||
plasma-vault = callPackage ./plasma-vault { };
|
||||
plasma-welcome = callPackage ./plasma-welcome.nix { };
|
||||
plasma-workspace = callPackage ./plasma-workspace { };
|
||||
plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix { };
|
||||
polkit-kde-agent = callPackage ./polkit-kde-agent.nix { };
|
||||
|
||||
@ -1 +1 @@
|
||||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.26.5/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.0/ -A '*.tar.xz' )
|
||||
|
||||
18
pkgs/desktops/plasma-5/flatpak-kcm.nix
Normal file
18
pkgs/desktops/plasma-5/flatpak-kcm.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ mkDerivation
|
||||
, extra-cmake-modules
|
||||
, flatpak
|
||||
, kcmutils
|
||||
, kconfig
|
||||
, kdeclarative
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "flatpak-kcm";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
flatpak
|
||||
kcmutils
|
||||
kconfig
|
||||
kdeclarative
|
||||
];
|
||||
}
|
||||
@ -99,6 +99,6 @@ mkDerivation {
|
||||
# the same directory, while it is actually located in a completely different
|
||||
# store path
|
||||
preFixup = ''
|
||||
ln -sf ${lib.getExe systemsettings} $out/bin/kinfocenter
|
||||
ln -sf ${systemsettings}/bin/systemsettings $out/bin/kinfocenter
|
||||
'';
|
||||
}
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
, kdeclarative
|
||||
, kglobalaccel
|
||||
, kidletime
|
||||
, libkscreen
|
||||
, kwayland
|
||||
, libXcursor
|
||||
, pam
|
||||
@ -27,6 +28,7 @@ mkDerivation {
|
||||
kdeclarative
|
||||
kglobalaccel
|
||||
kidletime
|
||||
libkscreen
|
||||
kwayland
|
||||
libXcursor
|
||||
pam
|
||||
|
||||
@ -1,153 +0,0 @@
|
||||
From 84f020835e3624342a928aae68e62e636bf2cc8c Mon Sep 17 00:00:00 2001
|
||||
From: Yuriy Taraday <yorik.sar@gmail.com>
|
||||
Date: Wed, 12 Oct 2022 12:07:23 +0400
|
||||
Subject: [PATCH] Revert "[x11] Refactor output updates"
|
||||
|
||||
This reverts commit 9a34ebbffc791cbeadc9abafda793ebee654b270.
|
||||
|
||||
This should fix compilation with older GCC.
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
.../standalone/x11_standalone_platform.cpp | 63 +++++++++++--------
|
||||
2 files changed, 38 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 3e7bf700e..6ff24aa5c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -70,7 +70,7 @@ add_definitions(-DMESA_EGL_NO_X11_HEADERS)
|
||||
add_definitions(-DEGL_NO_X11)
|
||||
add_definitions(-DEGL_NO_PLATFORM_SPECIFIC_TYPES)
|
||||
|
||||
-set(CMAKE_CXX_STANDARD 20)
|
||||
+set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
# required frameworks by Core
|
||||
diff --git a/src/backends/x11/standalone/x11_standalone_platform.cpp b/src/backends/x11/standalone/x11_standalone_platform.cpp
|
||||
index 498d5cbe3..ac0f732b2 100644
|
||||
--- a/src/backends/x11/standalone/x11_standalone_platform.cpp
|
||||
+++ b/src/backends/x11/standalone/x11_standalone_platform.cpp
|
||||
@@ -54,8 +54,6 @@
|
||||
#include <QX11Info>
|
||||
#endif
|
||||
|
||||
-#include <span>
|
||||
-
|
||||
namespace KWin
|
||||
{
|
||||
|
||||
@@ -407,7 +405,8 @@ void X11StandalonePlatform::invertScreen()
|
||||
ScreenResources res((active_client && active_client->window() != XCB_WINDOW_NONE) ? active_client->window() : rootWindow());
|
||||
|
||||
if (!res.isNull()) {
|
||||
- for (auto crtc : std::span(res.crtcs(), res->num_crtcs)) {
|
||||
+ for (int j = 0; j < res->num_crtcs; ++j) {
|
||||
+ auto crtc = res.crtcs()[j];
|
||||
CrtcGamma gamma(crtc);
|
||||
if (gamma.isNull()) {
|
||||
continue;
|
||||
@@ -480,39 +479,54 @@ void X11StandalonePlatform::doUpdateOutputs()
|
||||
if (Xcb::Extensions::self()->isRandrAvailable()) {
|
||||
T resources(rootWindow());
|
||||
if (!resources.isNull()) {
|
||||
+ xcb_randr_crtc_t *crtcs = resources.crtcs();
|
||||
+ const xcb_randr_mode_info_t *modes = resources.modes();
|
||||
+
|
||||
+ QVector<Xcb::RandR::CrtcInfo> infos(resources->num_crtcs);
|
||||
+ for (int i = 0; i < resources->num_crtcs; ++i) {
|
||||
+ infos[i] = Xcb::RandR::CrtcInfo(crtcs[i], resources->config_timestamp);
|
||||
+ }
|
||||
|
||||
- std::span crtcs(resources.crtcs(), resources->num_crtcs);
|
||||
- for (auto crtc : crtcs) {
|
||||
- Xcb::RandR::CrtcInfo info(crtc, resources->config_timestamp);
|
||||
+ for (int i = 0; i < resources->num_crtcs; ++i) {
|
||||
+ Xcb::RandR::CrtcInfo info(infos.at(i));
|
||||
|
||||
const QRect geometry = info.rect();
|
||||
if (!geometry.isValid()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
- float refreshRate = -1.0f;
|
||||
+ xcb_randr_output_t *outputs = info.outputs();
|
||||
+ QVector<Xcb::RandR::OutputInfo> outputInfos(outputs ? resources->num_outputs : 0);
|
||||
+ QVector<Xcb::RandR::OutputProperty> edids(outputs ? resources->num_outputs : 0);
|
||||
+ if (outputs) {
|
||||
+ for (int i = 0; i < resources->num_outputs; ++i) {
|
||||
+ outputInfos[i] = Xcb::RandR::OutputInfo(outputs[i], resources->config_timestamp);
|
||||
+ edids[i] = Xcb::RandR::OutputProperty(outputs[i], atoms->edid, XCB_ATOM_INTEGER, 0, 100, false, false);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
- for (auto mode : std::span(resources.modes(), resources->num_modes)) {
|
||||
- if (info->mode == mode.id) {
|
||||
- if (mode.htotal != 0 && mode.vtotal != 0) { // BUG 313996
|
||||
+ float refreshRate = -1.0f;
|
||||
+ for (int j = 0; j < resources->num_modes; ++j) {
|
||||
+ if (info->mode == modes[j].id) {
|
||||
+ if (modes[j].htotal != 0 && modes[j].vtotal != 0) { // BUG 313996
|
||||
// refresh rate calculation - WTF was wikipedia 1998 when I needed it?
|
||||
- int dotclock = mode.dot_clock,
|
||||
- vtotal = mode.vtotal;
|
||||
- if (mode.mode_flags & XCB_RANDR_MODE_FLAG_INTERLACE) {
|
||||
+ int dotclock = modes[j].dot_clock,
|
||||
+ vtotal = modes[j].vtotal;
|
||||
+ if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_INTERLACE) {
|
||||
dotclock *= 2;
|
||||
}
|
||||
- if (mode.mode_flags & XCB_RANDR_MODE_FLAG_DOUBLE_SCAN) {
|
||||
+ if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_DOUBLE_SCAN) {
|
||||
vtotal *= 2;
|
||||
}
|
||||
- refreshRate = dotclock / float(mode.htotal * vtotal);
|
||||
+ refreshRate = dotclock / float(modes[j].htotal * vtotal);
|
||||
}
|
||||
break; // found mode
|
||||
}
|
||||
}
|
||||
|
||||
- for (auto xcbOutput : std::span(info.outputs(), info->num_outputs)) {
|
||||
- Xcb::RandR::OutputInfo outputInfo(xcbOutput, resources->config_timestamp);
|
||||
- if (outputInfo->crtc != crtc) {
|
||||
+ for (int j = 0; j < info->num_outputs; ++j) {
|
||||
+ Xcb::RandR::OutputInfo outputInfo(outputInfos.at(j));
|
||||
+ if (outputInfo->crtc != crtcs[i]) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -528,14 +542,12 @@ void X11StandalonePlatform::doUpdateOutputs()
|
||||
// TODO: Perhaps the output has to save the inherited gamma ramp and
|
||||
// restore it during tear down. Currently neither standalone x11 nor
|
||||
// drm platform do this.
|
||||
- Xcb::RandR::CrtcGamma gamma(crtc);
|
||||
+ Xcb::RandR::CrtcGamma gamma(crtcs[i]);
|
||||
|
||||
output->setRenderLoop(m_renderLoop.get());
|
||||
- output->setCrtc(crtc);
|
||||
+ output->setCrtc(crtcs[i]);
|
||||
output->setGammaRampSize(gamma.isNull() ? 0 : gamma->size);
|
||||
- auto it = std::find(crtcs.begin(), crtcs.end(), crtc);
|
||||
- int crtcIndex = std::distance(crtcs.begin(), it);
|
||||
- output->setXineramaNumber(crtcIndex);
|
||||
+ output->setXineramaNumber(i);
|
||||
|
||||
QSize physicalSize(outputInfo->mm_width, outputInfo->mm_height);
|
||||
switch (info->rotation) {
|
||||
@@ -556,10 +568,9 @@ void X11StandalonePlatform::doUpdateOutputs()
|
||||
.physicalSize = physicalSize,
|
||||
};
|
||||
|
||||
- auto edidProperty = Xcb::RandR::OutputProperty(xcbOutput, atoms->edid, XCB_ATOM_INTEGER, 0, 100, false, false);
|
||||
bool ok;
|
||||
- if (auto data = edidProperty.toByteArray(&ok); ok && !data.isEmpty()) {
|
||||
- if (auto edid = Edid(data, edidProperty.data()->num_items); edid.isValid()) {
|
||||
+ if (auto data = edids[j].toByteArray(&ok); ok && !data.isEmpty()) {
|
||||
+ if (auto edid = Edid(data, edids[j].data()->num_items); edid.isValid()) {
|
||||
information.manufacturer = edid.manufacturerString();
|
||||
information.model = edid.monitorName();
|
||||
information.serialNumber = edid.serialNumber();
|
||||
--
|
||||
2.37.2
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user