Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
10a18604a1
@ -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";
|
||||
@ -1766,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";
|
||||
@ -3142,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";
|
||||
@ -3421,7 +3421,7 @@
|
||||
};
|
||||
davsanchez = {
|
||||
email = "davidslt+nixpkgs@pm.me";
|
||||
github = "davsanchez";
|
||||
github = "DavSanchez";
|
||||
githubId = 11422515;
|
||||
name = "David Sánchez";
|
||||
};
|
||||
@ -3914,6 +3914,7 @@
|
||||
name = "Davide Peressoni";
|
||||
email = "davide.peressoni@tuta.io";
|
||||
matrix = "@dpd-:matrix.org";
|
||||
github = "DPDmancul";
|
||||
githubId = 3186857;
|
||||
};
|
||||
dpercy = {
|
||||
@ -4344,7 +4345,7 @@
|
||||
};
|
||||
elnudev = {
|
||||
email = "elnu@elnu.com";
|
||||
github = "elnudev";
|
||||
github = "ElnuDev";
|
||||
githubId = 9874955;
|
||||
name = "Elnu";
|
||||
};
|
||||
@ -4632,7 +4633,7 @@
|
||||
};
|
||||
ewok = {
|
||||
email = "ewok@ewok.ru";
|
||||
github = "ewok";
|
||||
github = "ewok-old";
|
||||
githubId = 454695;
|
||||
name = "Artur Taranchiev";
|
||||
};
|
||||
@ -5763,7 +5764,7 @@
|
||||
};
|
||||
harrisonthorne = {
|
||||
email = "harrisonthorne@proton.me";
|
||||
github = "harrisonthorne";
|
||||
github = "muni-corn";
|
||||
githubId = 33523827;
|
||||
name = "Harrison Thorne";
|
||||
};
|
||||
@ -6998,7 +6999,7 @@
|
||||
};
|
||||
jkarlson = {
|
||||
email = "jekarlson@gmail.com";
|
||||
github = "jkarlson";
|
||||
github = "ethorsoe";
|
||||
githubId = 1204734;
|
||||
name = "Emil Karlson";
|
||||
};
|
||||
@ -7776,7 +7777,7 @@
|
||||
name = "Kid";
|
||||
};
|
||||
kidsan = {
|
||||
github = "kidsan";
|
||||
github = "Kidsan";
|
||||
githubId = 8798449;
|
||||
name = "kidsan";
|
||||
};
|
||||
@ -8673,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";
|
||||
}];
|
||||
@ -8824,7 +8827,7 @@
|
||||
};
|
||||
lux = {
|
||||
email = "lux@lux.name";
|
||||
github = "luxferresum";
|
||||
github = "luxzeitlos";
|
||||
githubId = 1208273;
|
||||
matrix = "@lux:ontheblueplanet.com";
|
||||
name = "Lux";
|
||||
@ -9297,7 +9300,7 @@
|
||||
};
|
||||
maxwell-lt = {
|
||||
email = "maxwell.lt@live.com";
|
||||
github = "maxwell-lt";
|
||||
github = "Maxwell-lt";
|
||||
githubId = 17859747;
|
||||
name = "Maxwell L-T";
|
||||
};
|
||||
@ -9936,7 +9939,7 @@
|
||||
name = "Mon Aaraj";
|
||||
email = "owo69uwu69@gmail.com";
|
||||
matrix = "@mon:tchncs.de";
|
||||
github = "MonAaraj";
|
||||
github = "ribosomerocker";
|
||||
githubId = 46468162;
|
||||
};
|
||||
monsieurp = {
|
||||
@ -10185,7 +10188,7 @@
|
||||
munksgaard = {
|
||||
name = "Philip Munksgaard";
|
||||
email = "philip@munksgaard.me";
|
||||
github = "munksgaard";
|
||||
github = "Munksgaard";
|
||||
githubId = 230613;
|
||||
matrix = "@philip:matrix.munksgaard.me";
|
||||
keys = [{
|
||||
@ -10802,7 +10805,7 @@
|
||||
};
|
||||
nrhelmi = {
|
||||
email = "helmiinour@gmail.com";
|
||||
github = "nrhelmi";
|
||||
github = "NRHelmi";
|
||||
githubId = 15707703;
|
||||
name = "Helmi Nour";
|
||||
};
|
||||
@ -11179,7 +11182,7 @@
|
||||
};
|
||||
paddygord = {
|
||||
email = "pgpatrickgordon@gmail.com";
|
||||
github = "paddygord";
|
||||
github = "avaunit02";
|
||||
githubId = 10776658;
|
||||
name = "Patrick Gordon";
|
||||
};
|
||||
@ -12229,7 +12232,7 @@
|
||||
};
|
||||
ratsclub = {
|
||||
email = "victor@freire.dev.br";
|
||||
github = "vtrf";
|
||||
github = "ratsclub";
|
||||
githubId = 25647735;
|
||||
name = "Victor Freire";
|
||||
};
|
||||
@ -12493,7 +12496,7 @@
|
||||
};
|
||||
rika = {
|
||||
email = "rika@paymentswit.ch";
|
||||
github = "NekomimiScience";
|
||||
github = "ScarletHg";
|
||||
githubId = 1810487;
|
||||
name = "Rika";
|
||||
};
|
||||
@ -13494,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";
|
||||
@ -13732,7 +13735,7 @@
|
||||
sno2wman = {
|
||||
name = "SnO2WMaN";
|
||||
email = "me@sno2wman.net";
|
||||
github = "sno2wman";
|
||||
github = "SnO2WMaN";
|
||||
githubId = 15155608;
|
||||
};
|
||||
snpschaaf = {
|
||||
@ -14486,7 +14489,7 @@
|
||||
};
|
||||
teozkr = {
|
||||
email = "teo@nullable.se";
|
||||
github = "teozkr";
|
||||
github = "nightkr";
|
||||
githubId = 649832;
|
||||
name = "Teo Klestrup Röijezon";
|
||||
};
|
||||
@ -14973,7 +14976,7 @@
|
||||
};
|
||||
tonyshkurenko = {
|
||||
email = "support@twingate.com";
|
||||
github = "tonyshkurenko";
|
||||
github = "antonshkurenko";
|
||||
githubId = 8597964;
|
||||
name = "Anton Shkurenko";
|
||||
};
|
||||
@ -15312,7 +15315,7 @@
|
||||
};
|
||||
uthar = {
|
||||
email = "galkowskikasper@gmail.com";
|
||||
github = "uthar";
|
||||
github = "Uthar";
|
||||
githubId = 15697697;
|
||||
name = "Kasper Gałkowski";
|
||||
};
|
||||
@ -16442,7 +16445,7 @@
|
||||
zebreus = {
|
||||
matrix = "@lennart:cicen.net";
|
||||
email = "lennarteichhorn+nixpkgs@gmail.com";
|
||||
github = "Zebreus";
|
||||
github = "zebreus";
|
||||
githubId = 1557253;
|
||||
name = "Lennart Eichhorn";
|
||||
};
|
||||
|
||||
@ -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
|
||||
];
|
||||
}
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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 = ''
|
||||
|
||||
@ -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 ];
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure";
|
||||
version = "1.11.1.1208";
|
||||
version = "1.11.1.1224";
|
||||
|
||||
src = fetchurl {
|
||||
# https://clojure.org/releases/tools
|
||||
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
|
||||
sha256 = "sha256-bn9uNM46oYc0wxJJ8HMGbE8/2mnYxm/p9S6MhYfhcQM=";
|
||||
sha256 = "sha256-T55/uETQFBWYS9ZifbF3KW8vWoeInq/QxH7UabVkBVI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
]);
|
||||
|
||||
RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [
|
||||
SDL2 SDL2.dev libpng ffmpeg.out freetype glew.dev libGLU libGL fribidi zlib
|
||||
SDL2 SDL2.dev libpng ffmpeg.lib freetype glew.dev libGLU libGL fribidi zlib
|
||||
]);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, bzip2, libtomcrypt, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, bzip2, libtomcrypt, zlib, darwin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "StormLib";
|
||||
@ -11,13 +11,23 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1rcdl6ryrr8fss5z5qlpl4prrw8xpbcdgajg2hpp0i7fpk21ymcc";
|
||||
};
|
||||
|
||||
# Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin
|
||||
# upgrades to a newer SDK.
|
||||
NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DTARGET_OS_IPHONE=0";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "FRAMEWORK DESTINATION /Library/Frameworks" "FRAMEWORK DESTINATION Library/Frameworks"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DWITH_LIBTOMCRYPT=ON"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ bzip2 libtomcrypt zlib ];
|
||||
buildInputs = [ bzip2 libtomcrypt zlib ] ++
|
||||
lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Carbon ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ladislav-zezula/StormLib";
|
||||
|
||||
@ -67,7 +67,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "https://confluence.ecmwf.int/display/ECC/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ knedlsepp ];
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "home-assistant-bluetooth";
|
||||
version = "1.9.2";
|
||||
version = "1.9.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8RGwWx/I6Log7qyGiP+LAWC1GCG2A7UEXnO5fGoTsb4=";
|
||||
hash = "sha256-7wZocfTYTwTBwm61hKmIS4xlHq2nSvC6p8SlklnHq4M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip,
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, fetchurl, pytestCheckHook, p7zip,
|
||||
cabextract, zip, lzip, zpaq, gnutar, gnugrep, diffutils, file,
|
||||
gzip, bzip2, xz}:
|
||||
|
||||
@ -6,6 +6,17 @@
|
||||
# it will still use unrar if present in the path
|
||||
|
||||
let
|
||||
# FIXME: backport a patch in `file` that seemingly only affects this package
|
||||
# Revert when fix to main package makes it through staging.
|
||||
file' = file.overrideAttrs(old: {
|
||||
patches = (old.patches or []) ++ [
|
||||
(fetchurl {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/file/files/file-5.44-decompress-empty.patch?h=dfc57da515a2aaf085bea68267cc727f1bfaa691";
|
||||
hash = "sha256-fUzRQAlLWczBmR5iA1Gk66mHjP40MJcMdgCtm2+u1SQ=";
|
||||
})
|
||||
];
|
||||
});
|
||||
|
||||
compression-utilities = [
|
||||
p7zip
|
||||
gnutar
|
||||
@ -17,7 +28,7 @@ let
|
||||
gnugrep
|
||||
diffutils
|
||||
bzip2
|
||||
file
|
||||
file'
|
||||
xz
|
||||
];
|
||||
in
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, black
|
||||
, toml
|
||||
, pytestCheckHook
|
||||
, python-language-server
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyls-black";
|
||||
version = "0.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rupert";
|
||||
repo = "pyls-black";
|
||||
rev = "v${version}";
|
||||
sha256 = "0bkhfnlik89j3yamr20br4wm8975f20v33wabi2nyxvj10whr5dj";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
propagatedBuildInputs = [ black toml python-language-server ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rupert/pyls-black";
|
||||
description = "Black plugin for the Python Language Server";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@ -12,20 +12,20 @@ in
|
||||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.76.0";
|
||||
version = "1.77.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kPc6T8yLe1TDxPKLnK/TcU+RUxAVIq8qsr5JQXCXyjM=";
|
||||
hash = "sha256-//1BTiNH3n2eNjwOADb1OB7xp5QsH6arV5Pg3B7y3r0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-tXtnVYH9uWu0nHHx53PgML92NWl3qcAcnFKhiijvQBc=";
|
||||
hash = "sha256-B9Z+7VtbbX/S01aaMFHgXH60sg8Lmwku2XPRnpMpwjo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -20,13 +20,13 @@ let
|
||||
]);
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
pname = "moonraker";
|
||||
version = "unstable-2022-04-23";
|
||||
version = "unstable-2022-11-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Arksine";
|
||||
repo = "moonraker";
|
||||
rev = "cd520ba91728abb5a3d959269fbd8e4f40d1eb0b";
|
||||
sha256 = "sha256-sopX9t+LjYldx+syKwU3I0x/VYy4hLyXfitG0uumayE=";
|
||||
rev = "362bc1a3d3ad397416f7fc48b8efe33837428b90";
|
||||
sha256 = "sha256-cebRHOx2hg470jM1CoQAk13Whv+KN2qx97BTlpjxSZg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1274,6 +1274,7 @@ mapAliases ({
|
||||
pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22
|
||||
pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13
|
||||
pulseeffects-pw = easyeffects; # Added 2021-07-07
|
||||
pyls-black = throw "pyls-black has been removed from nixpkgs. Use python-lsp-black instead."; # Added 2023-01-09
|
||||
py-wmi-client = throw "py-wmi-client has been removed: abandoned by upstream"; # Added 2022-04-26
|
||||
pydb = throw "pydb has been removed: abandoned by upstream"; # Added 2022-04-22
|
||||
pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only";
|
||||
|
||||
@ -19467,6 +19467,7 @@ with pkgs;
|
||||
|
||||
eccodes = callPackage ../development/libraries/eccodes {
|
||||
pythonPackages = python3Packages;
|
||||
stdenv = if stdenv.isDarwin then gccStdenv else stdenv;
|
||||
};
|
||||
|
||||
eclib = callPackage ../development/libraries/eclib {};
|
||||
@ -30412,6 +30413,16 @@ with pkgs;
|
||||
inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) ImageMagick;
|
||||
};
|
||||
|
||||
ikiwiki-full = ikiwiki.override {
|
||||
bazaarSupport = false; # tests broken
|
||||
cvsSupport = true;
|
||||
docutilsSupport = true;
|
||||
gitSupport = true;
|
||||
mercurialSupport = true;
|
||||
monotoneSupport = true;
|
||||
subversionSupport = true;
|
||||
};
|
||||
|
||||
iksemel = callPackage ../development/libraries/iksemel {
|
||||
texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8.
|
||||
};
|
||||
|
||||
@ -8313,8 +8313,6 @@ self: super: with self; {
|
||||
|
||||
pylsqpack = callPackage ../development/python-modules/pylsqpack { };
|
||||
|
||||
pyls-black = callPackage ../development/python-modules/pyls-black { };
|
||||
|
||||
pyls-flake8 = callPackage ../development/python-modules/pyls-flake8 { };
|
||||
|
||||
pyls-isort = callPackage ../development/python-modules/pyls-isort { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user