mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a912b83051
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
@ -238,7 +238,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
||||
|
||||
# VsCode Extensions
|
||||
/pkgs/applications/editors/vscode @superherointj
|
||||
/pkgs/applications/editors/vscode/extensions @jonringer
|
||||
/pkgs/applications/editors/vscode/extensions @jonringer @superherointj
|
||||
|
||||
# Prometheus exporter modules and tests
|
||||
/nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz
|
||||
|
||||
@ -338,7 +338,7 @@ in
|
||||
lidarr = 306;
|
||||
slurm = 307;
|
||||
kapacitor = 308;
|
||||
solr = 309;
|
||||
# solr = 309; removed 2023-03-16
|
||||
alerta = 310;
|
||||
minetest = 311;
|
||||
rss2email = 312;
|
||||
@ -648,7 +648,7 @@ in
|
||||
lidarr = 306;
|
||||
slurm = 307;
|
||||
kapacitor = 308;
|
||||
solr = 309;
|
||||
# solr = 309; removed 2023-03-16
|
||||
alerta = 310;
|
||||
minetest = 311;
|
||||
rss2email = 312;
|
||||
|
||||
@ -1061,7 +1061,6 @@
|
||||
./services/search/meilisearch.nix
|
||||
./services/search/opensearch.nix
|
||||
./services/search/qdrant.nix
|
||||
./services/search/solr.nix
|
||||
./services/security/aesmd.nix
|
||||
./services/security/certmgr.nix
|
||||
./services/security/cfssl.nix
|
||||
|
||||
@ -1,110 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.solr;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.solr = {
|
||||
enable = mkEnableOption (lib.mdDoc "Solr");
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.solr;
|
||||
defaultText = literalExpression "pkgs.solr";
|
||||
description = lib.mdDoc "Which Solr package to use.";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 8983;
|
||||
description = lib.mdDoc "Port on which Solr is ran.";
|
||||
};
|
||||
|
||||
stateDir = mkOption {
|
||||
type = types.path;
|
||||
default = "/var/lib/solr";
|
||||
description = lib.mdDoc "The solr home directory containing config, data, and logging files.";
|
||||
};
|
||||
|
||||
extraJavaOptions = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = lib.mdDoc "Extra command line options given to the java process running Solr.";
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "solr";
|
||||
description = lib.mdDoc "User under which Solr is ran.";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "solr";
|
||||
description = lib.mdDoc "Group under which Solr is ran.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
systemd.services.solr = {
|
||||
after = [ "network.target" "remote-fs.target" "nss-lookup.target" "systemd-journald-dev-log.socket" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
environment = {
|
||||
SOLR_HOME = "${cfg.stateDir}/data";
|
||||
LOG4J_PROPS = "${cfg.stateDir}/log4j2.xml";
|
||||
SOLR_LOGS_DIR = "${cfg.stateDir}/logs";
|
||||
SOLR_PORT = "${toString cfg.port}";
|
||||
};
|
||||
path = with pkgs; [
|
||||
gawk
|
||||
procps
|
||||
];
|
||||
preStart = ''
|
||||
mkdir -p "${cfg.stateDir}/data";
|
||||
mkdir -p "${cfg.stateDir}/logs";
|
||||
|
||||
if ! test -e "${cfg.stateDir}/data/solr.xml"; then
|
||||
install -D -m0640 ${cfg.package}/server/solr/solr.xml "${cfg.stateDir}/data/solr.xml"
|
||||
install -D -m0640 ${cfg.package}/server/solr/zoo.cfg "${cfg.stateDir}/data/zoo.cfg"
|
||||
fi
|
||||
|
||||
if ! test -e "${cfg.stateDir}/log4j2.xml"; then
|
||||
install -D -m0640 ${cfg.package}/server/resources/log4j2.xml "${cfg.stateDir}/log4j2.xml"
|
||||
fi
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
ExecStart="${cfg.package}/bin/solr start -f -a \"${concatStringsSep " " cfg.extraJavaOptions}\"";
|
||||
ExecStop="${cfg.package}/bin/solr stop";
|
||||
};
|
||||
};
|
||||
|
||||
users.users = optionalAttrs (cfg.user == "solr") {
|
||||
solr = {
|
||||
group = cfg.group;
|
||||
home = cfg.stateDir;
|
||||
createHome = true;
|
||||
uid = config.ids.uids.solr;
|
||||
};
|
||||
};
|
||||
|
||||
users.groups = optionalAttrs (cfg.group == "solr") {
|
||||
solr.gid = config.ids.gids.solr;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@ -624,7 +624,6 @@ in {
|
||||
soapui = handleTest ./soapui.nix {};
|
||||
sogo = handleTest ./sogo.nix {};
|
||||
solanum = handleTest ./solanum.nix {};
|
||||
solr = handleTest ./solr.nix {};
|
||||
sonarr = handleTest ./sonarr.nix {};
|
||||
sourcehut = handleTest ./sourcehut.nix {};
|
||||
spacecookie = handleTest ./spacecookie.nix {};
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
name = "netdata";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ cransom ];
|
||||
maintainers = [ cransom raitobezarius ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
|
||||
{
|
||||
name = "solr";
|
||||
meta.maintainers = [ pkgs.lib.maintainers.aanderse ];
|
||||
|
||||
nodes.machine =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
# Ensure the virtual machine has enough memory for Solr to avoid the following error:
|
||||
#
|
||||
# OpenJDK 64-Bit Server VM warning:
|
||||
# INFO: os::commit_memory(0x00000000e8000000, 402653184, 0)
|
||||
# failed; error='Cannot allocate memory' (errno=12)
|
||||
#
|
||||
# There is insufficient memory for the Java Runtime Environment to continue.
|
||||
# Native memory allocation (mmap) failed to map 402653184 bytes for committing reserved memory.
|
||||
virtualisation.memorySize = 2000;
|
||||
|
||||
services.solr.enable = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
machine.wait_for_unit("solr.service")
|
||||
machine.wait_for_open_port(8983)
|
||||
machine.succeed("curl --fail http://localhost:8983/solr/")
|
||||
|
||||
# adapted from pkgs.solr/examples/films/README.txt
|
||||
machine.succeed("sudo -u solr solr create -c films")
|
||||
assert '"status":0' in machine.succeed(
|
||||
"""
|
||||
curl http://localhost:8983/solr/films/schema -X POST -H 'Content-type:application/json' --data-binary '{
|
||||
"add-field" : {
|
||||
"name":"name",
|
||||
"type":"text_general",
|
||||
"multiValued":false,
|
||||
"stored":true
|
||||
},
|
||||
"add-field" : {
|
||||
"name":"initial_release_date",
|
||||
"type":"pdate",
|
||||
"stored":true
|
||||
}
|
||||
}'
|
||||
"""
|
||||
)
|
||||
machine.succeed(
|
||||
"sudo -u solr post -c films ${pkgs.solr}/example/films/films.json"
|
||||
)
|
||||
assert '"name":"Batman Begins"' in machine.succeed(
|
||||
"curl http://localhost:8983/solr/films/query?q=name:batman"
|
||||
)
|
||||
'';
|
||||
})
|
||||
@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: let
|
||||
user = nodes.machine.config.users.users.alice;
|
||||
user = nodes.machine.users.users.alice;
|
||||
in ''
|
||||
machine.wait_for_x()
|
||||
machine.wait_for_file("${user.home}/.Xauthority")
|
||||
|
||||
@ -66,9 +66,6 @@ self: let
|
||||
seq = if lib.versionAtLeast self.emacs.version "27"
|
||||
then null
|
||||
else super.seq;
|
||||
project = if lib.versionAtLeast self.emacs.version "28"
|
||||
then null
|
||||
else super.project;
|
||||
# Compilation instructions for the Ada executables:
|
||||
# https://www.nongnu.org/ada-mode/
|
||||
ada-mode = super.ada-mode.overrideAttrs (old: {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
|
||||
extra-cmake-modules, shared-mime-info, accounts-qt,
|
||||
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
|
||||
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb,
|
||||
postgresql, qttools, signond, xz,
|
||||
@ -17,7 +17,6 @@ mkDerivation {
|
||||
meta = {
|
||||
license = [ lib.licenses.lgpl21 ];
|
||||
maintainers = kdepimTeam;
|
||||
broken = lib.versionOlder qtbase.version "5.13";
|
||||
};
|
||||
patches = [
|
||||
./0001-akonadi-paths.patch
|
||||
|
||||
@ -30,9 +30,6 @@ still shows most of the available features is in `./gwenview.nix`.
|
||||
}:
|
||||
|
||||
let
|
||||
minQtVersion = "5.15";
|
||||
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
|
||||
|
||||
mirror = "mirror://kde";
|
||||
srcs = import ./srcs.nix { inherit fetchurl mirror; };
|
||||
|
||||
@ -53,7 +50,6 @@ let
|
||||
meta // {
|
||||
homepage = meta.homepage or "http://www.kde.org";
|
||||
platforms = meta.platforms or lib.platforms.linux;
|
||||
broken = meta.broken or broken;
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
kcompletion, kconfig, kcoreaddons, kdbusaddons,
|
||||
kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
|
||||
kparts, ktexteditor, kwindowsystem, phonon, solid,
|
||||
wayland, qtbase, qtwayland
|
||||
wayland, qtwayland
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -15,7 +15,6 @@ mkDerivation {
|
||||
description = "KDE file manager";
|
||||
license = with lib.licenses; [ gpl2Plus fdl12Plus ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
broken = lib.versionOlder qtbase.version "5.14";
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
propagatedUserEnvPkgs = [ baloo ];
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, lib
|
||||
, extra-cmake-modules
|
||||
, kdoctools
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, qtquickcontrols2
|
||||
, qtwebsockets
|
||||
@ -17,7 +16,7 @@
|
||||
, libvlc
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
mkDerivation {
|
||||
pname = "elisa";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
@ -45,6 +44,5 @@ mkDerivation rec {
|
||||
description = "A simple media player for KDE";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
broken = lib.versionOlder qtbase.version "5.15";
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, kio
|
||||
, kparts
|
||||
, kxmlgui
|
||||
, qtbase
|
||||
, qtscript
|
||||
, solid
|
||||
, qtquickcontrols2
|
||||
@ -21,7 +20,6 @@ mkDerivation {
|
||||
homepage = "https://apps.kde.org/filelight/";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ fridh vcunat ];
|
||||
broken = lib.versionOlder qtbase.version "5.13";
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,6 @@ mkDerivation {
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ];
|
||||
maintainers = kdepimTeam;
|
||||
broken = lib.versionOlder qtbase.version "5.13.0";
|
||||
};
|
||||
output = [ "out" "dev" ];
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
extra-cmake-modules, kdoctools,
|
||||
gettext,
|
||||
kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion,
|
||||
qtbase, python3
|
||||
python3
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -13,7 +13,6 @@ mkDerivation {
|
||||
description = "KDE debug settings";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = [ ];
|
||||
broken = lib.versionOlder qtbase.version "5.13";
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, qtbase,
|
||||
kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba,
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -9,7 +9,6 @@ mkDerivation {
|
||||
meta = {
|
||||
license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
broken = lib.versionOlder qtbase.version "5.13";
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba ];
|
||||
|
||||
@ -6,10 +6,9 @@
|
||||
, qtgraphicaleffects
|
||||
, qtquickcontrols2
|
||||
, qttools
|
||||
, qtbase
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
mkDerivation {
|
||||
pname = "kirigami-gallery";
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules qttools ];
|
||||
@ -26,6 +25,5 @@ mkDerivation rec {
|
||||
description = "View examples of Kirigami components";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = with maintainers; [ shadowrz ];
|
||||
broken = versionOlder qtbase.version "5.15";
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,5 +13,4 @@ mkDerivation {
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ kcodecs ki18n qtbase ];
|
||||
outputs = [ "out" "dev" ];
|
||||
meta.broken = lib.versionOlder qtbase.version "5.15.0";
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, mkDerivation
|
||||
, extra-cmake-modules, kdoctools
|
||||
, kinit, kcmutils, khtml, kdesu
|
||||
, qtbase, qtwebengine, qtx11extras, qtscript, qtwayland
|
||||
, qtwebengine, qtx11extras, qtscript, qtwayland
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -25,7 +25,6 @@ mkDerivation {
|
||||
homepage = "https://apps.kde.org/konqueror/";
|
||||
description = "Web browser, file manager and viewer";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
broken = lib.versionOlder qtbase.version "5.13";
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, kdoctools,
|
||||
grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
|
||||
kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qtbase, qttools,
|
||||
kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,
|
||||
qtspeech
|
||||
}:
|
||||
|
||||
@ -11,7 +11,6 @@ mkDerivation {
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ];
|
||||
maintainers = kdepimTeam;
|
||||
broken = lib.versionOlder qtbase.version "5.13.0";
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
|
||||
@ -8,7 +8,6 @@ mkDerivation {
|
||||
meta = {
|
||||
license = with lib.licenses; [ lgpl21 ];
|
||||
maintainers = [ lib.maintainers.bkchr ];
|
||||
broken = lib.versionOlder qtbase.version "5.15";
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
|
||||
buildInputs = [ qtbase karchive ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools, makeWrapper,
|
||||
kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons,
|
||||
kwindowsystem, libvncserver, freerdp, qtbase,
|
||||
kwindowsystem, libvncserver, freerdp,
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -22,6 +22,5 @@ mkDerivation {
|
||||
license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus bsd3 ];
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.linux;
|
||||
broken = lib.versionOlder qtbase.version "5.14";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig
|
||||
, kcrash, kiconthemes, kio, audiofile, libsamplerate, alsa-lib, libpulseaudio, flac, id3lib
|
||||
, libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }:
|
||||
, libogg, libmad, libopus, libvorbis, fftw, librsvg }:
|
||||
|
||||
mkDerivation {
|
||||
pname = "kwave";
|
||||
@ -11,7 +11,6 @@ mkDerivation {
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
broken = lib.versionOlder qtbase.version "5.14";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, kdoctools,
|
||||
qtbase, qtwebengine, kio, kcalendarcore, kcontacts,
|
||||
qtwebengine, kio, kcalendarcore, kcontacts,
|
||||
cyrus_sasl
|
||||
}:
|
||||
|
||||
@ -10,7 +10,6 @@ mkDerivation {
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ];
|
||||
maintainers = kdepimTeam;
|
||||
broken = lib.versionOlder qtbase.version "5.14.0";
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ qtwebengine kio kcalendarcore kcontacts cyrus_sasl ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ mkDerivation, qtbase
|
||||
{ mkDerivation
|
||||
, lib, extra-cmake-modules, gettext, python3
|
||||
, drumstick, fluidsynth
|
||||
, kcoreaddons, kcrash, kdoctools
|
||||
@ -12,7 +12,6 @@ mkDerivation {
|
||||
description = "Music Education Software";
|
||||
license = with licenses; [ lgpl21 gpl3 ];
|
||||
maintainers = with maintainers; [ peterhoeg HaoZeke ];
|
||||
broken = lib.versionOlder qtbase.version "5.14";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 qtdeclarative ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, ki18n, xcb-util-cursor
|
||||
, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins
|
||||
, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
|
||||
, qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
|
||||
, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -23,6 +23,5 @@ mkDerivation {
|
||||
homepage = "https://apps.kde.org/spectacle/";
|
||||
description = "Screenshot capture utility";
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
broken = versionOlder qtbase.version "5.15";
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,9 +28,6 @@ See also `pkgs/applications/kde` as this is what this is based on.
|
||||
}:
|
||||
|
||||
let
|
||||
minQtVersion = "5.15";
|
||||
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
|
||||
|
||||
mirror = "mirror://kde";
|
||||
srcs = import ./srcs.nix { inherit fetchurl mirror; };
|
||||
|
||||
@ -51,11 +48,10 @@ let
|
||||
meta // {
|
||||
homepage = meta.homepage or "https://mauikit.org/";
|
||||
platforms = meta.platforms or lib.platforms.linux;
|
||||
broken = meta.broken or broken;
|
||||
};
|
||||
});
|
||||
|
||||
packages = self: with self;
|
||||
packages = self:
|
||||
let
|
||||
callPackage = self.newScope {
|
||||
inherit mkDerivation;
|
||||
|
||||
@ -64,9 +64,6 @@ mkDerivation rec {
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ zraexy peterhoeg ];
|
||||
platforms = platforms.all;
|
||||
# 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8
|
||||
# but qt > 5.6 works when only using the native browser
|
||||
# https://github.com/sieren/QSyncthingTray/issues/223
|
||||
broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative) || stdenv.isDarwin;
|
||||
broken = !preferNative || stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,9 +28,6 @@ See also `pkgs/applications/kde` as this is what this is based on.
|
||||
}:
|
||||
|
||||
let
|
||||
minQtVersion = "5.15";
|
||||
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
|
||||
|
||||
mirror = "mirror://kde";
|
||||
srcs = import ./srcs.nix { inherit fetchurl mirror; };
|
||||
|
||||
@ -51,11 +48,10 @@ let
|
||||
meta // {
|
||||
homepage = meta.homepage or "https://www.plasma-mobile.org/";
|
||||
platforms = meta.platforms or lib.platforms.linux;
|
||||
broken = meta.broken or broken;
|
||||
};
|
||||
});
|
||||
|
||||
packages = self: with self;
|
||||
packages = self:
|
||||
let
|
||||
callPackage = self.newScope {
|
||||
inherit mkDerivation;
|
||||
|
||||
@ -17,13 +17,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openboardview";
|
||||
version = "9.0.3";
|
||||
version = "9.95.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenBoardView";
|
||||
repo = "OpenBoardView";
|
||||
rev = version;
|
||||
sha256 = "sha256-0vxWFNM9KQ5zs+VDDV3mVMfHZau4pgNxQ1HhH2vktCM=";
|
||||
sha256 = "sha256-sKDDOPpCagk7rBRlMlZhx+RYYbtoLzJsrnL8qKZMKW8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -31,7 +31,6 @@ mkDerivation rec {
|
||||
'';
|
||||
maintainers = with maintainers; [ gebner j0hax ];
|
||||
inherit (qtbase.meta) platforms;
|
||||
# works with qt 5.6 and qt 5.8
|
||||
broken = builtins.compareVersions qtbase.version "5.7.0" == 0 || stdenv.isDarwin;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional withVPX libvpx;
|
||||
|
||||
buildCommand = let
|
||||
qtVersion = "5.${lib.versions.minor qtbase.version}";
|
||||
wrapWith = makeWrapper: filename:
|
||||
"${makeWrapper} ${filename} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib";
|
||||
wrapQtApp = wrapWith "wrapQtApp";
|
||||
|
||||
@ -33,8 +33,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
minQtVersion = "5.15";
|
||||
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
|
||||
maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
|
||||
license = with lib.licenses; [
|
||||
lgpl21Plus
|
||||
@ -107,7 +105,6 @@ let
|
||||
license = meta.license or license;
|
||||
maintainers = (meta.maintainers or [ ]) ++ maintainers;
|
||||
platforms = meta.platforms or lib.platforms.linux;
|
||||
broken = meta.broken or broken;
|
||||
};
|
||||
in
|
||||
qtStdenv.mkDerivation (args // {
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "mousepad";
|
||||
version = "0.5.10";
|
||||
version = "0.6.0";
|
||||
odd-unstable = false;
|
||||
|
||||
sha256 = "sha256-AKyFCzQE6OfMzKh5Lk16W01255vPeco1II80oLqT4oM=";
|
||||
sha256 = "sha256-VmpCjR8/3rsCGkVGhT+IdC6kaQkGz8G2ktFhJk32DeQ=";
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection ];
|
||||
|
||||
|
||||
@ -1,44 +1,31 @@
|
||||
{ lib
|
||||
, mkXfceDerivation
|
||||
, dbus-glib
|
||||
, gtk3
|
||||
, libical
|
||||
, libnotify
|
||||
, libxfce4ui
|
||||
, popt
|
||||
, tzdata
|
||||
, xfce4-panel
|
||||
, withPanelPlugin ? true
|
||||
}:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "orage";
|
||||
version = "4.16.0";
|
||||
odd-unstable = false;
|
||||
sha256 = "sha256-Q2vTjfhbhG7TrkGeU5oVBB+UvrV5QFtl372wgHU4cxw=";
|
||||
version = "4.18.0";
|
||||
|
||||
sha256 = "sha256-vL9zexPbQKPqIzK5UqUIxkE9I7hEupkDOJehMgj2Leo=";
|
||||
|
||||
buildInputs = [
|
||||
dbus-glib
|
||||
gtk3
|
||||
libical
|
||||
libnotify
|
||||
libxfce4ui
|
||||
popt
|
||||
]
|
||||
++ lib.optionals withPanelPlugin [
|
||||
xfce4-panel
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
# ensure pkgs.libical is used instead of one included in the orage sources
|
||||
rm -rf libical
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -7,9 +7,9 @@
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "parole";
|
||||
version = "4.16.0";
|
||||
version = "4.18.0";
|
||||
|
||||
sha256 = "sha256-9Rvhc8asFEb/+OU6uhuHKPl7w5mWBfzGP5ia0tiyDB4=";
|
||||
sha256 = "sha256-TLH9ZUggjclJlbBg3EBVgbcrdiMZ8n+cGDgfNgYNiPI=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/plugins/mpris2/Makefile.am \
|
||||
|
||||
@ -11,9 +11,10 @@
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "ristretto";
|
||||
version = "0.12.4";
|
||||
version = "0.13.0";
|
||||
odd-unstable = false;
|
||||
|
||||
sha256 = "sha256-pspS9zRvDOMz4+Ud43uT4gsDQhB51bwmaXPXcGlOhsY=";
|
||||
sha256 = "sha256-K1cC5NnRv/C5ZiwMAmaQ8qxvlxHRsJ4F1TgR9CN8Qgc=";
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
|
||||
@ -3,9 +3,10 @@
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfburn";
|
||||
version = "0.6.2";
|
||||
version = "0.7.0";
|
||||
odd-unstable = false;
|
||||
|
||||
sha256 = "sha256-AUonNhMs2HBF1WBLdZNYmASTOxYt6A6WDKNtvZaGXQk=";
|
||||
sha256 = "sha256-/CuV2tqja5fa2H2mmU9BP6tZHoCZZML5d2LL/CG3rno=";
|
||||
|
||||
nativeBuildInputs = [ libxslt docbook_xsl ];
|
||||
buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ];
|
||||
|
||||
@ -2,9 +2,11 @@
|
||||
, mkXfceDerivation
|
||||
, glib
|
||||
, gtk3
|
||||
, libcanberra-gtk3
|
||||
, libnotify
|
||||
, libxfce4ui
|
||||
, libxfce4util
|
||||
, sqlite
|
||||
, xfce4-panel
|
||||
, xfconf
|
||||
}:
|
||||
@ -12,16 +14,18 @@
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfce4-notifyd";
|
||||
version = "0.6.5";
|
||||
version = "0.8.2";
|
||||
|
||||
sha256 = "sha256-NUEqQk9EcDl23twbo+DUt7QYZrPmWpsRzmi5wIdolqw=";
|
||||
sha256 = "sha256-M8L2HWTuQDl/prD7s6uptkW4XDscpk6fc+epoxjFNS8=";
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
glib
|
||||
libcanberra-gtk3
|
||||
libnotify
|
||||
libxfce4ui
|
||||
libxfce4util
|
||||
sqlite
|
||||
xfce4-panel
|
||||
xfconf
|
||||
];
|
||||
@ -30,6 +34,7 @@ mkXfceDerivation {
|
||||
|
||||
configureFlags = [
|
||||
"--enable-dbus-start-daemon"
|
||||
"--enable-sound"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -4,16 +4,16 @@
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "libxfce4ui";
|
||||
version = "4.18.1";
|
||||
version = "4.18.2";
|
||||
|
||||
sha256 = "sha256-1kzvFr/WeTl3HpVMJZRBgsvmG8VtYkdEbIQSniJIaHA=";
|
||||
sha256 = "sha256-h9D0boBCCC4txnSRc6VcdNbrm8D21LwE63Q/LsExFNE=";
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection vala ];
|
||||
buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ];
|
||||
propagatedBuildInputs = [ libxfce4util libICE libSM ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-vendor-info='NixOS'"
|
||||
"--with-vendor-info=NixOS"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -21,9 +21,9 @@
|
||||
let unwrapped = mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "thunar";
|
||||
version = "4.18.3";
|
||||
version = "4.18.4";
|
||||
|
||||
sha256 = "sha256-sYn1gBzqEFcB3jHWxmoqqv0Cxa3mui/j0kgBqJMgJrc=";
|
||||
sha256 = "sha256-tdk0sWUzTmYXk+dOPVOpjmODpqmhzQc9jAOCk2+yNKM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
docbook_xsl
|
||||
|
||||
@ -16,9 +16,9 @@
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "xfce4-panel";
|
||||
version = "4.18.1";
|
||||
version = "4.18.2";
|
||||
|
||||
sha256 = "sha256-5GJO8buOTnRGnm3+kesrZjTprCY1qiyookpW6dzI2AE=";
|
||||
sha256 = "sha256-kqc+5pClmAPEkyNWKj4uPgwFFKBDWrwFHqRDWjYrwa4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
|
||||
@ -4,9 +4,9 @@
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "xfce4-power-manager";
|
||||
version = "4.18.0";
|
||||
version = "4.18.1";
|
||||
|
||||
sha256 = "sha256-vl0SfZyVGxZYnSa2nCnYlqT05Hm7PLzOxgAGzapkKVI=";
|
||||
sha256 = "sha256-H9tu94ZQLLQhXIDtIWL3qZJo/ux2xC2Y9m7uwwey8M8=";
|
||||
|
||||
nativeBuildInputs = [ automakeAddFlags exo ];
|
||||
buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf xfce4-panel ];
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "xfce4-session";
|
||||
version = "4.18.0";
|
||||
version = "4.18.1";
|
||||
|
||||
sha256 = "sha256-eSQXVMdwxr/yE806Tly8CLimmJso6k4muuTR7RHPU3U=";
|
||||
sha256 = "sha256-mG+tyQ319fvQpitT6sb46R+8AF+3gxqPHMiGMAaqnSo=";
|
||||
|
||||
buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck xfconf polkit iceauth ];
|
||||
|
||||
|
||||
@ -16,9 +16,9 @@
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "xfce4-settings";
|
||||
version = "4.18.1";
|
||||
version = "4.18.2";
|
||||
|
||||
sha256 = "sha256-Uy5dObnMV+fpt8RdyFOsYVPN8Dyx1zzOu0pDak01ipQ=";
|
||||
sha256 = "sha256-u8xto4tP9fsaPaY6dzv4Bj/C6qvltT5wXJlV+TzP5uE=";
|
||||
|
||||
postPatch = ''
|
||||
for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do
|
||||
|
||||
@ -149,6 +149,7 @@ let
|
||||
|
||||
disallowedReferences = [ openjdk15-bootstrap ];
|
||||
|
||||
pos = builtins.unsafeGetAttrPos "feature" version;
|
||||
meta = import ./meta.nix lib version;
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -156,6 +156,7 @@ let
|
||||
|
||||
disallowedReferences = [ openjdk16-bootstrap ];
|
||||
|
||||
pos = builtins.unsafeGetAttrPos "feature" version;
|
||||
meta = import ./meta.nix lib version.feature;
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -175,6 +175,7 @@ let
|
||||
|
||||
disallowedReferences = [ openjdk17-bootstrap ];
|
||||
|
||||
pos = builtins.unsafeGetAttrPos "feature" version;
|
||||
meta = import ./meta.nix lib version.feature;
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -165,6 +165,7 @@ let
|
||||
|
||||
disallowedReferences = [ openjdk18-bootstrap ];
|
||||
|
||||
pos = builtins.unsafeGetAttrPos "feature" version;
|
||||
meta = import ./meta.nix lib version.feature;
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -175,6 +175,7 @@ let
|
||||
|
||||
disallowedReferences = [ openjdk19-bootstrap ];
|
||||
|
||||
pos = builtins.unsafeGetAttrPos "feature" version;
|
||||
meta = import ./meta.nix lib version.feature;
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rakudo";
|
||||
version = "2022.07";
|
||||
version = "2023.02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
|
||||
hash = "sha256-ejvJ1lTh0nkqBVtPrxFu820UH2tq3eeqcDF3BfJgkK0=";
|
||||
hash = "sha256-/RaGqizzLrnw630Nb5bfyJfPU8z4ntp9Iltoc4CTqhE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ removeReferencesTo ];
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, perl
|
||||
, CoreServices
|
||||
, ApplicationServices
|
||||
@ -9,23 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moarvm";
|
||||
version = "2022.07";
|
||||
version = "2023.02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz";
|
||||
hash = "sha256-M37wTRb4JvmUZcZTuSAGAo/iIL5o09z9BylhL09rW0Y=";
|
||||
hash = "sha256-Z+IU1E1fYmeHyn8EQkBDpjkwikOnd3tvpBkmtyQODcU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "mimalloc-older-macos-fixes.patch";
|
||||
url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "3rdparty/mimalloc/";
|
||||
sha256 = "1gcbn1850vy7xzalhn9ffnsg6x1ywi3fmnxvnal3m6lmb4kz5kb1";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nqp";
|
||||
version = "2022.07";
|
||||
version = "2023.02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
|
||||
hash = "sha256-WAgcEG1nKlQGAY/WmRLI1IX9Er8iWVEyXFDJKagjImg=";
|
||||
hash = "sha256-417V7ZTsMqbXMO6BW/hcX8+IqGf6xlZjaMGtSf5jtT8=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
diff --git a/qt/component.h b/qt/component.h
|
||||
index 47abd1f3..74de943c 100644
|
||||
--- a/qt/component.h
|
||||
+++ b/qt/component.h
|
||||
@@ -90,7 +90,7 @@ class APPSTREAMQT_EXPORT Component {
|
||||
UrlKindContact,
|
||||
|
||||
// deprecated
|
||||
- UrlTranslate [[deprecated]] = UrlKindTranslate,
|
||||
+ UrlTranslate = UrlKindTranslate,
|
||||
};
|
||||
Q_ENUM(UrlKind)
|
||||
|
||||
diff --git a/qt/pool.h b/qt/pool.h
|
||||
index b59829b7..5237f613 100644
|
||||
--- a/qt/pool.h
|
||||
+++ b/qt/pool.h
|
||||
@@ -70,9 +70,9 @@ public:
|
||||
FlagMonitor = 1 << 7,
|
||||
|
||||
// deprecated
|
||||
- FlagReadCollection [[deprecated]] = FlagLoadOsCollection,
|
||||
- FlagReadMetainfo [[deprecated]] = FlagLoadOsMetainfo,
|
||||
- FlagReadDesktopFiles [[deprecated]] = FlagLoadOsDesktopFiles,
|
||||
+ FlagReadCollection = FlagLoadOsCollection,
|
||||
+ FlagReadMetainfo = FlagLoadOsMetainfo,
|
||||
+ FlagReadDesktopFiles = FlagLoadOsDesktopFiles,
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -84,9 +84,9 @@ public:
|
||||
* Flags on how caching should be used.
|
||||
**/
|
||||
enum CacheFlags {
|
||||
- CacheFlagNone [[deprecated]] = 0,
|
||||
- CacheFlagUseUser [[deprecated]] = 1 << 0,
|
||||
- CacheFlagUseSystem [[deprecated]] = 1 << 1,
|
||||
+ CacheFlagNone = 0,
|
||||
+ CacheFlagUseUser = 1 << 0,
|
||||
+ CacheFlagUseSystem = 1 << 1,
|
||||
};
|
||||
|
||||
/**
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, mkDerivation, appstream, qtbase, qttools, nixosTests }:
|
||||
{ mkDerivation, appstream, qtbase, qttools, nixosTests }:
|
||||
|
||||
# TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here
|
||||
|
||||
@ -14,14 +14,7 @@ mkDerivation {
|
||||
|
||||
mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ];
|
||||
|
||||
patches = (appstream.patches or []) ++ lib.optionals (lib.versionOlder qtbase.version "5.14") [
|
||||
# Fix darwin build for libsForQt5.appstream-qt
|
||||
# Old Qt moc doesn't know about fancy C++14 features
|
||||
# ../qt/component.h:93: Parse error at "UrlTranslate"
|
||||
# Remove both this patch and related comment in default.nix
|
||||
# once Qt 5.14 or later becomes default on darwin
|
||||
./fix-build-for-qt-olderthan-514.patch
|
||||
];
|
||||
patches = appstream.patches;
|
||||
|
||||
postFixup = ''
|
||||
sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \
|
||||
|
||||
25
pkgs/development/libraries/cista/default.nix
Normal file
25
pkgs/development/libraries/cista/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cista";
|
||||
version = "0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "felixguendling";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dQOVmKRXfApN0QRx/PmLVzeCGppFJBnNWIOoLbDbrds=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [ "-DCISTA_INSTALL=ON" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://cista.rocks";
|
||||
description = "A simple, high-performance, zero-copy C++ serialization & reflection library";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ candyc1oud ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -27,9 +27,6 @@ existing packages here and modify it as necessary.
|
||||
{ libsForQt5, lib, fetchurl }:
|
||||
|
||||
let
|
||||
|
||||
minQtVersion = "5.15";
|
||||
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
|
||||
maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
|
||||
license = with lib.licenses; [
|
||||
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12Plus
|
||||
@ -86,7 +83,6 @@ let
|
||||
license = meta.license or license;
|
||||
maintainers = (meta.maintainers or []) ++ maintainers;
|
||||
platforms = meta.platforms or lib.platforms.linux;
|
||||
broken = meta.broken or broken;
|
||||
};
|
||||
|
||||
in mkDerivation (args // {
|
||||
|
||||
@ -16,8 +16,4 @@ mkDerivation {
|
||||
cmakeFlags = [
|
||||
"-DKIMAGEFORMATS_HEIF=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = versionOlder qtbase.version "5.14";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchurl, extra-cmake-modules
|
||||
, qca-qt5, kauth, kio, polkit-qt, qtbase
|
||||
, qca-qt5, kauth, kio, polkit-qt
|
||||
, util-linux
|
||||
}:
|
||||
|
||||
@ -42,7 +42,5 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://invent.kde.org/system/kpmcore";
|
||||
license = with licenses; [ cc-by-40 cc0 gpl3Plus mit ];
|
||||
maintainers = with maintainers; [ peterhoeg oxalica ];
|
||||
# The build requires at least Qt 5.14:
|
||||
broken = versionOlder qtbase.version "5.14";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libharu";
|
||||
version = "2.4.0";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libharu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-85o9pb2zJVYbM0SHxCNgJuDkcsHuFuwFe6B6xivoUUg=";
|
||||
hash = "sha256-v8eD1ZEFQFA7ceWOgOmq7hP0ZMPfxjdAp7ov4PBPaAE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -8,7 +8,7 @@ qtModule {
|
||||
preConfigure = ''
|
||||
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
|
||||
'';
|
||||
configureFlags = lib.optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-qml-debug" ];
|
||||
configureFlags = [ "-qml-debug" ];
|
||||
devTools = [
|
||||
"bin/qml"
|
||||
"bin/qmlcachegen"
|
||||
|
||||
@ -17,8 +17,7 @@ qtModule {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gstreamer gst-plugins-base ]
|
||||
# https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio
|
||||
++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib ]
|
||||
++ lib.optional (lib.versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland;
|
||||
++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib wayland ];
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
qmakeFlags = [ "GST_VERSION=1.0" ];
|
||||
NIX_LDFLAGS = lib.optionalString (stdenv.isDarwin) "-lobjc";
|
||||
|
||||
@ -66,7 +66,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/tsujan/Kvantum";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
broken = lib.versionOlder qtbase.version "5.14";
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import ./generic.nix {
|
||||
majorVersion = "9.2";
|
||||
minorVersion = "5";
|
||||
sourceSha256 = "sha256-Eo1gG6qYDpjuA0IHl0sz+zjSyYq5z0pXVu/bCe1sCUk=";
|
||||
minorVersion = "6";
|
||||
sourceSha256 = "sha256-BvyNScTlb0mMQPyzilY+2NTsMTWNAQHomI8LtNU53RI=";
|
||||
}
|
||||
|
||||
@ -12,7 +12,6 @@ buildPythonPackage rec {
|
||||
pname = "greenlet";
|
||||
version = "2.0.2";
|
||||
format = "setuptools";
|
||||
disabled = isPyPy; # builtin for pypy
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
||||
@ -8,6 +8,8 @@
|
||||
, watchdog
|
||||
, execnb
|
||||
, ghapi
|
||||
, pyyaml
|
||||
, quarto
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
@ -22,7 +24,18 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-ITMCmuAb1lXONbP5MREpk8vfNSztoTEmT87W1o+fbIU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ fastprogress fastcore asttokens astunparse watchdog execnb ghapi ];
|
||||
propagatedBuildInputs = [
|
||||
fastprogress
|
||||
fastcore
|
||||
asttokens
|
||||
astunparse
|
||||
watchdog
|
||||
execnb
|
||||
ghapi
|
||||
pyyaml
|
||||
quarto
|
||||
];
|
||||
|
||||
# no real tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "nbdev" ];
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPyPy
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
@ -19,6 +20,11 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = if isPyPy then [
|
||||
# uses ctypes to find native library
|
||||
"--deselect=test_six.py::test_move_items"
|
||||
] else null;
|
||||
|
||||
pythonImportsCheck = [ "six" ];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
let
|
||||
pname = "trainer";
|
||||
version = "0.0.22";
|
||||
version = "0.0.24";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -28,7 +28,7 @@ buildPythonPackage {
|
||||
owner = "coqui-ai";
|
||||
repo = "Trainer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-iujRx/9HNHIUOuoTHvQM5EByKydLjoVwfsBn7XdM3ks=";
|
||||
hash = "sha256-+Wr8kmHo3rWxknSN/jJVzXow95hNgth/j4OSj96gScE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "devbox";
|
||||
version = "0.4.2";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetpack-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-9aGmX21TUINGDA3NB/OrGXi8W4i+b8fKS8ft8GtQxNM=";
|
||||
hash = "sha256-mowrp08L74IgOoyA30cmt4QWDsHo1HPKm7bxiYp+YVI=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tfplugindocs";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "terraform-plugin-docs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-adOaX8VxMytnALkuXBlmRKfRmk6x7bHTg/oEJQiJ1+U=";
|
||||
sha256 = "sha256-GiMjm7XG/gFGOQXYeXsKbU7WQdrkQ0+J/SvfbLu24bo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Qo8L0Rm7ZxcZ9YZTqfx51Tt8DRj4M+be6NdrsrwRt30=";
|
||||
vendorHash = "sha256-qUlyOAiLzLgrtaAfs/aGpAikGmGcQ9PI7QRyp9+Qn4w=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate and validate Terraform plugin/provider documentation";
|
||||
|
||||
@ -210,7 +210,7 @@ let
|
||||
changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}";
|
||||
license = lib.licenses.cddl;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ jcumming jonringer wizeman globin ];
|
||||
maintainers = with lib.maintainers; [ jcumming jonringer wizeman globin raitobezarius ];
|
||||
mainProgram = "zfs";
|
||||
# If your Linux kernel version is not yet supported by zfs, try zfsUnstable.
|
||||
# On NixOS set the option boot.zfs.enableUnstable.
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-cqhttp";
|
||||
version = "1.0.0-rc4";
|
||||
version = "1.0.0-rc5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mrs4s";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7TWKd0y8yBi2piKBCUZFeo3swtC/SteRtXXRv7Ojajs=";
|
||||
sha256 = "sha256-t9R1hnd0LzLYn2EiX6JOpbVuhyrWJUB0FYikP2g1CYs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Oz/4bazhNnkf26YJ4H7c7d7vNzIJxG2OG0BJOiHBY7Y=";
|
||||
vendorSha256 = "sha256-4j1CRRaHzjvFus+djR9tJU4vVY4g34o8V1owz7hi4qI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Golang implementation of OneBot based on Mirai and MiraiGo";
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-whatsapp";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "whatsapp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0hnBqYwFVVlqv+8Cx2qvytDU6I+MPWQIpG4nYd7mPLM=";
|
||||
hash = "sha256-rSyKKWg9PiAZAdmUfWWxU4ZXGHP+LR1kcDXMbkB3wYA=";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
vendorSha256 = "sha256-n3DBPI1gjbmP9m+xkGVoTSBcA0ELSokNZb9i3cYmAqc=";
|
||||
vendorSha256 = "sha256-eHY6YBPDA2uJyhvB/3bd+W2PEfGjyx3BEAlbJvVV0Yo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -103,15 +103,13 @@ stdenv.mkDerivation rec {
|
||||
libarchive
|
||||
zlib
|
||||
gnutls
|
||||
ldb
|
||||
talloc
|
||||
libtasn1
|
||||
tdb
|
||||
tevent
|
||||
libxcrypt
|
||||
] ++ optionals stdenv.isLinux [ liburing systemd ]
|
||||
++ optionals stdenv.isDarwin [ libiconv ]
|
||||
++ optionals enableLDAP [ openldap.dev python3Packages.markdown ]
|
||||
++ optionals (!enableLDAP && stdenv.isLinux) [ ldb talloc tevent ]
|
||||
++ optional (enablePrinting && stdenv.isLinux) cups
|
||||
++ optional enableMDNS avahi
|
||||
++ optionals enableDomainController [ gpgme lmdb python3Packages.dnspython ]
|
||||
@ -149,6 +147,7 @@ stdenv.mkDerivation rec {
|
||||
++ optionals (!enableLDAP) [
|
||||
"--without-ldap"
|
||||
"--without-ads"
|
||||
] ++ optionals (!enableLDAP && stdenv.isLinux) [
|
||||
"--bundled-libraries=!ldb,!pyldb-util!talloc,!pytalloc-util,!tevent,!tdb,!pytdb"
|
||||
] ++ optional enableLibunwind "--with-libunwind"
|
||||
++ optional enableProfiling "--with-profiling-data"
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, jre, makeWrapper, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "solr";
|
||||
version = "8.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
|
||||
sha256 = "0mbbmamajamxzcvdlrzx9wmv26kg9nhg9bzazk176dhhx3rjajf2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out $out/bin
|
||||
|
||||
cp -r bin/solr bin/post $out/bin/
|
||||
cp -r contrib $out/
|
||||
cp -r dist $out/
|
||||
cp -r example $out/
|
||||
cp -r server $out/
|
||||
|
||||
wrapProgram $out/bin/solr --set JAVA_HOME "${jre}"
|
||||
wrapProgram $out/bin/post --set JAVA_HOME "${jre}"
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) solr;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://lucene.apache.org/solr/";
|
||||
description = "Open source enterprise search platform from the Apache Lucene project";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ];
|
||||
knownVulnerabilities = [
|
||||
"Multiple security issues throughout 2021, see https://solr.apache.org/security.html"
|
||||
"Package is outdated and has no maintainer"
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
@ -38,14 +38,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "tts";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coqui-ai";
|
||||
repo = "TTS";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EVFFETiGbrouUsrIhMFZEex3UGCCWTI3CC4yFAcERyw=";
|
||||
hash = "sha256-3t4JYEwQ+puGLhGl3nn93qsL8IeOwlYtHXTrnZ5Cf+w=";
|
||||
};
|
||||
|
||||
postPatch = let
|
||||
|
||||
@ -5,20 +5,22 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hyperledger-fabric";
|
||||
version = "2.4.6";
|
||||
version = "2.4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyperledger";
|
||||
repo = "fabric";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Q0qrDPih3M4YCzjhLFBy51qVvoICwwn1LJf63rYiUUg=";
|
||||
hash = "sha256-tHchOki5xlu87onUCqdK/OQxJ6lcvhlUlLcQM6Fap+A=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
postPatch = ''
|
||||
# Broken
|
||||
rm cmd/peer/main_test.go
|
||||
# Requires network
|
||||
rm cmd/osnadmin/main_test.go
|
||||
'';
|
||||
|
||||
subPackages = [
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "uncover";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yyx7gkOUQibcrMCEeeSeHtnKlxSnd/i6c1pq1V6hzA4=";
|
||||
hash = "sha256-emfS5/HEt+I0DlUDgbWGqjF8bVLHsKxgAS4CKB8WO9E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xB1JJIM/aro1Hk4JIwpR6WV6V+5hO9T3yWokxbybRXU=";
|
||||
vendorHash = "sha256-ckswffKbTXq8GMO2RvVz43ig27LKBxI2WqHRAx04dk0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "API wrapper to search for exposed hosts";
|
||||
|
||||
@ -122,6 +122,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.netdata.cloud/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ raitobezarius ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
{ lib, fetchFromGitHub, buildGoModule, nixosTests }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "netdata-go-plugins";
|
||||
version = "0.51.2";
|
||||
version = "0.51.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netdata";
|
||||
repo = "go.d.plugin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u87kTNM1oAmJRtm/iEESjVvQ9qEpFCGqRT8M+iVEwlI=";
|
||||
hash = "sha256-yYagbTrUpynvmd20MATQvsR+jZM7dhrQdfSjuayrZJI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QB+Sf7biNPD8/3y9pFxOJZXtc6BaBcQsUGP7y9Wukwg=";
|
||||
vendorHash = "sha256-lKoFm+wch9/ZgDSNSgYUrOq/X8DUEuSAQ4cc8UGaJzU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -21,10 +22,13 @@ buildGoModule rec {
|
||||
cp -r config/* $out/lib/netdata/conf.d
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) netdata; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Netdata orchestrator for data collection modules written in go";
|
||||
homepage = "https://github.com/netdata/go.d.plugin";
|
||||
license = licenses.gpl3;
|
||||
changelog = "https://github.com/netdata/go.d.plugin/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1440,7 +1440,8 @@ mapAliases ({
|
||||
smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries"; # Added 2020-11-04
|
||||
snack = throw "snack has been removed: broken for 5+ years"; # Added 2022-04-21
|
||||
soldat-unstable = opensoldat; # Added 2022-07-02
|
||||
solr_8 = solr; # Added 2021-01-30
|
||||
solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16
|
||||
solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16
|
||||
|
||||
# Added 2020-02-10
|
||||
sourceHanSansPackages = {
|
||||
|
||||
@ -12277,8 +12277,6 @@ with pkgs;
|
||||
|
||||
sonar-scanner-cli = callPackage ../tools/security/sonar-scanner-cli { };
|
||||
|
||||
solr = callPackage ../servers/search/solr { };
|
||||
|
||||
solvespace = callPackage ../applications/graphics/solvespace { };
|
||||
|
||||
sonarr = callPackage ../servers/sonarr { };
|
||||
@ -19458,6 +19456,8 @@ with pkgs;
|
||||
|
||||
cimg = callPackage ../development/libraries/cimg { };
|
||||
|
||||
cista = callPackage ../development/libraries/cista { };
|
||||
|
||||
cjose = callPackage ../development/libraries/cjose { };
|
||||
|
||||
scmccid = callPackage ../development/libraries/scmccid { };
|
||||
@ -30580,9 +30580,7 @@ with pkgs;
|
||||
|
||||
hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { };
|
||||
|
||||
hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { };
|
||||
|
||||
hypnotix = callPackage ../applications/video/hypnotix { };
|
||||
|
||||
|
||||
@ -4458,10 +4458,10 @@ let
|
||||
|
||||
CpanelJSONXS = buildPerlPackage {
|
||||
pname = "Cpanel-JSON-XS";
|
||||
version = "4.31";
|
||||
version = "4.36";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.31.tar.gz";
|
||||
hash = "sha256-AqZ6zuPeJKcow5ZIaADiojVZGlQ9B5REmtOI/j1c/yk=";
|
||||
url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.36.tar.gz";
|
||||
hash = "sha256-7OhHQhfLLt8E5PUaGM7aN4e1sd//7iyJGbLrEJpnJu0=";
|
||||
};
|
||||
meta = {
|
||||
description = "CPanel fork of JSON::XS, fast and correct serializing";
|
||||
|
||||
@ -4180,7 +4180,8 @@ self: super: with self; {
|
||||
|
||||
greeneye-monitor = callPackage ../development/python-modules/greeneye-monitor { };
|
||||
|
||||
greenlet = callPackage ../development/python-modules/greenlet { };
|
||||
# built-in for pypi
|
||||
greenlet = if isPyPy then null else callPackage ../development/python-modules/greenlet { };
|
||||
|
||||
grequests = callPackage ../development/python-modules/grequests { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user