From a4de5673de10e1623c893b7f107825daaacb5420 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sat, 8 Jun 2019 17:54:17 +0200 Subject: [PATCH 01/43] nvidia-x11: Put absolute library paths into ICD config files. --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 56012aafea9..c403e3916cb 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -58,14 +58,16 @@ installPhase() { mkdir $i/lib/vdpau mv $i/lib/libvdpau* $i/lib/vdpau - # Install ICDs. - install -Dm644 nvidia.icd $i/etc/OpenCL/vendors/nvidia.icd + # Install ICDs, make absolute paths. + sed -E "s#(libnvidia-opencl)#$i/lib/\\1#" nvidia.icd > nvidia.icd.fixed + install -Dm644 nvidia.icd.fixed $i/etc/OpenCL/vendors/nvidia.icd if [ -e nvidia_icd.json.template ]; then - sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json + sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json fi if [ "$useGLVND" = "1" ]; then - install -Dm644 10_nvidia.json $i/share/glvnd/egl_vendor.d/nvidia.json + sed -E "s#(libEGL_nvidia)#$i/lib/\\1#" 10_nvidia.json > 10_nvidia.json.fixed + install -Dm644 10_nvidia.json.fixed $i/share/glvnd/egl_vendor.d/nvidia.json fi done From 8679773d637254ad089ae1e89647dfc4dfa3852b Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 16 Jun 2019 15:53:18 +0300 Subject: [PATCH 02/43] pythonPackages.pysmf: init at 0.1.1 --- .../python-modules/pysmf/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/pysmf/default.nix diff --git a/pkgs/development/python-modules/pysmf/default.nix b/pkgs/development/python-modules/pysmf/default.nix new file mode 100644 index 00000000000..ef5e560b08c --- /dev/null +++ b/pkgs/development/python-modules/pysmf/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }: + +buildPythonPackage rec { + pname = "pysmf"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "10i7vvvdx6c3gl4afsgnpdanwgzzag087zs0fxvfipnqknazj806"; + }; + + nativeBuildInputs = [ pkg-config pytest ]; + buildInputs = [ libsmf glib ]; + + meta = with stdenv.lib; { + homepage = "http://das.nasophon.de/pysmf/"; + description = "Python extension module for reading and writing Standard MIDI Files, based on libsmf."; + license = licenses.bsd2; + maintainers = [ maintainers.gnidorah ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 828cf517d5c..4e08541c044 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -807,6 +807,8 @@ in { slurm = pkgs.slurm; }; + pysmf = callPackage ../development/python-modules/pysmf { }; + pyspinel = callPackage ../development/python-modules/pyspinel {}; pyssim = callPackage ../development/python-modules/pyssim { }; From de8ad1f55b0b5871f12d46d035902c45a982e4e3 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 16 Jun 2019 15:57:36 +0300 Subject: [PATCH 03/43] mididings: init at 20151117 --- pkgs/tools/audio/mididings/default.nix | 38 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/audio/mididings/default.nix diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix new file mode 100644 index 00000000000..fb3d0e51341 --- /dev/null +++ b/pkgs/tools/audio/mididings/default.nix @@ -0,0 +1,38 @@ +{ stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: + +pythonPackages.buildPythonApplication rec { + version = "20151117"; + pname = "mididings"; + + src = fetchFromGitHub { + owner = "dsacre"; + repo = "mididings"; + rev = "bbec99a8c878a2a7029e78e84fc736e4a68ed5a0"; + sha256 = "1pdf5mib87zy7yjh9vpasja419h28wvgq6x5hw2hkm7bg9ds4p2m"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glib alsaLib libjack2 pythonPackages.boost ]; + propagatedBuildInputs = with pythonPackages; [ decorator ] + # for livedings + ++ [ tkinter pyliblo ] + # for mididings.extra + ++ [ dbus-python pyinotify ] + # to read/write standard MIDI files + ++ [ pysmf ] + # so mididings knows where to look for config files + ++ [ pyxdg ]; + + preBuild = with stdenv.lib.versions; '' + substituteInPlace setup.py \ + --replace boost_python "boost_python${major pythonPackages.python.version}${minor pythonPackages.python.version}" + ''; + + meta = with stdenv.lib; { + description = "A MIDI router and processor based on Python, supporting ALSA and JACK MIDI"; + homepage = "http://das.nasophon.de/mididings"; + license = licenses.gpl2; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 889684d3fa9..754745bae85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1695,6 +1695,8 @@ in metabase = callPackage ../servers/metabase { }; + mididings = callPackage ../tools/audio/mididings { }; + miniserve = callPackage ../tools/misc/miniserve { }; mkspiffs = callPackage ../tools/filesystems/mkspiffs { }; From 4e08e8ef30a7070885ef69fe4fc3cea36b15abe0 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Wed, 19 Jun 2019 23:55:12 -0400 Subject: [PATCH 04/43] gitkraken: 5.0.4 -> 6.0.0 - Add at_spi2_atk dependency - Add libuuid dependency --- .../applications/version-management/gitkraken/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 8b807d11e34..4720701613d 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -2,7 +2,7 @@ , libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus -, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme +, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at_spi2_atk, libuuid }: with stdenv.lib; @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "5.0.4"; + version = "6.0.0"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "1fq0w8djkcx5jr2pw6izlq5rkwbq3r3f15xr3dmmbz6gjvi3nra0"; + sha256 = "1ykjdnzl34pqr6dhfnswix44i412c7gcba1pk95a8670wmc29a1f"; }; libPath = makeLibraryPath [ @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { gnome2.GConf libgnome-keyring openssl + at_spi2_atk + libuuid ]; desktopItem = makeDesktopItem { From 6b799f218e6e5e6b6b53a3430363f3a4706644ff Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Thu, 20 Jun 2019 00:52:02 -0400 Subject: [PATCH 05/43] Use at-spi2-atk instead of at_spi2_atk --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 4720701613d..12d22e2cc3c 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -2,7 +2,7 @@ , libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus -, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at_spi2_atk, libuuid +, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at-spi2-atk, libuuid }: with stdenv.lib; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { gnome2.GConf libgnome-keyring openssl - at_spi2_atk + at-spi2-atk libuuid ]; From c0b2c6973636e3e763642d6b23e0c708fd18f548 Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Mon, 8 Jul 2019 03:47:41 -0300 Subject: [PATCH 06/43] ipxe: fix build by not generating 64bit efi on 32bit systems --- pkgs/tools/misc/ipxe/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 99b7ea10bd3..a9cddcc5ff8 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -5,8 +5,7 @@ let date = "20190318"; rev = "ebf2eaf515e46abd43bc798e7e4ba77bfe529218"; - targets = [ - "bin-x86_64-efi/ipxe.efi" + targets = (lib.optional stdenv.isx86_64 "bin-x86_64-efi/ipxe.efi") ++ [ "bin/ipxe.dsk" "bin/ipxe.usb" "bin/ipxe.iso" From 3a7ff4e44d42d44a102a86e38334467769bc5148 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jul 2019 21:17:36 -0500 Subject: [PATCH 07/43] okteta: 0.26.1 -> 0.26.2 --- pkgs/applications/editors/okteta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index ffa80bc68ca..03bdd5e0882 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "okteta-${version}"; - version = "0.26.1"; + version = "0.26.2"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz"; - sha256 = "1bqq3ax47xym3ikwn6xsshs1b5gpfg5djrnkzszqnp127f1fxi54"; + sha256 = "0k38hd9wq6jvzy0225y61rzr7lgwbac1haalhsrfpmyjy6d833dv"; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; From b730ae12afad2a9ed606e516d8b5c85584da21a7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 9 Jul 2019 16:20:00 -0500 Subject: [PATCH 08/43] prometheus_2: 2.10.0 -> 2.11.0 Changelog: https://github.com/prometheus/prometheus/releases/tag/v2.11.0 --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index a9ee991bac7..3523c3b0817 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -48,7 +48,7 @@ in rec { }; prometheus_2 = buildPrometheus { - version = "2.10.0"; - sha256 = "00597rf4cg20clr3g3ql3nf47r8qij2xspcpp8y8mpxm2b60zjnq"; + version = "2.11.0"; + sha256 = "0x5q2zv8nvqdns8780rsbdhv44azg1fz631ji2rlmiy1l6n1q3hb"; }; } From 8578d7ab800e7970f7675217901e34eedd09f5ae Mon Sep 17 00:00:00 2001 From: edef Date: Tue, 9 Jul 2019 22:30:40 +0000 Subject: [PATCH 09/43] etcd: 3.3.1 -> 3.3.13 While I would've liked to keep them, the release branch drops the tools directory as of v3.3.4, seemingly without explanation: https://github.com/etcd-io/etcd/commit/074e4177707f4daead816c108a06980d77d0aad0 master appears to contain them, so they might return at some point. --- pkgs/servers/etcd/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index d6b71f81608..d3c5555fa6a 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { name = "etcd-${version}"; - version = "3.3.1"; # After updating check that nixos tests pass + version = "3.3.13"; # After updating check that nixos tests pass rev = "v${version}"; goPackagePath = "github.com/coreos/etcd"; @@ -13,15 +13,12 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "etcd"; - sha256 = "11gzmi05y4kpnzgqc737l0wk5svxai4z17nl92jazqga6zhyavyl"; + sha256 = "1kac4qfr83f2hdz35403f1ald05wc85vvhw79vxb431n61jvyaqy"; }; subPackages = [ "cmd/etcd" "cmd/etcdctl" - "cmd/tools/benchmark" - "cmd/tools/etcd-dump-db" - "cmd/tools/etcd-dump-logs" ]; buildInputs = [ libpcap ]; From 950d91cc9cc994cfa0009ab21442b643ced5d986 Mon Sep 17 00:00:00 2001 From: edef Date: Tue, 9 Jul 2019 23:46:21 +0000 Subject: [PATCH 10/43] nixos/tests: include the etcd-cluster test in all-tests.nix We seem to have had this test for quite a while, but nothing seems to reference it. --- nixos/tests/all-tests.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2f527bfa090..665a75e47da 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -77,6 +77,7 @@ in elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; env = handleTest ./env.nix {}; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; + etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {}; ferm = handleTest ./ferm.nix {}; firefox = handleTest ./firefox.nix {}; firewall = handleTest ./firewall.nix {}; From b3bce2cfa2dc9929d8c24989b800e1a10e1a64f3 Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 10 Jul 2019 00:42:48 +0000 Subject: [PATCH 11/43] nixos/tests/etcd-cluster: be more lenient about member addition --- nixos/tests/etcd-cluster.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix index 3c4de5950a7..43fde7d5920 100644 --- a/nixos/tests/etcd-cluster.nix +++ b/nixos/tests/etcd-cluster.nix @@ -140,7 +140,7 @@ in { }; subtest "should add another member", sub { - $node1->succeed("etcdctl member add node3 https://node3:2380"); + $node1->waitUntilSucceeds("etcdctl member add node3 https://node3:2380"); $node3->start(); $node3->waitForUnit("etcd.service"); $node3->waitUntilSucceeds("etcdctl member list | grep 'node3'"); From 9a15d93f07a89bd8463b84b0365f45917971353a Mon Sep 17 00:00:00 2001 From: Travis Athougies Date: Tue, 9 Jul 2019 22:45:33 -0700 Subject: [PATCH 12/43] colm: cross-compilation --- pkgs/development/compilers/colm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index 888750efdf9..237a80280ec 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, gcc, asciidoc }: +{ stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }: stdenv.mkDerivation rec { name = "colm-${version}"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4"; }; - nativeBuildInputs = [ makeWrapper asciidoc ]; + patches = [ ./cross-compile.patch ]; + + nativeBuildInputs = [ makeWrapper asciidoc autoreconfHook ]; doCheck = true; From 91a14926490a84f00c4092afed317b3faadbcd25 Mon Sep 17 00:00:00 2001 From: Travis Athougies Date: Tue, 9 Jul 2019 22:46:53 -0700 Subject: [PATCH 13/43] colm: add cross-compile patch --- pkgs/development/compilers/colm/cross-compile.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 pkgs/development/compilers/colm/cross-compile.patch diff --git a/pkgs/development/compilers/colm/cross-compile.patch b/pkgs/development/compilers/colm/cross-compile.patch new file mode 100644 index 00000000000..470ea23aaf1 --- /dev/null +++ b/pkgs/development/compilers/colm/cross-compile.patch @@ -0,0 +1,13 @@ +--- a/configure.ac 2019-07-09 22:41:03.166948024 -0700 ++++ b/configure.ac 2019-07-09 22:41:16.699948056 -0700 +@@ -40,9 +40,7 @@ + + dnl Choose a default for the build_manual var. If the dist file is present in + dnl the root then default to no, otherwise go for it. +-AC_CHECK_FILES( [$srcdir/DIST], +- [. $srcdir/DIST;], +- [build_manual=yes; ] ) ++build_manual=yes; + + dnl Set to true if the manual should be built. + AM_CONDITIONAL(BUILD_MANUAL, [test "x$build_manual" = "xyes"]) From 780b84189df1e194609c43302bd111cdfff4e51e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 8 Jul 2019 20:29:19 +0300 Subject: [PATCH 14/43] cpp-utilities: init at 4.17.1 --- .../libraries/cpp-utilities/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/cpp-utilities/default.nix diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix new file mode 100644 index 00000000000..cd16dea56b1 --- /dev/null +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, cppunit }: + +stdenv.mkDerivation rec { + pname = "cpp-utilities"; + version = "4.17.1"; + + src = fetchFromGitHub { + owner = "Martchus"; + repo = pname; + rev = "v${version}"; + sha256 = "12088cwg3jbqipmbn4843w1cgxi1q6vwx47gy042rkfvbk6azhxl"; + }; + + nativeBuildInputs = [ cmake ]; + checkInputs = [ cppunit ]; + # Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files + checkFlagsArray = [ "LD_LIBRARY_PATH=$(PWD)" ]; + doCheck = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/Martchus/cpp-utilities"; + description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; + license = licenses.gpl2; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3943d02499c..8da5ac0a08f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10168,6 +10168,8 @@ in cppdb = callPackage ../development/libraries/cppdb { }; + cpp-utilities = callPackage ../development/libraries/cpp-utilities { }; + cpp-hocon = callPackage ../development/libraries/cpp-hocon { }; cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { }; From 7370abcbebd10bf261cd3f9206315d0128abc2f1 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Wed, 10 Jul 2019 10:27:21 +0200 Subject: [PATCH 15/43] zabbixctl: init at unstable-2019-07-06 --- pkgs/tools/misc/zabbixctl/default.nix | 25 ++++++ pkgs/tools/misc/zabbixctl/deps.nix | 111 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 138 insertions(+) create mode 100644 pkgs/tools/misc/zabbixctl/default.nix create mode 100644 pkgs/tools/misc/zabbixctl/deps.nix diff --git a/pkgs/tools/misc/zabbixctl/default.nix b/pkgs/tools/misc/zabbixctl/default.nix new file mode 100644 index 00000000000..b74ab51680d --- /dev/null +++ b/pkgs/tools/misc/zabbixctl/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "zabbixctl"; + version = "unstable-2019-07-06"; + + goPackagePath = "github.com/kovetskiy/zabbixctl"; + + src = fetchFromGitHub { + owner = "kovetskiy"; + repo = pname; + rev = "f2e856b7ab7d8ff9f494fe9f481bbaef18ea6ff7"; + sha256 = "1lr3g9h3aa2px2kh5b2qcpj3aqyhqwq7kj1s9wifgmri9q7fsdzy"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Most effective way for operating in Zabbix Server"; + homepage = "https://github.com/kovetskiy/zabbixctl"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/pkgs/tools/misc/zabbixctl/deps.nix b/pkgs/tools/misc/zabbixctl/deps.nix new file mode 100644 index 00000000000..2bf015acf5f --- /dev/null +++ b/pkgs/tools/misc/zabbixctl/deps.nix @@ -0,0 +1,111 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/jinzhu/configor"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/configor"; + rev = "9064de4b2535f218bde55dc8de50a3904ef800d0"; + sha256 = "13wd7s2kff3s0bz5mi0m2zcz1r8mwnwhd944gxymzkwij71lhasn"; + }; + } + { + goPackagePath = "github.com/kovetskiy/godocs"; + fetch = { + type = "git"; + url = "https://github.com/kovetskiy/godocs"; + rev = "2d9428f80f3442e07f67daf7ba378cd0ff6cfe24"; + sha256 = "128dlvxqk31crzl9p3ps0nir724cjzxv4lxpgdvsir0wvfp8f83j"; + }; + } + { + goPackagePath = "github.com/kovetskiy/lorg"; + fetch = { + type = "git"; + url = "https://github.com/kovetskiy/lorg"; + rev = "9c6042b7edb0c491dd0722fad91e2b5e833d6b43"; + sha256 = "0j1cm7mni47vraxnyigc55cq0yxw8zdyjmrq2c7vnm5s4kiia8pi"; + }; + } + { + goPackagePath = "github.com/kovetskiy/spinner-go"; + fetch = { + type = "git"; + url = "https://github.com/kovetskiy/spinner-go"; + rev = "00597fd24fe0d8079821b68f71d73b0661401752"; + sha256 = "19qcpnvs61fsk7xgcj5b6s3zksnkc5rk9n5hx73v9ya7m2k7xr2n"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211"; + sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "cc27d85e17cec9768d2ac401ea5d619a9628f16d"; + sha256 = "1y3pkvypkxjrhlnsv8lcyd0c2q8mn5asfny2zi9j2vs77s5bd9qm"; + }; + } + { + goPackagePath = "github.com/reconquest/karma-go"; + fetch = { + type = "git"; + url = "https://github.com/reconquest/karma-go"; + rev = "1094651bd246b1685f7b368e099aba6fca9efd8f"; + sha256 = "0jiayzxwp0h7skg86q58rh58m2imdg3ng2vzpc2bxiz67lzcpk3r"; + }; + } + { + goPackagePath = "github.com/simplereach/timeutils"; + fetch = { + type = "git"; + url = "https://github.com/simplereach/timeutils"; + rev = "1a719258b86a08630289b86902ab16817ba641e9"; + sha256 = "08mf2j0dk07c9p279ydbrjxbjf113azmq0x8vhf7jvldcgjpw3m6"; + }; + } + { + goPackagePath = "github.com/zazab/zhash"; + fetch = { + type = "git"; + url = "https://github.com/zazab/zhash"; + rev = "ad45b89afe7af57319ca32f174e4dabeb00c44e4"; + sha256 = "16b6f70qwfyg0zvbpk0yj5jx4cv2ggkyiqc5nk8n0165z46i62hs"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "9856a29383ce1c59f308dd1cf0363a79b5bef6b5"; + sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba8d7cfede6..e70fe21c63f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2691,6 +2691,8 @@ in zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; + zabbixctl = callPackage ../tools/misc/zabbixctl { }; + zzuf = callPackage ../tools/security/zzuf { }; ### DEVELOPMENT / EMSCRIPTEN From 6049c39bdb3d8bfc01e2a86d2fc6ef6e46f9b0be Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 10 Jul 2019 10:30:43 +0200 Subject: [PATCH 16/43] keybase: fix eval after merge mistake --- pkgs/tools/security/keybase/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index e94289f048e..18e3836c99d 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHubtchurl +{ stdenv, lib, buildGoPackage, fetchFromGitHub , AVFoundation, AudioToolbox, ImageIO, CoreMedia , Foundation, CoreGraphics, MediaToolbox }: From 279a00106290045ab42e7df85edab114b53e13c6 Mon Sep 17 00:00:00 2001 From: SLNOS Date: Mon, 1 Jul 2019 00:00:00 +0000 Subject: [PATCH 17/43] firefoxPackages.tor-browser: 8.5.2 -> 8.5.4 --- .../networking/browsers/firefox/packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e7dc84ebda0..93449288075 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -245,16 +245,16 @@ in rec { }; tor-browser-8-5 = tbcommon rec { - ffversion = "60.7.0esr"; - tbversion = "8.5.2"; + ffversion = "60.8.0esr"; + tbversion = "8.5.4"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.7.0esr-8.5-2-slnos" - rev = "b8216328bf6bf1996fcd794d4531689a7c373a2f"; - sha256 = "0zmqam3c91iww33jpfyl6q6wacj20nqkfzyqryalfvnvx3zi0i1q"; + # branch "tor-browser-60.8.0esr-8.5-1-slnos" + rev = "9ec7e4832a68ba3a77f5e8e21dc930a25757f55d"; + sha256 = "10x9h2nm1p8cs0qnd8yjp7ly5raxagqyfjn4sj2y3i86ya5zygb9"; }; patches = [ From b837620e98d3661f2c3cc961ffc604d3bda71f7a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jul 2019 18:04:45 -0500 Subject: [PATCH 18/43] krita: 4.2.1 -> 4.2.2 https://krita.org/en/item/krita-4-2-2-released/ --- pkgs/applications/graphics/krita/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index ca174080778..cc46ac2d3bb 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -8,20 +8,13 @@ , python3Packages }: -let - -major = "4.2"; -minor = "1"; - -in - mkDerivation rec { - name = "krita-${version}"; - version = "${major}.${minor}"; + pname = "krita"; + version = "4.2.2"; src = fetchurl { - url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz"; - sha256 = "1jm9kj9cq2nhaqg3kvyb193hhkd6al1gh23fkl54dj88x3fpldim"; + url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz"; + sha256 = "1pzk5bqp3kh22djhvsvmsc7ybirs4hsnkpg1y9677m2gxwbqnnps"; }; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; From ce2f74df2cade57e74c235292c8b074281903e71 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 10 Jul 2019 12:35:48 +0200 Subject: [PATCH 19/43] Revert "systems/doubles.nix: add Apple doubles" The lib tests need to be fixed as well. This unbreaks the tarball job. This reverts commit 00ba557856d6217121e50ea69c251e9458d9dc08. --- lib/systems/doubles.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 39018d045b3..09e9089aa6f 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -13,11 +13,9 @@ let "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd" - "x86_64-cygwin" "x86_64-freebsd" "x86_64-linux" + "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux" "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris" - "x86_64-darwin" "aarch64-ios" "armv7a-ios" "x86_64-ios" "i686-ios" - "x86_64-windows" "i686-windows" "wasm64-wasi" "wasm32-wasi" From b179b1d7e0491d3819551515d6ac7e45de5d3017 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Tue, 9 Jul 2019 15:02:49 -0700 Subject: [PATCH 20/43] cocoapods: 1.7.3 -> 1.7.4 --- pkgs/development/mobile/cocoapods/Gemfile.lock | 8 ++++---- pkgs/development/mobile/cocoapods/gemset.nix | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 1ca395b5d92..758383455e0 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.3) + cocoapods (1.7.4) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.3) + cocoapods-core (= 1.7.4) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.3) + cocoapods-core (1.7.4) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -59,7 +59,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.10.0) + xcodeproj (1.11.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index e3e2b13b259..bb4ea396c09 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -40,10 +40,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c0xh7wh8l34wqiiwwhdakm6zin8xd5svgh63c6pb2pd1d4phhyv"; + sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc"; type = "gem"; }; - version = "1.7.3"; + version = "1.7.4"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -51,10 +51,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p76z708fbb61x0m585iaf912f0s3qw0a1mryhpqa2wyrjrlmg31"; + sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c"; type = "gem"; }; - version = "1.7.3"; + version = "1.7.4"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -254,9 +254,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7"; + sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; } \ No newline at end of file From 11b8159328358cc90165017a0cc9de3fc18c99d0 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Tue, 9 Jul 2019 15:02:59 -0700 Subject: [PATCH 21/43] cocoapods-beta: 1.7.3 -> 1.7.4 --- pkgs/development/mobile/cocoapods/Gemfile-beta.lock | 8 ++++---- pkgs/development/mobile/cocoapods/gemset-beta.nix | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 4783f9a8748..2c881a5c45a 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.3) + cocoapods (1.7.4) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.3) + cocoapods-core (= 1.7.4) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.3) + cocoapods-core (1.7.4) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -59,7 +59,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.10.0) + xcodeproj (1.11.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index 142f30615f6..bd89b448eac 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c0xh7wh8l34wqiiwwhdakm6zin8xd5svgh63c6pb2pd1d4phhyv"; + sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc"; type = "gem"; }; - version = "1.7.3"; + version = "1.7.4"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p76z708fbb61x0m585iaf912f0s3qw0a1mryhpqa2wyrjrlmg31"; + sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c"; type = "gem"; }; - version = "1.7.3"; + version = "1.7.4"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -292,9 +292,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7"; + sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; } \ No newline at end of file From 50464716e3eec4deee6ef8f9a58752eb1a29b16e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 10 Jul 2019 13:20:40 +0200 Subject: [PATCH 22/43] fuse3: 3.6.1 -> 3.6.2 --- pkgs/os-specific/linux/fuse/common.nix | 5 ++- pkgs/os-specific/linux/fuse/default.nix | 4 +- .../linux/fuse/fuse3-install.patch | 37 +++++-------------- 3 files changed, 15 insertions(+), 31 deletions(-) diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index f72b3cac737..f829f1da424 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -38,7 +38,10 @@ in stdenv.mkDerivation rec { outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common"; - mesonFlags = stdenv.lib.optional isFuse3 "-Dudevrulesdir=etc/udev/rules.d"; + mesonFlags = stdenv.lib.optionals isFuse3 [ + "-Dudevrulesdir=/udev/rules.d" + "-Duseroot=false" + ]; preConfigure = '' export MOUNT_FUSE_PATH=$out/sbin diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index a4dfda41a0c..f48e528b486 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.6.1"; - sha256Hash = "1118r2nx64cpv9s5a6dgh49y0pnjcc5ybpkh5pigxf14bpqa26pb"; + version = "3.6.2"; + sha256Hash = "1cxx94q6zqns1iw5d4g3ll8f78swqxl6h25bpxmqkqsj6c91pzkl"; }; } diff --git a/pkgs/os-specific/linux/fuse/fuse3-install.patch b/pkgs/os-specific/linux/fuse/fuse3-install.patch index 6f938536974..147bcb439fb 100644 --- a/pkgs/os-specific/linux/fuse/fuse3-install.patch +++ b/pkgs/os-specific/linux/fuse/fuse3-install.patch @@ -1,37 +1,18 @@ ---- a/util/install_helper.sh 2018-08-31 21:22:34.580563286 +0200 -+++ b/util/install_helper.sh 2018-08-31 21:30:54.837939149 +0200 -@@ -22,30 +22,11 @@ - DESTDIR="${DESTDIR%/}" +--- a/util/install_helper.sh 2019-07-10 12:00:15.984840142 +0200 ++++ b/util/install_helper.sh 2019-07-10 12:28:56.343011401 +0200 +@@ -37,10 +37,10 @@ fi --chown root:root "${DESTDIR}${bindir}/fusermount3" --chmod u+s "${DESTDIR}${bindir}/fusermount3" -- - install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \ - "${DESTDIR}${sysconfdir}/fuse.conf" - -- --if test ! -e "${DESTDIR}/dev/fuse"; then -- mkdir -p "${DESTDIR}/dev" -- mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229 --fi -- install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ - "${DESTDIR}${udevrulesdir}/99-fuse3.rules" -+ "${sysconfdir}/udev/rules.d/99-fuse3.rules" ++ "${sysconfdir}${udevrulesdir}/99-fuse3.rules" install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ - "${DESTDIR}${sysconfdir}/init.d/fuse3" -- -- --if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then -- /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true --else -- echo "== FURTHER ACTION REQUIRED ==" -- echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script" --fi -- -- +- "${DESTDIR}/etc/init.d/fuse3" ++ "${sysconfdir}/init.d/fuse3" + + + if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then diff --git a/util/meson.build b/util/meson.build index aa0e734..06d4378 100644 --- a/util/meson.build From 103c4f41fedfe51e97f7dc09dafaf6a696eaa35d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Jul 2019 07:28:07 -0400 Subject: [PATCH 23/43] linux: 4.14.132 -> 4.14.133 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 30750c9f5d6..d3d2e2728a2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.132"; + version = "4.14.133"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0c7k5yl2h929kvbzqij0p56myp9v14im4s72wky5d9idfadg71ns"; + sha256 = "005pg4f8l2qz8g6hd71pj567z91hwjwdwb37h4dbb3fj6kjl965y"; }; } // (args.argsOverride or {})) From 07f40d8f535777c90a5e0fded22225d2a3774524 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Jul 2019 07:28:13 -0400 Subject: [PATCH 24/43] linux: 4.19.57 -> 4.19.58 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index f38196fef7d..b9d05c9fe6e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.57"; + version = "4.19.58"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "11rz1pfphc4zkn3fbfavn1764g3ymp4b1bfnr7b630w8smcmfz1j"; + sha256 = "1waqk2ggnnaqa5pxhdbvxkkchvxxz9pbkqnr5pn5rj6h2v5644az"; }; } // (args.argsOverride or {})) From d21b26ac54230e361b83a1c6a08969d59640d80d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Jul 2019 07:28:19 -0400 Subject: [PATCH 25/43] linux: 4.4.184 -> 4.4.185 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index a80e578c75b..1e3da908519 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.184"; + version = "4.4.185"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jn3mwnfcvhnn0bqiyabkqii3rd6w5b982w3i085qj42q0pj6hv5"; + sha256 = "1ll694m5193dmwn8ys4sf2p6a6njd5pm38v862ih1iw7l3vj0l3s"; }; } // (args.argsOverride or {})) From d863c484bb5508f3a4a2a8098101196e2c5813f7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Jul 2019 07:28:28 -0400 Subject: [PATCH 26/43] linux: 4.9.184 -> 4.9.185 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 4f054dcc665..d611e4cf71e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.184"; + version = "4.9.185"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1bwzmmpc7k9n7p2s383pipdjc3hvqfbbacaxk7gdw9856pai8c83"; + sha256 = "16z3ijfzffpkp4mj42j3j8zbnpba1a67kd5cdqwb28spf32a66vc"; }; } // (args.argsOverride or {})) From f9796375213654758077e64b3a789596d116f487 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Jul 2019 07:28:37 -0400 Subject: [PATCH 27/43] linux: 5.1.16 -> 5.1.17 --- pkgs/os-specific/linux/kernel/linux-5.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index 85dc12c6b04..e0e64fdc5d4 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.16"; + version = "5.1.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0gms4zkx97njzk1czsnih6jj9f6knismixxndn1h11vq7sz5agla"; + sha256 = "0gf4jqmq6b66jrlygmvn2z8xif3n83yq85jldbm3r257crww6dar"; }; } // (args.argsOverride or {})) From dc336293a166a474d236256f9e196c435d5266a5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 10 Jul 2019 08:01:45 -0700 Subject: [PATCH 28/43] doc: fix after snaptools merge --- .../build-support => doc/functions}/snap/example-firefox.nix | 0 {pkgs/build-support => doc/functions}/snap/example-hello.nix | 0 doc/functions/snaptools.xml | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename {pkgs/build-support => doc/functions}/snap/example-firefox.nix (100%) rename {pkgs/build-support => doc/functions}/snap/example-hello.nix (100%) diff --git a/pkgs/build-support/snap/example-firefox.nix b/doc/functions/snap/example-firefox.nix similarity index 100% rename from pkgs/build-support/snap/example-firefox.nix rename to doc/functions/snap/example-firefox.nix diff --git a/pkgs/build-support/snap/example-hello.nix b/doc/functions/snap/example-hello.nix similarity index 100% rename from pkgs/build-support/snap/example-hello.nix rename to doc/functions/snap/example-hello.nix diff --git a/doc/functions/snaptools.xml b/doc/functions/snaptools.xml index a951c36730d..d0e3efdf6c6 100644 --- a/doc/functions/snaptools.xml +++ b/doc/functions/snaptools.xml @@ -38,7 +38,7 @@ The following expression packages GNU Hello as a Snapcraft snap. - + nix-build this expression and install it with snap install ./result --dangerous. @@ -57,7 +57,7 @@ example uses Firefox as an example, because it is one of the most complicated programs we could package. - + nix-build this expression and install it with snap install ./result --dangerous. From 1bc8cd8ff5fb4b6756bf23289693d8e24f7fa07f Mon Sep 17 00:00:00 2001 From: uHOOCCOOHu Date: Thu, 11 Jul 2019 00:15:44 +0800 Subject: [PATCH 29/43] tdesktop: 1.7.10 -> 1.7.14 --- .../telegram/tdesktop/default.nix | 8 +++---- .../telegram/tdesktop/generic.nix | 22 +++++++++++++------ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 14289a66e25..3e529481508 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,11 +4,11 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.7.10"; - sha256Hash = "04if7siv0ib5sbdkdc7vwmxyjy3fnijrshgc8i8m79marfkn3wac"; + version = "1.7.14"; + sha256Hash = "1bw804a9kffmn23wv0570wihbvfm7jy9cqmxlv196f4j7bw7zkv3"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "480743"; - archPatchesHash = "0jfyp642l2850yzgrw3irq8bn6vl44rx2693c5cshwbihd212af7"; + archPatchesRevision = "487779"; + archPatchesHash = "0f09hvimb66xqksb2v0zc4ryshx7y7z0rafzjd99x37rpib9f3kq"; }; in { stable = mkTelegram stableVersion; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index ef9367553ff..df06dc49eef 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -28,13 +28,17 @@ mkDerivation rec { sha256 = archPatchesHash; }; - # TODO: libtgvoip.patch no-gtk2.patch - # TODO: Avoid tdesktop_lottie_animation_qtdebug.patch and tdesktop_qtlottie_qtdebug.patch - patches = [ "${archPatches}/tdesktop.patch" "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" ]; + patches = [ + "${archPatches}/tdesktop.patch" + "${archPatches}/no-gtk2.patch" + # "${archPatches}/Use-system-wide-font.patch" + "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" + "${archPatches}/issue6219.patch" + ]; postPatch = '' substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ - --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' + --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \ --replace '"notify"' '"${libnotify}/lib/libnotify.so"' ''; @@ -75,12 +79,14 @@ mkDerivation rec { CPPFLAGS = NIX_CFLAGS_COMPILE; preConfigure = '' + patch -R -Np1 -i "${archPatches}/demibold.patch" + pushd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "${archPatches}/libtgvoip.patch" popd - pushd "Telegram/ThirdParty/qtlottie" - patch -Np1 -i "${archPatches}/tdesktop_qtlottie_qtdebug.patch" - popd + + # disable static-qt for rlottie + sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp" sed -i Telegram/gyp/telegram_linux.gypi \ -e 's,/usr,/does-not-exist,g' \ @@ -118,6 +124,8 @@ mkDerivation rec { export ASM=$(type -p gcc) ''; + cmakeFlags = [ "-UTDESKTOP_OFFICIAL_TARGET" ]; + installPhase = '' install -Dm755 Telegram $out/bin/telegram-desktop From 7d95bc0c85af1dd3650164757c2e2d511638f459 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 10 Jul 2019 12:21:22 -0400 Subject: [PATCH 30/43] nixos/libinput: use `types.lines` for additionalOptions --- nixos/modules/services/x11/hardware/libinput.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 58fe702d496..a0a5e265685 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -178,7 +178,7 @@ in { }; additionalOptions = mkOption { - type = types.str; + type = types.lines; default = ""; example = '' From 4dcd65aa993d908a32a71fe69156d4021fcf887f Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Thu, 11 Jul 2019 00:36:06 +0800 Subject: [PATCH 31/43] fzf: 0.17.5 -> 0.18.0 --- pkgs/tools/misc/fzf/default.nix | 51 ++++++++++---------- pkgs/tools/misc/fzf/deps.nix | 84 --------------------------------- 2 files changed, 26 insertions(+), 109 deletions(-) delete mode 100644 pkgs/tools/misc/fzf/deps.nix diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index de211d1d1c4..66da4f53099 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,27 +1,24 @@ -{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText, runtimeShell }: +{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, }: -buildGoPackage rec { - name = "fzf-${version}"; - version = "0.17.5"; - rev = "${version}"; - - goPackagePath = "github.com/junegunn/fzf"; +buildGoModule rec { + pname = "fzf"; + version = "0.18.0"; src = fetchFromGitHub { - inherit rev; owner = "junegunn"; - repo = "fzf"; - sha256 = "04kalm25sn5k24nrdmbkafp4zvxpm2l3rxchvccl0kz0j3szh62z"; + repo = pname; + rev = version; + sha256 = "0pwpr4fpw56yzzkcabzzgbgwraaxmp7xzzmap7w1xsrkbj7dl2xl"; }; - outputs = [ "bin" "out" "man" ]; + modSha256 = "0xc4166d74ix5nzjphrq4rgw7qpskz05ymzl77i2qh2nhbdb53p0"; + + outputs = [ "out" "man" ]; fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings"; buildInputs = [ ncurses ]; - goDeps = ./deps.nix; - patchPhase = '' sed -i -e "s|expand(':h:h')|'$bin'|" plugin/fzf.vim @@ -33,30 +30,34 @@ buildGoPackage rec { ''; preInstall = '' - mkdir -p $bin/share/fish/vendor_functions.d $bin/share/fish/vendor_conf.d - cp $src/shell/key-bindings.fish $bin/share/fish/vendor_functions.d/fzf_key_bindings.fish - cp ${fishHook} $bin/share/fish/vendor_conf.d/load-fzf-key-bindings.fish + mkdir -p $out/share/fish/{vendor_functions.d,vendor_conf.d} + cp $src/shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish + cp ${fishHook} $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish ''; postInstall = '' - cp $src/bin/fzf-tmux $bin/bin + name="${pname}-${version}" + + cp $src/bin/fzf-tmux $out/bin + mkdir -p $man/share/man cp -r $src/man/man1 $man/share/man - mkdir -p $out/share/vim-plugins/${name} - cp -r $src/plugin $out/share/vim-plugins/${name} - cp -R $src/shell $bin/share/fzf - cat <