Merge branch 'master' into staging-next
(adds huge rebuild *and* its revert)
This commit is contained in:
Vladimír Čunát
commit
48d4a1cee9
@ -644,6 +644,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
|
||||
url = "https://enterprise.dejacode.com/licenses/public/purdue-bsd";
|
||||
};
|
||||
|
||||
prosperity30 = {
|
||||
fullName = "Prosperity-3.0.0";
|
||||
free = false;
|
||||
url = "https://prosperitylicense.com/versions/3.0.0.html";
|
||||
};
|
||||
|
||||
qhull = spdx {
|
||||
spdxId = "Qhull";
|
||||
fullName = "Qhull License";
|
||||
|
||||
@ -26,6 +26,12 @@
|
||||
<listitem>
|
||||
<para>GNOME desktop environment was upgraded to 3.36, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.36/">release notes</link>.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Quickly configure a complete, private, self-hosted video
|
||||
conferencing solution with the new Jitsi Meet module.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<package>maxx</package> package removed along with <varname>services.xserver.desktopManager.maxx</varname> module.
|
||||
@ -1127,5 +1133,20 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para />
|
||||
<para>
|
||||
Kubernetes has been upgraded to 1.19.1, which also means that the
|
||||
golang version to build it has been bumped to 1.15. This may have
|
||||
consequences for your existing clusters and their certificates. Please
|
||||
consider
|
||||
<link xlink:href="https://relnotes.k8s.io/?markdown=93264">
|
||||
the release notes for Kubernetes 1.19 carefully
|
||||
</link>
|
||||
before upgrading.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -20,7 +20,7 @@ let
|
||||
size = 2048;
|
||||
};
|
||||
CN = top.masterAddress;
|
||||
hosts = cfg.cfsslAPIExtraSANs;
|
||||
hosts = [top.masterAddress] ++ cfg.cfsslAPIExtraSANs;
|
||||
});
|
||||
|
||||
cfsslAPITokenBaseName = "apitoken.secret";
|
||||
@ -228,7 +228,8 @@ in
|
||||
};
|
||||
private_key = cert.privateKeyOptions;
|
||||
request = {
|
||||
inherit (cert) CN hosts;
|
||||
hosts = [cert.CN] ++ cert.hosts;
|
||||
inherit (cert) CN;
|
||||
key = {
|
||||
algo = "rsa";
|
||||
size = 2048;
|
||||
|
||||
@ -6,7 +6,7 @@ let
|
||||
cfg = config.services.datadog-agent;
|
||||
|
||||
ddConf = {
|
||||
dd_url = "https://app.datadoghq.com";
|
||||
dd_url = cfg.ddUrl;
|
||||
skip_ssl_validation = false;
|
||||
confd_path = "/etc/datadog-agent/conf.d";
|
||||
additional_checksd = "/etc/datadog-agent/checks.d";
|
||||
@ -77,6 +77,18 @@ in {
|
||||
type = types.path;
|
||||
};
|
||||
|
||||
ddUrl = mkOption {
|
||||
description = ''
|
||||
Custom dd_url to configure the agent with.
|
||||
Useful when you want to point datadog to another endpoint, either
|
||||
because you need a proxy to send out data, or because you use their EU
|
||||
endpoint.
|
||||
'';
|
||||
default = "https://app.datadoghq.com";
|
||||
example = "https://app.datadoghq.eu";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
tags = mkOption {
|
||||
description = "The tags to mark this Datadog agent";
|
||||
example = [ "test" "service" ];
|
||||
|
||||
@ -329,5 +329,6 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
meta.doc = ./jitsi-meet.xml;
|
||||
meta.maintainers = lib.teams.jitsi.members;
|
||||
}
|
||||
|
||||
55
nixos/modules/services/web-apps/jitsi-meet.xml
Normal file
55
nixos/modules/services/web-apps/jitsi-meet.xml
Normal file
@ -0,0 +1,55 @@
|
||||
<chapter xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:xi="http://www.w3.org/2001/XInclude"
|
||||
version="5.0"
|
||||
xml:id="module-services-jitsi-meet">
|
||||
<title>Jitsi Meet</title>
|
||||
<para>
|
||||
With Jitsi Meet on NixOS you can quickly configure a complete,
|
||||
private, self-hosted video conferencing solution.
|
||||
</para>
|
||||
|
||||
<section xml:id="module-services-jitsi-basic-usage">
|
||||
<title>Basic usage</title>
|
||||
<para>
|
||||
A minimal configuration using Let's Encrypt for TLS certificates looks like this:
|
||||
<programlisting>{
|
||||
services.jitsi-meet = {
|
||||
<link linkend="opt-services.jitsi-meet.enable">enable</link> = true;
|
||||
<link linkend="opt-services.jitsi-meet.enable">hostName</link> = "jitsi.example.com";
|
||||
};
|
||||
<link linkend="opt-services.jitsi-videobridge.openFirewall">services.jitsi-videobridge.openFirewall</link> = true;
|
||||
<link linkend="opt-networking.firewall.allowedTCPPorts">networking.firewall.allowedTCPPorts</link> = [ 80 443 ];
|
||||
<link linkend="opt-security.acme.email">security.acme.email</link> = "me@example.com";
|
||||
<link linkend="opt-security.acme.acceptTerms">security.acme.acceptTerms</link> = true;
|
||||
}</programlisting>
|
||||
</para>
|
||||
</section>
|
||||
|
||||
<section xml:id="module-services-jitsi-configuration">
|
||||
<title>Configuration</title>
|
||||
<para>
|
||||
Here is the minimal configuration with additional configurations:
|
||||
<programlisting>{
|
||||
services.jitsi-meet = {
|
||||
<link linkend="opt-services.jitsi-meet.enable">enable</link> = true;
|
||||
<link linkend="opt-services.jitsi-meet.enable">hostName</link> = "jitsi.example.com";
|
||||
<link linkend="opt-services.jitsi-meet.config">config</link> = {
|
||||
enableWelcomePage = false;
|
||||
prejoinPageEnabled = true;
|
||||
defaultLang = "fi";
|
||||
};
|
||||
<link linkend="opt-services.jitsi-meet.interfaceConfig">interfaceConfig</link> = {
|
||||
SHOW_JITSI_WATERMARK = false;
|
||||
SHOW_WATERMARK_FOR_GUESTS = false;
|
||||
};
|
||||
};
|
||||
<link linkend="opt-services.jitsi-videobridge.openFirewall">services.jitsi-videobridge.openFirewall</link> = true;
|
||||
<link linkend="opt-networking.firewall.allowedTCPPorts">networking.firewall.allowedTCPPorts</link> = [ 80 443 ];
|
||||
<link linkend="opt-security.acme.email">security.acme.email</link> = "me@example.com";
|
||||
<link linkend="opt-security.acme.acceptTerms">security.acme.acceptTerms</link> = true;
|
||||
}</programlisting>
|
||||
</para>
|
||||
</section>
|
||||
|
||||
</chapter>
|
||||
@ -41,5 +41,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
||||
)
|
||||
|
||||
assert title == "Gotify"
|
||||
|
||||
# Ensure that the UI responds with a successfuly code and that the
|
||||
# response is not empty
|
||||
result = machine.succeed("curl -fsS localhost:3000")
|
||||
assert result, "HTTP response from localhost:3000 must not be empty!"
|
||||
'';
|
||||
})
|
||||
|
||||
@ -3,44 +3,32 @@
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, vala
|
||||
, gettext
|
||||
, gnome3
|
||||
, libnotify
|
||||
, itstool
|
||||
, glib
|
||||
, gtk3
|
||||
, libxml2
|
||||
, gnome-online-accounts
|
||||
, coreutils
|
||||
, libsoup
|
||||
, libsecret
|
||||
, pcre
|
||||
, libxkbcommon
|
||||
, libhandy
|
||||
, wrapGAppsHook
|
||||
, libpthreadstubs
|
||||
, libXdmcp
|
||||
, epoxy
|
||||
, at-spi2-core
|
||||
, dbus
|
||||
, libgpgerror
|
||||
, json-glib
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, duplicity
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deja-dup";
|
||||
version = "40.6";
|
||||
version = "42.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1d4g34g660wv42a4k2511bxrh90z0vdl3v7ahg0m45phijg9n2n1";
|
||||
sha256 = "c4E6mHYVb8TWVTVlmHidcLa9ebHJ27iStsNNLJhY8vY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -48,54 +36,31 @@ stdenv.mkDerivation rec {
|
||||
src = ./fix-paths.patch;
|
||||
inherit coreutils;
|
||||
})
|
||||
|
||||
# Hardcode GSettings path for Nautilus extension to avoid crashes from missing schemas
|
||||
./hardcode-gsettings.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# substitute variable from hardcode-gsettings.patch
|
||||
substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH "${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
pkg-config
|
||||
vala
|
||||
gettext
|
||||
itstool
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
libxml2
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libnotify
|
||||
libsoup
|
||||
glib
|
||||
gtk3
|
||||
libsecret
|
||||
pcre
|
||||
libxkbcommon
|
||||
libpthreadstubs
|
||||
libXdmcp
|
||||
epoxy
|
||||
gnome3.nautilus
|
||||
at-spi2-core
|
||||
dbus
|
||||
gnome-online-accounts # GOA not used any more, only for transferring legacy keys
|
||||
libhandy
|
||||
libgpgerror
|
||||
json-glib
|
||||
];
|
||||
|
||||
# TODO: hard code the path
|
||||
# https://gitlab.gnome.org/World/deja-dup/merge_requests/32
|
||||
propagatedUserEnvPkgs = [ duplicity ];
|
||||
|
||||
# install nautilus plug-in to correct path
|
||||
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
|
||||
mesonFlags = [
|
||||
"-Dduplicity_command=${duplicity}/bin/duplicity"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A simple backup tool";
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
--- a/deja-dup/nautilus/NautilusExtension.c
|
||||
+++ b/deja-dup/nautilus/NautilusExtension.c
|
||||
@@ -313,7 +313,12 @@
|
||||
bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
|
||||
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
|
||||
|
||||
- settings = g_settings_new(APPLICATION_ID);
|
||||
+ g_autoptr (GSettingsSchemaSource) schema_source = g_settings_schema_source_new_from_directory ("@DEJA_DUP_GSETTINGS_PATH@",
|
||||
+ g_settings_schema_source_get_default (), TRUE, NULL);
|
||||
+
|
||||
+ g_autoptr (GSettingsSchema) schema = g_settings_schema_source_lookup (schema_source, APPLICATION_ID, FALSE);
|
||||
+
|
||||
+ settings = g_settings_new_full (schema, NULL, NULL);
|
||||
g_signal_connect(settings, "changed::include-list",
|
||||
update_include_excludes, NULL);
|
||||
g_signal_connect(settings, "changed::exclude-list",
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "setzer";
|
||||
version = "0.3.0";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvfosammmm";
|
||||
repo = "Setzer";
|
||||
rev = "v${version}";
|
||||
sha256 = "0gx5fnyi932lswkhdvxfqs0wxx7hz690cbnpv4m3ysydi96mxwiv";
|
||||
sha256 = "1c7jrq20m53y2k8lmh37zldgc3bndldxipx4xq0lz3qq2fv1gg07";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
@ -1,133 +0,0 @@
|
||||
{ stdenv
|
||||
, boehmgc
|
||||
, boost
|
||||
, cairo
|
||||
, cmake
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, gettext
|
||||
, glib
|
||||
, glibmm
|
||||
, gsl
|
||||
, gtkmm2
|
||||
, gtkspell2
|
||||
, imagemagick
|
||||
, lcms
|
||||
, libcdr
|
||||
, libexif
|
||||
, libpng
|
||||
, librevenge
|
||||
, librsvg
|
||||
, libsigcxx
|
||||
, libvisio
|
||||
, libwpg
|
||||
, libXft
|
||||
, libxml2
|
||||
, libxslt
|
||||
, makeWrapper
|
||||
, perlPackages
|
||||
, pkg-config
|
||||
, poppler
|
||||
, popt
|
||||
, potrace
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, zlib
|
||||
}:
|
||||
let
|
||||
python3Env = python3.withPackages
|
||||
(ps: with ps; [
|
||||
numpy
|
||||
lxml
|
||||
scour
|
||||
]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inkscape_0";
|
||||
version = "0.92.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.bz2";
|
||||
sha256 = "ge5/aeK9ZKlzQ9g5Wkp6eQWyG4YVZu1eXZF5F41Rmgs=";
|
||||
};
|
||||
|
||||
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
|
||||
# CMake’s ARGMAX check doesn’t offer enough padding for NIX_LDFLAGS.
|
||||
# Setting strictDeps it avoids duplicating some dependencies so it
|
||||
# will leave us under ARGMAX.
|
||||
strictDeps = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs share/extensions
|
||||
patchShebangs fix-roff-punct
|
||||
|
||||
# Python is used at run-time to execute scripts, e.g., those from
|
||||
# the "Effects" menu.
|
||||
substituteInPlace src/extension/implementation/script.cpp \
|
||||
--replace '"python-interpreter", "python"' '"python-interpreter", "${python3Env}/bin/python"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
makeWrapper
|
||||
python3Env
|
||||
wrapGAppsHook
|
||||
] ++ (with perlPackages; [
|
||||
perl
|
||||
XMLParser
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
boehmgc
|
||||
boost
|
||||
gettext
|
||||
glib
|
||||
glibmm
|
||||
gsl
|
||||
gtkmm2
|
||||
imagemagick
|
||||
lcms
|
||||
libcdr
|
||||
libexif
|
||||
libpng
|
||||
librevenge
|
||||
librsvg # for loading icons
|
||||
libsigcxx
|
||||
libvisio
|
||||
libwpg
|
||||
libXft
|
||||
libxml2
|
||||
libxslt
|
||||
perlPackages.perl
|
||||
poppler
|
||||
popt
|
||||
potrace
|
||||
python3Env
|
||||
zlib
|
||||
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
|
||||
gtkspell2
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
cairo
|
||||
];
|
||||
|
||||
# Make sure PyXML modules can be found at run-time.
|
||||
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape
|
||||
install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Legacy version of vector graphics editor";
|
||||
homepage = "https://www.inkscape.org";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.jtojnar ];
|
||||
platforms = platforms.all;
|
||||
longDescription = ''
|
||||
Inkscape is a feature-rich vector graphics editor that edits
|
||||
files in the W3C SVG (Scalable Vector Graphics) file format.
|
||||
|
||||
If you want to import .eps files install ps2edit.
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -50,11 +50,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inkscape";
|
||||
version = "1.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz";
|
||||
sha256 = "1fwl7yjkykqb86555k4fm24inhc40mrvxqwgl2v2vi9alv8j7hc9";
|
||||
sha256 = "1hjp5nnyx2m3miji6q4lcb6zgbi498v641dc7apkqqvayknrb4ng";
|
||||
};
|
||||
|
||||
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, atk
|
||||
, cairo
|
||||
, desktop-file-utils
|
||||
@ -17,36 +16,29 @@
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, python3
|
||||
, sqlite
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "almanah";
|
||||
version = "0.12.0";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "09rxx4s4c34d1axza6ayss33v78p44r9bpx058shllh1sf5avpcb";
|
||||
sha256 = "IWYOnOu0C9uQ9k1dgWkJ6Kv+o/jY+6Llfsi4PusHE24=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix gpgme detection
|
||||
# https://gitlab.gnome.org/GNOME/almanah/merge_requests/7
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/almanah/commit/4b979c4145ef2fbceebb3849a70df1d0ceb1bb93.patch";
|
||||
sha256 = "0wwkgqr5vi597j734xq0fwgk1zpcabp8wi8b1lnb1ksnqfi3wwxb";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
gettext
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
|
||||
# electrum is not compatible with dnspython 2.0.0 yet
|
||||
# use the latest 1.x release instead
|
||||
@ -43,7 +43,7 @@ let
|
||||
owner = "spesmilo";
|
||||
repo = "electrum";
|
||||
rev = version;
|
||||
sha256 = "1xpkbard994n1gwl95b558x69k1m1m258bc220nxrajg1pywh90f";
|
||||
sha256 = "1r40i0v7nm35m3pzbd0l5z4qphl13s31l9v5njmyvpfjirdmhjbv";
|
||||
|
||||
extraPostFetch = ''
|
||||
mv $out ./all
|
||||
@ -58,7 +58,7 @@ py.pkgs.buildPythonApplication {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
|
||||
sha256 = "05ibrr6ysf6fncs1pimhxvyr7d659jwj2r2a9pdd3cmn1dxzy2w1";
|
||||
sha256 = "0q891fgzxvyzjxfczynx92hvclfs8i3nr5nr9sgbvz13hsg4s6lg";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
@ -80,13 +80,11 @@ py.pkgs.buildPythonApplication {
|
||||
matplotlib
|
||||
pbkdf2
|
||||
protobuf
|
||||
pyaes
|
||||
pycryptodomex
|
||||
pysocks
|
||||
qrcode
|
||||
requests
|
||||
tlslite-ng
|
||||
|
||||
# plugins
|
||||
ckcc-protocol
|
||||
keepkey
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gallery_dl";
|
||||
version = "1.14.3";
|
||||
version = "1.14.5";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0lyy48za81vfw4a5l7fsczsv889dk829nby941xvswp3scclpvfy";
|
||||
sha256 = "03xkrmwk4bvkqai9ghdm5arw9i4zhnfbabdn99lr1cv5prq7m4p3";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
let
|
||||
pname = "joplin-desktop";
|
||||
version = "1.0.241";
|
||||
version = "1.0.245";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage";
|
||||
sha256 = "0q0vwjch6m0n461x4llhidkqvy492dqnk8q1al8gnfz2grav6537";
|
||||
sha256 = "1xybzjixqmp95b2a97kbbygn0jwndws9115cd7mbw8czl7nshdq6";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
50
pkgs/applications/misc/prusa-slicer/super-slicer.nix
Normal file
50
pkgs/applications/misc/prusa-slicer/super-slicer.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{
|
||||
stdenv, lib, fetchFromGitHub, makeDesktopItem, prusa-slicer
|
||||
}:
|
||||
let
|
||||
appname = "SuperSlicer";
|
||||
version = "2.2.53.1";
|
||||
pname = "super-slicer";
|
||||
description = "PrusaSlicer fork with more features and faster development cycle";
|
||||
override = super: {
|
||||
inherit version pname;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supermerill";
|
||||
repo = "SuperSlicer";
|
||||
sha256 = "sha256-CAhwmQ63N/XJYToTnIV84lNnjDGNbkmYPzNKNL/wVxs=";
|
||||
rev = version;
|
||||
};
|
||||
|
||||
# See https://github.com/supermerill/SuperSlicer/issues/432
|
||||
cmakeFlags = super.cmakeFlags ++ [
|
||||
"-DSLIC3R_BUILD_TESTS=0"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/pixmaps/"
|
||||
# Change slic3r++ to SuperSlicer at the next release!
|
||||
ln -s "$out/share/slic3r++/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png"
|
||||
mkdir -p "$out/share/applications"
|
||||
cp "$desktopItem"/share/applications/* "$out/share/applications/"
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = appname;
|
||||
exec = "superslicer";
|
||||
icon = appname;
|
||||
comment = description;
|
||||
desktopName = appname;
|
||||
genericName = "3D printer tool";
|
||||
categories = "Development;";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit description;
|
||||
homepage = "https://github.com/supermerili/SuperSlicer";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ cab404 moredread ];
|
||||
};
|
||||
|
||||
};
|
||||
in prusa-slicer.overrideAttrs override
|
||||
@ -1,16 +1,16 @@
|
||||
{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver }:
|
||||
|
||||
let
|
||||
version = "2.16.3.1";
|
||||
version = "2.16.4.2";
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
|
||||
name = "rescuetime-installer.deb";
|
||||
url = "https://www.rescuetime.com/installers/rescuetime_${version}_i386.deb";
|
||||
sha256 = "1374nmj6g6w24cv604kzac0v57gcl1pwpw0nxpr7kv2786x1aqg2";
|
||||
sha256 = "0zyal9n3rfj8i13v1q25inq6qyil7897483cdhqvwpb8wskrij4c";
|
||||
} else fetchurl {
|
||||
name = "rescuetime-installer.deb";
|
||||
url = "https://www.rescuetime.com/installers/rescuetime_${version}_amd64.deb";
|
||||
sha256 = "05qs6wbc3705z8w9c3n83m4j8xfmzm673lyh5j95x1ak5czkrphk";
|
||||
sha256 = "03bmnkxhip1wilnfqs8akmy1hppahxrmnm8gasnmw5s922vn06cv";
|
||||
};
|
||||
in mkDerivation {
|
||||
# https://www.rescuetime.com/updates/linux_release_notes.html
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
|
||||
, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
|
||||
, kerberos, libdrm, mesa
|
||||
, libxkbcommon, wayland # ozone/wayland
|
||||
|
||||
# Command line programs
|
||||
, coreutils
|
||||
@ -62,6 +63,7 @@ let
|
||||
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
|
||||
bzip2 libcap at-spi2-atk at-spi2-core
|
||||
kerberos libdrm mesa coreutils
|
||||
libxkbcommon wayland
|
||||
] ++ optional pulseSupport libpulseaudio
|
||||
++ [ gtk ];
|
||||
|
||||
|
||||
@ -15,13 +15,13 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.18.8";
|
||||
version = "1.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dswgxxbybwllf2lf89saarsrn4pkb2617wycim07cd7i1l1dv5n";
|
||||
sha256 = "1wnlw2rl14q7cb8shhldbavdamvl3w3mlfvymwfvmvxfxzhrjlaq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "FlexGet";
|
||||
version = "3.1.67";
|
||||
version = "3.1.71";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d3f4b7bebff80a3a3aa00daf60145a6bc3d12847d7339b39846b2341bca75ef3";
|
||||
sha256 = "4c25d8733c8eb54c7d3ce60a17d8020049fb137b796e5ada9d15f41cdd0e1655";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gomuks";
|
||||
version = "0.1.2";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tulir";
|
||||
repo = pname;
|
||||
rev = "v" + version;
|
||||
sha256 = "11bainw4w9fdrhv2jm0j9fw0f7r4cxlblyazbhckgr4j9q900383";
|
||||
sha256 = "0sf1nqwimxqql8wm6763jyc5rclhd4zxgg9gfi0qvg5ccm1r1z5q";
|
||||
};
|
||||
|
||||
vendorSha256 = "11rk7pma6dr6fsyz8hpjyr7nc2c7ichh5m7ds07m89gzk6ar55gb";
|
||||
vendorSha256 = "sha256:0n9mwbzjkvlljlns7sby8nb9gm4vj0v4idp1zxv5xssqr5qalihf";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, glibcLocales
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "zulip-term";
|
||||
version = "0.5.2";
|
||||
|
||||
# no tests on PyPI
|
||||
src = fetchFromGitHub {
|
||||
owner = "zulip";
|
||||
repo = "zulip-terminal";
|
||||
rev = version;
|
||||
sha256 = "1xhhy3v4wck74a83avil0rnmsi2grrh03cww19n5mv80p2q1cjmf";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./pytest-executable-name.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
urwid
|
||||
zulip
|
||||
urwid-readline
|
||||
beautifulsoup4
|
||||
lxml
|
||||
mypy-extensions
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
glibcLocales
|
||||
] ++ (with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
pytestcov
|
||||
pytest-mock
|
||||
]);
|
||||
|
||||
meta = with lib; {
|
||||
description = "Zulip's official terminal client";
|
||||
homepage = "https://github.com/zulip/zulip-terminal";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/tests/cli/test_run.py b/tests/cli/test_run.py
|
||||
index 459aa82..c6e434e 100644
|
||||
--- a/tests/cli/test_run.py
|
||||
+++ b/tests/cli/test_run.py
|
||||
@@ -180,7 +180,7 @@ def test_main_multiple_autohide_options(capsys, options):
|
||||
assert str(e.value) == "2"
|
||||
captured = capsys.readouterr()
|
||||
lines = captured.err.strip('\n')
|
||||
- lines = lines.split("pytest: ", 1)[1]
|
||||
+ lines = lines.split("__main__.py: ", 1)[1]
|
||||
expected = ("error: argument {}: not allowed "
|
||||
"with argument {}".format(options[1], options[0]))
|
||||
assert lines == expected
|
||||
@ -1,6 +1,7 @@
|
||||
{ akonadi-contacts
|
||||
, cmake
|
||||
, fetchgit
|
||||
, fetchsvn
|
||||
, gnupg
|
||||
, gpgme
|
||||
, kcontacts
|
||||
@ -15,11 +16,14 @@
|
||||
, qtkeychain
|
||||
, qttools
|
||||
, qtwebkit
|
||||
, qttranslations
|
||||
, substituteAll
|
||||
, withI18n ? true
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "trojita";
|
||||
version = "0.7.20200706";
|
||||
version = "unstable-2020-07-06";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://anongit.kde.org/trojita.git";
|
||||
@ -27,6 +31,18 @@ mkDerivation rec {
|
||||
sha256 = "0r8nmlqwgsqkk0k8xh32fkwvv6iylj35xq2h8b7l3g03yc342kbn";
|
||||
};
|
||||
|
||||
l10n = fetchsvn {
|
||||
url = "svn://anonsvn.kde.org/home/kde/trunk/l10n-kf5";
|
||||
rev = "1566642";
|
||||
sha256 = "0y45fjib153za085la3hqpryycx33dkj3cz8kwzn2w31kvldfl1q";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
# See https://github.com/NixOS/nixpkgs/issues/86054
|
||||
src = ./fix-qttranslations-path.patch;
|
||||
inherit qttranslations;
|
||||
});
|
||||
|
||||
buildInputs = [
|
||||
akonadi-contacts
|
||||
gpgme
|
||||
@ -48,6 +64,14 @@ mkDerivation rec {
|
||||
gnupg
|
||||
];
|
||||
|
||||
postPatch = "echo ${version} > src/trojita-version"
|
||||
+ lib.optionalString withI18n ''
|
||||
mkdir -p po
|
||||
for f in `find ${l10n} -name "trojita_common.po"`; do
|
||||
cp $f po/trojita_common_$(echo $f | cut -d/ -f5).po
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Qt IMAP e-mail client";
|
||||
homepage = "http://trojita.flaska.net/";
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git i/src/Gui/main.cpp w/src/Gui/main.cpp
|
||||
index 851db4f1..e997f46e 100644
|
||||
--- i/src/Gui/main.cpp
|
||||
+++ w/src/Gui/main.cpp
|
||||
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
|
||||
|
||||
QTranslator qtTranslator;
|
||||
qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(),
|
||||
- QLibraryInfo::location(QLibraryInfo::TranslationsPath));
|
||||
+ QLatin1String("@qttranslations@/translations"));
|
||||
app.installTranslator(&qtTranslator);
|
||||
|
||||
QLatin1String localeSuffix("/locale");
|
||||
@ -10,13 +10,13 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "z3";
|
||||
version = "4.8.8";
|
||||
version = "4.8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Z3Prover";
|
||||
repo = pname;
|
||||
rev = "z3-${version}";
|
||||
sha256 = "1rn538ghqwxq0v8i6578j8mflk6fyv0cp4hjfqynzvinjbps56da";
|
||||
sha256 = "1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx";
|
||||
};
|
||||
|
||||
buildInputs = [ python fixDarwinDylibNames ] ++ optional javaBindings jdk;
|
||||
|
||||
@ -13,11 +13,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gitkraken";
|
||||
version = "7.3.0";
|
||||
version = "7.3.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
|
||||
sha256 = "0q9imaka79p3krmcrxvnxzb2gprczybnw8d4y9p4icbmdbyb6h70";
|
||||
sha256 = "0bw75m87qbnnn1gjphik3xcjx2zwczsa37rpr16la1zjhqjl5m7j";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -4,13 +4,13 @@ let
|
||||
common = opts: callPackage (import ./common.nix opts);
|
||||
in {
|
||||
sublime-merge = common {
|
||||
buildVersion = "2033";
|
||||
sha256 = "1ym806df2hsw1ml932mshlw7cdxfi6jwa3mkh5m7gbmn7qwpm4xb";
|
||||
buildVersion = "2032";
|
||||
sha256 = "b782c768383893ba7803c2cffd428b09bec46be8a65e61a5f17964bdcc2aaf7c";
|
||||
} {};
|
||||
|
||||
sublime-merge-dev = common {
|
||||
buildVersion = "2031";
|
||||
sha256 = "1vv3qcggicy5fb4nm2k5a6nw1f20cwxgrmn3xv2dvgx7mpzbhknp";
|
||||
buildVersion = "2033";
|
||||
sha256 = "ab937a393eb6ae776a81b30ec5a589ae37763885ba8a91680d5c43e19a01a8fa";
|
||||
dev = true;
|
||||
} {};
|
||||
}
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "windowmaker";
|
||||
version = "0.95.8";
|
||||
version = "0.95.9";
|
||||
srcName = "WindowMaker-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://windowmaker.org/pub/source/release/${srcName}.tar.gz";
|
||||
sha256 = "12p8kljqgx5hnic0zvs5mxwp7kg21sb6qjagb2qw8ydvf5amrgwx";
|
||||
sha256 = "055pqvlkhipyjn7m6bb3fs4zz9rd1ynzl0mmwbhp05ihc3zmh8zj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
|
||||
"--with-x"
|
||||
"--enable-modelock"
|
||||
"--enable-randr"
|
||||
"--enable-magick"
|
||||
"--enable-webp"
|
||||
"--disable-magick" # Many distros reported imagemagick fails to be found
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
@ -40,5 +41,3 @@ stdenv.mkDerivation rec {
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
};
|
||||
}
|
||||
|
||||
# TODO: investigate support for WEBP (its autodetection is failing)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, inkscape_0, imagemagick, potrace, svgo, scfbuild }:
|
||||
{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "emojione";
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
export HOME="$NIX_BUILD_ROOT"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ inkscape_0 imagemagick potrace svgo scfbuild ];
|
||||
nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, inkscape_0, imagemagick, potrace, svgo, scfbuild }:
|
||||
{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "twemoji-color-font";
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ inkscape_0 imagemagick potrace svgo scfbuild ];
|
||||
nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ];
|
||||
# silence inkscape errors about non-writable home
|
||||
preBuild = "export HOME=\"$NIX_BUILD_ROOT\"";
|
||||
makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen, python3 }:
|
||||
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
|
||||
|
||||
let
|
||||
py = python3.withPackages(ps: [ ps.pillow ]);
|
||||
@ -25,7 +25,7 @@ in stdenvNoCC.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnome-themes-extra
|
||||
inkscape_0
|
||||
inkscape
|
||||
xcursorgen
|
||||
py
|
||||
];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen, python3 }:
|
||||
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
|
||||
|
||||
let
|
||||
py = python3.withPackages(ps: [ ps.pillow ]);
|
||||
@ -25,7 +25,7 @@ in stdenvNoCC.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnome-themes-extra
|
||||
inkscape_0
|
||||
inkscape
|
||||
xcursorgen
|
||||
py
|
||||
];
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen }:
|
||||
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bibata-cursors-translucent";
|
||||
version = "unstable-2019-09-13";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Silicasandwhich";
|
||||
repo = "Bibata_Cursor_Translucent";
|
||||
@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnome-themes-extra
|
||||
inkscape_0
|
||||
inkscape
|
||||
xcursorgen
|
||||
];
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub
|
||||
, inkscape_0, xcursorgen, bc }:
|
||||
, inkscape, xcursorgen, bc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "capitaine-cursors";
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs =[
|
||||
inkscape_0
|
||||
inkscape
|
||||
xcursorgen
|
||||
bc
|
||||
];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, inkscape_0, xcursorgen }:
|
||||
{ stdenv, fetchFromGitHub, inkscape, xcursorgen }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0p8h48wsy3z5dz9vdnp01fpn6q8ky0h74l5qgixlip557bsa1spi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ inkscape_0 xcursorgen ];
|
||||
nativeBuildInputs = [ inkscape xcursorgen ];
|
||||
|
||||
buildPhase = ''
|
||||
patchShebangs .
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape_0, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adapta-gtk-theme";
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
pkgconfig
|
||||
parallel
|
||||
sassc
|
||||
inkscape_0
|
||||
inkscape
|
||||
libxml2
|
||||
glib.dev
|
||||
gnome3.gnome-shell
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, gnome3
|
||||
, gtk-engine-murrine
|
||||
, optipng
|
||||
, inkscape_0
|
||||
, inkscape
|
||||
, cinnamon
|
||||
}:
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
pkgconfig
|
||||
sassc
|
||||
optipng
|
||||
inkscape_0
|
||||
inkscape
|
||||
gtk3
|
||||
];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape_0, optipng, sassc, which }:
|
||||
{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mojave-gtk-theme";
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sourceRoot = "source";
|
||||
|
||||
nativeBuildInputs = [ glib inkscape_0 optipng sassc which ];
|
||||
nativeBuildInputs = [ glib inkscape optipng sassc which ];
|
||||
|
||||
buildInputs = [ gtk_engines ];
|
||||
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
src/assets/xfwm4/render-assets.sh
|
||||
do
|
||||
substituteInPlace $f \
|
||||
--replace /usr/bin/inkscape ${inkscape_0}/bin/inkscape \
|
||||
--replace /usr/bin/inkscape ${inkscape}/bin/inkscape \
|
||||
--replace /usr/bin/optipng ${optipng}/bin/optipng
|
||||
done
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, python3, sass, glib, gdk-pixbuf, libxml2,
|
||||
inkscape_0, optipng, gtk-engine-murrine
|
||||
inkscape, optipng, gtk-engine-murrine
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1kda0lyqi3cxh163fbj8yyi6jj6pf0y980k4s0cmyi3hkh4cqyd5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape_0 optipng ];
|
||||
nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape optipng ];
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs .
|
||||
substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out
|
||||
substituteInPlace scripts/render-assets.sh \
|
||||
--replace /usr/bin/inkscape ${inkscape_0}/bin/inkscape \
|
||||
--replace /usr/bin/inkscape ${inkscape}/bin/inkscape \
|
||||
--replace /usr/bin/optipng ${optipng}/bin/optipng
|
||||
'';
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel
|
||||
, sassc, inkscape_0, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine
|
||||
, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine
|
||||
, cinnamonSupport ? true
|
||||
, gnomeFlashbackSupport ? true
|
||||
, gnomeShellSupport ? true
|
||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
pkgconfig
|
||||
parallel
|
||||
sassc
|
||||
inkscape_0
|
||||
inkscape
|
||||
libxml2
|
||||
glib.dev
|
||||
]
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, ninja
|
||||
, sassc
|
||||
, gtk3
|
||||
, inkscape_0
|
||||
, inkscape
|
||||
, optipng
|
||||
, gtk-engine-murrine
|
||||
, gdk-pixbuf
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
ninja
|
||||
sassc
|
||||
gtk3
|
||||
inkscape_0
|
||||
inkscape
|
||||
optipng
|
||||
python3
|
||||
];
|
||||
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||
for file in $(find -name render-\*.sh); do
|
||||
substituteInPlace "$file" \
|
||||
--replace 'INKSCAPE="/usr/bin/inkscape"' \
|
||||
'INKSCAPE="${inkscape_0}/bin/inkscape"' \
|
||||
'INKSCAPE="${inkscape}/bin/inkscape"' \
|
||||
--replace 'OPTIPNG="/usr/bin/optipng"' \
|
||||
'OPTIPNG="${optipng}/bin/optipng"'
|
||||
done
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
, docbook_xsl
|
||||
, docbook_xml_dtd_42
|
||||
, gobject-introspection
|
||||
, inkscape_0
|
||||
, inkscape
|
||||
, poppler_utils
|
||||
, desktop-file-utils
|
||||
, wrapGAppsHook
|
||||
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
python3
|
||||
|
||||
# building getting started
|
||||
inkscape_0
|
||||
inkscape
|
||||
poppler_utils
|
||||
];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-dash-to-panel";
|
||||
version = "38";
|
||||
version = "39";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-sweet-gnome";
|
||||
repo = "dash-to-panel";
|
||||
rev = "v${version}";
|
||||
sha256 = "1kvybb49l1vf0fvh8d0c6xkwnry8m330scamf5x40y63d4i213j1";
|
||||
sha256 = "0r7kbmrizl9ilqy7gzzvjwxcv8xpp13n5n0a8s84blg97cih0hw2";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape_0, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }:
|
||||
{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-utils";
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
pkgconfig
|
||||
gettext
|
||||
itstool
|
||||
inkscape_0
|
||||
inkscape
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
|
||||
@ -4,18 +4,18 @@ let
|
||||
|
||||
pkg = buildGoModule rec {
|
||||
pname = "arduino-cli";
|
||||
version = "0.11.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arduino";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0k9091ci7n7hl44nyzlxkmbwibgrrh9s6z7pgyj9v0mzxjmgz8h2";
|
||||
sha256 = "1jlxs4szss2250zp8rz4bislgnzvqhxyp6z48dhx7zaam03hyf0w";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "1qybym95a38az8lk8bqc53ngn08hijckajv8v2giifc4q7sb17d2";
|
||||
vendorSha256 = "03yj2iar63qm10fw3jh9fvz57c2sqcmngb0mj5jkhbnwf8nl7mhc";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -22,8 +22,8 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "platformio";
|
||||
repo = "platformio-core";
|
||||
rev = "v4.3.4";
|
||||
sha256 = "0vf2j79319ypr4yrdmx84853igkb188sjfvlxgw06rlsvsm3kacq";
|
||||
rev = "v5.0.1";
|
||||
sha256 = "01xh61ldilg6fg95l1p870rld2xffhnl9f9ndvbi5jdn8q634pmw";
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -9,33 +9,57 @@
|
||||
let
|
||||
args = lib.concatStringsSep " " ((map (e: "--deselect tests/${e}") [
|
||||
"commands/test_ci.py::test_ci_boards"
|
||||
"commands/test_ci.py::test_ci_project_conf"
|
||||
"commands/test_ci.py::test_ci_lib_and_board"
|
||||
"commands/test_ci.py::test_ci_build_dir"
|
||||
"commands/test_ci.py::test_ci_keep_build_dir"
|
||||
"commands/test_init.py::test_init_enable_auto_uploading"
|
||||
"commands/test_ci.py::test_ci_lib_and_board"
|
||||
"commands/test_ci.py::test_ci_project_conf"
|
||||
"commands/test_init.py::test_init_custom_framework"
|
||||
"commands/test_init.py::test_init_incorrect_board"
|
||||
"commands/test_init.py::test_init_duplicated_boards"
|
||||
"commands/test_init.py::test_init_enable_auto_uploading"
|
||||
"commands/test_init.py::test_init_ide_atom"
|
||||
"commands/test_init.py::test_init_ide_eclipse"
|
||||
"commands/test_init.py::test_init_duplicated_boards"
|
||||
"commands/test_init.py::test_init_ide_vscode"
|
||||
"commands/test_init.py::test_init_incorrect_board"
|
||||
"commands/test_init.py::test_init_special_board"
|
||||
"commands/test_lib.py::test_search"
|
||||
"commands/test_lib.py::test_install_duplicates"
|
||||
"commands/test_lib.py::test_global_lib_update_check"
|
||||
"commands/test_lib.py::test_global_lib_update"
|
||||
"commands/test_lib.py::test_global_lib_uninstall"
|
||||
"commands/test_lib.py::test_lib_show"
|
||||
"commands/test_lib.py::test_lib_stats"
|
||||
"commands/test_lib.py::test_global_install_registry"
|
||||
"commands/test_lib.py::test_global_install_archive"
|
||||
"commands/test_lib.py::test_global_install_registry"
|
||||
"commands/test_lib.py::test_global_install_repository"
|
||||
"commands/test_lib.py::test_global_lib_list"
|
||||
"commands/test_lib.py::test_global_lib_uninstall"
|
||||
"commands/test_lib.py::test_global_lib_update"
|
||||
"commands/test_lib.py::test_global_lib_update_check"
|
||||
"commands/test_lib.py::test_install_duplicates"
|
||||
"commands/test_lib.py::test_lib_show"
|
||||
"commands/test_lib.py::test_lib_stats"
|
||||
"commands/test_lib.py::test_saving_deps"
|
||||
"commands/test_lib.py::test_search"
|
||||
"commands/test_lib.py::test_update"
|
||||
"commands/test_lib_complex.py::test_global_install_archive"
|
||||
"commands/test_lib_complex.py::test_global_install_registry"
|
||||
"commands/test_lib_complex.py::test_global_install_repository"
|
||||
"commands/test_lib_complex.py::test_global_lib_list"
|
||||
"commands/test_lib_complex.py::test_global_lib_uninstall"
|
||||
"commands/test_lib_complex.py::test_global_lib_update"
|
||||
"commands/test_lib_complex.py::test_global_lib_update_check"
|
||||
"commands/test_lib_complex.py::test_install_duplicates"
|
||||
"commands/test_lib_complex.py::test_lib_show"
|
||||
"commands/test_lib_complex.py::test_lib_stats"
|
||||
"commands/test_lib_complex.py::test_search"
|
||||
"commands/test_test.py::test_local_env"
|
||||
"commands/test_test.py::test_multiple_env_build"
|
||||
"commands/test_test.py::test_setup_teardown_are_compilable"
|
||||
"package/test_manager.py::test_download"
|
||||
"package/test_manager.py::test_install_force"
|
||||
"package/test_manager.py::test_install_from_registry"
|
||||
"package/test_manager.py::test_install_lib_depndencies"
|
||||
"package/test_manager.py::test_registry"
|
||||
"package/test_manager.py::test_uninstall"
|
||||
"package/test_manager.py::test_update_with_metadata"
|
||||
"package/test_manager.py::test_update_without_metadata"
|
||||
"test_builder.py::test_build_flags"
|
||||
"test_builder.py::test_build_unflags"
|
||||
"test_builder.py::test_debug_default_build_flags"
|
||||
"test_builder.py::test_debug_custom_build_flags"
|
||||
"test_builder.py::test_debug_default_build_flags"
|
||||
"test_misc.py::test_api_cache"
|
||||
"test_misc.py::test_ping_internet_ips"
|
||||
"test_misc.py::test_platformio_cli"
|
||||
@ -51,14 +75,14 @@ let
|
||||
|
||||
in buildPythonApplication rec {
|
||||
pname = "platformio";
|
||||
version = "4.3.4";
|
||||
version = "5.0.1";
|
||||
|
||||
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
|
||||
src = fetchFromGitHub {
|
||||
owner = "platformio";
|
||||
repo = "platformio-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "0vf2j79319ypr4yrdmx84853igkb188sjfvlxgw06rlsvsm3kacq";
|
||||
sha256 = "01xh61ldilg6fg95l1p870rld2xffhnl9f9ndvbi5jdn8q634pmw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
diff --git a/platformio/exception.py b/platformio/exception.py
|
||||
index d291ad7f..4761a35b 100644
|
||||
index ef1d3bab..445174fc 100644
|
||||
--- a/platformio/exception.py
|
||||
+++ b/platformio/exception.py
|
||||
@@ -195,7 +195,8 @@ class MissedUdevRules(InvalidUdevRules):
|
||||
|
||||
@@ -57,6 +57,7 @@ class MissedUdevRules(InvalidUdevRules):
|
||||
MESSAGE = (
|
||||
"Warning! Please install `99-platformio-udev.rules`. \nMode details: "
|
||||
- "https://docs.platformio.org/en/latest/faq.html#platformio-udev-rules"
|
||||
+ "https://docs.platformio.org/en/latest/faq.html#platformio-udev-rules\n"
|
||||
"Warning! Please install `99-platformio-udev.rules`. \nMore details: "
|
||||
"https://docs.platformio.org/page/faq.html#platformio-udev-rules"
|
||||
+ "On NixOS add the platformio package to services.udev.packages"
|
||||
)
|
||||
|
||||
|
||||
@ -1,16 +1,11 @@
|
||||
diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
|
||||
index be49b3ee..d1390a88 100644
|
||||
index f293ba5a..a818271f 100644
|
||||
--- a/platformio/package/manifest/schema.py
|
||||
+++ b/platformio/package/manifest/schema.py
|
||||
@@ -240,9 +240,5 @@ class ManifestSchema(BaseSchema):
|
||||
@@ -252,5 +252,4 @@ class ManifestSchema(BaseSchema):
|
||||
@staticmethod
|
||||
@memoized(expire="1h")
|
||||
def load_spdx_licenses():
|
||||
- r = requests.get(
|
||||
- "https://raw.githubusercontent.com/spdx/license-list-data"
|
||||
- "/v3.9/json/licenses.json"
|
||||
- )
|
||||
- r.raise_for_status()
|
||||
- return r.json()
|
||||
+ import json
|
||||
- spdx_data_url = "https://dl.bintray.com/platformio/dl-misc/spdx-licenses-3.json"
|
||||
- return json.loads(fetch_remote_content(spdx_data_url))
|
||||
+ return json.load(open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json"))
|
||||
|
||||
@ -47,7 +47,7 @@ with stdenv.lib;
|
||||
with builtins;
|
||||
|
||||
let majorVersion = "10";
|
||||
version = "${majorVersion}.1.0";
|
||||
version = "${majorVersion}.2.0";
|
||||
|
||||
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
|
||||
|
||||
@ -81,7 +81,7 @@ stdenv.mkDerivation ({
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
|
||||
sha256 = "b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2";
|
||||
sha256 = "130xdkhmz1bc2kzx061s3sfwk36xah1fw5w332c0nzwwpdl47pdq";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-reason-${version}";
|
||||
version = "3.6.0";
|
||||
version = "3.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "reason";
|
||||
rev = "2860cc274b1b5b76a71d0e5190bf67a133d6f809";
|
||||
sha256 = "05wcg0gfln85spjfgsij818h2sp4y6s8bvdcwmzv0r8jblr8402b";
|
||||
rev = "6017d6dd930f4989177c3f7c3c20cffbaabaa49a";
|
||||
sha256 = "17wkcl3r0ckhlki9fk0mcwbnd7kpkqm1h0xjw2j2x1097n470df0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./nix-unstable-sandbox-fix.patch
|
||||
./encoding.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
10
pkgs/development/libraries/allegro/encoding.patch
Normal file
10
pkgs/development/libraries/allegro/encoding.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- allegro-4.4.3/docs/src/allegro._tx.orig 2019-02-02 20:28:46.000000000 +0100
|
||||
+++ allegro-4.4.3/docs/src/allegro._tx 2019-11-04 11:12:39.352699777 +0100
|
||||
@@ -23,6 +23,7 @@
|
||||
@man_shortdesc_force1=allegro
|
||||
@man_shortdesc_force2=Allegro game programming library.
|
||||
@$\input texinfo
|
||||
+@$@documentencoding ISO-8859-1
|
||||
@$@setfilename allegro.inf
|
||||
@$@settitle Allegro Manual
|
||||
@$@setchapternewpage odd
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, aspell
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, glib
|
||||
, hunspell
|
||||
, hspell
|
||||
@ -10,17 +10,17 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "enchant";
|
||||
version = "2.2.10";
|
||||
version = "2.2.11";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1hxx5kb015a5rvjimrpcb5050xb3988dgc52fd5m5n270v238nva";
|
||||
sha256 = "opxXd8TkX8rCWVwVxJ1tKqQ0+l58mT3/P582e2X+Ryo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -57,14 +57,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flatpak";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
# TODO: split out lib once we figure out what to do with triggerdir
|
||||
outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "ZpFLZvmmQHk4bMCXpAoZ+oQZVo33+0VvLkB/D3asnq0=";
|
||||
sha256 = "eSZiXffCKCpe4aizwxevU9QKZjsbxrGKLch0fiZQhbA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libxmlb";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];
|
||||
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "hughsie";
|
||||
repo = "libxmlb";
|
||||
rev = version;
|
||||
sha256 = "VBIQo+6WqJUbkBZnG6eihx3eJFFWF68A7RpZ7gPVbEI=";
|
||||
sha256 = "XD66YfD8fjaqp5pkcR8qNh7Srjh+atAIC2qkDTF7KdM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "malcontent";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ];
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "pwithnall";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "Y9HzysChzzmKW5PuCLm9AZ4oaBLMpB0I5NyZUOYFzm4=";
|
||||
sha256 = "DEtibrGgHSgRjaarAzizzLN1xsJKXl+LCQ29FmpPoJo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
, flatpak
|
||||
, malcontent
|
||||
, gtk3
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, polkit
|
||||
, glib-testing
|
||||
@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
appstream-glib
|
||||
dbus
|
||||
polkit
|
||||
glib-testing
|
||||
|
||||
@ -50,4 +50,6 @@ in stdenv.mkDerivation {
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ tbenst ];
|
||||
};
|
||||
|
||||
passthru.cudatoolkit = cudatoolkit;
|
||||
}
|
||||
|
||||
@ -1,43 +1,29 @@
|
||||
{ stdenv, fetchzip, ocaml, findlib, obuild }:
|
||||
{ lib, buildDunePackage, fetchurl
|
||||
, seq
|
||||
, stdlib-shims
|
||||
}:
|
||||
|
||||
let param =
|
||||
if stdenv.lib.versionAtLeast ocaml.version "4.07"
|
||||
then {
|
||||
version = "2.0.4";
|
||||
sha256 = "05a391m1l04zigi6ghywj7f5kxy2w6186221k7711wmg56m94yjw";
|
||||
} else {
|
||||
version = "2.0.3";
|
||||
sha256 = "19xykhqk7q25r1pj8rpfj53j2r9ls8mxi1w5m2wqshrf20gf078h";
|
||||
}
|
||||
; in
|
||||
buildDunePackage rec {
|
||||
pname = "ptmap";
|
||||
version = "2.0.5";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml${ocaml.version}-ptmap-${param.version}";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/backtracking/ptmap/archive/v${param.version}.tar.gz";
|
||||
inherit (param) sha256;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/backtracking/ptmap/releases/download/${version}/ptmap-${version}.tbz";
|
||||
sha256 = "1apk61fc1y1g7x3m3c91fnskvxp6i0vk5nxwvipj56k7x2pzilgb";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib obuild ];
|
||||
propagatedBuildInputs = [ seq ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
doCheck = true;
|
||||
|
||||
buildPhase = ''
|
||||
substituteInPlace ptmap.obuild --replace 'build-deps: qcheck' ""
|
||||
obuild configure
|
||||
obuild build lib-ptmap
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
obuild install --destdir $out/lib/ocaml/${ocaml.version}/site-lib
|
||||
'';
|
||||
checkInputs = [ stdlib-shims ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.lri.fr/~filliatr/software.en.html";
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
description = "Maps over integers implemented as Patricia trees";
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
maintainers = with stdenv.lib.maintainers; [ volth ];
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = with lib.maintainers; [ volth ];
|
||||
};
|
||||
}
|
||||
|
||||
26
pkgs/development/ocaml-modules/ptset/default.nix
Normal file
26
pkgs/development/ocaml-modules/ptset/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, fetchurl, buildDunePackage
|
||||
, stdlib-shims
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ptset";
|
||||
version = "1.0.1";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/backtracking/ptset/releases/download/${version}/ptset-${version}.tbz";
|
||||
sha256 = "1pr80mgk12l93mdq1wfsv2b6ccraxs334d5h92qzjh7bw2g13424";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
propagatedBuildInputs = [ stdlib-shims ];
|
||||
|
||||
meta = {
|
||||
description = "Integer set implementation using Patricia trees";
|
||||
homepage = "https://github.com/backtracking/ptset";
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
@ -25,6 +25,10 @@ buildPythonPackage rec {
|
||||
sha256 = "42023d89520e3a29891ec2eb4c326eef9d1f7516fe9abee8b6c97ce064187b45";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyyaml
|
||||
six
|
||||
@ -40,6 +44,21 @@ buildPythonPackage rec {
|
||||
|
||||
# No tests included in archive
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [
|
||||
"cfnlint"
|
||||
"cfnlint.conditions"
|
||||
"cfnlint.core"
|
||||
"cfnlint.decode.node"
|
||||
"cfnlint.decode.cfn_yaml"
|
||||
"cfnlint.decode.cfn_json"
|
||||
"cfnlint.decorators.refactored"
|
||||
"cfnlint.graph"
|
||||
"cfnlint.helpers"
|
||||
"cfnlint.rules"
|
||||
"cfnlint.runner"
|
||||
"cfnlint.template"
|
||||
"cfnlint.transform"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Checks cloudformation for practices and behaviour that could potentially be improved";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, ncurses }:
|
||||
{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cx_Freeze";
|
||||
@ -9,6 +9,8 @@ buildPythonPackage rec {
|
||||
sha256 = "44bbbcea3196b79da77cc22637cb28a825b51182d32209e8a3f6cd4042edc247";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
propagatedBuildInputs = [ ncurses ];
|
||||
|
||||
# timestamp need to come after 1980 for zipfiles and nix store is set to epoch
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, flask, markdown }:
|
||||
{ lib, buildPythonPackage, pythonOlder, fetchPypi, flask, markdown }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-API";
|
||||
version = "2.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6986642e5b25b7def710ca9489ed2b88c94006bfc06eca01c78da7cf447e66e5";
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mocket";
|
||||
version = "3.8.8";
|
||||
version = "3.8.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0yqls2hqmfs6i4p2nb89j5icyrqwabalsmwfixfvbjir4fmgad2l";
|
||||
sha256 = "12gfqp7y7w6bgky3daxdggdzp08cg9ss64hbf5f49kywvsmcs01i";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -25,15 +25,11 @@ assert !openMPISupport || openmpi != null;
|
||||
assert !cudaSupport || cudatoolkit != null;
|
||||
assert cudnn == null || cudatoolkit != null;
|
||||
assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version;
|
||||
in majorIs == "9" || majorIs == "10");
|
||||
in majorIs == "9" || majorIs == "10" || majorIs == "11");
|
||||
|
||||
let
|
||||
hasDependency = dep: pkg: lib.lists.any (inp: inp == dep) pkg.buildInputs;
|
||||
matchesCudatoolkit = hasDependency cudatoolkit;
|
||||
in
|
||||
# confirm that cudatoolkits are sync'd across dependencies
|
||||
assert !(openMPISupport && cudaSupport) || matchesCudatoolkit openmpi;
|
||||
assert !cudaSupport || matchesCudatoolkit magma;
|
||||
assert !(openMPISupport && cudaSupport) || openmpi.cudatoolkit == cudatoolkit;
|
||||
assert !cudaSupport || magma.cudatoolkit == cudatoolkit;
|
||||
|
||||
let
|
||||
cudatoolkit_joined = symlinkJoin {
|
||||
|
||||
33
pkgs/development/python-modules/urwid-readline/default.nix
Normal file
33
pkgs/development/python-modules/urwid-readline/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, urwid
|
||||
, glibcLocales
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "urwid_readline";
|
||||
version = "0.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "24e376d4b75940d19e8bc81c264be5d383f8d4da560f68f648dd16c85f6afdb5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
urwid
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
glibcLocales
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A textbox edit widget for urwid that supports readline shortcuts";
|
||||
homepage = "https://github.com/rr-/urwid_readline";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -22,6 +22,13 @@ buildPythonPackage rec {
|
||||
# Tests fail on Darwin with `OSError: AF_UNIX path too long`
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
# Disable all tests that need to terminate within a predetermined amount of
|
||||
# time. This is nondeterministic.
|
||||
patchPhase = ''
|
||||
sed -i 's/with self.assertCompletesWithin.*:/if True:/' \
|
||||
tests/test_protocol.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "WebSocket implementation in Python 3";
|
||||
homepage = "https://github.com/aaugustin/websockets";
|
||||
|
||||
41
pkgs/development/python-modules/zulip/default.nix
Normal file
41
pkgs/development/python-modules/zulip/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, fetchFromGitHub
|
||||
, requests
|
||||
, matrix-client
|
||||
, distro
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zulip";
|
||||
version = "0.7.0";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
# no sdist on PyPI
|
||||
src = fetchFromGitHub {
|
||||
owner = "zulip";
|
||||
repo = "python-zulip-api";
|
||||
rev = version;
|
||||
sha256 = "0waldgpzq3ms1r1z14lxdj56lf082fnmi83l3fn8i8gqr8nvnch1";
|
||||
};
|
||||
sourceRoot = "source/zulip";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
matrix-client
|
||||
distro
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export COLUMNS=80
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bindings for the Zulip message API";
|
||||
homepage = "https://github.com/zulip/python-zulip-api";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, zlib, boost
|
||||
, openal, glm, freetype, libGLU, SDL2, epoxy
|
||||
, dejavu_fonts, inkscape_0, optipng, imagemagick
|
||||
, dejavu_fonts, inkscape, optipng, imagemagick
|
||||
, withCrashReporter ? !stdenv.isDarwin
|
||||
, qtbase ? null
|
||||
, wrapQtAppsHook ? null
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake inkscape_0 imagemagick optipng
|
||||
cmake inkscape imagemagick optipng
|
||||
] ++ optionals withCrashReporter [ wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, jre_headless }:
|
||||
stdenv.mkDerivation {
|
||||
pname = "minecraft-server";
|
||||
version = "1.16.2";
|
||||
version = "1.16.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launcher.mojang.com/v1/objects/c5f6fb23c3876461d46ec380421e42b289789530/server.jar";
|
||||
url = "https://launcher.mojang.com/v1/objects/f02f4473dbf152c23d7d484952121db0b36698cb/server.jar";
|
||||
# sha1 because that comes from mojang via api
|
||||
sha1 = "c5f6fb23c3876461d46ec380421e42b289789530";
|
||||
sha1 = "f02f4473dbf152c23d7d484952121db0b36698cb";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
@ -2,21 +2,19 @@
|
||||
, python
|
||||
, alsaLib, glew, libGL, libpng
|
||||
, libogg, libtheora, libvorbis
|
||||
, SDL, SDL_image, SDL_ttf
|
||||
, SDL2, SDL2_image, SDL2_ttf
|
||||
, freetype, tcl, zlib
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "openmsx";
|
||||
version = "0.15.0";
|
||||
version = "16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openMSX";
|
||||
repo = "openMSX";
|
||||
rev = "RELEASE_0_15_0";
|
||||
sha256 = "1lv5kdw0812mkf7k20z2djzk0pbs792xq2mibbnz9rfjf02whi7l";
|
||||
rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "04sphn9ph378r0qv881riv90cgz58650jcqcwmi1mv6gbcb3img5";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -24,10 +22,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ alsaLib glew libGL libpng
|
||||
libogg libtheora libvorbis freetype
|
||||
SDL SDL_image SDL_ttf tcl zlib ];
|
||||
SDL2 SDL2_image SDL2_ttf tcl zlib ];
|
||||
|
||||
postPatch = ''
|
||||
cp ${./custom-nixos.mk} build/custom.mk
|
||||
cp ${./custom-nix.mk} build/custom.mk
|
||||
'';
|
||||
|
||||
dontAddPrefix = true;
|
||||
@ -36,8 +34,8 @@ stdenv.mkDerivation rec {
|
||||
# for providing support to Nixpkgs :)
|
||||
TCL_CONFIG="${tcl}/lib/";
|
||||
|
||||
meta = {
|
||||
description = "A MSX emulator";
|
||||
meta = with stdenv.lib;{
|
||||
description = "The MSX emulator that aims for perfection";
|
||||
longDescription = ''
|
||||
OpenMSX is an emulator for the MSX home computer system. Its goal is
|
||||
to emulate all aspects of the MSX with 100% accuracy.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils, fftw}:
|
||||
{stdenv, fetchurl, alsaLib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alsa-utils";
|
||||
@ -9,18 +9,17 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1ai1z4kf91b1m3qrpwqkc1af5vm2fkdkknqv95xdwf19q94aw6gz";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace alsa-info/alsa-info.sh \
|
||||
--replace "which" "type -p" \
|
||||
--replace "lspci" "${pciutils}/bin/lspci"
|
||||
'';
|
||||
nativeBuildInputs = [ gettext ];
|
||||
nativeBuildInputs = [ gettext makeWrapper ];
|
||||
buildInputs = [ alsaLib ncurses libsamplerate fftw ];
|
||||
|
||||
configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];
|
||||
|
||||
installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/alsa-info.sh --prefix PATH : "${stdenv.lib.makeBinPath [ which pciutils ]}"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://www.alsa-project.org/";
|
||||
description = "ALSA, the Advanced Linux Sound Architecture utils";
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, gtk-doc
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, gobject-introspection
|
||||
, intltool
|
||||
, gettext
|
||||
, libgudev
|
||||
, polkit
|
||||
, libxmlb
|
||||
@ -23,13 +23,12 @@
|
||||
, libsmbios
|
||||
, efivar
|
||||
, gnu-efi
|
||||
, libyaml
|
||||
, valgrind
|
||||
, meson
|
||||
, libuuid
|
||||
, colord
|
||||
, docbook_xml_dtd_43
|
||||
, docbook_xsl
|
||||
, docbook-xsl-nons
|
||||
, ninja
|
||||
, gcab
|
||||
, python3
|
||||
@ -67,10 +66,6 @@ let
|
||||
requests
|
||||
]);
|
||||
|
||||
fontsConf = makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
};
|
||||
|
||||
isx86 = stdenv.isx86_64 || stdenv.isi686;
|
||||
|
||||
# Dell isn't supported on Aarch64
|
||||
@ -93,30 +88,50 @@ let
|
||||
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "fwupd";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
|
||||
sha256 = "0hpqxwqbbqn440c2swpnc06z8dskisrli4ynsxrzzqyp0dan46xw";
|
||||
};
|
||||
version = "1.4.6";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
# CLI programs go to out
|
||||
outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
|
||||
sha256 = "AKG5stioIveQc7ooYb/2UoOaBzbPUFzYk8tZK0rzvK0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Do not try to create useless paths in /var.
|
||||
./fix-paths.patch
|
||||
|
||||
# Allow installing
|
||||
./add-option-for-installation-sysconfdir.patch
|
||||
|
||||
# Install plug-ins and libfwupdplugin to out,
|
||||
# they are not really part of the library.
|
||||
./install-fwupdplugin-to-out.patch
|
||||
|
||||
# Installed tests are installed to different output
|
||||
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle.
|
||||
(substituteAll {
|
||||
src = ./installed-tests-path.patch;
|
||||
# Needs a different set of modules than po/make-images.
|
||||
inherit installedTestsPython;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
gtk-doc
|
||||
pkgconfig
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
intltool
|
||||
gettext
|
||||
shared-mime-info
|
||||
valgrind
|
||||
gcab
|
||||
docbook_xml_dtd_43
|
||||
docbook_xsl
|
||||
docbook-xsl-nons
|
||||
help2man
|
||||
libxslt
|
||||
python
|
||||
@ -133,7 +148,6 @@ let
|
||||
libsoup
|
||||
elfutils
|
||||
gnu-efi
|
||||
libyaml
|
||||
libgudev
|
||||
colord
|
||||
libjcat
|
||||
@ -152,55 +166,6 @@ let
|
||||
libsmbios
|
||||
];
|
||||
|
||||
patches = [
|
||||
./fix-paths.patch
|
||||
./add-option-for-installation-sysconfdir.patch
|
||||
|
||||
# Install plug-ins and libfwupdplugin to out,
|
||||
# they are not really part of the library.
|
||||
./install-fwupdplugin-to-out.patch
|
||||
|
||||
# Installed tests are installed to different output
|
||||
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle.
|
||||
(substituteAll {
|
||||
src = ./installed-tests-path.patch;
|
||||
# Needs a different set of modules than po/make-images.
|
||||
inherit installedTestsPython;
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fwupd/fwupd/commit/3e82beeddac31292c50229e59e2404865edee5ad.patch";
|
||||
sha256 = "17p9r8qddqkrnhy9bvp9207afh5fcl1whn79nqcp57b4q4c17zgk";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
contrib/get-version.py \
|
||||
contrib/generate-version-script.py \
|
||||
meson_post_install.sh \
|
||||
po/make-images \
|
||||
po/make-images.sh \
|
||||
po/test-deps
|
||||
'';
|
||||
|
||||
# /etc/os-release not available in sandbox
|
||||
# doCheck = true;
|
||||
|
||||
preFixup = let
|
||||
binPath = [
|
||||
efibootmgr
|
||||
bubblewrap
|
||||
tpm2-tools
|
||||
] ++ stdenv.lib.optional haveFlashrom flashrom;
|
||||
in ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
|
||||
# See programs reached with fu_common_find_program_in_path in source
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath binPath}"
|
||||
)
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtkdoc=true"
|
||||
"-Dplugin_dummy=true"
|
||||
@ -228,20 +193,57 @@ let
|
||||
"-Dplugin_flashrom=true"
|
||||
];
|
||||
|
||||
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
|
||||
# TODO: wrapGAppsHook wraps efi capsule even though it is not ELF
|
||||
dontWrapGApps = true;
|
||||
|
||||
# /etc/os-release not available in sandbox
|
||||
# doCheck = true;
|
||||
|
||||
# Environment variables
|
||||
|
||||
# Fontconfig error: Cannot load default config file
|
||||
FONTCONFIG_FILE =
|
||||
let
|
||||
fontsConf = makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
};
|
||||
in fontsConf;
|
||||
|
||||
# error: “PolicyKit files are missing”
|
||||
# https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428
|
||||
PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions";
|
||||
|
||||
# TODO: wrapGAppsHook wraps efi capsule even though it is not elf
|
||||
dontWrapGApps = true;
|
||||
# Phase hooks
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
contrib/get-version.py \
|
||||
contrib/generate-version-script.py \
|
||||
meson_post_install.sh \
|
||||
po/make-images \
|
||||
po/make-images.sh \
|
||||
po/test-deps
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share"
|
||||
'';
|
||||
|
||||
# so we need to wrap the executables manually
|
||||
preFixup = let
|
||||
binPath = [
|
||||
efibootmgr
|
||||
bubblewrap
|
||||
tpm2-tools
|
||||
] ++ stdenv.lib.optional haveFlashrom flashrom;
|
||||
in ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
|
||||
# See programs reached with fu_common_find_program_in_path in source
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath binPath}"
|
||||
)
|
||||
'';
|
||||
|
||||
# Since we had to disable wrapGAppsHook, we need to wrap the executables manually.
|
||||
postFixup = ''
|
||||
find -L "$out/bin" "$out/libexec" -type f -executable -print0 \
|
||||
| while IFS= read -r -d ''' file; do
|
||||
@ -312,7 +314,7 @@ let
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://fwupd.org/";
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
license = [ licenses.gpl2 ];
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
@ -11,6 +11,12 @@ iproute.overrideAttrs (oa: rec {
|
||||
sha256 = "07fihvwlaj0ng8s8sxqhd0a9h1narcnp4ibk88km9cpsd32xv4q3";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
# Don't try to create /var/lib/arpd:
|
||||
sed -e '/ARPDDIR/d' -i Makefile
|
||||
patchShebangs configure
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/multipath-tcp/iproute-mptcp";
|
||||
description = "IP-Route extensions for MultiPath TCP";
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, packr
|
||||
, sqlite
|
||||
, callPackage
|
||||
}:
|
||||
@ -32,12 +31,10 @@ buildGoModule rec {
|
||||
|
||||
buildInputs = [ sqlite ];
|
||||
|
||||
nativeBuildInputs = [ packr ];
|
||||
|
||||
ui = callPackage ./ui.nix { };
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${ui}/libexec/gotify-ui/deps/gotify-ui/build ui/build && packr
|
||||
cp -r ${ui}/libexec/gotify-ui/deps/gotify-ui/build ui/build && go run hack/packr/packr.go
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -35,13 +35,6 @@ let
|
||||
(mkOverride "bcrypt" "3.1.7"
|
||||
"0hhywhxx301cxivgxrpslrangbfpccc8y83qbwn1f57cab3nj00b")
|
||||
|
||||
# required by aioesphomeapi
|
||||
(self: super: {
|
||||
protobuf = super.protobuf.override {
|
||||
protobuf = protobuf3_6;
|
||||
};
|
||||
})
|
||||
|
||||
# hass-frontend does not exist in python3.pkgs
|
||||
(self: super: {
|
||||
hass-frontend = self.callPackage ./frontend.nix { };
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec {
|
||||
pname = "tt-rss-theme-feedly";
|
||||
version = "2.3.1";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "levito";
|
||||
repo = "tt-rss-feedly-theme";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rl5g664grx3m7yxa14rgnbvnlc3xnn44kzjji5layxww6jd8h2s";
|
||||
sha256 = "sha256-wZ6Q4cxvJKot1TWE8tOVZeaaeBSXghmkYkOK9GjAnEM=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, autoconf, automake, pkgconfig
|
||||
, perl, flex, bison, readline, libexif
|
||||
, x11Support ? true, SDL
|
||||
, svgSupport ? true, inkscape_0
|
||||
, svgSupport ? true, inkscape
|
||||
, asciiArtSupport ? true, aalib
|
||||
, gifSupport ? true, giflib
|
||||
, tiffSupport ? true, libtiff
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = with stdenv.lib;
|
||||
[ perl flex bison readline libexif ]
|
||||
++ optional x11Support SDL
|
||||
++ optional svgSupport inkscape_0
|
||||
++ optional svgSupport inkscape
|
||||
++ optional asciiArtSupport aalib
|
||||
++ optional gifSupport giflib
|
||||
++ optional tiffSupport libtiff
|
||||
|
||||
23
pkgs/tools/misc/asciinema-scenario/default.nix
Normal file
23
pkgs/tools/misc/asciinema-scenario/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "asciinema-scenario";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ubiVpKFU81Ot9V9oMexWSiUXHepoJ6nXtrWVAFhgcYw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "109ij5h31bhn44l0wywgpnnlfjgyairxr5l19s6bz47sbka0xyxk";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Create asciinema videos from a text file.";
|
||||
homepage = "https://github.com/garbas/asciinema-scenario/";
|
||||
maintainers = with maintainers; [ garbas ];
|
||||
license = with licenses; [ mit ];
|
||||
};
|
||||
}
|
||||
@ -16,11 +16,11 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "156";
|
||||
version = "160";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
sha256 = "1irmsa0g0hggxijqyy7mghc8zy82cr6zn8qil253pm426j7gf7vm";
|
||||
sha256 = "1nshcgq31nrbh4r70i5azs7s0wfc4llb60ka1w8rncy22rg8rabc";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@ -5,8 +5,8 @@ GEM
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
ethon (0.12.0)
|
||||
ffi (>= 1.3.0)
|
||||
ffi (1.12.2)
|
||||
html-proofer (3.15.3)
|
||||
ffi (1.13.1)
|
||||
html-proofer (3.16.0)
|
||||
addressable (~> 2.3)
|
||||
mercenary (~> 0.3)
|
||||
nokogumbo (~> 2.0)
|
||||
@ -16,14 +16,14 @@ GEM
|
||||
yell (~> 2.0)
|
||||
mercenary (0.4.0)
|
||||
mini_portile2 (2.4.0)
|
||||
nokogiri (1.10.9)
|
||||
nokogiri (1.10.10)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
nokogumbo (2.0.2)
|
||||
nokogiri (~> 1.8, >= 1.8.4)
|
||||
parallel (1.19.1)
|
||||
public_suffix (4.0.4)
|
||||
parallel (1.19.2)
|
||||
public_suffix (4.0.6)
|
||||
rainbow (3.0.0)
|
||||
typhoeus (1.3.1)
|
||||
typhoeus (1.4.0)
|
||||
ethon (>= 0.9.0)
|
||||
yell (2.2.2)
|
||||
|
||||
|
||||
@ -26,10 +26,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
|
||||
sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.12.2";
|
||||
version = "1.13.1";
|
||||
};
|
||||
html-proofer = {
|
||||
dependencies = ["addressable" "mercenary" "nokogumbo" "parallel" "rainbow" "typhoeus" "yell"];
|
||||
@ -37,10 +37,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18afz6rz72j8hnfgzhyr21wh1rfy1x41iyhbcgaq0r1bd7ng1vni";
|
||||
sha256 = "18s8l3nys0lvdkqpfg3c1rd84c5j4dmlx503wnksw9skbzn7l93m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.15.3";
|
||||
version = "3.16.0";
|
||||
};
|
||||
mercenary = {
|
||||
groups = ["default"];
|
||||
@ -68,10 +68,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
|
||||
sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.9";
|
||||
version = "1.10.10";
|
||||
};
|
||||
nokogumbo = {
|
||||
dependencies = ["nokogiri"];
|
||||
@ -89,20 +89,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2";
|
||||
sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.19.1";
|
||||
version = "1.19.2";
|
||||
};
|
||||
public_suffix = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz";
|
||||
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.4";
|
||||
version = "4.0.6";
|
||||
};
|
||||
rainbow = {
|
||||
groups = ["default"];
|
||||
@ -120,10 +120,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5";
|
||||
sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
};
|
||||
yell = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -22,16 +22,6 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace Makefile --replace 'gzip' 'gzip -n'
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(CC="cc"
|
||||
ADD_CFLAGS=""
|
||||
COLOR="-DCOLOR_SUPPORT"
|
||||
CLOCK="-DCLOCK_SUPPORT"
|
||||
READLINE="-DREADLINE_SUPPORT"
|
||||
CFLAGS="-D_GNU_SOURCE -DWITH_UTF8 $(ADD_CFLAGS) $(COLOR) $(CLOCK) $(READLINE)"
|
||||
LDFLAGS="-lncursesw -lreadline")
|
||||
'';
|
||||
|
||||
installFlags = [ "DESTDIR=${placeholder "out"}" ];
|
||||
|
||||
preInstall = ''
|
||||
|
||||
@ -1,32 +1,46 @@
|
||||
{ stdenv, fetchFromGitLab, lib, darwin
|
||||
, git, nettle, llvmPackages, cargo, rustc
|
||||
, rustPlatform, pkgconfig, glib
|
||||
, openssl, sqlite, capnproto
|
||||
, ensureNewerSourcesForZipFilesHook, pythonSupport ? true, pythonPackages ? null
|
||||
{ stdenv
|
||||
, fetchFromGitLab
|
||||
, lib
|
||||
, darwin
|
||||
, git
|
||||
, nettle
|
||||
# Use the same llvmPackages version as Rust
|
||||
, llvmPackages_10
|
||||
, cargo
|
||||
, rustc
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, glib
|
||||
, openssl
|
||||
, sqlite
|
||||
, capnproto
|
||||
, ensureNewerSourcesForZipFilesHook
|
||||
, pythonSupport ? true
|
||||
, pythonPackages ? null
|
||||
}:
|
||||
|
||||
assert pythonSupport -> pythonPackages != null;
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sequoia";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sequoia-pgp";
|
||||
repo = pname;
|
||||
repo = "sequoia";
|
||||
rev = "v${version}";
|
||||
sha256 = "18acv0185y51yz6jwchi1vf701shz37z5qmnzpq6z419lpjdaskd";
|
||||
sha256 = "1870wd03c3x0da9p3jmkvfx8am87ak0dcsvp2qkjvglbl396kd8y";
|
||||
};
|
||||
|
||||
cargoSha256 = "1jazwpv5mrsd0hxfavk0lvq8n26iglzl8pggw311ysi0lwabjq0y";
|
||||
cargoSha256 = "0bb51vdppdjhsxbfy3lyqvw5r5j58r3wi0qb68m2a45k3za7liss";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
pkg-config
|
||||
cargo
|
||||
rustc
|
||||
git
|
||||
llvmPackages.libclang
|
||||
llvmPackages.clang
|
||||
llvmPackages_10.libclang
|
||||
llvmPackages_10.clang
|
||||
ensureNewerSourcesForZipFilesHook
|
||||
capnproto
|
||||
] ++
|
||||
@ -54,27 +68,24 @@ rustPlatform.buildRustPackage rec {
|
||||
"build-release"
|
||||
];
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
|
||||
LIBCLANG_PATH = "${llvmPackages_10.libclang}/lib";
|
||||
|
||||
# Please check if this is still needed when updating.
|
||||
# Exlude tests for sequoia-store, they often error with 'Too many open files' Hydra.
|
||||
CARGO_TEST_ARGS = " --all --exclude sequoia-store";
|
||||
# Sometimes, tests fail on CI (ofborg) & hydra without this
|
||||
CARGO_TEST_ARGS = "--workspace --exclude sequoia-store";
|
||||
|
||||
# Without this, the examples won't build
|
||||
postPatch = ''
|
||||
# otherwise, the check fails because we delete the `.git` in the unpack phase
|
||||
substituteInPlace openpgp-ffi/Makefile \
|
||||
--replace 'git grep' 'grep -R'
|
||||
# Without this, the check fails
|
||||
substituteInPlace openpgp-ffi/examples/Makefile \
|
||||
--replace '-O0 -g -Wall -Werror' '-g'
|
||||
substituteInPlace ffi/examples/Makefile \
|
||||
--replace '-O0 -g -Wall -Werror' '-g'
|
||||
'';
|
||||
|
||||
|
||||
preInstall = lib.optionalString pythonSupport ''
|
||||
export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}"
|
||||
'' + lib.optionalString (!pythonSupport) ''
|
||||
export installFlags="PYTHON=disable"
|
||||
export makeFlags="PYTHON=disable"
|
||||
'';
|
||||
|
||||
# Don't use buildRustPackage phases, only use it for rust deps setup
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zenith";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bvaisvil";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "04nd5gq49y1k9xxrc9ll155k9j42ivscjzx405qyyxv7dpgyw131";
|
||||
sha256 = "0jz0pjibjiyg0rjmpihxxjhg9cbccvqfr5si5rji585l0zrpdwsg";
|
||||
};
|
||||
|
||||
cargoSha256 = "0ggpr2skl3d47y771npmbbqb9vga4y4iyry3qn0xj2hg9d7msf4l";
|
||||
cargoSha256 = "1zkx6sr5xlj7pb91bxvqjib5awscy1rmv4g89xb76dahac8fan6z";
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
|
||||
|
||||
@ -21,6 +21,7 @@ rustPlatform.buildRustPackage rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
# doesn't build on aarch64 https://github.com/bvaisvil/zenith/issues/19
|
||||
# see https://github.com/NixOS/nixpkgs/pull/88616
|
||||
platforms = platforms.x86;
|
||||
};
|
||||
}
|
||||
|
||||
25
pkgs/tools/text/choose/default.nix
Normal file
25
pkgs/tools/text/choose/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "choose";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theryangeary";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0j3861pxqw0lnamb201c7h5w7npzyiwwb6c1xzxjv72m2ccvz76j";
|
||||
};
|
||||
|
||||
cargoSha256 = "1p18926pfff1yayb2i28v0nz37j52hqqv7244yfrzgidi29kyvbc";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A human-friendly and fast alternative to cut and (sometimes) awk";
|
||||
homepage = "https://github.com/theryangeary/choose";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ sohalt ];
|
||||
};
|
||||
}
|
||||
24
pkgs/tools/text/chroma/default.nix
Normal file
24
pkgs/tools/text/chroma/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chroma";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alecthomas";
|
||||
repo = "chroma";
|
||||
rev = "v${version}";
|
||||
sha256 = "066a6rdmf670d3v5sc7chbn7db09ldgxjympb03pcqwk644dixb1";
|
||||
};
|
||||
|
||||
vendorSha256 = "16cnc4scgkx8jan81ymha2q1kidm6hzsnip5mmgbxpqcc2h7hv9m";
|
||||
|
||||
subPackages = [ "cmd/chroma" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/alecthomas/chroma";
|
||||
description = "A general purpose syntax highlighter in pure Go";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, python2, libxslt, texlive
|
||||
, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape_0 ? null, fontconfig ? null, ghostscript ? null
|
||||
, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null
|
||||
|
||||
, tex ? texlive.combine { # satisfy all packages that ./configure mentions
|
||||
inherit (texlive) scheme-basic epstopdf anysize appendix changebar
|
||||
@ -16,7 +16,7 @@
|
||||
assert enableAllFeatures ->
|
||||
imagemagick != null &&
|
||||
transfig != null &&
|
||||
inkscape_0 != null &&
|
||||
inkscape != null &&
|
||||
fontconfig != null &&
|
||||
ghostscript != null;
|
||||
|
||||
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
-e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \
|
||||
-e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \
|
||||
-e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \
|
||||
-e 's|cmd = "inkscape|cmd = "${inkscape_0}/bin/inkscape|g' \
|
||||
-e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \
|
||||
-e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \
|
||||
-e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \
|
||||
-e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \
|
||||
|
||||
@ -619,7 +619,7 @@ in
|
||||
|
||||
aescrypt = callPackage ../tools/misc/aescrypt { };
|
||||
|
||||
acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; };
|
||||
acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; stdenv = gccStdenv; };
|
||||
|
||||
amass = callPackage ../tools/networking/amass { };
|
||||
|
||||
@ -772,6 +772,8 @@ in
|
||||
|
||||
asciinema = callPackage ../tools/misc/asciinema {};
|
||||
|
||||
asciinema-scenario = callPackage ../tools/misc/asciinema-scenario {};
|
||||
|
||||
asciiquarium = callPackage ../applications/misc/asciiquarium {};
|
||||
|
||||
ashuffle = callPackage ../applications/audio/ashuffle {};
|
||||
@ -926,6 +928,8 @@ in
|
||||
withDriver = false;
|
||||
};
|
||||
|
||||
chroma = callPackage ../tools/text/chroma { };
|
||||
|
||||
clair = callPackage ../tools/admin/clair { };
|
||||
|
||||
cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { };
|
||||
@ -3401,6 +3405,8 @@ in
|
||||
|
||||
cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { };
|
||||
|
||||
choose = callPackage ../tools/text/choose { };
|
||||
|
||||
emscripten = callPackage ../development/compilers/emscripten { };
|
||||
|
||||
emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });
|
||||
@ -9861,6 +9867,8 @@ in
|
||||
|
||||
zulip = callPackage ../applications/networking/instant-messengers/zulip { };
|
||||
|
||||
zulip-term = callPackage ../applications/networking/instant-messengers/zulip-term { };
|
||||
|
||||
zulu8 = callPackage ../development/compilers/zulu/8.nix { };
|
||||
zulu = callPackage ../development/compilers/zulu { };
|
||||
|
||||
@ -20134,7 +20142,7 @@ in
|
||||
|
||||
electron-cash = libsForQt514.callPackage ../applications/misc/electron-cash { };
|
||||
|
||||
electrum = libsForQt514.callPackage ../applications/misc/electrum { };
|
||||
electrum = libsForQt5.callPackage ../applications/misc/electrum { };
|
||||
|
||||
electrum-dash = callPackage ../applications/misc/electrum/dash.nix { };
|
||||
|
||||
@ -21221,10 +21229,6 @@ in
|
||||
|
||||
inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {});
|
||||
|
||||
inkscape_0 = callPackage ../applications/graphics/inkscape/0.x.nix {
|
||||
lcms = lcms2;
|
||||
};
|
||||
|
||||
inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { };
|
||||
|
||||
ion3 = callPackage ../applications/window-managers/ion-3 {
|
||||
@ -23131,6 +23135,8 @@ in
|
||||
|
||||
prusa-slicer = callPackage ../applications/misc/prusa-slicer { };
|
||||
|
||||
super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { };
|
||||
|
||||
robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
|
||||
|
||||
sddm = libsForQt514.callPackage ../applications/display-managers/sddm { };
|
||||
@ -27664,7 +27670,7 @@ in
|
||||
snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { };
|
||||
|
||||
openmsx = callPackage ../misc/emulators/openmsx {
|
||||
python = python27;
|
||||
python = python3;
|
||||
};
|
||||
|
||||
higan = callPackage ../misc/emulators/higan {
|
||||
|
||||
@ -882,6 +882,8 @@ let
|
||||
|
||||
ptmap = callPackage ../development/ocaml-modules/ptmap { };
|
||||
|
||||
ptset = callPackage ../development/ocaml-modules/ptset { };
|
||||
|
||||
pycaml = callPackage ../development/ocaml-modules/pycaml { };
|
||||
|
||||
qcheck = callPackage ../development/ocaml-modules/qcheck { };
|
||||
|
||||
@ -7247,6 +7247,8 @@ in {
|
||||
|
||||
urwidtrees = callPackage ../development/python-modules/urwidtrees { };
|
||||
|
||||
urwid-readline = callPackage ../development/python-modules/urwid-readline { };
|
||||
|
||||
usbtmc = callPackage ../development/python-modules/usbtmc { };
|
||||
|
||||
us = callPackage ../development/python-modules/us { };
|
||||
@ -7710,6 +7712,8 @@ in {
|
||||
|
||||
zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkgconfig; };
|
||||
|
||||
zulip = callPackage ../development/python-modules/zulip { };
|
||||
|
||||
zxcvbn = callPackage ../development/python-modules/zxcvbn { };
|
||||
|
||||
});
|
||||
|
||||
Loading…
Reference in New Issue
Block a user