From a2226d7de5e030b78aa714a9709b7e87dc0cb83a Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 17 Aug 2019 21:00:40 +0300 Subject: [PATCH 01/82] qemu: 4.0.0 -> 4.1.0 --- .../virtualization/qemu/default.nix | 9 ++----- .../virtualization/qemu/no-etc-install.patch | 24 +++++-------------- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index d64baca2cc7..5aa1f2e1f55 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -35,7 +35,7 @@ let in stdenv.mkDerivation rec { - version = "4.0.0"; + version = "4.1.0"; name = "qemu-" + stdenv.lib.optionalString xenSupport "xen-" + stdenv.lib.optionalString hostCpuOnly "host-cpu-only-" @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "085g6f75si8hbn94mnnjn1r7ysixn5bqj4bhqwvadj00fhzp2zvd"; + sha256 = "1bpl6hwiw1jdxk4xmqp10qgki0dji0l2rzr10dyhyk8d85vxxw29"; }; nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ]; @@ -78,11 +78,6 @@ stdenv.mkDerivation rec { ./no-etc-install.patch ./fix-qemu-ga.patch ./9p-ignore-noatime.patch - (fetchpatch { - url = "https://git.qemu.org/?p=qemu.git;a=patch;h=d52680fc932efb8a2f334cc6993e705ed1e31e99"; - name = "CVE-2019-12155.patch"; - sha256 = "0h2q71mcz3gvlrbfkqcgla74jdg73hvzcrwr4max2ckpxx8x9207"; - }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch index 37c12ddbfeb..57e190f5ae7 100644 --- a/pkgs/applications/virtualization/qemu/no-etc-install.patch +++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch @@ -1,25 +1,13 @@ -From 98b3e5993bbdb0013b6cc1814e0ad9555290c3af Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Tue, 23 Apr 2019 21:31:45 -0500 -Subject: [PATCH] no install localstatedir - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/Makefile b/Makefile -index 04a0d45050..5dc82d0eb7 100644 +index 85862fb8..ed52c5ec 100644 --- a/Makefile +++ b/Makefile -@@ -786,7 +786,7 @@ endif +@@ -841,7 +841,7 @@ endif ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 --install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir -+install: all $(if $(BUILD_DOCS),install-doc) install-datadir +-install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir \ ++install: all $(if $(BUILD_DOCS),install-doc) install-datadir \ + $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ + recurse-install ifneq ($(TOOLS),) - $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir)) - endif --- -2.21.GIT - From b4f6931acde5433ffebfedf79a31eb5903ffa51e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 28 Aug 2019 14:34:05 -0400 Subject: [PATCH 02/82] busybox: fix static builds Fixes #52074 --- pkgs/os-specific/linux/busybox/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index f041d2b5042..da9ed304db8 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPackages, fetchurl , enableStatic ? false , enableMinimal ? false -, useMusl ? stdenv.hostPlatform.libc == "musl", musl +, useMusl ? stdenv.hostPlatform.libc == "musl" , extraConfig ? "" }: @@ -88,10 +88,6 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - postConfigure = lib.optionalString useMusl '' - makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib") - ''; - depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ]; From 075b528a6d43318c793f55ad351c03b4ce68b919 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 6 Mar 2018 18:14:37 +0100 Subject: [PATCH 03/82] doc: add GNOME Closes: #16285 --- doc/languages-frameworks/gnome.xml | 198 +++++++++++++++++++++++++++++ doc/languages-frameworks/index.xml | 1 + doc/stdenv.xml | 8 +- 3 files changed, 202 insertions(+), 5 deletions(-) create mode 100644 doc/languages-frameworks/gnome.xml diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml new file mode 100644 index 00000000000..2bead65ecf1 --- /dev/null +++ b/doc/languages-frameworks/gnome.xml @@ -0,0 +1,198 @@ +
+ GNOME + +
+ Packaging GNOME applications + + + Programs in the GNOME universe are written in various languages but they all use GObject-based libraries like GLib, GTK or GStreamer. These libraries are often modular, relying on looking into certain directories to find their modules. However, due to Nix’s specific file system organization, this will fail without our intervention. Fortunately, the libraries usually allow overriding the directories through environment variables, either natively or thanks to a patch in nixpkgs. Wrapping the executables to ensure correct paths are available to the application constitutes a significant part of packaging a modern desktop application. In this section, we will describe various modules needed by such applications, environment variables needed to make the modules load, and finally a script that will do the work for us. + + +
+ Settings + + + GSettings API is often used for storing settings. GSettings schemas are required, to know the type and other metadata of the stored values. GLib looks for glib-2.0/schemas/gschemas.compiled files inside the directories of XDG_DATA_DIRS. + + + + On Linux, GSettings API is implemented using dconf backend. You will need to add dconf GIO module to GIO_EXTRA_MODULES variable, otherwise the memory backend will be used and the saved settings will not be persistent. + + + + Last you will need the dconf database D-Bus service itself. You can enable it using . + + + + Some applications will also require gsettings-desktop-schemas for things like reading proxy configuration or user interface customization. This dependency is often not mentioned by upstream, you should grep for org.gnome.desktop and org.gnome.system to see if the schemas are needed. + +
+ +
+ Icons + + + When an application uses icons, an icon theme should be available in XDG_DATA_DIRS. The package for the default, icon-less hicolor-icon-theme contains a setup hook that will pick up icon themes from buildInputs and pass it to our wrapper. Unfortunately, relying on that would mean every user has to download the theme included in the package expression no matter their preference. For that reason, we leave the installation of icon theme on the user. If you use one of the desktop environments, you probably already have an icon theme installed. + +
+ +
+ GTK Themes + + + Previously, a GTK theme needed to be in XDG_DATA_DIRS. This is no longer necessary for most programs since GTK incorporated Adwaita theme. Some programs (for example, those designed for elementary HIG) might require a special theme like pantheon.elementary-gtk-theme. + +
+ +
+ GObject introspection typelibs + + + GObject introspection allows applications to use C libraries in other languages easily. It does this through typelib files searched in GI_TYPELIB_PATH. + +
+ +
+ Various plug-ins + + + If your application uses GStreamer or Grilo, you should set GST_PLUGIN_SYSTEM_PATH_1_0 and GRL_PLUGIN_PATH, respectively. + +
+
+ +
+ Onto <package>wrapGAppsHook</package> + + + Given the requirements above, the package expression would become messy quickly: + +preFixup = '' + for f in $(find $out/bin/ $out/libexec/ -type f -executable); do + wrapProgram "$f" \ + --prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : "$out/share" \ + --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \ + --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ + --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ + --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ pango json-glib ]}" + done +''; + + Fortunately, there is wrapGAppsHook, that does the wrapping for us. In particular, it works in conjunction with other setup hooks that will populate the variable: + + + + wrapGAppsHook itself will add the package’s share directory to XDG_DATA_DIRS. + + + + + glib setup hook will populate GSETTINGS_SCHEMAS_PATH and then wrapGAppsHook will prepend it to XDG_DATA_DIRS. + + + + + gnome3.dconf.lib is a dependency of wrapGAppsHook, which then also adds it to the GIO_EXTRA_MODULES variable. + + + + + hicolor-icon-theme’s setup hook will add icon themes to XDG_ICON_DIRS which is prepended to XDG_DATA_DIRS by wrapGAppsHook. + + + + + gobject-introspection setup hook populates GI_TYPELIB_PATH variable with lib/girepository-1.0 directories of dependencies, which is then added to wrapper by wrapGAppsHook. It also adds share directories of dependencies to XDG_DATA_DIRS, which is intended to promote GIR files but it also pollutes the closures of packages using wrapGAppsHook. + + + + The setup hook currently does not work in expressions with strictDeps enabled, like Python packages. In those cases, you will need to disable it with strictDeps = false;. + + + + + + Setup hooks of gst_all_1.gstreamer and gnome3.grilo will populate the GST_PLUGIN_SYSTEM_PATH_1_0 and GRL_PLUGIN_PATH variables, respectively, which will then be added to the wrapper by wrapGAppsHook. + + + + + + + You can also pass additional arguments to makeWrapper using gappsWrapperArgs in preFixup hook: + +preFixup = '' + gappsWrapperArgs+=( + # Thumbnailers + --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" + --prefix XDG_DATA_DIRS : "${librsvg}/share" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) +''; + + +
+ +
+ Updating GNOME packages + + + Most GNOME package offer updateScript, it is therefore possible to update to latest source tarball by running nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus or even en masse with nix-shell maintainers/scripts/update.nix --argstr path gnome3. Read the package’s NEWS file to see what changed. + +
+ +
+ Frequently encountered issues + + + + + GLib-GIO-ERROR **: 06:04:50.903: No GSettings schemas are installed on the system + + + + There are no schemas avalable in XDG_DATA_DIRS. Temporarily add a random package containing schemas like gsettings-desktop-schemas to buildInputs. glib and wrapGAppsHook setup hooks will take care of making the schemas available to application and you will see the actual missing schemas with the next error. Or you can try looking through the source code for the actual schemas used. + + + + + + GLib-GIO-ERROR **: 06:04:50.903: Settings schema ‘org.gnome.foo’ is not installed + + + + Package is missing some GSettings schemas. You can find out the package containing the schema with nix-locate org.gnome.foo.gschema.xml and let the hooks handle the wrapping as above. + + + + + + I am packaging a project that cannot be wrapped, like a library or GNOME Shell extension. + + + + You can rely on applications depending on the library set the necessary environment variables but that it often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples: + + + + Replacing a GI_TYPELIB_PATH in GNOME Shell extension – we are using substituteAll to include the path to a typelib into a patch. + + + + + Hard-coding GSettings schema path in Vala plug-in (dynamically loaded library) – here, substituteAll cannot be used since the schema comes from the same package preventing us from pass its path to the function, probably due to a Nix bug. + + + + + Hard-coding GSettings schema path in C library – nothing special other than using Coccinelle patch to generate the patch itself. + + + + + + + +
+
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index cd4e95cfae6..5836294b774 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -14,6 +14,7 @@ + diff --git a/doc/stdenv.xml b/doc/stdenv.xml index fe592965656..d25656838f8 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -699,7 +699,7 @@ passthru = { - + passthru.updateScript @@ -2629,13 +2629,11 @@ addEnvHooks "$hostOffset" myBashFunction - GStreamer + GNOME platform - Adds the GStreamer plugins subdirectory of each build input to the - GST_PLUGIN_SYSTEM_PATH_1_0 or - GST_PLUGIN_SYSTEM_PATH environment variable. + Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in . From 69e0d954624103d24de0b3f3ebb279ed0a799dd5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 5 Sep 2019 21:30:06 -0400 Subject: [PATCH 04/82] doc/gnome: explain double wrapped binaries --- doc/languages-frameworks/gnome.xml | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml index 2bead65ecf1..399e7c396a8 100644 --- a/doc/languages-frameworks/gnome.xml +++ b/doc/languages-frameworks/gnome.xml @@ -166,6 +166,58 @@ preFixup = '' + + + When using wrapGAppsHook with special derivers you can end up with double wrapped binaries. + + + + This is because derivers like python.pkgs.buildPythonApplication or qt5.mkDerivation have setup-hooks automatically added that produce wrappers with makeWrapper. The simplest way to workaround that is to disable the wrapGAppsHook automatic wrapping with dontWrapGApps = true; and pass the arguments it intended to pass to makeWrapper to another. + + + In the case of a Python application it could look like: + +python3.pkgs.buildPythonApplication { + pname = "gnome-music"; + version = "3.32.2"; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + ... + ]; + + dontWrapGApps = true; + + # Arguments to be passed to `makeWrapper`, only used by buildPython* + makeWrapperArgs = [ + "\${gappsWrapperArgs[@]}" + ]; +} + + And for a QT app like: + +mkDerivation { + pname = "calibre"; + version = "3.47.0"; + + nativeBuildInputs = [ + wrapGAppsHook + qmake + ... + ]; + + dontWrapGApps = true; + + # Arguments to be passed to `makeWrapper`, only used by qt5’s mkDerivation + qtWrapperArgs [ + "\${gappsWrapperArgs[@]}" + ]; +} + + + + I am packaging a project that cannot be wrapped, like a library or GNOME Shell extension. From 463377597b6b6182288e0bf6ec0a45c7507cb85f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 5 Sep 2019 22:31:48 -0400 Subject: [PATCH 05/82] doc/gnome: explain glib passthru functions Examples are updated to commits that use them as well. --- doc/languages-frameworks/gnome.xml | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml index 399e7c396a8..9e0f21a6c74 100644 --- a/doc/languages-frameworks/gnome.xml +++ b/doc/languages-frameworks/gnome.xml @@ -228,16 +228,29 @@ mkDerivation { - Replacing a GI_TYPELIB_PATH in GNOME Shell extension – we are using substituteAll to include the path to a typelib into a patch. + Replacing a GI_TYPELIB_PATH in GNOME Shell extension – we are using substituteAll to include the path to a typelib into a patch. - + - Hard-coding GSettings schema path in Vala plug-in (dynamically loaded library) – here, substituteAll cannot be used since the schema comes from the same package preventing us from pass its path to the function, probably due to a Nix bug. + The following examples are hardcoding GSettings schema paths. To get the schema paths we use the functions + + + + glib.getSchemaPath Takes a nix package attribute as an argument. + + + + + glib.makeSchemaPath Takes a package output like $out and a derivation name. You should use this if the schemas you need to hardcode are in the same derivation. + + + - - - + + Hard-coding GSettings schema path in Vala plug-in (dynamically loaded library) – here, substituteAll cannot be used since the schema comes from the same package preventing us from pass its path to the function, probably due to a Nix bug. + + Hard-coding GSettings schema path in C library – nothing special other than using Coccinelle patch to generate the patch itself. From b9d9045d5745fec640fb8261f9bdf2512eb372bd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 6 Sep 2019 13:51:38 -0400 Subject: [PATCH 06/82] nixos/cupsd: passwordless admin for wheel with polkit --- nixos/modules/services/printing/cupsd.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 42c1b9482cb..f0179c1fb02 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -291,6 +291,16 @@ in services.dbus.packages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper; + # Allow asswordless printer admin for members of wheel group + security.polkit.extraConfig = mkIf polkitEnabled '' + polkit.addRule(function(action, subject) { + if (action.id == "org.opensuse.cupspkhelper.mechanism.all-edit" && + subject.isInGroup("wheel")){ + return polkit.Result.YES; + } + }); + ''; + # Cups uses libusb to talk to printers, and does not use the # linux kernel driver. If the driver is not in a black list, it # gets loaded, and then cups cannot access the printers. From a4ca05f7ebcc59fccf1f694c2e87e633f29f574d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 7 Sep 2019 00:29:35 -0700 Subject: [PATCH 07/82] grabserial: 1.9.3 -> 1.9.8 --- pkgs/development/tools/grabserial/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix index d1709369511..ab32674f188 100644 --- a/pkgs/development/tools/grabserial/default.nix +++ b/pkgs/development/tools/grabserial/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchgit, pythonPackages }: +{ lib, fetchFromGitHub, pythonPackages }: -pythonPackages.buildPythonApplication { +pythonPackages.buildPythonApplication rec { + pname = "grabserial"; + version = "1.9.8"; - name = "grabserial-1.9.3"; - namePrefix = ""; - - src = fetchgit { - url = https://github.com/tbird20d/grabserial.git; - rev = "7cbf104b61ffdf68e6782a8e885050565399a014"; - sha256 = "043r2p5jw0ymx8ka1d39q1ap39i7sliq5f4w3yr1n53lzshjmc5g"; + src = fetchFromGitHub { + owner = "tbird20d"; + repo = "grabserial"; + rev = "v${version}"; + sha256 = "1xmy3js4hzsxlkxc172hkjzxsc34mmg3vfz61h24c7svmfzyhbd5"; }; propagatedBuildInputs = [ pythonPackages.pyserial ]; - meta = { + meta = with lib; { description = "Python based serial dump and timing program"; - homepage = https://github.com/tbird20d/grabserial; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ vmandela ]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/tbird20d/grabserial"; + license = licenses.gpl2; + maintainers = with maintainers; [ vmandela ]; + platforms = platforms.linux; }; } From d90455ed18ec851231ced00d66b9b978964d5caf Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sat, 7 Sep 2019 13:58:19 +0300 Subject: [PATCH 08/82] pythonPackages.eth-typing: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/eth-typing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index fee2156e67d..0fcf7731ee0 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "2.0.0"; + version = "2.1.0"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-typing/issues/8 @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "017rshrz9kzax851hdbd3924jmr06h2sx3xdq7m4dwhgz3pgqfcy"; + sha256 = "0chrrfw3kdaihgr2ryhljf56bflipzmfxai688xrc2yk7yiqnll5"; }; # setuptools-markdown uses pypandoc which is broken at the moment From 0fdf1f5306dbd155f9a229740d40833aa812fa48 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sat, 7 Sep 2019 14:09:41 +0300 Subject: [PATCH 09/82] pythonPackages.eth-utils: 1.4.1 -> 1.7.0 --- pkgs/development/python-modules/eth-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 5fb83126d1c..116fa0273e5 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "eth-utils"; - version = "1.4.1"; + version = "1.7.0"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-utils/issues/130 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "1bwn7b5f0nzvwiw9zs63wy3qhaxvz2fhjp4wj9djp2337d7195h4"; + sha256 = "0hhhdz764xgwj5zg3pjzpx10vh54q7kbvlnj9d67qkgwl3fkfgw2"; }; checkInputs = [ pytest hypothesis ]; From 7c22e3af3003c66a936ea6d7ec385a39518eddf4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Sep 2019 12:20:15 +0200 Subject: [PATCH 10/82] gmic-qt-krita: rename from gmic_krita_qt --- pkgs/tools/graphics/{gmic_krita_qt => gmic-qt}/default.nix | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) rename pkgs/tools/graphics/{gmic_krita_qt => gmic-qt}/default.nix (100%) diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix similarity index 100% rename from pkgs/tools/graphics/gmic_krita_qt/default.nix rename to pkgs/tools/graphics/gmic-qt/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 046c6bc9acc..4b243fabb3a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -114,6 +114,7 @@ mapAliases ({ git-hub = gitAndTools.git-hub; # added 2016-04-29 glib_networking = glib-networking; # added 2018-02-25 gnome-mpv = celluloid; # added 2019-08-22 + gmic_krita_qt = gmic-qt-krita; # added 2019-09-07 gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 793d1485bc1..68f8cc6d913 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1694,7 +1694,9 @@ in gmic = callPackage ../tools/graphics/gmic { }; - gmic_krita_qt = libsForQt5.callPackage ../tools/graphics/gmic_krita_qt { }; + gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { }; + + gmic-qt-krita = gmic-qt; goa = callPackage ../development/tools/goa { }; From 8ad04d92f6be2254f58024842fbdbea7afd5e1c5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Sep 2019 12:22:02 +0200 Subject: [PATCH 11/82] gmic-qt: format with nixpkgs-fmt --- pkgs/tools/graphics/gmic-qt/default.nix | 53 +++++++++++++++++++------ 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index e5bdf6f3177..44e9243d91c 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -1,11 +1,25 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig -, opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng -, curl, krita, qtbase, qttools -, fetchgit }: +{ stdenv +, fetchurl +, fetchFromGitHub +, cmake +, pkgconfig +, opencv +, openexr +, graphicsmagick +, fftw +, zlib +, libjpeg +, libtiff +, libpng +, curl +, krita +, qtbase +, qttools +, fetchgit +}: let version = "2.3.6"; - in stdenv.mkDerivation rec { pname = "gmic_krita_qt"; inherit version; @@ -41,7 +55,7 @@ in stdenv.mkDerivation rec { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${version}"; - sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3"; + sha256 = "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3"; }; unpackPhase = '' @@ -60,14 +74,29 @@ in stdenv.mkDerivation rec { make -C ../gmic/src CImg.h gmic_stdlib.h ''; - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ - qtbase qttools fftw zlib libjpeg libtiff libpng - opencv openexr graphicsmagick curl krita + nativeBuildInputs = [ + cmake + pkgconfig ]; - cmakeFlags = [ "-DGMIC_QT_HOST=krita" ]; + buildInputs = [ + qtbase + qttools + fftw + zlib + libjpeg + libtiff + libpng + opencv + openexr + graphicsmagick + curl + krita + ]; + + cmakeFlags = [ + "-DGMIC_QT_HOST=krita" + ]; installPhase = '' mkdir -p $out/bin; From d8749430e43c05e3ee1602eb1a12d53362ae29e7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Sep 2019 12:33:56 +0200 Subject: [PATCH 12/82] gmic-qt: allow building non-Krita hosts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use qt5’s mkDerivation * Also switch gimpPlugins.gmic to qmic-qt --- .../graphics/gimp/plugins/default.nix | 4 +- pkgs/tools/graphics/gmic-qt/default.nix | 73 +++++++++++++++---- .../gmic-qt/fix-gimp-plugin-path.patch | 21 ++++++ pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 87 insertions(+), 15 deletions(-) create mode 100644 pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 008bfdf881e..2c520f21f84 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -152,7 +152,9 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { installPhase = "installPlugins src/gimp-lqr-plugin"; }; - gmic = pkgs.gmic.gimpPlugin; + gmic = pkgs.gmic-qt.override { + variant = "gimp"; + }; ufraw = pkgs.ufraw.gimpPlugin; diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index 44e9243d91c..b8714e9b355 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -1,5 +1,8 @@ -{ stdenv +{ lib +, mkDerivation , fetchurl +, fetchpatch +, variant ? "standalone" , fetchFromGitHub , cmake , pkgconfig @@ -12,17 +15,44 @@ , libtiff , libpng , curl -, krita +, krita ? null +, gimp ? null , qtbase , qttools , fetchgit }: let + variants = { + gimp = { + extraDeps = [ + gimp + gimp.gtk + ]; + description = "GIMP plugin for the G'MIC image processing framework"; + }; + + krita = { + extraDeps = [ + krita + ]; + description = "Krita plugin for the G'MIC image processing framework"; + }; + + standalone = { + description = "Versatile front-end to the image processing framework G'MIC"; + }; + }; + +in + +assert lib.assertMsg (builtins.hasAttr variant variants) "gmic-qt variant “${variant}” is not supported. Please use one of ${lib.concatStringsSep ", " (builtins.attrNames variants)}."; + +assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps or []) "gmic-qt variant “${variant}” is missing one of its dependencies."; + +mkDerivation rec { + pname = "gmic-qt${lib.optionalString (variant != "standalone") ''-${variant}''}"; version = "2.3.6"; -in stdenv.mkDerivation rec { - pname = "gmic_krita_qt"; - inherit version; gmic-community = fetchFromGitHub { owner = "dtschump"; @@ -58,6 +88,24 @@ in stdenv.mkDerivation rec { sha256 = "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3"; }; + patches = [ + # Add install targets + (fetchpatch { + url = https://github.com/c-koi/gmic-qt/commit/ec4babbaf06a8711a4fd841f7de4106cda765109.patch; + sha256 = "1rim6vjx3k0yw8mplq8ampb2ykfabjj6d8vynmp8lm6n8id99yr0"; + }) + + # Fix translations installation + (fetchpatch { + url = https://github.com/c-koi/gmic-qt/commit/91f92ba589d6559541d5dfacf39dab4e0faaa106.patch; + sha256 = "1kh39349qcna386lx80kgj87xxlyh95xmwnv539z4zqnpzyqdxfs"; + }) + + # Install GIMP plug-in to a correct destination + # https://github.com/c-koi/gmic-qt/pull/78 + ./fix-gimp-plugin-path.patch + ]; + unpackPhase = '' cp -r ${gmic} gmic ln -s ${gmic-community} gmic-community @@ -91,20 +139,19 @@ in stdenv.mkDerivation rec { openexr graphicsmagick curl - krita - ]; + ] ++ variants.${variant}.extraDeps or []; cmakeFlags = [ - "-DGMIC_QT_HOST=krita" + "-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}" ]; - installPhase = '' - mkdir -p $out/bin; - install -Dm755 gmic_krita_qt "$out/bin/gmic_krita_qt" + postFixup = lib.optionalString (variant == "gimp") '' + echo "wrapping $out/${gimp.targetPluginDir}/gmic_gimp_qt" + wrapQtApp "$out/${gimp.targetPluginDir}/gmic_gimp_qt" ''; - meta = with stdenv.lib; { - description = "Krita plugin for the G'MIC image processing framework"; + meta = with lib; { + description = variants.${variant}.description; homepage = http://gmic.eu/; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch b/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch new file mode 100644 index 00000000000..ac0600fb76c --- /dev/null +++ b/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1483056..26d2b9a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -473,6 +473,7 @@ + + execute_process(COMMAND gimptool-2.0 --libs-noui OUTPUT_VARIABLE GIMP2_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND gimptool-2.0 --cflags-noui OUTPUT_VARIABLE GIMP2_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE) ++ execute_process(COMMAND pkg-config gimp-2.0 --define-variable=prefix=${CMAKE_INSTALL_PREFIX} --variable gimplibdir OUTPUT_VARIABLE GIMP2_PKGLIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GIMP2_INCLUDE_DIRS}") + + set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/Gimp/host_gimp.cpp) +@@ -484,7 +485,7 @@ + ${GIMP2_LIBRARIES} + ${gmic_qt_LIBRARIES} + ) +- install(TARGETS gmic_gimp_qt RUNTIME DESTINATION bin) ++ install(TARGETS gmic_gimp_qt RUNTIME DESTINATION "${GIMP2_PKGLIBDIR}/plug-ins") + + elseif (${GMIC_QT_HOST} STREQUAL "krita") + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68f8cc6d913..57cf9ac5e23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1696,7 +1696,9 @@ in gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { }; - gmic-qt-krita = gmic-qt; + gmic-qt-krita = gmic-qt.override { + variant = "krita"; + }; goa = callPackage ../development/tools/goa { }; From ac757fbd420f3c748f20b348951fbe6a13088ced Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Sep 2019 14:09:23 +0200 Subject: [PATCH 13/82] =?UTF-8?q?gmic:=202.2.2=20=E2=86=92=202.7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/graphics/gmic/default.nix | 61 ++++++++++++++++------------ 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index c487e42329d..c6781310bdb 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,46 +1,53 @@ -{ stdenv, fetchurl, cmake, ninja, pkgconfig -, opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng -, withGimpPlugin ? true, gimp ? null}: +{ stdenv +, fetchurl +, cmake +, ninja +, pkgconfig +, opencv +, openexr +, graphicsmagick +, fftw +, zlib +, libjpeg +, libtiff +, libpng +}: -assert withGimpPlugin -> gimp != null; - -let - version = "2.2.2"; - - # CMakeLists.txt is missing from the tarball and Makefile is terrible - CMakeLists = fetchurl { - url = "https://github.com/dtschump/gmic/raw/v.${version}/CMakeLists.txt"; - sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg"; - }; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gmic"; - inherit version; + version = "2.7.1"; - outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; + outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "0zqfj2ym5nn3ff93xh2wf9ayxqlznabbdi00xw4lm7vw3iwkzqnc"; + sha256 = "1sxgmrxv1px07h5m7dcdg24c6x39ifjbc1fmz8p2ah91pm57h7n7"; }; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ + cmake + ninja + pkgconfig + ]; buildInputs = [ - fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick - ] ++ stdenv.lib.optionals withGimpPlugin [ gimp gimp.gtk ]; + fftw + zlib + libjpeg + libtiff + libpng + opencv + openexr + graphicsmagick + ]; cmakeFlags = [ "-DBUILD_LIB_STATIC=OFF" - "-DBUILD_PLUGIN=${if withGimpPlugin then "ON" else "OFF"}" "-DENABLE_DYNAMIC_LINKING=ON" - ] ++ stdenv.lib.optional withGimpPlugin "-DPLUGIN_INSTALL_PREFIX=${placeholder "gimpPlugin"}/${gimp.targetPluginDir}"; - - postPatch = '' - cp ${CMakeLists} CMakeLists.txt - ''; + ]; meta = with stdenv.lib; { - description = "G'MIC is an open and full-featured framework for image processing"; + description = "Open and full-featured framework for image processing"; homepage = http://gmic.eu/; license = licenses.cecill20; platforms = platforms.unix; From 01e7149af6aeefb149d3e38777438242a31d5b09 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Sep 2019 15:59:34 +0200 Subject: [PATCH 14/82] =?UTF-8?q?cimg:=202.7.0=20=E2=86=92=202.7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/cimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 3e7ef6d96ee..6181122aa7f 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "1la6332cppyciyn3pflbchxa3av72a70p0n1c9sm1hgfbjlydqnv"; + sha256 = "1lw1hjk65zyd5x9w113yrqyy8db45jdzzkqslkipaiskl9f81y9z"; }; nativeBuildInputs = [ unzip ]; From 7a0f2fc3a02b6b89dbfa990c7b9908e34be62cc3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Sep 2019 16:53:01 +0200 Subject: [PATCH 15/82] =?UTF-8?q?gmic-qt:=202.3.6=20=E2=86=92=202.7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/graphics/gmic-qt/default.nix | 39 ++++++++----------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index b8714e9b355..cb0862c6373 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -4,6 +4,7 @@ , fetchpatch , variant ? "standalone" , fetchFromGitHub +, fetchFromGitLab , cmake , pkgconfig , opencv @@ -19,7 +20,6 @@ , gimp ? null , qtbase , qttools -, fetchgit }: let @@ -52,7 +52,7 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps mkDerivation rec { pname = "gmic-qt${lib.optionalString (variant != "standalone") ''-${variant}''}"; - version = "2.3.6"; + version = "2.7.1"; gmic-community = fetchFromGitHub { owner = "dtschump"; @@ -61,46 +61,35 @@ mkDerivation rec { sha256 = "08d37b49qgh5d4rds7hvr5wjj4p1y8cnbidz1cyqsibq0555pwq2"; }; - CImg = fetchgit { - url = "https://framagit.org/dtschump/CImg"; - rev = "90f5657d8eab7b549ef945103ef680e747385805"; - sha256 = "1af3dwqq18dkw0lz2gvnlw8y0kc1cw01hnc72rf3pg2wyjcp0pvc"; + CImg = fetchFromGitLab { + domain = "framagit.org"; + owner = "dtschump"; + repo = "CImg"; + rev = "v.${version}"; + sha256 = "1mfkjvf5r3ppc1dd6yvqn7xlhgzfg9k1k5v2sq2k9m70g8p7rgpd"; }; gmic_stdlib = fetchurl { name = "gmic_stdlib.h"; - # Version should e in sync with gmic. Basically the version string without dots - url = "http://gmic.eu/gmic_stdlib236.h"; - sha256 = "0q5g87dsn9byd2qqsa9xrsggfb9qv055s3l2gc0jrcvpx2qbza4q"; + url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h"; + sha256 = "0v12smknr1s44s6wq2gbnw0hb98xrwp6i3zg9wf49cl7s9qf76j3"; }; gmic = fetchFromGitHub { owner = "dtschump"; repo = "gmic"; rev = "v.${version}"; - sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi"; + sha256 = "0pa6kflr1gqgzh8rk7bylvkxs989r5jy0q7b62mnzx8895slwfb5"; }; gmic_qt = fetchFromGitHub { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${version}"; - sha256 = "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3"; + sha256 = "08a0660083wv5fb1w9qqhm4f8cfwbqq723qzqq647mid1n7sy959"; }; patches = [ - # Add install targets - (fetchpatch { - url = https://github.com/c-koi/gmic-qt/commit/ec4babbaf06a8711a4fd841f7de4106cda765109.patch; - sha256 = "1rim6vjx3k0yw8mplq8ampb2ykfabjj6d8vynmp8lm6n8id99yr0"; - }) - - # Fix translations installation - (fetchpatch { - url = https://github.com/c-koi/gmic-qt/commit/91f92ba589d6559541d5dfacf39dab4e0faaa106.patch; - sha256 = "1kh39349qcna386lx80kgj87xxlyh95xmwnv539z4zqnpzyqdxfs"; - }) - # Install GIMP plug-in to a correct destination # https://github.com/c-koi/gmic-qt/pull/78 ./fix-gimp-plugin-path.patch @@ -118,10 +107,6 @@ mkDerivation rec { cd gmic_qt ''; - preConfigure = '' - make -C ../gmic/src CImg.h gmic_stdlib.h - ''; - nativeBuildInputs = [ cmake pkgconfig From e57c0f3bf9625d0cf6f4b0c3cf65aa086d3f8a50 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 8 Sep 2019 14:51:23 +0200 Subject: [PATCH 16/82] nixos/xserver: export configuration with startx and extra layouts If the X server is run manually it must be started with an `-xkbdir` argument pointing to the custom xkb directory. So we export it to /etc/X11/xkb. --- nixos/modules/services/x11/extra-layouts.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix index 5523dd2bf02..1af98a1318b 100644 --- a/nixos/modules/services/x11/extra-layouts.nix +++ b/nixos/modules/services/x11/extra-layouts.nix @@ -158,7 +158,10 @@ in }); - services.xserver.xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb"; + services.xserver = { + xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb"; + exportConfiguration = config.services.xserver.displayManager.startx.enable; + }; }; From 7468809e72366376db73b821c8f4439738a04c37 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 8 Sep 2019 14:57:52 +0200 Subject: [PATCH 17/82] nixos/doc: inform users of startx about `-xkbdir` argument needed --- nixos/doc/manual/configuration/x-windows.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 7cdc5196e0d..f6f659b02af 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -279,6 +279,12 @@ xkb_symbols "media" = "setxkbmap -keycodes media"; + + If you are manually starting the X server, you should set the argument + -xkbdir /etc/X11/xkb, otherwise X won't find your layout files. + For example with xinit run + $ xinit -- -xkbdir /etc/X11/xkb + To learn how to write layouts take a look at the XKB From e2fca8b1db9b861c7d877aac2631f734030b1f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Sun, 18 Aug 2019 15:03:38 +0200 Subject: [PATCH 18/82] nixos/xserver: refactor/fix xml tags for keyboard layout overrides With the current XML tags there is an issue when building with a custom keyboard. The description of the new keyboard layout will be missing in the built file: xkeyboard-config-2.27/share/X11/xkb/rules/evdev.lst --- pkgs/servers/x11/xorg/overrides.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b581b7e8a4c..7e081b664b3 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -468,7 +468,7 @@ self: super: ${name} - <_description>${layout.description} + ${layout.description} ${layout.description} @@ -484,8 +484,8 @@ self: super: ${name} - <_shortDescription>${name} - <_description>${layout.description} + ${name} + ${layout.description} ${concatMapStrings (lang: "${lang}\n") layout.languages} From 2e94b9853c4d76dd8a2524ee79d72a0adce1a965 Mon Sep 17 00:00:00 2001 From: Matthew Harm Bekkema Date: Mon, 9 Sep 2019 00:22:27 +1000 Subject: [PATCH 19/82] kernel: Enable X86_AMD_PLATFORM_DEVICE This is needed to get the toupad working on my Acer Nitro laptop. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 42230fe31ec..f2cb14fa182 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -698,6 +698,8 @@ let PREEMPT = no; PREEMPT_VOLUNTARY = yes; + + X86_AMD_PLATFORM_DEVICE = yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable CPU/memory hotplug support From a8973fa845e5d5d5868e3e1d6a7d9b83b5c7947c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 8 Sep 2019 17:28:52 -0300 Subject: [PATCH 20/82] shades-of-gray-theme: 1.1.8 -> 1.1.9 --- pkgs/data/themes/shades-of-gray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/pkgs/data/themes/shades-of-gray/default.nix index fb94fa00b75..5d335905273 100644 --- a/pkgs/data/themes/shades-of-gray/default.nix +++ b/pkgs/data/themes/shades-of-gray/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "shades-of-gray-theme"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "WernerFP"; repo = pname; rev = version; - sha256 = "08i2pkq7ygf9fs9cdrw4khrb8m1w2hvgmz064g36fh35r02sms3w"; + sha256 = "1hg4g242cjncrx9cn7gbzl9gj7zz2fwrkzkkbfazzrdaylbwgm4i"; }; buildInputs = [ gtk_engines ]; From 3a7c980ba10081dee41ad3b0a862787df15a4aa2 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 8 Sep 2019 13:10:36 +0300 Subject: [PATCH 21/82] tippecanoe: init at 1.34.3 --- pkgs/applications/misc/tippecanoe/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/misc/tippecanoe/default.nix diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix new file mode 100644 index 00000000000..8d84ab59d47 --- /dev/null +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, sqlite, zlib, perl }: + +stdenv.mkDerivation rec { + pname = "tippecanoe"; + version = "1.34.3"; + + src = fetchFromGitHub { + owner = "mapbox"; + repo = pname; + rev = version; + sha256 = "08pkxzwp4w5phrk9b0vszxnx8yymp50v0bcw96pz8qwk48z4xm0i"; + }; + + buildInputs = [ sqlite zlib ]; + checkInputs = [ perl ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + doCheck = true; + + meta = with stdenv.lib; { + description = "Build vector tilesets from large collections of GeoJSON features"; + homepage = https://github.com/mapbox/tippecanoe; + license = licenses.bsd2; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45acba9fb26..b816bbf3cf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20802,6 +20802,8 @@ in inherit (linuxPackages) x86_energy_perf_policy; }; + tippecanoe = callPackage ../applications/misc/tippecanoe { }; + tmatrix = callPackage ../applications/misc/tmatrix { }; tnef = callPackage ../applications/misc/tnef { }; From ed620603d40691fd29b1c1ba66a19f65c8174734 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Sun, 8 Sep 2019 14:58:15 -0700 Subject: [PATCH 22/82] ffsend: adopt installShellFiles --- pkgs/tools/misc/ffsend/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 90092c9b0c0..31642000806 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, rustPlatform, cmake, pkgconfig, openssl -, darwin +, darwin, installShellFiles , x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD , xclip ? null, xsel ? null @@ -27,7 +27,7 @@ buildRustPackage rec { cargoSha256 = "1x4hxar60lwimldpsi0frdlssgsb72qahn3dmb980sj6cmbq3f0b"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) ; @@ -41,9 +41,7 @@ buildRustPackage rec { ); postInstall = '' - install -Dm644 contrib/completions/_ffsend "$out/share/zsh/site-functions/_ffsend" - install -Dm644 contrib/completions/ffsend.bash "$out/share/bash-completion/completions/ffsend.bash" - install -Dm644 contrib/completions/ffsend.fish "$out/share/fish/vendor_completions.d/ffsend.fish" + installShellCompletion contrib/completions/ffsend.{bash,fish} --zsh contrib/completions/_ffsend ''; # There's also .elv and .ps1 completion files but I don't know where to install those From a8c3fb990f4ec4e37780632e7d0dbf33e0ba8860 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Sun, 8 Sep 2019 14:59:09 -0700 Subject: [PATCH 23/82] exa: adopt installShellFiles Also declare a separate "man" output. --- pkgs/tools/misc/exa/default.nix | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index d94f1c1929f..e05963b6902 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib -, darwin, libiconv +, darwin, libiconv, installShellFiles }: with rustPlatform; @@ -17,24 +17,20 @@ buildRustPackage rec { sha256 = "14qlm9zb9v22hxbbi833xaq2b7qsxnmh15s317200vz5f1305hhw"; }; - nativeBuildInputs = [ cmake pkgconfig perl ]; + nativeBuildInputs = [ cmake pkgconfig perl installShellFiles ]; buildInputs = [ zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ] ; + outputs = [ "out" "man" ]; + postInstall = '' - mkdir -p $out/share/man/man1 - cp contrib/man/exa.1 $out/share/man/man1/ - - mkdir -p $out/share/bash-completion/completions - cp contrib/completions.bash $out/share/bash-completion/completions/exa - - mkdir -p $out/share/fish/vendor_completions.d - cp contrib/completions.fish $out/share/fish/vendor_completions.d/exa.fish - - mkdir -p $out/share/zsh/site-functions - cp contrib/completions.zsh $out/share/zsh/site-functions/_exa + installManPage contrib/man/exa.1 + installShellCompletion \ + --name exa contrib/completions.bash \ + --name exa.fish contrib/completions.fish \ + --name _exa contrib/completions.zsh ''; # Some tests fail, but Travis ensures a proper build From f688c794746d555a221e9aa242c20a563c070bcd Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Mon, 9 Sep 2019 11:38:55 +0800 Subject: [PATCH 24/82] parity: update cargoSha256 hash --- pkgs/applications/blockchains/parity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix index 9b5a72077d5..88d24a87e13 100644 --- a/pkgs/applications/blockchains/parity/default.nix +++ b/pkgs/applications/blockchains/parity/default.nix @@ -1,6 +1,6 @@ let version = "2.5.7"; sha256 = "0aprs71cbf98dsvjz0kydngkvdg5x7dijji8j6xadgvsarl1ljnj"; - cargoSha256 = "0aa0nkv3jr7cdzswbxghxxv0y65a59jgs1682ch8vrasi0x17m1x"; + cargoSha256 = "11mr5q5aynli9xm4wnxcypl3ij7f4b0p7l557yi9n0cvdraw8ki4"; in import ./parity.nix { inherit version sha256 cargoSha256; } From 5a1df82bc57a188a24015218bffe42c19ff8e20c Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Mon, 9 Sep 2019 11:39:14 +0800 Subject: [PATCH 25/82] parity-beta: update cargoSha256 hash --- pkgs/applications/blockchains/parity/beta.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix index a936691bd79..a6d4660dff1 100644 --- a/pkgs/applications/blockchains/parity/beta.nix +++ b/pkgs/applications/blockchains/parity/beta.nix @@ -1,6 +1,6 @@ let version = "2.6.2"; sha256 = "1j4249m5k3bi7di0wq6fm64zv3nlpgmg4hr5hnn94fyc09nz9n1r"; - cargoSha256 = "18zd91n04wck3gd8szj4vxn3jq0bzq0h3rg0wcs6nzacbzhcx2sw"; + cargoSha256 = "1wr0i54zc3l6n0x6cvlq9zfy3bw9w5fcvdz4vmyym9r1nkvk31s7"; in import ./parity.nix { inherit version sha256 cargoSha256; } From c78216067b1153cf9ca65493b18ae121960ad2d2 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 26 Aug 2019 20:43:18 +0800 Subject: [PATCH 26/82] xxdiff: drop the old qt4 version in favour of qt5 --- .../development/tools/misc/xxdiff/default.nix | 51 ++++++++++++++----- pkgs/development/tools/misc/xxdiff/tip.nix | 36 ------------- pkgs/top-level/all-packages.nix | 7 ++- 3 files changed, 40 insertions(+), 54 deletions(-) delete mode 100644 pkgs/development/tools/misc/xxdiff/tip.nix diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index 51f4de8eacc..c187ad42c0e 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -1,28 +1,51 @@ -{ stdenv, fetchurl, qt4, flex, bison, docutils }: +{ lib, mkDerivation, fetchFromBitbucket, docutils, bison, flex, qmake +, qtbase +}: -stdenv.mkDerivation rec { - name = "xxdiff-4.0.1"; +mkDerivation rec { + pname = "xxdiff"; + version = "5.0b1"; - src = fetchurl { - url = "mirror://sourceforge/xxdiff/${name}.tar.bz2"; - sha256 = "0050qd12fvlcfdh0iwjsaxgxdq7jsl70f85fbi7pz23skpddsn5z"; + src = fetchFromBitbucket { + owner = "blais"; + repo = pname; + rev = "5e5f885dfc43559549a81c59e9e8c9525306356a"; + sha256 = "0gbvxrkwkbvag3298j89smszghpr8ilxxfb0cvsknfqdf15b296w"; }; - nativeBuildInputs = [ flex bison qt4 docutils ]; + nativeBuildInputs = [ bison docutils flex qmake ]; - buildInputs = [ qt4 ]; + buildInputs = [ qtbase ]; - QMAKE = "qmake"; + dontUseQmakeConfigure = true; - configurePhase = "cd src; make -f Makefile.bootstrap"; + # c++11 and above is needed for building with Qt 5.9+ + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; - installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin"; + sourceRoot = "source/src"; - meta = with stdenv.lib; { - homepage = http://furius.ca/xxdiff/; + postPatch = '' + substituteInPlace xxdiff.pro --replace ../bin ./bin + ''; + + preConfigure = '' + make -f Makefile.bootstrap + ''; + + installPhase = '' + runHook preInstall + + install -Dm555 -t $out/bin ./bin/xxdiff + install -Dm444 -t $out/share/doc/${pname} ${src}/README + + runHook postInstall + ''; + + meta = with lib; { description = "Graphical file and directories comparator and merge tool"; + homepage = "http://furius.ca/xxdiff/"; license = licenses.gpl2; + maintainers = with maintainers; [ pSub raskin ]; platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix deleted file mode 100644 index 04827fade70..00000000000 --- a/pkgs/development/tools/misc/xxdiff/tip.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }: - -stdenv.mkDerivation { - name = "xxdiff-5.0b1"; - - src = fetchFromBitbucket { - owner = "blais"; - repo = "xxdiff"; - rev = "5e5f885dfc43559549a81c59e9e8c9525306356a"; - sha256 = "0gbvxrkwkbvag3298j89smszghpr8ilxxfb0cvsknfqdf15b296w"; - }; - - nativeBuildInputs = [ flex bison docutils ]; - - buildInputs = [ qtbase ]; - - # Fixes build with Qt 5.9 - NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; - - preConfigure = '' - cd src - make -f Makefile.bootstrap - ''; - - postInstall = '' - install -D ../bin/xxdiff $out/bin/xxdiff - ''; - - meta = with stdenv.lib; { - homepage = http://furius.ca/xxdiff/; - description = "Graphical file and directories comparator and merge tool"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ pSub raskin ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca37025f7f3..382802f0cd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10192,10 +10192,9 @@ in xpwn = callPackage ../development/mobile/xpwn {}; - xxdiff = callPackage ../development/tools/misc/xxdiff { - bison = bison2; - }; - xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { }; + xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { }; + + xxdiff-tip = xxdiff; yaml2json = callPackage ../development/tools/yaml2json { }; From e72ec381b2ef090a84985bce86d4a308b86d9c3b Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Mon, 9 Sep 2019 08:04:22 +0100 Subject: [PATCH 27/82] ociTools: fixing outdated documentation --- doc/functions/ocitools.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/functions/ocitools.xml b/doc/functions/ocitools.xml index 4500c41a34a..163bee2382e 100644 --- a/doc/functions/ocitools.xml +++ b/doc/functions/ocitools.xml @@ -31,10 +31,10 @@ Build Container buildContainer { - cmd = with pkgs; writeScript "run.sh" '' + args = [ (with pkgs; writeScript "run.sh" '' #!${bash}/bin/bash ${coreutils}/bin/exec ${bash}/bin/bash - ''; + '').outPath ]; mounts = { "/data" = { @@ -51,7 +51,7 @@ buildContainer { - cmd specifies the program to run inside the container. + args specifies a set of arguments to run inside the container. This is the only required argument for buildContainer. All referenced packages inside the derivation will be made available inside the container From a96ef6cca5e93dc7f90b38054e98fa4f91c4ecc0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 9 Sep 2019 09:45:13 +0200 Subject: [PATCH 28/82] git-cola: fix wrapping --- .../version-management/git-and-tools/git-cola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 6945e24ee46..545fc77168e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -21,8 +21,8 @@ in buildPythonApplication rec { doCheck = false; postFixup = '' - wrapQtApp bin/git-cola - wrapQtApp bin/git-dag + wrapQtApp $out/bin/git-cola + wrapQtApp $out/bin/git-dag ''; From 98c17a68e778bbd3ddb957adb7be7a72ab3505dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 9 Sep 2019 09:52:08 +0200 Subject: [PATCH 29/82] cachix: fix build --- pkgs/development/haskell-modules/configuration-nix.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 29483b56a7d..88ec8ad85ff 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -94,7 +94,12 @@ self: super: builtins.intersectAttrs super { # Won't find it's header files without help. sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; - cachix = enableSeparateBinOutput super.cachix; + cachix = overrideCabal (addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost]) (drv: { + postPatch = (drv.postPatch or "") + '' + substituteInPlace cachix.cabal --replace "c++14" "c++17" + ''; + }); + ghcid = enableSeparateBinOutput super.ghcid; hzk = overrideCabal super.hzk (drv: { From 8af0412e9094acf7d7501175821b40743732f0f9 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 9 Sep 2019 10:59:58 +0300 Subject: [PATCH 30/82] gixy: fix error - no module named pkg_resources --- pkgs/tools/admin/gixy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index ab5aad6d68c..bbec64c0aee 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -25,6 +25,7 @@ python.pkgs.buildPythonApplication rec { pyparsing jinja2 nose + setuptools six ]; From bcc8db0298642f56e4d02fde3f91b2dacdc5cb1f Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 9 Sep 2019 13:12:59 +0200 Subject: [PATCH 31/82] kind: 0.3.0 -> 0.5.1 (#68319) --- pkgs/development/tools/kind/default.nix | 9 +- pkgs/development/tools/kind/deps.nix | 227 +++++++++++++----------- 2 files changed, 130 insertions(+), 106 deletions(-) diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 5246a51aabb..4ac57d0e850 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -4,21 +4,18 @@ with stdenv.lib; buildGoPackage rec { pname = "kind"; - version = "0.3.0"; + version = "0.5.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "1azl5knw1n7g42xp92r9k7y4rzwp9xx0spcldszrpry2v4lmc5sb"; + sha256 = "12bjvma98dlxybqs43dggnd6cihxm18xz68a5jw8dzf0cg738gs8"; }; - # move dev tool package that confuses the go compiler - patchPhase = "rm -r hack"; - goDeps = ./deps.nix; goPackagePath = "sigs.k8s.io/kind"; - excludedPackages = "images/base/entrypoint"; + subPackages = [ "." ]; meta = { description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; diff --git a/pkgs/development/tools/kind/deps.nix b/pkgs/development/tools/kind/deps.nix index 1681fe9e2eb..c5557c2aa49 100644 --- a/pkgs/development/tools/kind/deps.nix +++ b/pkgs/development/tools/kind/deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/purell"; - rev = "v1.1.0"; - sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; + rev = "v1.1.1"; + sha256 = "0c525frsxmalrn55hzzsxy17ng8avkd40ga0wxfw9haxsdjgqdqy"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/emicklei/go-restful"; - rev = "ff4f55a20633"; - sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c"; + rev = "v2.9.6"; + sha256 = "0dgjld5240xhz45rj929ffm452n931qfw3fx8x99vhlnii9qrwz2"; }; } { @@ -50,8 +50,17 @@ fetch = { type = "git"; url = "https://github.com/evanphx/json-patch"; - rev = "v4.2.0"; - sha256 = "0cfvyhl3hjfc4z8hbkfc40yafv6r7y513zgp3jwf88isbd13r7a6"; + rev = "v4.5.0"; + sha256 = "144mk2v9q37l1qjf8498nff4hhz96mlkl7ls7ihixbmrji4lmch4"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } { @@ -59,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/ghodss/yaml"; - rev = "v1.0.0"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + rev = "73d445a93680"; + sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; }; } { @@ -68,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/go-openapi/jsonpointer"; - rev = "v0.17.0"; - sha256 = "0sv2k1fwj6rsigc9489c19ap0jib1d0widm040h0sjdw2nadh3i2"; + rev = "v0.19.2"; + sha256 = "1s3cqf4svrbygvvpvi7hf122szsgihas52vqh0bba3avf4w03g9n"; }; } { @@ -77,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/go-openapi/jsonreference"; - rev = "v0.17.0"; - sha256 = "1d0rk17wn755xsfi9pxifdpgs2p23bc0rkf95kjwxczyy6jbqdaj"; + rev = "v0.19.2"; + sha256 = "0v933yvcwyzzlpdxwb9204ki7lls2rwfd96ww2i901ndvz37kdf8"; }; } { @@ -86,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/go-openapi/spec"; - rev = "v0.19.0"; - sha256 = "1527dbn74c0gw9gib5lmdr5vjgp5h57r1j92c3wh37irz90vnb6a"; + rev = "v0.19.2"; + sha256 = "1r2my46qc85fp1j4lbddmd6c1n0am9bq1wyqsnw7x8raiznqxp5l"; }; } { @@ -95,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/go-openapi/swag"; - rev = "v0.17.0"; - sha256 = "1hhgbx59f7lcsqiza2is8q9walhf8mxfkwj7xql1scrn6ms2jmlv"; + rev = "v0.19.2"; + sha256 = "1mlxlajx2p9wjm72rmqjrx5g49q2sn04y45s3nrykkf6jqlq1v4z"; }; } { @@ -113,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "4bd1920723d7"; - sha256 = "0z21hxin616xvkv075vdz416zm36qs0mbi76526l9yz8khbg7jmr"; + rev = "v1.3.1"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; }; } { @@ -140,8 +149,17 @@ fetch = { type = "git"; url = "https://github.com/googleapis/gnostic"; - rev = "68f4ded48ba9"; - sha256 = "0l6qkbpmy2qd0q8h7dghhv27qjngll739kzm389qdbjxj3inq2dl"; + rev = "v0.3.0"; + sha256 = "0bnxpkxw9kmwm27rxhgv3i0jn362wp9whmqrv0lb77874s5iz2lc"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; }; } { @@ -189,13 +207,40 @@ sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; }; } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.5"; + sha256 = "1bpq77b90z72cv9h66dvxsg2j197ylpgcps23xsjfbs752bykfw1"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } { goPackagePath = "github.com/mailru/easyjson"; fetch = { type = "git"; url = "https://github.com/mailru/easyjson"; - rev = "60711f1a8329"; - sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; + rev = "da37f6c1e481"; + sha256 = "0yhamddd1jyqslp0hm5g07ki82sp52f0idfiqylx6fm24fin74gh"; }; } { @@ -230,8 +275,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/ginkgo"; - rev = "11459a886d9c"; - sha256 = "1nswc1fnrrs792qbix05h91bilj8rr3wxmxgwi97p2gjk0r292zh"; + rev = "v1.8.0"; + sha256 = "1326s5fxgasdpz1qqwrw4n5p3k0vz44msnyz14knrhlw5l97lx33"; }; } { @@ -239,8 +284,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/gomega"; - rev = "dcabb60a477c"; - sha256 = "1775lv5jbsgv3ghq5v2827slqlhqdadrzc1nkpq4y0hdv2qzrgkm"; + rev = "v1.5.0"; + sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9"; }; } { @@ -248,8 +293,8 @@ fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; }; } { @@ -293,8 +338,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + rev = "v0.2.0"; + sha256 = "0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k"; }; } { @@ -302,8 +347,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; }; } { @@ -311,8 +356,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + rev = "5c40567a22f8"; + sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg"; }; } { @@ -320,8 +365,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "3ec191127204"; - sha256 = "0zzhbkw3065dp1jscp7q8dxw3mkwj95ixnrr8j7c47skis0m11i3"; + rev = "3b0461eec859"; + sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; }; } { @@ -329,8 +383,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + rev = "d432491b9138"; + sha256 = "0ijq720jr76yxdd6mh1rdpxh7q93w6149paclb4g39vhr84hfiv8"; }; } { @@ -338,8 +392,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; }; } { @@ -347,8 +401,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "1f849cf54d09"; - sha256 = "19a3srk9dcqad3sqd8mfg36pbaxcfkbzhp3jinhqxnzd90bds6am"; + rev = "5aca471b1d59"; + sha256 = "1i4h3q83w4y9s065w0wnnnwlssy69jbrj08k47ppsa8dnv85kyrf"; }; } { @@ -356,8 +410,17 @@ fetch = { type = "git"; url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } { @@ -369,13 +432,22 @@ sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; }; } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } { @@ -419,8 +491,8 @@ fetch = { type = "git"; url = "https://github.com/kubernetes/klog"; - rev = "v0.3.0"; - sha256 = "05lp8ddqnbypgszv3ra7x105qpr8rr1g4rk2148wcmgfjrfhw437"; + rev = "v0.3.3"; + sha256 = "1gk1jhhyzsqcb4wnb02hkp8fwmk3ac924yzk87hfc6sgz43jplpn"; }; } { @@ -428,17 +500,17 @@ fetch = { type = "git"; url = "https://github.com/kubernetes/kube-openapi"; - rev = "a01b7d5d6c22"; - sha256 = "182s6gqhzal5602dfyk9h8adsdqgh5fmgh0bifksp1x856v4aizx"; + rev = "db7b694dc208"; + sha256 = "11pmxz6if6gphspyyjqrphwclg02mgnp30mn1i0lr8r21d64m148"; }; } { - goPackagePath = "sigs.k8s.io/kustomize"; + goPackagePath = "sigs.k8s.io/kustomize/v3"; fetch = { type = "git"; url = "https://github.com/kubernetes-sigs/kustomize"; - rev = "v2.0.3"; - sha256 = "1dfkpx9rllj1bzm5f52bx404kdds3zx1h38yqri9ha3p3pcb1bbb"; + rev = "4b67a6de1296"; + sha256 = "1qi5swzs3qix9mimrc660hxh9qgcrbcw49z4w27hdv27xl5fa0rd"; }; } { @@ -446,8 +518,8 @@ fetch = { type = "git"; url = "https://github.com/kubernetes-sigs/structured-merge-diff"; - rev = "ea680f03cc65"; - sha256 = "1drc908qcvwifvbz12vxahplycnaj177pz5ay6ygbn3q8824qv7b"; + rev = "15d366b2352e"; + sha256 = "1anrx09ksgrwjwmbrcrk3hx8wyzjaakzmmn36nd23if36nv1xg11"; }; } { @@ -459,49 +531,4 @@ sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; }; } - { - goPackagePath = "github.com/vishvananda/netlink"; - fetch = { - type = "git"; - url = "https://github.com/vishvananda/netlink"; - rev = "v1.0.0"; - sha256 = "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0"; - }; - } - { - goPackagePath = "github.com/vishvananda/netns"; - fetch = { - type = "git"; - url = "https://github.com/vishvananda/netns"; - rev = "13995c7128cc"; - sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "9f3314589c9a"; - sha256 = "13rr34jmgisgy8mc7yqz3474w4qbs01gz4b7zrgkvikdv4a6py3h"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "9d24e82272b4"; - sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; - }; - } - { - goPackagePath = "k8s.io/utils"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/utils"; - rev = "8fab8cb257d5"; - sha256 = "0ckkl9zj8c0p5csfgsnvgb3vm91l2zgxgxhbjcf3ds3wryljalyj"; - }; - } ] From 862e91dc6bc3722438a476d65e710f89ec66b379 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 9 Sep 2019 13:28:29 +0200 Subject: [PATCH 32/82] helm: 2.14.2 -> 2.14.3 --- pkgs/applications/networking/cluster/helm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index b32862bb4d6..f0edbdf3ed6 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,14 +1,14 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - version = "2.14.2"; + version = "2.14.3"; pname = "helm"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "0hxfyfpmhgr5jilp2xm9d5vxiq5fcgqm2hh4g4izcgiz9bz7b6k0"; + sha256 = "18ly31db2kxybjlisz8dfz3cdxs7j2wsh4rx5lwhbm5hpp42h17d"; }; goPackagePath = "k8s.io/helm"; From 0bf5907aa9494bb341ce65fa526e7b831ae26f10 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 5 Sep 2019 20:00:19 +0200 Subject: [PATCH 33/82] ipfs: 0.4.21 -> 0.4.22, use Go 1.12 --- pkgs/applications/networking/ipfs/default.nix | 8 +++----- pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 54943533b85..db325cf1387 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,19 +2,17 @@ buildGoModule rec { pname = "ipfs"; - version = "0.4.21"; + version = "0.4.22"; rev = "v${version}"; - goPackagePath = "github.com/ipfs/go-ipfs"; - src = fetchFromGitHub { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "0jlj89vjy4nw3x3j45r16y8bph5ss5lp907pjgqvad0naxbf99b0"; + sha256 = "1drwkam2m1qdny51l7ja9vd33jffy8w0z0wbp28ajx4glp0kyra2"; }; - modSha256 = "0d9rq0hig9jwv9jfajfyj2111arikqzdnyhf5aqkwahcblpx54iy"; + modSha256 = "0jbzkifn88myk2vpd390clyl835978vpcfz912y8cnl26s6q677n"; meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d27cccbc9c9..e831241181f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4001,7 +4001,12 @@ in iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { }; + ipfs = callPackage ../applications/networking/ipfs { + # Version 0.4.22 fails to build with go 1.13 due to version validation: + # go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z) + # This is fixed in master, but release containing the fix does not exist yet. + buildGoModule = buildGo112Module; + }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; From bf96e6da6d0cadf12124a887721d0efb422d9146 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Sep 2019 13:26:09 +0200 Subject: [PATCH 34/82] =?UTF-8?q?graphene:=201.9.6=20=E2=86=92=201.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/graphene/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 0348135c7b2..f1a9dacd4e2 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "graphene"; - version = "1.9.6"; + version = "1.10.0"; outputs = [ "out" "devdoc" "installedTests" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "ebassi"; repo = pname; rev = version; - sha256 = "0hb7s6g00l7zlf4hlfda55krn0pls9ajz0hcqrh8m656zr18ddwa"; + sha256 = "16vqwih5bfxv7r3mm7iiha804rpsxzxjfrs4kx76d9q5yg2hayxr"; }; patches = [ From 5fe42dde52368357b30b6eeef3683b82c96ea239 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Sep 2019 13:36:49 +0200 Subject: [PATCH 35/82] =?UTF-8?q?gthree:=20unstable-2019-08-21=20=E2=86=92?= =?UTF-8?q?=200.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://blogs.gnome.org/alexl/2019/09/09/gthree-ready-to-play/ https://github.com/alexlarsson/gthree/releases/tag/0.2.0 --- pkgs/development/libraries/gthree/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix index 1af62e14d8d..04d7c8d8f4d 100644 --- a/pkgs/development/libraries/gthree/default.nix +++ b/pkgs/development/libraries/gthree/default.nix @@ -15,28 +15,19 @@ , json-glib }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gthree"; - version = "unstable-2019-08-21"; + version = "0.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "alexlarsson"; repo = "gthree"; - rev = "dac46b0f35e29319c004c7e17b5f345ef4c04cb8"; - sha256 = "16ixis2g04000zffm44s7ir64vn3byz9a793g2s76aasqybl86i2"; + rev = version; + sha256 = "16ap1ampnzsyhrs84b168d6889lh8sjr2j5sqv9mdbnnhy72p5cd"; }; - patches = [ - # correctly declare json-glib in .pc file - # https://github.com/alexlarsson/gthree/pull/61 - (fetchpatch { - url = https://github.com/alexlarsson/gthree/commit/784b1f20e0b6eb15f113a51f74c2cba871249861.patch; - sha256 = "07vxafaxris5a98w751aw04nlw0l45np1lba08xd16wdzmkadz0x"; - }) - ]; - nativeBuildInputs = [ ninja meson @@ -64,7 +55,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "GObject/GTK port of three.js"; - homepage = https://github.com/alexlarsson/gthree; + homepage = "https://github.com/alexlarsson/gthree"; license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; From 16203d6a8b9b997965fffaf5990232336c9fa12b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Sep 2019 13:51:05 +0200 Subject: [PATCH 36/82] =?UTF-8?q?gnome-hexgl:=20unstable-2019-08-21=20?= =?UTF-8?q?=E2=86=92=200.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/alexlarsson/gnome-hexgl/releases/tag/0.2.0 --- pkgs/games/gnome-hexgl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix index 340dd20aaaf..6212c1bbec1 100644 --- a/pkgs/games/gnome-hexgl/default.nix +++ b/pkgs/games/gnome-hexgl/default.nix @@ -9,15 +9,15 @@ , gtk3 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gnome-hexgl"; - version = "unstable-2019-08-21"; + version = "0.2.0"; src = fetchFromGitHub { owner = "alexlarsson"; repo = "gnome-hexgl"; - rev = "c6edde1250b830c7c8ee738905cb39abef67d4a6"; - sha256 = "17j236damqij8n4a37psvkfxbbc18yw03s3hs0qxgfhl4671wf6z"; + rev = version; + sha256 = "08iy2iciscd2wbhh6v4cpghx8r94v1ffbgla9yb3bcsdhlag0iw4"; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gthree port of HexGL"; - homepage = https://github.com/alexlarsson/gnome-hexgl; + homepage = "https://github.com/alexlarsson/gnome-hexgl"; license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; From 4a53284bc0bdf041e2be66ff860ab34ca2a63c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 9 Sep 2019 13:18:07 +0100 Subject: [PATCH 37/82] python.pkgs.MySQL_python: remove Reasons: - No release since 2014 - deprecated by upstream - no longer compatible with newer libmysql versions --- .../python-modules/mysql_python/default.nix | 33 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 35 deletions(-) delete mode 100644 pkgs/development/python-modules/mysql_python/default.nix diff --git a/pkgs/development/python-modules/mysql_python/default.nix b/pkgs/development/python-modules/mysql_python/default.nix deleted file mode 100644 index 0ab11521cc8..00000000000 --- a/pkgs/development/python-modules/mysql_python/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv -, buildPythonPackage -, isPy3k -, fetchPypi -, nose -, pkgs -}: - -buildPythonPackage rec { - pname = "MySQL-python"; - version = "1.2.5"; - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441"; - }; - - checkInputs = [ nose ]; - nativeBuildInputs = [ pkgs.mysql.connector-c ]; - buildInputs = [ pkgs.mysql.connector-c ]; - - # plenty of failing tests - doCheck = false; - - meta = with stdenv.lib; { - description = "MySQL database binding for Python"; - homepage = https://sourceforge.net/projects/mysql-python; - license = licenses.gpl3; - }; - -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e936afd5ea..c010555d28c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3873,8 +3873,6 @@ in { monotonic = callPackage ../development/python-modules/monotonic { }; - MySQL_python = callPackage ../development/python-modules/mysql_python { }; - mysql-connector = callPackage ../development/python-modules/mysql-connector { }; namebench = callPackage ../development/python-modules/namebench { }; From 5e3faee99fcc02152bbba89dca74690996df2f1d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 9 Sep 2019 08:18:51 -0400 Subject: [PATCH 38/82] oh-my-zsh: 2019-08-07 -> 2019-09-08 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 61e60e97edd..d83a8a115ab 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-08-07"; + version = "2019-09-08"; pname = "oh-my-zsh"; - rev = "40fafe0f59371d1a9d83b83c614acfd1d740aabb"; + rev = "fd4571d1b02ac68833a5b5c166395434723b9128"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "0vk78dkrgbj51jvbpn337d7dnsb3p7cdj4bk92m6xqby5lmk4q01"; + sha256 = "1294na7mb48xa5iifbsjvggiznglnydlnwhb1zqwrmdi84qhydri"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From c51eaf4398a7c2f82d7d31d217191b06342571dc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 9 Sep 2019 08:19:08 -0400 Subject: [PATCH 39/82] slack-theme-black: 2019-07-26 -> 2019-09-07 --- .../networking/instant-messengers/slack/dark-theme.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix index 58cc7a220b9..f36e32731be 100644 --- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix +++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix @@ -1,13 +1,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - rev = "e2a6a9cd9da70175881ab991220c86aa87179509"; - version = "2019-07-26"; + rev = "779bf26f7d9754879fbc1e308fc35ee154fd4b97"; + version = "2019-09-07"; pname = "slack-theme-black"; src = fetchgit { inherit rev; url = "https://github.com/laCour/slack-night-mode"; - sha256 = "1jwxy63qzgvr83idsgcg7yhm9kn0ybfji1m964c5c6ypzcm7j10v"; + sha256 = "0p3wjwwchb0zw10rf5qlx7ffxryb42hixfrji36c57g1853qhw0f"; }; dontUnpack = true; From 69796183b3177fec8bfa912aa7c2dddf91fff17e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 9 Sep 2019 08:59:03 -0400 Subject: [PATCH 40/82] docker: 18.09.8 -> 18.09.9 --- pkgs/applications/virtualization/docker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 72b885b79e7..fb25b07449c 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -201,9 +201,9 @@ rec { # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* docker_18_09 = makeOverridable dockerGen { - version = "18.09.8"; - rev = "0dd43dd87fd530113bf44c9bba9ad8b20ce4637f"; - sha256 = "07ljxdqylbfbq1939hqyaav966ga7ds5b38dn7af1h0aks86y2s3"; + version = "18.09.9"; + rev = "039a7df9ba8097dd987370782fcdd6ea79b26016"; + sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h"; runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; From 8a18c9f26148d1bcfcd9ba711d56e8bdb80899a1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 9 Sep 2019 09:11:41 -0400 Subject: [PATCH 41/82] docker: 19.03.1 -> 19.03.2 --- pkgs/applications/virtualization/docker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index fb25b07449c..027404439cd 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -213,9 +213,9 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.1"; - rev = "74b1e89e8ac68948be88fe0aa1e2767ae28659fe"; - sha256 = "1m7bq7la29d8piwiq5whzcyrm7g3lv497wnri0lh6gxi10nwv06h"; + version = "19.03.2"; + rev = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"; + sha256 = "0bghqwxlx4v06bwcv3c2wizbihhf983gvypx5sjcbgmiyd3bgb47"; runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; From 24c55e2c9d4be35b778bfb08db7832756f2dc93b Mon Sep 17 00:00:00 2001 From: Jos van Bakel Date: Sun, 8 Sep 2019 14:20:34 +0200 Subject: [PATCH 42/82] sonic-pi: fix qt wrapper --- pkgs/applications/audio/sonic-pi/default.nix | 45 +++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 7934af8aad8..2a39caa0865 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -1,4 +1,6 @@ -{ stdenv +{ mkDerivation +, lib +, qtbase , fetchFromGitHub , fftwSinglePrec , ruby @@ -6,20 +8,21 @@ , aubio , cmake , pkgconfig -, qt5 -, libsForQt5 , boost , bash -, makeWrapper , jack2Full +, supercollider +, qscintilla +, qwt }: let - supercollider = libsForQt5.callPackage ../../../development/interpreters/supercollider { - fftw = fftwSinglePrec; - }; -in stdenv.mkDerivation rec { + supercollider_single_prec = supercollider.override { fftw = fftwSinglePrec; }; + +in + +mkDerivation rec { version = "3.1.0"; pname = "sonic-pi"; @@ -33,15 +36,14 @@ in stdenv.mkDerivation rec { buildInputs = [ bash cmake - makeWrapper pkgconfig - qt5.qtbase - libsForQt5.qscintilla - libsForQt5.qwt + qtbase + qscintilla + qwt ruby libffi aubio - supercollider + supercollider_single_prec boost ]; @@ -80,20 +82,23 @@ in stdenv.mkDerivation rec { installPhase = '' runHook preInstall - cp -r . $out - wrapProgram $out/bin/sonic-pi \ + runHook postInstall + ''; + + # $out/bin/sonic-pi is a shell script, and wrapQtAppsHook doesn't wrap them. + dontWrapQtApps = true; + preFixup = '' + wrapQtApp "$out/bin/sonic-pi" \ --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2Full}/bin \ --set AUBIO_LIB "${aubio}/lib/libaubio.so" - - runHook postInstall ''; meta = { homepage = http://sonic-pi.net/; description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ Phlogistique kamilchm ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Phlogistique kamilchm ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d27cccbc9c9..0d5ff821e5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20419,7 +20419,7 @@ in wavebox = callPackage ../applications/networking/instant-messengers/wavebox { }; - sonic-pi = callPackage ../applications/audio/sonic-pi { }; + sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; st = callPackage ../applications/misc/st { conf = config.st.conf or null; From 39d0c9693eeade81d11c6219741668df4930ba5b Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 9 Sep 2019 14:31:08 +0000 Subject: [PATCH 43/82] pythonPackages.lmdb: fix build This fixes: pythonCatchConflictsPhase Found duplicated packages in closure for dependency 'lmdb': lmdb 0.97 (/build/lmdb-0.97) lmdb 0.97 (/nix/store/js0iimri6y9yqgfc111jzp3mrv5ic9cj-python3.7-lmdb-0.97/lib/python3.7/site-packages) Package duplicates found in closure, see above. Usually this happens if two packages depend on different version of the same dependency. builder for '/nix/store/9bcn2m3r5v8slmpj31hxw05j906qgl5l-python3.7-lmdb-0.97.drv' failed with exit code 1 This was probably broken by https://github.com/NixOS/nixpkgs/commit/f7e28bf5d8181926e600a222cb70180519d09726 --- pkgs/development/python-modules/lmdb/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 4f090d73e60..13adad603d1 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -16,7 +16,6 @@ buildPythonPackage rec { checkInputs = [ pytest cffi ]; checkPhase = '' - export PYTHONPATH=.:$PYTHONPATH py.test ''; @@ -24,7 +23,7 @@ buildPythonPackage rec { description = "Universal Python binding for the LMDB 'Lightning' Database"; homepage = "https://github.com/dw/py-lmdb"; license = licenses.openldap; - maintainers = with maintainers; [ copumpkin ]; + maintainers = with maintainers; [ copumpkin ivan ]; }; } From 01268fda85b7eee4e462c873d8654f975067731f Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Mon, 9 Sep 2019 11:24:15 -0400 Subject: [PATCH 44/82] 20.03 is Markhor * Markhor is a spiral horned animal that is on the endangered species list * https://en.wikipedia.org/wiki/Markhor --- .version | 2 +- lib/trivial.nix | 2 +- .../manual/release-notes/release-notes.xml | 1 + nixos/doc/manual/release-notes/rl-2003.xml | 80 +++++++++++++++++++ 4 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 nixos/doc/manual/release-notes/rl-2003.xml diff --git a/.version b/.version index ba19dc3bb41..88b8320330d 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -19.09 \ No newline at end of file +20.03 \ No newline at end of file diff --git a/lib/trivial.nix b/lib/trivial.nix index f2710a6f033..54c66cfce7b 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -134,7 +134,7 @@ rec { On each release the first letter is bumped and a new animal is chosen starting with that new letter. */ - codeName = "Loris"; + codeName = "Markhor"; /* Returns the current nixpkgs version suffix as string. */ versionSuffix = diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index 02b59147721..444862c5739 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -8,6 +8,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. + diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml new file mode 100644 index 00000000000..c84bc8dbb37 --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -0,0 +1,80 @@ +
+ Release 20.03 (“Markhor”, 2020.03/??) + +
+ Highlights + + + In addition to numerous new and upgraded packages, this release has the + following highlights: + + + + + + Support is planned until the end of October 2020, handing over to 20.09. + + + +
+ +
+ New Services + + + The following new services were added since the last release: + + + + + + + + +
+ +
+ Backward Incompatibilities + + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + + + + + +
+ +
+ Other Notable Changes + + + + + + +
+
From a80eef922da258598565c55c5ae10240109139b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 1 Sep 2019 01:56:28 +0200 Subject: [PATCH 45/82] rss2email: 3.9 -> 3.10 --- nixos/modules/services/mail/rss2email.nix | 5 ++--- .../networking/feedreaders/rss2email/default.nix | 16 ++++++---------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/mail/rss2email.nix b/nixos/modules/services/mail/rss2email.nix index df454abc826..c1e5964c453 100644 --- a/nixos/modules/services/mail/rss2email.nix +++ b/nixos/modules/services/mail/rss2email.nix @@ -43,9 +43,8 @@ in { [DEFAULT] block along with the to parameter. - See - https://github.com/rss2email/rss2email/blob/master/r2e.1 - for more information on which parameters are accepted. + See man r2e for more information on which + parameters are accepted. ''; }; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 67346d45b9f..89eef9cae4c 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -4,15 +4,13 @@ with pythonPackages; buildPythonApplication rec { pname = "rss2email"; - version = "3.9"; # TODO: on next bump, the manpage will be updated. - # Update nixos/modules/services/mail/rss2email.nix to point to it instead of - # to the online r2e.1 + version = "3.10"; propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5"; + sha256 = "1yjgbgpq9jjmpywwk6n4lzb2k7mqgdgfgm4jckv4zy0fn595pih1"; }; outputs = [ "out" "man" "doc" ]; @@ -30,14 +28,12 @@ buildPythonApplication rec { # copy documentation mkdir -p $doc/share/doc/rss2email - cp AUTHORS COPYING CHANGELOG README $doc/share/doc/rss2email/ + cp AUTHORS COPYING CHANGELOG README.rst $doc/share/doc/rss2email/ ''; - # The tests currently fail, see - # https://github.com/rss2email/rss2email/issues/14 - # postCheck = '' - # env PYTHONPATH=.:$PYTHONPATH python ./test/test.py - # ''; + postCheck = '' + env PATH=$out/bin:$PATH python ./test/test.py + ''; meta = with lib; { description = "A tool that converts RSS/Atom newsfeeds to email."; From 456c42c3e8787d83d577526af90263de9b3d512d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 9 Sep 2019 12:07:11 -0400 Subject: [PATCH 46/82] nixos/xterm: stateVersion disable by default --- nixos/doc/manual/release-notes/rl-1909.xml | 5 +++-- nixos/modules/services/x11/desktop-managers/xterm.nix | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index db462944300..f9cea242c15 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -449,8 +449,9 @@ - is now disabled by default. - It was not useful except for debugging purposes and was confusingly set as default in some circumstances. + is now disabled by default if stateVersion is 19.09 or higher. + Previously the xterm desktopManager was enabled when xserver was enabled, but it isn't useful for all people so it didn't make sense to + have any desktopManager enabled default. diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index 93987bd1dfc..1408df31295 100644 --- a/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -13,8 +13,7 @@ in services.xserver.desktopManager.xterm.enable = mkOption { type = types.bool; - default = false; - defaultText = "config.services.xserver.enable"; + default = (versionOlder config.system.stateVersion "19.09"); description = "Enable a xterm terminal as a desktop manager."; }; From e5bbe65516ddb93ee785dd46e9d3296f518c005d Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 9 Sep 2019 18:16:11 +0200 Subject: [PATCH 47/82] vdirsyncer: fix build --- pkgs/tools/misc/vdirsyncer/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 8f79f5463e3..7ac9542c6b5 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -38,11 +38,8 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; postPatch = '' - # Invalid argument: 'perform_health_check' is not a valid setting - substituteInPlace tests/conftest.py \ - --replace "perform_health_check=False" "" - substituteInPlace tests/unit/test_repair.py \ - --replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' "" + # see https://github.com/pimutils/vdirsyncer/pull/805 + substituteInPlace setup.cfg --replace --duration --durations # for setuptools_scm: echo 'Version: ${version}' >PKG-INFO From 54d039f8f45c520f4d3e100d3bfc5a7809c3c602 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 30 Aug 2019 17:39:52 -0400 Subject: [PATCH 48/82] nixos/system-path: remove wrappers from system-path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove .*-wrapped files from system-path. These files aren’t needed in the path for users. --- nixos/modules/config/system-path.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index fae2fc74008..aba9bc0945b 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -135,6 +135,9 @@ in # outputs TODO: note that the tools will often not be linked by default postBuild = '' + # Remove wrapped binaries, they shouldn't be accessible via PATH. + find $out/bin -maxdepth 1 -name ".*-wrapped" -type l -delete + if [ -x $out/bin/glib-compile-schemas -a -w $out/share/glib-2.0/schemas ]; then $out/bin/glib-compile-schemas $out/share/glib-2.0/schemas fi From 5acfae828534cacd217306df0c1cc4f46e0d3795 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 9 Sep 2019 19:12:48 +0200 Subject: [PATCH 49/82] toxvpn: 2018-04-07 -> 2019-09-09 Added myself as maintainer for problems related to mac OS. --- pkgs/tools/networking/toxvpn/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index fed7eccdf48..e4faa5e30f4 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation { - name = "toxvpn-2018-04-17"; + name = "toxvpn-2019-09-09"; src = fetchFromGitHub { owner = "cleverca22"; repo = "toxvpn"; - rev = "dc766f98888f500ea51f002f59007eac3f3a0a06"; - sha256 = "19br3fmrdm45fvymj9kvwikkn8m657yd5fkhx6grv35ckrj83mxz"; + rev = "45083dec172ce167f7ed84d571ec2822ebe4d51a"; + sha256 = "193crarrx6q0zd2p6dn67pzv8kngwi440zm1y54njgcz0v3fpxmb"; }; buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ] @@ -27,7 +27,7 @@ stdenv.mkDerivation { description = "A powerful tool that allows one to make tunneled point to point connections over Tox"; homepage = https://github.com/cleverca22/toxvpn; license = licenses.gpl3; - maintainers = with maintainers; [ cleverca22 obadz ]; + maintainers = with maintainers; [ cleverca22 obadz toonn ]; platforms = platforms.linux ++ platforms.darwin; }; } From a34b61ab30e474bea438205de38b452cd4af2e78 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 4 Sep 2019 17:17:06 +0200 Subject: [PATCH 50/82] nixos/toxvpn: Fix typo in option description --- nixos/modules/services/networking/toxvpn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix index 7daacba185f..9e97faeebc1 100644 --- a/nixos/modules/services/networking/toxvpn.nix +++ b/nixos/modules/services/networking/toxvpn.nix @@ -23,7 +23,7 @@ with lib; type = types.listOf types.str; default = []; example = ''[ "toxid1" "toxid2" ]''; - description = "peers to automacally connect to on startup"; + description = "peers to automatically connect to on startup"; }; }; }; From c473526ff3b4630dbad13323ec9f59304361a4ee Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 9 Sep 2019 18:48:16 +0100 Subject: [PATCH 51/82] kontemplate: 1.7.0 -> 1.8.0 New upstream release was made available at https://github.com/tazjin/kontemplate/releases/tag/v1.8.0 --- .../cluster/kontemplate/default.nix | 4 +- .../networking/cluster/kontemplate/deps.nix | 106 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index e38dc355d24..359b289dbbc 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kontemplate"; - version = "1.7.0"; + version = "1.8.0"; goPackagePath = "github.com/tazjin/kontemplate"; goDeps = ./deps.nix; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "tazjin"; repo = "kontemplate"; rev = "v${version}"; - sha256 = "0vzircajhrfq1nykwpl52cqgzyhy51w4ff7ldpgi95w3a4fz1hzz"; + sha256 = "123mjmmm4hynraq1fpn3j5i0a1i87l265kkjraxxxbl0zacv74i1"; }; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix index f0a52f5266e..7693968bd55 100644 --- a/pkgs/applications/networking/cluster/kontemplate/deps.nix +++ b/pkgs/applications/networking/cluster/kontemplate/deps.nix @@ -1,111 +1,111 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ + { + goPackagePath = "github.com/Masterminds/goutils"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/goutils"; + rev = "41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"; + sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; + }; + } { goPackagePath = "github.com/Masterminds/semver"; fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "c84ddcca87bf5a941b138dde832a7e20b0159ad8"; - sha256 = "1dcfdr018a0yszjpvr3wshvq9cc3kvy95l55si556p617wsn1wan"; + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "5bc3b9184d48f1412b300b87a200cf020d9254cf"; + sha256 = "1vdfm653v50jf63cw0kg2hslx50cn4mk6lj3p51bi11jrg48kfng"; }; } { goPackagePath = "github.com/Masterminds/sprig"; fetch = { - type = "git"; - url = "https://github.com/Masterminds/sprig"; - rev = "77bb58b7f5e10889a1195c21b9e7a96ee166f199"; - sha256 = "0q4g12f3nvda1skz33qzbbdd2vj3gjfwf361hyzlx20s71brk3bk"; + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "6f509977777c33eae63b2136d97f7b976cb971cc"; + sha256 = "05h9k6fhjxnpwlihj3z02q9kvqvnq53jix0ab84sx0666bci3cdh"; }; } { goPackagePath = "github.com/alecthomas/template"; fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; }; } { goPackagePath = "github.com/alecthomas/units"; fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/aokoli/goutils"; - fetch = { - type = "git"; - url = "https://github.com/aokoli/goutils"; - rev = "3391d3790d23d03408670993e957e8f408993c34"; - sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n"; + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "c3de453c63f4bdb4dadffab9805ec00426c505f7"; + sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; }; } { goPackagePath = "github.com/ghodss/yaml"; fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "e9ed3c6dfb39bb1a32197cb10d527906fe4da4b6"; - sha256 = "07cf0j3wbsl1gmn175mdgljcarfz4xbqd6pgc7b08a5lcn7zwhjz"; + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "25d852aebe32c875e9c044af3eef9c7dc6bc777f"; + sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz"; }; } { goPackagePath = "github.com/google/uuid"; fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "dec09d789f3dba190787f8b4454c7d3c936fed9e"; - sha256 = "1hc4w67p6zkh2qk7wm1yrl69jjrjjk615mly5ll4iidn1m4mzi4i"; + type = "git"; + url = "https://github.com/google/uuid"; + rev = "c2e93f3ae59f2904160ceaab466009f965df46d6"; + sha256 = "0zw8fvl6jqg0fmv6kmvhss0g4gkrbvgyvl2zgy5wdbdlgp4fja0h"; }; } { goPackagePath = "github.com/huandu/xstrings"; fetch = { - type = "git"; - url = "https://github.com/huandu/xstrings"; - rev = "7bb0250b58e5c15670406e6f93ffda43281305b1"; - sha256 = "1fc8q65xvsxpa12p8hcjqap2pf72zqlwpm165js9kwbgm2sf977c"; + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "8bbcf2f9ccb55755e748b7644164cd4bdce94c1d"; + sha256 = "1ivvc95514z63k7cpz71l0dwlanffmsh1pijhaqmp41kfiby8rsx"; }; } { goPackagePath = "github.com/imdario/mergo"; fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4"; - sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "4c317f2286be3bd0c4f1a0e622edc6398ec4656d"; + sha256 = "0bihha1qsgfjk14yv1hwddv3d8dzxpbjlaxwwyys6lhgxz1cr9h9"; }; } { goPackagePath = "golang.org/x/crypto"; fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; - sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "9756ffdc24725223350eb3266ffb92590d28f278"; + sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; }; } { goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } { goPackagePath = "gopkg.in/yaml.v2"; fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] From 6d6c3f66b0f647b9306b7cfa5016749d5f80f991 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 20 Aug 2019 14:54:37 -0400 Subject: [PATCH 52/82] linux: 5.2-rc7 -> 5.3-rc5 --- pkgs/os-specific/linux/kernel/common-config.nix | 6 +++--- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- pkgs/os-specific/linux/kernel/manual-config.nix | 1 - pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index a73a4b9cc04..23a29cfb7b1 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -145,7 +145,7 @@ let NF_TABLES_IPV4 = whenAtLeast "4.17" yes; NF_TABLES_ARP = whenAtLeast "4.17" yes; NF_TABLES_IPV6 = whenAtLeast "4.17" yes; - NF_TABLES_BRIDGE = whenAtLeast "4.17" yes; + NF_TABLES_BRIDGE = whenBetween "4.17" "5.3" yes; }; wireless = { @@ -631,8 +631,8 @@ let IDLE_PAGE_TRACKING = yes; IRDA_ULTRA = whenOlder "4.17" yes; # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 = option yes; # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB = option yes; # I-Force USB joysticks and wheels + JOYSTICK_IFORCE_232 = { optional = true; tristate = whenOlder "5.3" "y"; }; # I-Force Serial joysticks and wheels + JOYSTICK_IFORCE_USB = { optional = true; tristate = whenOlder "5.3" "y"; }; # I-Force USB joysticks and wheels JOYSTICK_XPAD_FF = option yes; # X-Box gamepad rumble support JOYSTICK_XPAD_LEDS = option yes; # LED Support for Xbox360 controller 'BigX' LED diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 59b406a91ee..452e4e7dfb3 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2-rc7"; - extraMeta.branch = "5.2"; + version = "5.3-rc5"; + extraMeta.branch = "5.3"; # modDirVersion needs to be x.y.z, will always add .0 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1128jb1y4gia5icv614ycp3c5mkvrb2l2wn20765b3si256g68n4"; + sha256 = "1hsmd53fn1irv7w0z84i3rqdi497p1hsazasjv4g3bj1s9qcqjbp"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 257aec75142..88e990501f9 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -190,7 +190,6 @@ let # To save space, exclude a bunch of unneeded stuff when copying. (cd .. && rsync --archive --prune-empty-dirs \ --exclude='/build/' \ - --exclude='/Documentation/' \ * $dev/lib/modules/${modDirVersion}/source/) cd $dev/lib/modules/${modDirVersion}/source diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e7d7639ec1..b85585c435a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15745,8 +15745,6 @@ in linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions ]; }; From d37427c17b36527155c9e4e632b1dabc9025726d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Aug 2019 08:40:14 -0400 Subject: [PATCH 53/82] linux: 5.3-rc5 -> 5.3-rc6 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 452e4e7dfb3..3080cdfdcfc 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.3-rc5"; + version = "5.3-rc6"; extraMeta.branch = "5.3"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1hsmd53fn1irv7w0z84i3rqdi497p1hsazasjv4g3bj1s9qcqjbp"; + sha256 = "0q6h4hr42bi6cj8vi3g2v4yqj7x8rz8npz8sr2lxh0gy35akjdig"; }; # Should the testing kernels ever be built on Hydra? From acfea2179b633521c0c1688c099c01bed72e70f8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 3 Sep 2019 14:13:46 -0400 Subject: [PATCH 54/82] linux: 5.3-rc6 -> 5.3-rc7 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 3080cdfdcfc..06500b33643 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.3-rc6"; + version = "5.3-rc7"; extraMeta.branch = "5.3"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0q6h4hr42bi6cj8vi3g2v4yqj7x8rz8npz8sr2lxh0gy35akjdig"; + sha256 = "1cjiy4sd681k6c75kjwldp4h7nqr9if668h3lcg09qyd80cqbywp"; }; # Should the testing kernels ever be built on Hydra? From 557c933bca07a303ad87e03839cf1d4ebc389c79 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 9 Sep 2019 09:22:27 -0400 Subject: [PATCH 55/82] linux: 5.3-rc7 -> 5.3-rc8 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 06500b33643..e653a6459df 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.3-rc7"; + version = "5.3-rc8"; extraMeta.branch = "5.3"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1cjiy4sd681k6c75kjwldp4h7nqr9if668h3lcg09qyd80cqbywp"; + sha256 = "01pr8xb9akjzafl8zkpwwkmlsjxghv5bx0larkjqdakjfspqnhzj"; }; # Should the testing kernels ever be built on Hydra? From 4bee4a2400a0df3d81e1d86de88b1f30b62a8efe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Sep 2019 21:41:32 +0200 Subject: [PATCH 56/82] liblouis: format with nixpkgs-fmt --- .../libraries/liblouis/default.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 6dfb95d1fb8..96977f34514 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -1,12 +1,18 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, gettext, python3 -, texinfo, help2man, libyaml, perl +{ fetchFromGitHub +, stdenv +, autoreconfHook +, pkgconfig +, gettext +, python3 +, texinfo +, help2man +, libyaml +, perl }: -let - version = "3.10.0"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "liblouis"; - inherit version; + version = "3.10.0"; src = fetchFromGitHub { owner = "liblouis"; @@ -18,9 +24,13 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" "man" "info" "doc" ]; nativeBuildInputs = [ - autoreconfHook pkgconfig gettext python3 + autoreconfHook + pkgconfig + gettext + python3 # Docs, man, info - texinfo help2man + texinfo + help2man ]; buildInputs = [ From cf7995dbfa10ae04236278bc1423b905afccd041 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Sep 2019 21:42:08 +0200 Subject: [PATCH 57/82] =?UTF-8?q?liblouis:=203.10.0=20=E2=86=92=203.11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit http://liblouis.org/liblouis/2019/09/02/release-3.11.0.html --- pkgs/development/libraries/liblouis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 96977f34514..0f73be7ebce 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "1wimv2wfl566jp8hhrxr91dmx20hldqzj70dar8i9k3hzq1kmb4q"; + sha256 = "1y0pypgxchxczdnjkblibbvvy4gdk2pf8dzpqmbf824c7zpy8z5r"; }; outputs = [ "out" "dev" "man" "info" "doc" ]; From 44d32929f6a85202d939c0b4e5aa50e93f8979f8 Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Sun, 12 May 2019 11:34:33 -0400 Subject: [PATCH 58/82] kakounePlugins.kak-ansi: init at 0.2.1 --- .../editors/kakoune/plugins/default.nix | 1 + .../editors/kakoune/plugins/kak-ansi.nix | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/editors/kakoune/plugins/kak-ansi.nix diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix index f53d345d49e..61e2b3a5845 100644 --- a/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/pkgs/applications/editors/kakoune/plugins/default.nix @@ -3,6 +3,7 @@ { inherit parinfer-rust; + kak-ansi = pkgs.callPackage ./kak-ansi.nix { }; kak-auto-pairs = pkgs.callPackage ./kak-auto-pairs.nix { }; kak-buffers = pkgs.callPackage ./kak-buffers.nix { }; kak-fzf = pkgs.callPackage ./kak-fzf.nix { }; diff --git a/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix b/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix new file mode 100644 index 00000000000..408cba45fbe --- /dev/null +++ b/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "kak-ansi"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "eraserhd"; + repo = "kak-ansi"; + rev = "v${version}"; + sha256 = "0ddjih8hfyf6s4g7y46p1355kklaw1ydzzh61141i0r45wyb2d0d"; + }; + + installPhase = '' + mkdir -p $out/bin $out/share/kak/autoload/plugins/ + cp kak-ansi-filter $out/bin/ + # Hard-code path of filter and don't try to build when Kakoune boots + sed ' + /^declare-option.* ansi_filter /i\ +declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter} + /^declare-option.* ansi_filter /,/^}/d + ' rc/ansi.kak >$out/share/kak/autoload/plugins/ansi.kak + ''; + + meta = with stdenv.lib; { + description = "Kakoune support for rendering ANSI code"; + homepage = "https://github.com/eraserhd/kak-ansi"; + license = licenses.unlicense; + maintainers = with maintainers; [ eraserhd ]; + platforms = platforms.all; + }; +} From a9e0f1dee18632fd572e389f829bb15054ce26c0 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 9 Sep 2019 16:09:05 -0400 Subject: [PATCH 59/82] fwupd: add setuptools for python It's no longer propagated so we need to add it. Was failing like: FAILED: libfwupd/fwupd.map /build/fwupd-1.2.10/libfwupd/generate-version-script.py LIBFWUPD libfwupd/Fwupd-2.0.gir libfwupd/fwupd.map Traceback (most recent call last): File "/build/fwupd-1.2.10/libfwupd/generate-version-script.py", line 11, in from pkg_resources import parse_version ModuleNotFoundError: No module named 'pkg_resources' --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index c688d8c6ab3..9fdf9ca0bc1 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -57,6 +57,7 @@ let pygobject3 pycairo pillow + setuptools ]); installedTestsPython = python3.withPackages (p: with p; [ From c29b2cbb24626c412f06e89866206b0f2f5f37ae Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 9 Sep 2019 16:20:50 -0400 Subject: [PATCH 60/82] iasl: drop uneeded patch --- pkgs/development/compilers/iasl/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 1bcf4106a34..fccdf7a978d 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -17,12 +17,6 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex ]; - patches = fetchpatch { - /* https://github.com/acpica/acpica/pull/389 */ - url = "https://github.com/acpica/acpica/commit/935ca65f7806a3ef9bd02a947e50f3a1f586ac67.patch"; - sha256 = "0jz4bakifphm425shbd1j99hldgy71m7scl8mwibm441d56l3ydf"; - }; - installPhase = '' install -d $out/bin From 00d419c3624782e7a0e38440f61d51addbad2ed2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 9 Sep 2019 16:32:43 -0400 Subject: [PATCH 61/82] gnome3.epiphany: fix build Looks like something used to propagate nettle but doesn't anymore. Adding it properly, as it does depend on it, fixes the issue. --- pkgs/desktops/gnome-3/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 85f31bfdce5..c52162ce7f1 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,7 +1,7 @@ { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu , wrapGAppsHook, gnome3, libxml2, libxslt, itstool , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit -, sqlite, gcr, isocodes, desktop-file-utils, python3 +, sqlite, gcr, isocodes, desktop-file-utils, python3, nettle , gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gdk-pixbuf gnome3.adwaita-icon-theme gcr glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav json-glib libdazzle + gst_all_1.gst-libav json-glib libdazzle nettle ]; postPatch = '' From 95464bab66eb61d249cfe3e9ab41ba5c43728add Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 9 Sep 2019 23:23:02 +0200 Subject: [PATCH 62/82] dysnomia: 0.8 -> 0.9 --- .../package-management/disnix/dysnomia/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 14c07df6ffa..7b5d99bef9e 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null +, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null , enableApacheWebApplication ? false , enableAxis2WebService ? false , enableEjabberdDump ? false @@ -8,6 +8,7 @@ , enableSubversionRepository ? false , enableTomcatWebApplication ? false , enableMongoDatabase ? false +, enableInfluxDatabase ? false , catalinaBaseDir ? "/var/tomcat" , jobTemplate ? "systemd" , getopt @@ -18,12 +19,13 @@ assert enablePostgreSQLDatabase -> postgresql != null; assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); +assert enableInfluxDatabase -> influxdb != null; stdenv.mkDerivation { - name = "dysnomia-0.8"; + name = "dysnomia-0.9"; src = fetchurl { - url = https://github.com/svanderburg/dysnomia/files/1756700/dysnomia-0.8.tar.gz; - sha256 = "0pc4zwmmlsz02a6a4srpwdwhqrfvn3wkn22sz3fg7lwxbdbd5k0z"; + url = https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9/dysnomia-0.9.tar.gz; + sha256 = "09pk2l3pss48kvm5wvskh842vakbzmjzxzfzyw1nkqnvni130ikl"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; @@ -37,6 +39,7 @@ stdenv.mkDerivation { (if enableSubversionRepository then "--with-subversion" else "--without-subversion") (if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat") (if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") + (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") "--with-job-template=${jobTemplate}" ]; @@ -46,7 +49,8 @@ stdenv.mkDerivation { ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql ++ stdenv.lib.optional enableSubversionRepository subversion ++ stdenv.lib.optional enableMongoDatabase mongodb - ++ stdenv.lib.optional enableMongoDatabase mongodb-tools; + ++ stdenv.lib.optional enableMongoDatabase mongodb-tools + ++ stdenv.lib.optional enableInfluxDatabase influxdb; meta = { description = "Automated deployment of mutable components and services for Disnix"; From 46f190b40d68b2b37cdbd0a463239d8bc37b06d6 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 9 Sep 2019 23:25:06 +0200 Subject: [PATCH 63/82] disnix: 0.8 -> 0.9 --- pkgs/tools/package-management/disnix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index a55fd33f899..50e071be29c 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintl, libiconv }: stdenv.mkDerivation { - name = "disnix-0.8"; + name = "disnix-0.9"; src = fetchurl { - url = https://github.com/svanderburg/disnix/files/1756701/disnix-0.8.tar.gz; - sha256 = "02cmj1jqk5i90szjsn5csr7qb7n42v04rvl9syx0zi9sx9ldnb0w"; + url = https://github.com/svanderburg/disnix/releases/download/disnix-0.9/disnix-0.9.tar.gz; + sha256 = "1kc4520zjc1z72mknylfvrsyda9rbmm5c9mw8w13zhdwg3zbna06"; }; nativeBuildInputs = [ pkgconfig ]; From 67879a7f0d9dc587be2ac9e033c21a8b3fa0e46f Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 9 Sep 2019 23:25:33 +0200 Subject: [PATCH 64/82] disnixos: 0.7.1 -> 0.8 --- .../package-management/disnix/disnixos/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 7a58ec04e64..319716c0f3e 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.7.1"; + name = "disnixos-0.8"; src = fetchurl { - url = https://github.com/svanderburg/disnixos/files/2281312/disnixos-0.7.1.tar.gz; - sha256 = "00d7mcj77lwbj67vnh81bw6k6pg2asimky4zkq32mh8dslnhpnz6"; + url = https://github.com/svanderburg/disnixos/releases/download/disnixos-0.8/disnixos-0.8.tar.gz; + sha256 = "186blirfx89i8hdp4a0djy4q9qr9wcl0ilwr66hlil0wxqj1sr91"; }; - + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ socat dysnomia disnix getopt ]; - + meta = { description = "Provides complementary NixOS infrastructure deployment to Disnix"; license = stdenv.lib.licenses.lgpl21Plus; From e0af0be6e6a0db9419935b79aec274e9c2237c82 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 9 Sep 2019 23:26:03 +0200 Subject: [PATCH 65/82] DisnixWebService: 0.8 -> 0.9 --- .../disnix/DisnixWebService/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 3299ab8b63b..dd64241fd37 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,23 +1,16 @@ -{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java, fetchpatch }: +{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: stdenv.mkDerivation { - name = "DisnixWebService-0.8"; + name = "DisnixWebService-0.9"; src = fetchurl { - url = https://github.com/svanderburg/DisnixWebService/files/1756703/DisnixWebService-0.8.tar.gz; - sha256 = "05hmyz17rmqlph0i321kmhabnpw84kqz32lgc5cd4shxyzsal9hz"; + url = https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz; + sha256 = "1z7w44bf023c0aqchjfi4mla3qbhsh87mdzx7pqn0sy74cjfgqvl"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; AXIS2_LIB = "${axis2}/lib"; AXIS2_WEBAPP = "${axis2}/webapps/axis2"; DBUS_JAVA_LIB = "${dbus_java}/share/java"; - patches = [ - # Safe to remove once https://github.com/svanderburg/DisnixWebService/pull/1 is merged - (fetchpatch { - url = "https://github.com/mmahut/DisnixWebService/commit/cf07918b8c81b4ce01e0b489c1b5a3ef9c9a1cd6.patch"; - sha256 = "15zi1l69wzgwvvqx4492s7l444gfvc9vcm7ckgif4b6cvp837brn"; - }) - ]; prePatch = '' sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \ -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \ From e987e3fef9b4538d72f3e7704db15fecb66a5faf Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 9 Sep 2019 23:28:10 +0200 Subject: [PATCH 66/82] nixos/dysnomia: enable InfluxDB support --- nixos/modules/services/misc/dysnomia.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index 9402d5cd801..33a6fb15264 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -151,6 +151,7 @@ in enableSubversionRepository = config.services.svnserve.enable; enableTomcatWebApplication = config.services.tomcat.enable; enableMongoDatabase = config.services.mongodb.enable; + enableInfluxDatabase = config.services.influxdb.enable; }); dysnomia.properties = { From 29cd56611f3a9d80b34a9546541655ecf12a0ebe Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 10 Sep 2019 00:47:49 +0300 Subject: [PATCH 67/82] maintainers.sikmir: add .keys --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 57ce13aa230..141647d091c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5834,6 +5834,10 @@ github = "sikmir"; githubId = 688044; name = "Nikolay Korotkiy"; + keys = [{ + longkeyid = "rsa2048/0xD1DE6D7F693663A5"; + fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; + }]; }; simonvandel = { email = "simon.vandel@gmail.com"; From 78879ae0e99a00d5abadb16c6bc1d20c517dffcf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 9 Sep 2019 17:49:10 -0400 Subject: [PATCH 68/82] Revert "busybox: fix static builds" This reverts commit b4f6931acde5433ffebfedf79a31eb5903ffa51e. Broke busybox-sandbox-shell https://hydra.nixos.org/build/100470231 --- pkgs/os-specific/linux/busybox/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index da9ed304db8..f041d2b5042 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPackages, fetchurl , enableStatic ? false , enableMinimal ? false -, useMusl ? stdenv.hostPlatform.libc == "musl" +, useMusl ? stdenv.hostPlatform.libc == "musl", musl , extraConfig ? "" }: @@ -88,6 +88,10 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + postConfigure = lib.optionalString useMusl '' + makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib") + ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ]; From 41fbd5568913fbbdc6e0b608d78bd14f0e4c1150 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Sep 2019 12:07:46 +0200 Subject: [PATCH 69/82] zbar: format with nixpkgs-fmt --- pkgs/tools/graphics/zbar/default.nix | 60 +++++++++++++++++++++------- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 503461018ab..bb1081074b9 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,12 +1,26 @@ -{ stdenv, fetchFromGitHub, imagemagickBig, pkgconfig, python2Packages, perl -, libX11, libv4l, qt5, gtk2, xmlto, docbook_xsl, autoreconfHook, dbus -, enableVideo ? stdenv.isLinux, enableDbus ? stdenv.isLinux +{ stdenv +, lib +, fetchFromGitHub +, imagemagickBig +, pkgconfig +, python2Packages +, perl +, libX11 +, libv4l +, qt5 +, gtk2 +, xmlto +, docbook_xsl +, autoreconfHook +, dbus +, enableVideo ? stdenv.isLinux +, enableDbus ? stdenv.isLinux }: -with stdenv.lib; let inherit (python2Packages) pygtk python; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "zbar"; version = "0.23"; @@ -17,27 +31,43 @@ in stdenv.mkDerivation rec { sha256 = "0hlxakpyjg4q9hp7yp3har1n78341b4knwyll28hn48vykg28pza"; }; - nativeBuildInputs = [ pkgconfig xmlto autoreconfHook docbook_xsl ]; + nativeBuildInputs = [ + pkgconfig + xmlto + autoreconfHook + docbook_xsl + ]; buildInputs = [ - imagemagickBig python pygtk perl libX11 - ] ++ optional enableDbus dbus - ++ optionals enableVideo [ - libv4l gtk2 qt5.qtbase qt5.qtx11extras + imagemagickBig + python + pygtk + perl + libX11 + ] ++ lib.optionals enableDbus [ + dbus + ] ++ lib.optionals enableVideo [ + libv4l + gtk2 + qt5.qtbase + qt5.qtx11extras ]; configureFlags = (if enableDbus then [ - "--with-dbusconfdir=$out/etc/dbus-1/system.d" - ] else [ "--without-dbus" ]) - ++ optionals (!enableVideo) [ - "--disable-video" "--without-gtk" "--without-qt" + "--with-dbusconfdir=${placeholder "out"}/etc/dbus-1/system.d" + ] else [ + "--without-dbus" + ]) ++ lib.optionals (!enableVideo) [ + "--disable-video" + "--without-gtk" + "--without-qt" ]; postInstall = optionalString enableDbus '' install -Dm644 dbus/org.linuxtv.Zbar.conf $out/etc/dbus-1/system.d/org.linuxtv.Zbar.conf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bar code reader"; longDescription = '' ZBar is an open source software suite for reading bar codes from various From 8b75a0a25f2ec26977255208d87342a48f9b6e64 Mon Sep 17 00:00:00 2001 From: Nikita Voloboev Date: Mon, 9 Sep 2019 23:40:05 +0100 Subject: [PATCH 70/82] wifi-password: init at 0.1.0 (#68373) * wifi-password: init at 0.1.0 * Apply suggestions from code review Co-Authored-By: symphorien --- .../darwin/wifi-password/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/os-specific/darwin/wifi-password/default.nix diff --git a/pkgs/os-specific/darwin/wifi-password/default.nix b/pkgs/os-specific/darwin/wifi-password/default.nix new file mode 100644 index 00000000000..801e180f734 --- /dev/null +++ b/pkgs/os-specific/darwin/wifi-password/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.1.0"; + pname = "wifi-password"; + + src = fetchFromGitHub { + owner = "rauchg"; + repo = pname; + rev = version; + sha256 = "0sfvb40h7rz9jzp4l9iji3jg80paklqsbmnk5h7ipsv2xbsplp64"; + }; + + installPhase = '' + mkdir -p $out/bin + cp wifi-password.sh $out/bin/wifi-password + ''; + + meta = { + homepage = https://github.com/rauchg/wifi-password; + description = "Get the password of the wifi you're on"; + platforms = stdenv.lib.platforms.darwin; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.nikitavoloboev ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b85585c435a..5af54ea09ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24831,4 +24831,6 @@ in nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy {}; + wifi-password = callPackage ../os-specific/darwin/wifi-password {}; + } From e1cb839d17d7ec6bdf97624e0f1c0f0af6fb62c3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 23 Jun 2019 13:39:01 +0200 Subject: [PATCH 71/82] zbar: Split to multiple outputs Also fix D-Bus config dir path: The configure script is appending `/dbus-1/system.d` so when we added passed in `$out/etc/dbus-1/system.d`, it ended up with extra nesting. --- pkgs/applications/misc/electrum/default.nix | 2 +- pkgs/tools/graphics/zbar/default.nix | 11 +++++++---- .../security/asc-key-to-qr-code-gif/default.nix | 15 ++++++++++----- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index c48d458567d..0ebeb1beffa 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -88,7 +88,7 @@ python3Packages.buildPythonApplication { --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + (if enableQt then '' substituteInPlace ./electrum/qrscanner.py \ - --replace ${libzbar_name} ${zbar}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} + --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} '' else '' sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index bb1081074b9..116f32a701b 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { pname = "zbar"; version = "0.23"; + outputs = [ "out" "py" "lib" "dev" "doc" "man" ]; + src = fetchFromGitHub { owner = "mchehab"; repo = "zbar"; @@ -54,7 +56,7 @@ stdenv.mkDerivation rec { ]; configureFlags = (if enableDbus then [ - "--with-dbusconfdir=${placeholder "out"}/etc/dbus-1/system.d" + "--with-dbusconfdir=${placeholder "out"}/etc" ] else [ "--without-dbus" ]) ++ lib.optionals (!enableVideo) [ @@ -63,9 +65,10 @@ stdenv.mkDerivation rec { "--without-qt" ]; - postInstall = optionalString enableDbus '' - install -Dm644 dbus/org.linuxtv.Zbar.conf $out/etc/dbus-1/system.d/org.linuxtv.Zbar.conf - ''; + makeFlags = [ + "pyexecdir=${placeholder "py"}/${python.sitePackages}" + "pythondir=${placeholder "py"}/${python.sitePackages}" + ]; meta = with lib; { description = "Bar code reader"; diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix index 6b3a922bbe5..580cf7585c9 100644 --- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -15,15 +15,20 @@ stdenv.mkDerivation { sha256 = "0yrc302a2fhbzryb10718ky4fymfcps3lk67ivis1qab5kbp6z8r"; }; - buildInputs = [ imagemagick qrencode ] ++ stdenv.lib.optional testQR zbar; dontBuild = true; dontStrip = true; dontPatchELF = true; - preInstall = '' - substituteInPlace asc-to-gif.sh \ - --replace "convert" "${imagemagick}/bin/convert" \ - --replace "qrencode" "${qrencode.bin}/bin/qrencode" + preInstall = let + substitutions = [ + ''--replace "convert" "${imagemagick}/bin/convert"'' + ''--replace "qrencode" "${qrencode.bin}/bin/qrencode"'' + ] ++ stdenv.lib.optional testQR [ + ''--replace "hash zbarimg" "true"'' # hash does not work on NixOS + ''--replace "$(zbarimg --raw" "$(${zbar.out}/bin/zbarimg --raw"'' + ]; + in '' + substituteInPlace asc-to-gif.sh ${stdenv.lib.concatStringsSep " " substitutions} ''; installPhase = '' From 49d7cc29419b15efa0579ed51a8f6ad8f955955a Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Tue, 10 Sep 2019 01:52:34 +0200 Subject: [PATCH 72/82] Patch remind source to work on macOS (#67870) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The default version of the source will show a banner on macOS and Windows which tells the user that the author would rather that they didn’t use remind on Apple or Microsoft products, and then sleep for 5 seconds. There is no way for the user to remove this obstacle other than patch the source and recompile, which is also what other package managers do. This commit also changes supported platform from linux to unix. --- pkgs/tools/misc/remind/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index cc842105d0a..91d8e472130 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -11,6 +11,9 @@ let tclLibraries = stdenv.lib.optionals tkremind [ tcllib tk ]; tclLibPaths = stdenv.lib.concatStringsSep " " (map (p: "${p}/lib/${p.libPrefix}") tclLibraries); + tkremindPatch = optionalString tkremind '' + substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish" + ''; in stdenv.mkDerivation { name = "remind-3.1.16"; src = fetchurl { @@ -21,8 +24,13 @@ in stdenv.mkDerivation { nativeBuildInputs = optional tkremind makeWrapper; propagatedBuildInputs = tclLibraries; - postPatch = optionalString tkremind '' - substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish" + postPatch = '' + substituteInPlace ./configure \ + --replace "sleep 1" "true" + substituteInPlace ./src/init.c \ + --replace "rkrphgvba(0);" "" \ + --replace "rkrphgvba(1);" "" + ${tkremindPatch} ''; postInstall = optionalString tkremind '' @@ -34,6 +42,6 @@ in stdenv.mkDerivation { description = "Sophisticated calendar and alarm program for the console"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [raskin kovirobi]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } From e1d57791548dc5330d20420ffa57461f1a612ed8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 23 Jun 2019 15:06:01 +0200 Subject: [PATCH 73/82] v4l-utils: split to multiple outputs That required setting localedir to fix cycle. Also do not patch shebangs globally. --- pkgs/os-specific/linux/v4l-utils/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index a688f60492a..73db222d390 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -19,14 +19,14 @@ in stdenv.mkDerivation rec { sha256 = "1ng0x3wj3a1ckfd00yxa4za43xms92gdp7rdag060b7p39z7m4gf"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" ] ++ lib.optional withUtils "lib" ++ [ "dev" ]; - configureFlags = - if withUtils then [ - "--with-udevdir=${placeholder "out"}/lib/udev" - ] else [ - "--disable-v4l-utils" - ]; + configureFlags = (if withUtils then [ + "--with-localedir=${placeholder "lib"}/share/locale" + "--with-udevdir=${placeholder "out"}/lib/udev" + ] else [ + "--disable-v4l-utils" + ]); postFixup = '' # Create symlink for V4l1 compatibility @@ -39,10 +39,8 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ libjpeg ]; - NIX_CFLAGS_COMPILE = lib.optional withQt "-std=c++11"; - postPatch = '' - patchShebangs . + patchShebangs utils/cec-ctl/msg2ctl.pl ''; meta = with stdenv.lib; { From da135c2704e405e7e576a4e394027043d9781529 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 10 Sep 2019 00:35:05 +0200 Subject: [PATCH 74/82] zbar: drop pygtk support It is deprecated and we do not actually use it anywhere --- pkgs/tools/graphics/zbar/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 116f32a701b..74503862785 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , imagemagickBig , pkgconfig -, python2Packages , perl , libX11 , libv4l @@ -17,14 +16,11 @@ , enableDbus ? stdenv.isLinux }: -let - inherit (python2Packages) pygtk python; -in stdenv.mkDerivation rec { pname = "zbar"; version = "0.23"; - outputs = [ "out" "py" "lib" "dev" "doc" "man" ]; + outputs = [ "out" "lib" "dev" "doc" "man" ]; src = fetchFromGitHub { owner = "mchehab"; @@ -42,8 +38,6 @@ stdenv.mkDerivation rec { buildInputs = [ imagemagickBig - python - pygtk perl libX11 ] ++ lib.optionals enableDbus [ @@ -55,7 +49,9 @@ stdenv.mkDerivation rec { qt5.qtx11extras ]; - configureFlags = (if enableDbus then [ + configureFlags = [ + "--without-python" + ] ++ (if enableDbus then [ "--with-dbusconfdir=${placeholder "out"}/etc" ] else [ "--without-dbus" @@ -65,11 +61,6 @@ stdenv.mkDerivation rec { "--without-qt" ]; - makeFlags = [ - "pyexecdir=${placeholder "py"}/${python.sitePackages}" - "pythondir=${placeholder "py"}/${python.sitePackages}" - ]; - meta = with lib; { description = "Bar code reader"; longDescription = '' From 61fdd203d6e4e7e9c4b4b4ba0bfe0036666bc0d1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 10 Sep 2019 00:55:11 +0200 Subject: [PATCH 75/82] zbar: wrap Qt frontend --- pkgs/tools/graphics/zbar/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 74503862785..3574e2697c6 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { xmlto autoreconfHook docbook_xsl + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -61,6 +62,12 @@ stdenv.mkDerivation rec { "--without-qt" ]; + dontWrapQtApps = true; + + postFixup = lib.optionalString enableVideo '' + wrapQtApp "$out/bin/zbarcam-qt" + ''; + meta = with lib; { description = "Bar code reader"; longDescription = '' From 021faed5bae0fc63990167174c619580bec59950 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 10 Sep 2019 01:05:55 +0200 Subject: [PATCH 76/82] zbar: switch to GTK 3 --- pkgs/tools/graphics/zbar/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 3574e2697c6..c3a1d63f911 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -7,7 +7,7 @@ , libX11 , libv4l , qt5 -, gtk2 +, gtk3 , xmlto , docbook_xsl , autoreconfHook @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { dbus ] ++ lib.optionals enableVideo [ libv4l - gtk2 + gtk3 qt5.qtbase qt5.qtx11extras ]; @@ -56,15 +56,19 @@ stdenv.mkDerivation rec { "--with-dbusconfdir=${placeholder "out"}/etc" ] else [ "--without-dbus" - ]) ++ lib.optionals (!enableVideo) [ + ]) ++ (if enableVideo then [ + "--with-gtk=gtk3" + ] else [ "--disable-video" "--without-gtk" "--without-qt" - ]; + ]); dontWrapQtApps = true; + dontWrapGApps = true; postFixup = lib.optionalString enableVideo '' + wrapProgram "$out/bin/zbarcam-gtk" "''${gappsWrapperArgs[@]}" wrapQtApp "$out/bin/zbarcam-qt" ''; From 86f3b3f6282723065f15b8f7642fdcb6d6224db7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 10 Sep 2019 01:06:47 +0200 Subject: [PATCH 77/82] zbar: drop Perl dependency It does not appear to be necessary --- pkgs/tools/graphics/zbar/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index c3a1d63f911..69737461929 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , imagemagickBig , pkgconfig -, perl , libX11 , libv4l , qt5 @@ -39,7 +38,6 @@ stdenv.mkDerivation rec { buildInputs = [ imagemagickBig - perl libX11 ] ++ lib.optionals enableDbus [ dbus From 471ba8e2e635995b3445e61895f3b78638e7ffbd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 10 Sep 2019 01:08:28 +0200 Subject: [PATCH 78/82] linux: build rtw88 module Adds support for Realtek wireless/bluetooth cards found in some Lenovo laptops. The old `r8822be` module was removed in favour of this one. --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 23a29cfb7b1..4ad222b83e4 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -158,6 +158,9 @@ let ATH9K_AHB = option yes; # Ditto, AHB bus B43_PHY_HT = option yes; BCMA_HOST_PCI = option yes; + RTW88 = whenAtLeast "5.2" module; + RTW88_8822BE = whenAtLeast "5.2" yes; + RTW88_8822CE = whenAtLeast "5.2" yes; }; fb = { From 93b55c29ec61b34c940b1acde67e70f1615c7ff1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 9 Sep 2019 13:42:03 -0700 Subject: [PATCH 79/82] oracle-instantclient: 18.1.0.0.0 -> 19.3.0.0.0 (x86_64-darwin) macos binaries are available without having to login, so we can also remove the requireFile fetcher. --- .../oracle-instantclient/default.nix | 35 +++++++------------ 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index f47b6ac8b21..a7865fc7f4b 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, requireFile , autoPatchelfHook , fixDarwinDylibNames , unzip @@ -23,7 +22,7 @@ let # determine the version number, there might be different ones per architecture version = { x86_64-linux = "19.3.0.0.0"; - x86_64-darwin = "18.1.0.0.0"; + x86_64-darwin = "19.3.0.0.0"; }.${stdenv.hostPlatform.system} or throwSystem; # hashes per component and architecture @@ -35,18 +34,15 @@ let odbc = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch"; }; x86_64-darwin = { - basic = "fac3cdaaee7526f6c50ff167edb4ba7ab68efb763de24f65f63fb48cc1ba44c0"; - sdk = "98e6d797f1ce11e59b042b232f62380cec29ec7d5387b88a9e074b741c13e63a"; - sqlplus = "02e66dc52398fced75e7efcb6b4372afcf617f7d88344fb7f0f4bb2bed371f3b"; - odbc = "5d0cdd7f9dd2e27affbc9b36ef9fc48e329713ecd36905fdd089366e365ae8a2"; + basic = "f4335c1d53e8188a3a8cdfb97494ff87c4d0f481309284cf086dc64080a60abd"; + sdk = "b46b4b87af593f7cfe447cfb903d1ae5073cec34049143ad8cdc9f3e78b23b27"; + sqlplus = "f7565c3cbf898b0a7953fbb0017c5edd9d11d1863781588b7caf3a69937a2e9e"; + odbc = "f91da40684abaa866aa059eb26b1322f2d527670a1937d678404c991eadeb725"; }; }.${stdenv.hostPlatform.system} or throwSystem; # rels per component and architecture, optional rels = { - x86_64-darwin = { - sdk = "2"; - }; }.${stdenv.hostPlatform.system} or {}; # convert platform to oracle architecture names @@ -55,29 +51,24 @@ let x86_64-darwin = "macos.x64"; }.${stdenv.hostPlatform.system} or throwSystem; + shortArch = { + x86_64-linux = "linux"; + x86_64-darwin = "macos"; + }.${stdenv.hostPlatform.system} or throwSystem; + # calculate the filename of a single zip file srcFilename = component: arch: version: rel: "instantclient-${component}-${arch}-${version}" + (optionalString (rel != "") "-${rel}") + - (optionalString (arch == "linux.x64") "dbru") + # ¯\_(ツ)_/¯ + (optionalString (arch == "linux.x64" || arch == "macos.x64") "dbru") + # ¯\_(ツ)_/¯ ".zip"; - # fetcher for the clickthrough artifacts (requiring manual download) - fetchClickThrough = srcFilename: hash: (requireFile { - name = srcFilename; - url = "https://www.oracle.com/database/technologies/instant-client/downloads.html"; - sha256 = hash; - }); - # fetcher for the non clickthrough artifacts - fetchSimple = srcFilename: hash: fetchurl { - url = "https://download.oracle.com/otn_software/linux/instantclient/193000/${srcFilename}"; + fetcher = srcFilename: hash: fetchurl { + url = "https://download.oracle.com/otn_software/${shortArch}/instantclient/193000/${srcFilename}"; sha256 = hash; }; - # pick the appropriate fetcher depending on the platform - fetcher = if stdenv.hostPlatform.system == "x86_64-linux" then fetchSimple else fetchClickThrough; - # assemble srcs srcs = map (component: (fetcher (srcFilename component arch version rels.${component} or "") hashes.${component} or "")) From 4ece8498dc36499adf4c15d4214d8e3d95041bf4 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 9 Sep 2019 21:05:03 -0400 Subject: [PATCH 80/82] dolphinEmu: fix broken build --- pkgs/misc/emulators/dolphin-emu/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 813730d435d..303c2f82d9e 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -22,6 +22,12 @@ stdenv.mkDerivation rec { name = "dolphin-emu-5.0-soundtouch-exception-fix.patch"; sha256 = "0yd3l46nja5qiknnl30ryad98f3v8911jwnr67hn61dzx2kwbbaw"; }) + # Fix build with gcc 8 + (fetchpatch { + url = "https://salsa.debian.org/games-team/dolphin-emu/raw/9b7b4aeac1b60dcf28bdcafbed6bc498b2aeb0ad/debian/patches/03_gcc8.patch"; + name = "03_gcc8.patch"; + sha256 = "1da95gb8c95kd5cjhdvg19cv2z863lj3va5gx3bqc7g8r36glqxr"; + }) ]; postPatch = '' From f5e5aa74004965f180e154524dfd2ca1d01fad97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 9 Sep 2019 22:10:17 -0500 Subject: [PATCH 81/82] fira-code: 1.207 -> 2 --- pkgs/data/fonts/fira-code/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 09bae8cbea5..46149b0781b 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "1.207"; + version = "2"; in fetchzip { name = "fira-code-${version}"; @@ -10,9 +10,10 @@ in fetchzip { postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "13w2jklqndria2plgangl5gi56v1cj5ja9vznh9079kqnvq0cffz"; + sha256 = "0kg9lrrjr6wrd4r96y0rnslnaw2276558a369qdvalwb3q1gi8d2"; meta = with stdenv.lib; { homepage = https://github.com/tonsky/FiraCode; From 2eb7541b1acfad498b3367e2ecc0ebb4c5233b12 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 10 Sep 2019 05:54:35 +0200 Subject: [PATCH 82/82] zbar: use libsForQt5.callPackage --- pkgs/tools/graphics/zbar/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 69737461929..cb5ea25211c 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -5,7 +5,9 @@ , pkgconfig , libX11 , libv4l -, qt5 +, qtbase +, qtx11extras +, wrapQtAppsHook , gtk3 , xmlto , docbook_xsl @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { xmlto autoreconfHook docbook_xsl - qt5.wrapQtAppsHook + wrapQtAppsHook ]; buildInputs = [ @@ -44,8 +46,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableVideo [ libv4l gtk3 - qt5.qtbase - qt5.qtx11extras + qtbase + qtx11extras ]; configureFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca37025f7f3..4272504037a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7182,7 +7182,7 @@ in zbackup = callPackage ../tools/backup/zbackup {}; - zbar = callPackage ../tools/graphics/zbar { }; + zbar = libsForQt5.callPackage ../tools/graphics/zbar { }; zdelta = callPackage ../tools/compression/zdelta { };