From b7f1cf88331aa65f094b7ba91b1e7c34c1747172 Mon Sep 17 00:00:00 2001 From: "Scott W. Dunlop" Date: Wed, 16 Jan 2019 17:02:21 -0800 Subject: [PATCH 001/193] gnatsd: 1.2.0 -> 1.4.0 --- pkgs/servers/gnatsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gnatsd/default.nix b/pkgs/servers/gnatsd/default.nix index 81ea4056e091..e8e08271b3bc 100644 --- a/pkgs/servers/gnatsd/default.nix +++ b/pkgs/servers/gnatsd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { name = "gnatsd-${version}"; - version = "1.2.0"; + version = "1.4.0"; rev = "v${version}"; goPackagePath = "github.com/nats-io/gnatsd"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "nats-io"; repo = "gnatsd"; - sha256 = "186xywzdrmvlhlh9wgjs71rqvgab8vinlr3gkzkknny82nv7hcjw"; + sha256 = "0wxdvaxl273kd3wcas634hx1wx5piljgbfr6vhf669b1frkgrh2b"; }; meta = { From c26f2458d246e4a1d15911dcf444c10978506016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 20 Jan 2019 18:46:06 +0100 Subject: [PATCH 002/193] srt: init at 1.3.1 --- pkgs/development/libraries/srt/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/srt/default.nix diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix new file mode 100644 index 000000000000..b1882ff030b6 --- /dev/null +++ b/pkgs/development/libraries/srt/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, openssl +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "srt"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "Haivision"; + repo = "srt"; + rev = "v${version}"; + sha256 = "0cv73j9c8024p6pg16c4hiryiv4jpgrfj2xhfdaprsikmkdnygmz"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl ]; + + cmakeFlags = [ + # TODO Remove this when https://github.com/Haivision/srt/issues/538 is fixed and available to nixpkgs + # Workaround for the fact that srt incorrectly disables GNUInstallDirs when LIBDIR is specified, + # see https://github.com/NixOS/nixpkgs/pull/54463#discussion_r249878330 + "-UCMAKE_INSTALL_LIBDIR" + ]; + + meta = { + description = "Secure, Reliable, Transport"; + homepage = https://www.srtalliance.org; + license = licenses.mpl20; + maintainers = with maintainers; [ nh2 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d65dfadb8263..e4c0f2ba0326 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12658,6 +12658,8 @@ in srm = callPackage ../tools/security/srm { }; + srt = callPackage ../development/libraries/srt { }; + srtp = callPackage ../development/libraries/srtp { libpcap = if stdenv.isLinux then libpcap else null; }; From 31981d2cd9ae4eb3bf77e3fb904f0e8b45ea828d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 20 Jan 2019 18:59:47 +0100 Subject: [PATCH 003/193] gstreamer: Add srt support to gst-plugins-bad --- pkgs/development/libraries/gstreamer/bad/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 5d9c03b19190..8179806859c9 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -9,6 +9,7 @@ , libwebp, xvidcore, gnutls, mjpegtools , libGLU_combined, libintl, libgme , openssl, x265, libxml2 +, srt }: assert faacSupport -> faac != null; @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { libwebp xvidcore gnutls libGLU_combined libgme openssl x265 libxml2 libintl + srt ] ++ optional faacSupport faac ++ optional stdenv.isLinux wayland From 12ab4c330373c58284e936798e6db1f5a325d81f Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 24 Jan 2019 22:23:22 +0100 Subject: [PATCH 004/193] libLAS: fix build --- pkgs/development/libraries/libLAS/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 7bd2a1ec5738..15ef9ee890a6 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { "-DGDAL_CONFIG=${gdal}/bin/gdal-config" "-DWITH_LASZIP=ON" "-DLASZIP_INCLUDE_DIR=${LASzip}/include" + "-DCMAKE_EXE_LINKER_FLAGS=-pthread" ]; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' From 76b1610a35a6fe1082a892afa89345021dbdb475 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 24 Jan 2019 22:23:52 +0100 Subject: [PATCH 005/193] qgis: 2.18.22 -> 2.18.28 --- pkgs/applications/gis/qgis/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index b98d048d0343..61061a6d6721 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.22"; + name = "qgis-2.18.28"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig @@ -35,14 +35,15 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "00b3a2hfn3i7bdx7x96vz2nj0976vpkhid4ss7n8c33fdvw3k82a"; + sha256 = "18pijqls1isd2bpg0mkrw07jqvdfaiwwb9mvz7p2xrgqcjx7dxsq"; }; patches = [ - # https://github.com/qgis/QGIS/pull/7765 + # already merged upstream in QGIS-3.*, but needs to be backported to QGIS-2 (fetchpatch { - url = "https://github.com/qgis/QGIS/commit/6b61ef361a77f057dc29eb07463007bd9012b253.patch"; - sha256 = "1xibcahm18n7nxff1xvwwzjf505hvhiw5dk12is7aclv49h0rdf7"; + url = "https://patch-diff.githubusercontent.com/raw/qgis/QGIS/pull/7263.patch"; + name = "Ensure_qgis.db_is_writable_when_copied_from_RO_source"; + sha256 = "19wr2kz0x8x6p2n0ylzd4lqrdmbkxyxr0zpwf2vl9hdp92rdjxbv"; }) ]; From f15bdea8c3860eb78b17de609f93ddcca457dc4f Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Sat, 26 Jan 2019 16:32:19 +0100 Subject: [PATCH 006/193] buid-support: Add Ubuntu bionic base images --- pkgs/build-support/vm/default.nix | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 7880d98e6b6a..f31c2cdcff3f 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -964,6 +964,40 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; + ubuntu1804i386 = { + name = "ubuntu-18.04-bionic-i386"; + fullName = "Ubuntu 18.04 Bionic (i386)"; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/bionic/main/binary-i386/Packages.xz; + sha256 = "0f0v4131kwf7m7f8j3288rlqdxk1k3vqy74b7fcfd6jz9j8d840i"; + }) + (fetchurl { + url = mirror://ubuntu/dists/bionic/universe/binary-i386/Packages.xz; + sha256 = "1v75c0dqr0wp0dqd4hnci92qqs4hll8frqdbpswadgxm5chn91bw"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + + ubuntu1804x86_64 = { + name = "ubuntu-18.04-bionic-amd64"; + fullName = "Ubuntu 18.04 Bionic (amd64)"; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/bionic/main/binary-amd64/Packages.xz; + sha256 = "1ls81bjyvmfz6i919kszl7xks1ibrh1xqhsk6698ackndkm0wp39"; + }) + (fetchurl { + url = mirror://ubuntu/dists/bionic/universe/binary-amd64/Packages.xz; + sha256 = "1832nqpn4ap95b3sj870xqayrza9in4kih9jkmjax27pq6x15v1r"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + debian8i386 = { name = "debian-8.11-jessie-i386"; fullName = "Debian 8.11 Jessie (i386)"; From c72f8be60c52dfec9c4d243be13b68a3599aa7f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Jan 2019 16:40:39 -0800 Subject: [PATCH 007/193] yoshimi: 1.5.10 -> 1.5.10.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/yoshimi/versions --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 9d57095a26aa..24c033001cb6 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.10"; + version = "1.5.10.1"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0mazzn5pc4xnjci3yy1yfsx9l05gkxqzkmscaq1h75jpa7qfsial"; + sha256 = "02mmy17sa3dlwmjjahn8rfd6h67c5s0q3fvkf6ljrc2mbbpwc375"; }; buildInputs = [ From 6fa6fa5e621056ef470e582240d9d17968a21f90 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Jan 2019 23:38:36 -0800 Subject: [PATCH 008/193] sile: 0.9.5 -> 0.9.5.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sile/versions --- pkgs/tools/typesetting/sile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 609c782667e3..d12d39016ff1 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -18,11 +18,11 @@ in stdenv.mkDerivation rec { name = "sile-${version}"; - version = "0.9.5"; + version = "0.9.5.1"; src = fetchurl { url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0m80rkbkma11xsr7bbrmq5mdwi5k79clsrmc75blbnsf9wqil8dp"; + sha256 = "0fh0jbpsyqyq0hzq4midn7yw2z11hqdgqb9mmgz766cp152wrkb0"; }; nativeBuildInputs = [pkgconfig makeWrapper]; From d16ccbefad8bf2295758ab5bd62d418c0fdba308 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Jan 2019 23:43:39 -0800 Subject: [PATCH 009/193] sundials: 4.0.1 -> 4.0.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sundials/versions --- pkgs/development/libraries/sundials/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 8fe2431d142b..40bb8b8c43b7 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "4.0.1"; + version = "4.0.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "1m5f2glxmgc6imjr0yqqp448r8q3kvsfp8dxxn83k00fcb40kr19"; + sha256 = "0xfk0icsi63yi1dby4rn02ppwkzfykciw6q03bk454gdia9xcmk6"; }; preConfigure = '' From da0fbf4dd7deff4ed879171675e8f83c4e1a12d5 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 27 Jan 2019 20:46:55 -0500 Subject: [PATCH 010/193] linux_testing_bcachefs: 4.18.2018.10.12 -> 4.20.2019.01.23 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index b4df3b7b33e8..a3275786b338 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.18.2018.10.12"; - modDirVersion = "4.18.0"; + version = "4.20.2019.01.23"; + modDirVersion = "4.20.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "d7f6da1d60ec24266301231538ff6f09716537ed"; - sha256 = "05d7dh41nc35www8vmrn47wlf2mr2b8i4rm15vq3zgm32d0xv3lk"; + rev = "99750eab4d583132cf61f071082c7cf21f5295c0"; + sha256 = "05wg9w5f68qg02yrciir9h1wx448869763hg3w7j23wc2qywhwqb"; }; extraConfig = "BCACHEFS_FS m"; From efb1b47f9e74ff70272b9300d90de5fffaab410d Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 27 Jan 2019 20:47:24 -0500 Subject: [PATCH 011/193] bcachefs-tools: 2019-01-13 -> 2019-01-23 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 9f81db437134..eefc0beb1fcc 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -3,19 +3,19 @@ stdenv.mkDerivation rec { pname = "bcachefs-tools"; - version = "2019-01-13"; + version = "2019-01-23"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "47bd483d27ec13418978b24ec5951661d564ba35"; - sha256 = "0h0mi68f8hxjplh0f8yw9h1ax9y6cz9c9hlvl95nqhs352lkdrfj"; + rev = "35fca2f044d375b1590f499cfd34bef38ca0f8f1"; + sha256 = "1mmpwksszdi4n7zv3fm7qnmfk94m56d65lfw30553bnfm3yaz3k7"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 ]; installFlags = [ "PREFIX=${placeholder "out"}" ]; - + preInstall = '' substituteInPlace Makefile \ --replace "INITRAMFS_DIR=/etc/initramfs-tools" \ From f89b4fc4b150d4c8a281fc1a4c48e239502a8e51 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Mon, 28 Jan 2019 16:17:54 +0100 Subject: [PATCH 012/193] gauge: 1.0.3 -> 1.0.4 Signed-off-by: Vincent Demeester --- pkgs/development/tools/gauge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 82a7b4b0e276..c750b5537913 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gauge-${version}"; - version = "1.0.3"; + version = "1.0.4"; goPackagePath = "github.com/getgauge/gauge"; excludedPackages = ''\(build\|man\)''; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "0dcsgszg6ilf3sxan3ahf9cfpw66z3mh2svg2srxv8ici3ak8a2x"; + sha256 = "1b52kpv5561pyjvqi8xmidarqp6lcyyy4sjsl4qjx4cr7hmk8kc7"; }; meta = with stdenv.lib; { From 98c93c84e5307eb79b13ca644227d79bcc576d44 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 08:42:33 -0800 Subject: [PATCH 013/193] hivex: 1.3.15 -> 1.3.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/hivex/versions --- pkgs/development/libraries/hivex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 740d2d3244df..3a2e08e4b5bc 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "hivex-${version}"; - version = "1.3.15"; + version = "1.3.17"; src = fetchurl { url = "http://libguestfs.org/download/hivex/${name}.tar.gz"; - sha256 = "02vzipzrp1gr87rn7mkhyzr4zdjkp2dzcvvb223x7i0ch8ci7r4c"; + sha256 = "1nsjijgcpcl6vm7whbbpxqrjycajf7vy0sp5hfg4vmvjmf3lpjqk"; }; patches = [ ./hivex-syms.patch ]; From 4ad82dd6cdd01d195a929a786d006e63ada7a90f Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 31 Mar 2017 15:31:17 +0100 Subject: [PATCH 014/193] nixos/lightdm: allow cursor theme customisation. --- .../display-managers/lightdm-greeters/gtk.nix | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index d1ee076e9185..8682151f8ce1 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -12,6 +12,7 @@ let theme = cfg.theme.package; icons = cfg.iconTheme.package; + cursors = cfg.cursorTheme.package; # The default greeter provided with this expression is the GTK greeter. # Again, we need a few things in the environment for the greeter to run with @@ -28,7 +29,8 @@ let --set GTK_EXE_PREFIX "${theme}" \ --set GTK_DATA_PREFIX "${theme}" \ --set XDG_DATA_DIRS "${theme}/share:${icons}/share" \ - --set XDG_CONFIG_HOME "${theme}/share" + --set XDG_CONFIG_HOME "${theme}/share" \ + --set XCURSOR_PATH "${cursors}/share/icons" cat - > $out/lightdm-gtk-greeter.desktop << EOF [Desktop Entry] @@ -44,6 +46,8 @@ let [greeter] theme-name = ${cfg.theme.name} icon-theme-name = ${cfg.iconTheme.name} + cursor-theme-name = ${cfg.cursorTheme.name} + cursor-theme-size = ${toString cfg.cursorTheme.size} background = ${ldmcfg.background} ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"} ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"} @@ -106,6 +110,33 @@ in }; + cursorTheme = { + + package = mkOption { + default = pkgs.gnome3.defaultIconTheme; + defaultText = "pkgs.gnome3.defaultIconTheme"; + description = '' + The package path that contains the cursor theme given in the name option. + ''; + }; + + name = mkOption { + type = types.str; + default = "Adwaita"; + description = '' + Name of the cursor theme to use for the lightdm-gtk-greeter. + ''; + }; + + size = mkOption { + type = types.int; + default = 16; + description = '' + Size of the cursor theme to use for the lightdm-gtk-greeter. + ''; + }; + }; + clock-format = mkOption { type = types.nullOr types.str; default = null; From 6e581656d1ec489c8ba17b9e4a6332fb98235e75 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 27 Jan 2019 16:29:11 +0000 Subject: [PATCH 015/193] nixos/lightdm: inherit DPI settings from xserver config --- .../services/x11/display-managers/lightdm-greeters/gtk.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index d1ee076e9185..505c90ea95ca 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -6,6 +6,7 @@ let dmcfg = config.services.xserver.displayManager; ldmcfg = dmcfg.lightdm; + xcfg = config.services.xserver; cfg = ldmcfg.greeters.gtk; inherit (pkgs) writeText; @@ -47,6 +48,7 @@ let background = ${ldmcfg.background} ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"} ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"} + ${optionalString (xcfg.dpi != null) "xft-dpi=${toString xcfg.dpi}"} ${cfg.extraConfig} ''; From eae297ed068030535dd99240a2f20da2efabf616 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 12:42:51 -0800 Subject: [PATCH 016/193] cmst: 2018.01.06 -> 2019.01.13 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cmst/versions --- pkgs/tools/networking/cmst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index e20d62d1f077..cc88153bab9c 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cmst-${version}"; - version = "2018.01.06"; + version = "2019.01.13"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; rev = name; - sha256 = "1a3v7z75ghziymdj2w8603ql9nfac5q224ylfsqfxcqxw4bdip4r"; + sha256 = "13739f0ddld34dcqlfhylzn1zqz5a7jbp4a4id7gj7pcxjx1lafh"; }; nativeBuildInputs = [ qmake ]; From 2ab88b7dd9c0ffda0c4369e7cb92899820de68da Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 12:45:51 -0800 Subject: [PATCH 017/193] dhex: 0.68 -> 0.69 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dhex/versions --- pkgs/applications/editors/dhex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix index ff9ec73a2ef6..f4581c4beceb 100644 --- a/pkgs/applications/editors/dhex/default.nix +++ b/pkgs/applications/editors/dhex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dhex-${version}"; - version = "0.68"; + version = "0.69"; src = fetchurl { url = "http://www.dettus.net/dhex/dhex_${version}.tar.gz"; - sha256 = "126c34745b48a07448cfe36fe5913d37ec562ad72d3f732b99bd40f761f4da08"; + sha256 = "06y4lrp29f2fh303ijk1xhspa1d4x4dm6hnyw3dd8szi3k6hnwsj"; }; buildInputs = [ ncurses ]; From 32819a3f0a2216be2bbf11123ee7809d2caf19e3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 13:44:03 -0800 Subject: [PATCH 018/193] dar: 2.6.0 -> 2.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dar/versions --- pkgs/tools/backup/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 29d54eea4533..80d5937973f7 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.0"; + version = "2.6.1"; name = "dar-${version}"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "0avaffkfrgj8vhvnpqi4s21bsrlxl0xafpyd3v9n3f9hs2gnm3wg"; + sha256 = "107l9nirlqp7vx542ybza5vdsyykam4bjziq47xyb9hr7js86020"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] From 1eb59f30e5c8edb200a8328ee540d22af5174b67 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 14:21:23 -0800 Subject: [PATCH 019/193] dpkg: 1.19.2 -> 1.19.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dpkg/versions --- pkgs/tools/package-management/dpkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 8cb8237c538c..3ab7aa99c8df 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.19.2"; + version = "1.19.4"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "0w8vhvwnhvwq3k3cw9d1jiy61v4r81wv6q5rkliq2nq6z0naxwpq"; + sha256 = "1bp0zq3h1ad6rzljmmalkh9ms4y6znk1gmgjpy39as2mhvlk8ln1"; }; configureFlags = [ From 6cb6b90f1a67f0513fa34c3db880684e6ae533a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Jan 2019 15:22:28 +0100 Subject: [PATCH 020/193] home-assistant: 0.85.1 -> 0.86.4 --- .../home-assistant/component-packages.nix | 97 +++++++++++-------- pkgs/servers/home-assistant/default.nix | 16 +-- pkgs/servers/home-assistant/frontend.nix | 4 +- 3 files changed, 65 insertions(+), 52 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 66dfc4069ed6..73595c1d67bc 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.85.1"; + version = "0.86.4"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -21,17 +21,16 @@ "alarm_control_panel.egardia" = ps: with ps; [ ]; "alarm_control_panel.elkm1" = ps: with ps; [ ]; "alarm_control_panel.envisalink" = ps: with ps; [ ]; + "alarm_control_panel.homekit_controller" = ps: with ps; [ ]; "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ]; "alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; "alarm_control_panel.lupusec" = ps: with ps; [ ]; "alarm_control_panel.manual" = ps: with ps; [ ]; "alarm_control_panel.manual_mqtt" = ps: with ps; [ paho-mqtt ]; - "alarm_control_panel.mqtt" = ps: with ps; [ paho-mqtt ]; "alarm_control_panel.ness_alarm" = ps: with ps; [ ]; "alarm_control_panel.nx584" = ps: with ps; [ ]; "alarm_control_panel.satel_integra" = ps: with ps; [ ]; - "alarm_control_panel.simplisafe" = ps: with ps; [ ]; "alarm_control_panel.spc" = ps: with ps; [ ]; "alarm_control_panel.totalconnect" = ps: with ps; [ ]; "alarm_control_panel.verisure" = ps: with ps; [ ]; @@ -71,6 +70,7 @@ "automation.sun" = ps: with ps; [ ]; "automation.template" = ps: with ps; [ ]; "automation.time" = ps: with ps; [ ]; + "automation.time_pattern" = ps: with ps; [ ]; "automation.webhook" = ps: with ps; [ aiohttp-cors ]; "automation.zone" = ps: with ps; [ ]; "axis" = ps: with ps; [ ]; @@ -92,7 +92,6 @@ "binary_sensor.bmw_connected_drive" = ps: with ps; [ ]; "binary_sensor.command_line" = ps: with ps; [ ]; "binary_sensor.concord232" = ps: with ps; [ ]; - "binary_sensor.deconz" = ps: with ps; [ ]; "binary_sensor.demo" = ps: with ps; [ ]; "binary_sensor.digital_ocean" = ps: with ps; [ digital-ocean ]; "binary_sensor.ecobee" = ps: with ps; [ ]; @@ -100,7 +99,6 @@ "binary_sensor.eight_sleep" = ps: with ps; [ ]; "binary_sensor.enocean" = ps: with ps; [ ]; "binary_sensor.envisalink" = ps: with ps; [ ]; - "binary_sensor.esphome" = ps: with ps; [ ]; "binary_sensor.ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; "binary_sensor.ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; "binary_sensor.fibaro" = ps: with ps; [ ]; @@ -117,12 +115,11 @@ "binary_sensor.iss" = ps: with ps; [ ]; "binary_sensor.isy994" = ps: with ps; [ ]; "binary_sensor.knx" = ps: with ps; [ ]; - "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; + "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors ]; "binary_sensor.linode" = ps: with ps; [ linode-api ]; "binary_sensor.lupusec" = ps: with ps; [ ]; "binary_sensor.maxcube" = ps: with ps; [ ]; "binary_sensor.modbus" = ps: with ps; [ ]; - "binary_sensor.mqtt" = ps: with ps; [ paho-mqtt ]; "binary_sensor.mychevy" = ps: with ps; [ ]; "binary_sensor.mysensors" = ps: with ps; [ ]; "binary_sensor.mystrom" = ps: with ps; [ aiohttp-cors ]; @@ -132,14 +129,12 @@ "binary_sensor.nx584" = ps: with ps; [ ]; "binary_sensor.octoprint" = ps: with ps; [ ]; "binary_sensor.opentherm_gw" = ps: with ps; [ ]; - "binary_sensor.openuv" = ps: with ps; [ ]; "binary_sensor.pilight" = ps: with ps; [ ]; "binary_sensor.ping" = ps: with ps; [ ]; "binary_sensor.point" = ps: with ps; [ ]; "binary_sensor.qwikswitch" = ps: with ps; [ ]; "binary_sensor.rachio" = ps: with ps; [ ]; "binary_sensor.raincloud" = ps: with ps; [ ]; - "binary_sensor.rainmachine" = ps: with ps; [ ]; "binary_sensor.random" = ps: with ps; [ ]; "binary_sensor.raspihats" = ps: with ps; [ ]; "binary_sensor.rest" = ps: with ps; [ ]; @@ -174,7 +169,6 @@ "binary_sensor.wirelesstag" = ps: with ps; [ ]; "binary_sensor.workday" = ps: with ps; [ ]; "binary_sensor.xiaomi_aqara" = ps: with ps; [ ]; - "binary_sensor.zha" = ps: with ps; [ ]; "binary_sensor.zigbee" = ps: with ps; [ ]; "binary_sensor.zwave" = ps: with ps; [ ]; "blink" = ps: with ps; [ ]; @@ -204,7 +198,6 @@ "camera.local_file" = ps: with ps; [ ]; "camera.logi_circle" = ps: with ps; [ ]; "camera.mjpeg" = ps: with ps; [ ]; - "camera.mqtt" = ps: with ps; [ paho-mqtt ]; "camera.neato" = ps: with ps; [ pybotvac ]; "camera.nest" = ps: with ps; [ ]; "camera.netatmo" = ps: with ps; [ ]; @@ -247,7 +240,6 @@ "climate.melissa" = ps: with ps; [ ]; "climate.mill" = ps: with ps; [ ]; "climate.modbus" = ps: with ps; [ ]; - "climate.mqtt" = ps: with ps; [ paho-mqtt ]; "climate.mysensors" = ps: with ps; [ ]; "climate.nest" = ps: with ps; [ ]; "climate.netatmo" = ps: with ps; [ ]; @@ -301,20 +293,18 @@ "cover.aladdin_connect" = ps: with ps; [ ]; "cover.brunt" = ps: with ps; [ ]; "cover.command_line" = ps: with ps; [ ]; - "cover.deconz" = ps: with ps; [ ]; "cover.demo" = ps: with ps; [ ]; - "cover.esphome" = ps: with ps; [ ]; "cover.fibaro" = ps: with ps; [ ]; "cover.garadget" = ps: with ps; [ ]; "cover.gogogate2" = ps: with ps; [ ]; "cover.group" = ps: with ps; [ ]; + "cover.homekit_controller" = ps: with ps; [ ]; "cover.homematic" = ps: with ps; [ pyhomematic ]; "cover.insteon" = ps: with ps; [ ]; "cover.isy994" = ps: with ps; [ ]; "cover.knx" = ps: with ps; [ ]; "cover.lutron" = ps: with ps; [ ]; "cover.lutron_caseta" = ps: with ps; [ ]; - "cover.mqtt" = ps: with ps; [ paho-mqtt ]; "cover.myq" = ps: with ps; [ ]; "cover.mysensors" = ps: with ps; [ ]; "cover.opengarage" = ps: with ps; [ ]; @@ -337,9 +327,16 @@ "daikin.const" = ps: with ps; [ ]; "datadog" = ps: with ps; [ datadog ]; "deconz" = ps: with ps; [ ]; + "deconz.binary_sensor" = ps: with ps; [ ]; "deconz.config_flow" = ps: with ps; [ ]; "deconz.const" = ps: with ps; [ ]; + "deconz.cover" = ps: with ps; [ ]; + "deconz.deconz_device" = ps: with ps; [ ]; "deconz.gateway" = ps: with ps; [ ]; + "deconz.light" = ps: with ps; [ ]; + "deconz.scene" = ps: with ps; [ ]; + "deconz.sensor" = ps: with ps; [ ]; + "deconz.switch" = ps: with ps; [ ]; "demo" = ps: with ps; [ aiohttp-cors ]; "device_sun_light_trigger" = ps: with ps; [ ]; "device_tracker" = ps: with ps; [ ]; @@ -358,7 +355,6 @@ "device_tracker.demo" = ps: with ps; [ ]; "device_tracker.freebox" = ps: with ps; [ ]; "device_tracker.fritz" = ps: with ps; [ fritzconnection ]; - "device_tracker.geofency" = ps: with ps; [ aiohttp-cors ]; "device_tracker.google_maps" = ps: with ps; [ ]; "device_tracker.googlehome" = ps: with ps; [ ]; "device_tracker.gpslogger" = ps: with ps; [ aiohttp-cors ]; @@ -419,26 +415,33 @@ "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_hue.hue_api" = ps: with ps; [ ]; "emulated_hue.upnp" = ps: with ps; [ ]; + "emulated_roku" = ps: with ps; [ ]; + "emulated_roku.binding" = ps: with ps; [ ]; + "emulated_roku.config_flow" = ps: with ps; [ ]; + "emulated_roku.const" = ps: with ps; [ ]; "enocean" = ps: with ps; [ ]; "envisalink" = ps: with ps; [ ]; "esphome" = ps: with ps; [ ]; + "esphome.binary_sensor" = ps: with ps; [ ]; "esphome.config_flow" = ps: with ps; [ ]; + "esphome.cover" = ps: with ps; [ ]; + "esphome.fan" = ps: with ps; [ ]; + "esphome.light" = ps: with ps; [ ]; + "esphome.sensor" = ps: with ps; [ ]; + "esphome.switch" = ps: with ps; [ ]; "eufy" = ps: with ps; [ ]; "evohome" = ps: with ps; [ ]; "fan" = ps: with ps; [ ]; "fan.comfoconnect" = ps: with ps; [ ]; "fan.demo" = ps: with ps; [ ]; "fan.dyson" = ps: with ps; [ ]; - "fan.esphome" = ps: with ps; [ ]; "fan.insteon" = ps: with ps; [ ]; "fan.isy994" = ps: with ps; [ ]; - "fan.mqtt" = ps: with ps; [ paho-mqtt ]; "fan.template" = ps: with ps; [ ]; "fan.tuya" = ps: with ps; [ ]; "fan.wemo" = ps: with ps; [ ]; "fan.wink" = ps: with ps; [ ]; "fan.xiaomi_miio" = ps: with ps; [ construct ]; - "fan.zha" = ps: with ps; [ ]; "fan.zwave" = ps: with ps; [ ]; "feedreader" = ps: with ps; [ feedparser ]; "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; @@ -456,6 +459,7 @@ "geo_location.nsw_rural_fire_service_feed" = ps: with ps; [ ]; "geo_location.usgs_earthquakes_feed" = ps: with ps; [ ]; "geofency" = ps: with ps; [ aiohttp-cors ]; + "geofency.device_tracker" = ps: with ps; [ aiohttp-cors ]; "goalfeed" = ps: with ps; [ ]; "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; @@ -465,6 +469,7 @@ "google_assistant.smart_home" = ps: with ps; [ ]; "google_assistant.trait" = ps: with ps; [ ]; "google_domains" = ps: with ps; [ ]; + "gpslogger" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; "greeneye_monitor" = ps: with ps; [ ]; "group" = ps: with ps; [ ]; @@ -512,6 +517,7 @@ "hue.config_flow" = ps: with ps; [ ]; "hue.const" = ps: with ps; [ ]; "hue.errors" = ps: with ps; [ ]; + "hue.light" = ps: with ps; [ aiohue ]; "hydrawise" = ps: with ps; [ ]; "idteck_prox" = ps: with ps; [ ]; "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; @@ -550,7 +556,7 @@ "keyboard_remote" = ps: with ps; [ evdev ]; "kira" = ps: with ps; [ ]; "knx" = ps: with ps; [ ]; - "konnected" = ps: with ps; [ aiohttp-cors netdisco ]; + "konnected" = ps: with ps; [ aiohttp-cors ]; "lametric" = ps: with ps; [ ]; "lcn" = ps: with ps; [ ]; "lifx" = ps: with ps; [ ]; @@ -560,13 +566,11 @@ "light.avion" = ps: with ps; [ ]; "light.blinksticklight" = ps: with ps; [ BlinkStick ]; "light.blinkt" = ps: with ps; [ ]; - "light.deconz" = ps: with ps; [ ]; "light.decora" = ps: with ps; [ ]; "light.decora_wifi" = ps: with ps; [ ]; "light.demo" = ps: with ps; [ ]; "light.elkm1" = ps: with ps; [ ]; "light.enocean" = ps: with ps; [ ]; - "light.esphome" = ps: with ps; [ ]; "light.eufy" = ps: with ps; [ ]; "light.fibaro" = ps: with ps; [ ]; "light.flux_led" = ps: with ps; [ ]; @@ -578,7 +582,6 @@ "light.homematic" = ps: with ps; [ pyhomematic ]; "light.homematicip_cloud" = ps: with ps; [ ]; "light.homeworks" = ps: with ps; [ ]; - "light.hue" = ps: with ps; [ aiohue ]; "light.hyperion" = ps: with ps; [ ]; "light.iglo" = ps: with ps; [ ]; "light.ihc" = ps: with ps; [ defusedxml ]; @@ -595,7 +598,6 @@ "light.lutron_caseta" = ps: with ps; [ ]; "light.lw12wifi" = ps: with ps; [ ]; "light.mochad" = ps: with ps; [ ]; - "light.mqtt" = ps: with ps; [ paho-mqtt ]; "light.mysensors" = ps: with ps; [ ]; "light.mystrom" = ps: with ps; [ ]; "light.nanoleaf_aurora" = ps: with ps; [ nanoleaf ]; @@ -629,23 +631,23 @@ "light.yeelight" = ps: with ps; [ ]; "light.yeelightsunflower" = ps: with ps; [ ]; "light.zengge" = ps: with ps; [ ]; - "light.zha" = ps: with ps; [ ]; "light.zigbee" = ps: with ps; [ ]; "light.zwave" = ps: with ps; [ ]; "lightwave" = ps: with ps; [ ]; "linode" = ps: with ps; [ linode-api ]; "lirc" = ps: with ps; [ ]; "litejet" = ps: with ps; [ ]; + "locative" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; "lock.abode" = ps: with ps; [ ]; "lock.august" = ps: with ps; [ ]; "lock.bmw_connected_drive" = ps: with ps; [ ]; "lock.demo" = ps: with ps; [ ]; + "lock.homekit_controller" = ps: with ps; [ ]; "lock.homematic" = ps: with ps; [ pyhomematic ]; "lock.isy994" = ps: with ps; [ ]; "lock.kiwi" = ps: with ps; [ ]; "lock.lockitron" = ps: with ps; [ ]; - "lock.mqtt" = ps: with ps; [ paho-mqtt ]; "lock.nello" = ps: with ps; [ ]; "lock.nuki" = ps: with ps; [ ]; "lock.sesame" = ps: with ps; [ ]; @@ -673,6 +675,7 @@ "mailbox.asterisk_mbox" = ps: with ps; [ ]; "mailbox.demo" = ps: with ps; [ ]; "mailgun" = ps: with ps; [ aiohttp-cors ]; + "mailgun.notify" = ps: with ps; [ aiohttp-cors ]; "map" = ps: with ps; [ ]; "matrix" = ps: with ps; [ matrix-client ]; "maxcube" = ps: with ps; [ ]; @@ -713,7 +716,6 @@ "media_player.mpchc" = ps: with ps; [ ]; "media_player.mpd" = ps: with ps; [ mpd2 ]; "media_player.nad" = ps: with ps; [ ]; - "media_player.nadtcp" = ps: with ps; [ ]; "media_player.onkyo" = ps: with ps; [ onkyo-eiscp ]; "media_player.openhome" = ps: with ps; [ ]; "media_player.panasonic_bluray" = ps: with ps; [ ]; @@ -749,11 +751,22 @@ "mochad" = ps: with ps; [ ]; "modbus" = ps: with ps; [ ]; "mqtt" = ps: with ps; [ paho-mqtt ]; + "mqtt.alarm_control_panel" = ps: with ps; [ paho-mqtt ]; + "mqtt.binary_sensor" = ps: with ps; [ paho-mqtt ]; + "mqtt.camera" = ps: with ps; [ paho-mqtt ]; + "mqtt.climate" = ps: with ps; [ paho-mqtt ]; "mqtt.config_flow" = ps: with ps; [ ]; "mqtt.const" = ps: with ps; [ ]; + "mqtt.cover" = ps: with ps; [ paho-mqtt ]; "mqtt.discovery" = ps: with ps; [ ]; + "mqtt.fan" = ps: with ps; [ paho-mqtt ]; + "mqtt.light" = ps: with ps; [ paho-mqtt ]; + "mqtt.lock" = ps: with ps; [ paho-mqtt ]; + "mqtt.sensor" = ps: with ps; [ paho-mqtt ]; "mqtt.server" = ps: with ps; [ aiohttp-cors hbmqtt ]; "mqtt.subscription" = ps: with ps; [ ]; + "mqtt.switch" = ps: with ps; [ paho-mqtt ]; + "mqtt.vacuum" = ps: with ps; [ paho-mqtt ]; "mqtt_eventstream" = ps: with ps; [ paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ paho-mqtt ]; "mychevy" = ps: with ps; [ ]; @@ -805,7 +818,6 @@ "notify.lametric" = ps: with ps; [ ]; "notify.lannouncer" = ps: with ps; [ ]; "notify.llamalab_automate" = ps: with ps; [ ]; - "notify.mailgun" = ps: with ps; [ aiohttp-cors ]; "notify.mastodon" = ps: with ps; [ ]; "notify.matrix" = ps: with ps; [ matrix-client ]; "notify.message_bird" = ps: with ps; [ ]; @@ -844,8 +856,10 @@ "onboarding.views" = ps: with ps; [ ]; "opentherm_gw" = ps: with ps; [ ]; "openuv" = ps: with ps; [ ]; + "openuv.binary_sensor" = ps: with ps; [ ]; "openuv.config_flow" = ps: with ps; [ ]; "openuv.const" = ps: with ps; [ ]; + "openuv.sensor" = ps: with ps; [ ]; "owntracks" = ps: with ps; [ aiohttp-cors libnacl ]; "owntracks.config_flow" = ps: with ps; [ ]; "panel_custom" = ps: with ps; [ aiohttp-cors ]; @@ -865,8 +879,11 @@ "rainbird" = ps: with ps; [ ]; "raincloud" = ps: with ps; [ ]; "rainmachine" = ps: with ps; [ ]; + "rainmachine.binary_sensor" = ps: with ps; [ ]; "rainmachine.config_flow" = ps: with ps; [ ]; "rainmachine.const" = ps: with ps; [ ]; + "rainmachine.sensor" = ps: with ps; [ ]; + "rainmachine.switch" = ps: with ps; [ ]; "raspihats" = ps: with ps; [ ]; "recorder" = ps: with ps; [ sqlalchemy ]; "recorder.const" = ps: with ps; [ ]; @@ -880,11 +897,13 @@ "remote.harmony" = ps: with ps; [ ]; "remote.itach" = ps: with ps; [ ]; "remote.kira" = ps: with ps; [ ]; + "remote.roku" = ps: with ps; [ ]; "remote.xiaomi_miio" = ps: with ps; [ construct ]; "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ ]; "rfxtrx" = ps: with ps; [ ]; "ring" = ps: with ps; [ ]; + "roku" = ps: with ps; [ ]; "route53" = ps: with ps; [ boto3 ]; "rpi_gpio" = ps: with ps; [ ]; "rpi_pfio" = ps: with ps; [ ]; @@ -892,7 +911,6 @@ "sabnzbd" = ps: with ps; [ ]; "satel_integra" = ps: with ps; [ ]; "scene" = ps: with ps; [ ]; - "scene.deconz" = ps: with ps; [ ]; "scene.elkm1" = ps: with ps; [ ]; "scene.fibaro" = ps: with ps; [ ]; "scene.homeassistant" = ps: with ps; [ ]; @@ -956,7 +974,6 @@ "sensor.currencylayer" = ps: with ps; [ ]; "sensor.daikin" = ps: with ps; [ ]; "sensor.darksky" = ps: with ps; [ python-forecastio ]; - "sensor.deconz" = ps: with ps; [ ]; "sensor.deluge" = ps: with ps; [ deluge-client ]; "sensor.demo" = ps: with ps; [ ]; "sensor.deutsche_bahn" = ps: with ps; [ ]; @@ -985,7 +1002,6 @@ "sensor.entur_public_transport" = ps: with ps; [ ]; "sensor.envirophat" = ps: with ps; [ ]; "sensor.envisalink" = ps: with ps; [ ]; - "sensor.esphome" = ps: with ps; [ ]; "sensor.etherscan" = ps: with ps; [ ]; "sensor.fail2ban" = ps: with ps; [ ]; "sensor.fastdotcom" = ps: with ps; [ ]; @@ -1068,7 +1084,6 @@ "sensor.mold_indicator" = ps: with ps; [ ]; "sensor.moon" = ps: with ps; [ ]; "sensor.mopar" = ps: with ps; [ ]; - "sensor.mqtt" = ps: with ps; [ paho-mqtt ]; "sensor.mqtt_room" = ps: with ps; [ paho-mqtt ]; "sensor.mvglive" = ps: with ps; [ PyMVGLive ]; "sensor.mychevy" = ps: with ps; [ ]; @@ -1093,7 +1108,6 @@ "sensor.openhardwaremonitor" = ps: with ps; [ ]; "sensor.opensky" = ps: with ps; [ ]; "sensor.opentherm_gw" = ps: with ps; [ ]; - "sensor.openuv" = ps: with ps; [ ]; "sensor.openweathermap" = ps: with ps; [ pyowm ]; "sensor.otp" = ps: with ps; [ pyotp ]; "sensor.pi_hole" = ps: with ps; [ ]; @@ -1113,7 +1127,6 @@ "sensor.radarr" = ps: with ps; [ ]; "sensor.rainbird" = ps: with ps; [ ]; "sensor.raincloud" = ps: with ps; [ ]; - "sensor.rainmachine" = ps: with ps; [ ]; "sensor.random" = ps: with ps; [ ]; "sensor.rest" = ps: with ps; [ ]; "sensor.rflink" = ps: with ps; [ ]; @@ -1220,7 +1233,6 @@ "sensor.zabbix" = ps: with ps; [ ]; "sensor.zamg" = ps: with ps; [ ]; "sensor.zestimate" = ps: with ps; [ xmltodict ]; - "sensor.zha" = ps: with ps; [ ]; "sensor.zigbee" = ps: with ps; [ ]; "sensor.zoneminder" = ps: with ps; [ zm-py ]; "sensor.zwave" = ps: with ps; [ ]; @@ -1228,6 +1240,7 @@ "shiftr" = ps: with ps; [ paho-mqtt ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; "simplisafe" = ps: with ps; [ ]; + "simplisafe.alarm_control_panel" = ps: with ps; [ ]; "simplisafe.config_flow" = ps: with ps; [ ]; "simplisafe.const" = ps: with ps; [ ]; "sisyphus" = ps: with ps; [ ]; @@ -1258,7 +1271,6 @@ "switch.bbb_gpio" = ps: with ps; [ ]; "switch.broadlink" = ps: with ps; [ broadlink ]; "switch.command_line" = ps: with ps; [ ]; - "switch.deconz" = ps: with ps; [ ]; "switch.deluge" = ps: with ps; [ deluge-client ]; "switch.demo" = ps: with ps; [ ]; "switch.digital_ocean" = ps: with ps; [ digital-ocean ]; @@ -1269,7 +1281,6 @@ "switch.edp_redy" = ps: with ps; [ ]; "switch.elkm1" = ps: with ps; [ ]; "switch.enocean" = ps: with ps; [ ]; - "switch.esphome" = ps: with ps; [ ]; "switch.eufy" = ps: with ps; [ ]; "switch.fibaro" = ps: with ps; [ ]; "switch.flux" = ps: with ps; [ ]; @@ -1290,7 +1301,7 @@ "switch.isy994" = ps: with ps; [ ]; "switch.kankun" = ps: with ps; [ ]; "switch.knx" = ps: with ps; [ ]; - "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; + "switch.konnected" = ps: with ps; [ aiohttp-cors ]; "switch.lightwave" = ps: with ps; [ ]; "switch.linode" = ps: with ps; [ linode-api ]; "switch.litejet" = ps: with ps; [ ]; @@ -1300,7 +1311,6 @@ "switch.mfi" = ps: with ps; [ ]; "switch.mochad" = ps: with ps; [ ]; "switch.modbus" = ps: with ps; [ ]; - "switch.mqtt" = ps: with ps; [ paho-mqtt ]; "switch.mysensors" = ps: with ps; [ ]; "switch.mystrom" = ps: with ps; [ ]; "switch.neato" = ps: with ps; [ pybotvac ]; @@ -1313,7 +1323,6 @@ "switch.rachio" = ps: with ps; [ ]; "switch.rainbird" = ps: with ps; [ ]; "switch.raincloud" = ps: with ps; [ ]; - "switch.rainmachine" = ps: with ps; [ ]; "switch.raspihats" = ps: with ps; [ ]; "switch.raspyrfm" = ps: with ps; [ ]; "switch.recswitch" = ps: with ps; [ ]; @@ -1356,7 +1365,6 @@ "switch.wirelesstag" = ps: with ps; [ ]; "switch.xiaomi_aqara" = ps: with ps; [ ]; "switch.xiaomi_miio" = ps: with ps; [ construct ]; - "switch.zha" = ps: with ps; [ ]; "switch.zigbee" = ps: with ps; [ ]; "switch.zoneminder" = ps: with ps; [ zm-py ]; "switch.zwave" = ps: with ps; [ ]; @@ -1408,7 +1416,6 @@ "vacuum.demo" = ps: with ps; [ ]; "vacuum.dyson" = ps: with ps; [ ]; "vacuum.ecovacs" = ps: with ps; [ ]; - "vacuum.mqtt" = ps: with ps; [ paho-mqtt ]; "vacuum.neato" = ps: with ps; [ pybotvac ]; "vacuum.roomba" = ps: with ps; [ ]; "vacuum.xiaomi_miio" = ps: with ps; [ construct ]; @@ -1458,11 +1465,17 @@ "zabbix" = ps: with ps; [ ]; "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; "zha" = ps: with ps; [ ]; + "zha.api" = ps: with ps; [ ]; + "zha.binary_sensor" = ps: with ps; [ ]; "zha.config_flow" = ps: with ps; [ ]; "zha.const" = ps: with ps; [ ]; "zha.entities" = ps: with ps; [ ]; "zha.event" = ps: with ps; [ ]; + "zha.fan" = ps: with ps; [ ]; "zha.helpers" = ps: with ps; [ ]; + "zha.light" = ps: with ps; [ ]; + "zha.sensor" = ps: with ps; [ ]; + "zha.switch" = ps: with ps; [ ]; "zigbee" = ps: with ps; [ ]; "zone" = ps: with ps; [ ]; "zone.config_flow" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c56423adcdd0..27eff24d7043 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -18,16 +18,16 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py - (mkOverride "aiohttp" "3.5.1" - "c115744b2a0bf666fd8cde52a6d3e9319ffeb486009579743f5adfdcf0bf0773") + (mkOverride "aiohttp" "3.5.4" + "9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf") (mkOverride "astral" "1.7.1" "88086fd2006c946567285286464b2da3294a3b0cbba4410b7008ec2458f82a07") (mkOverride "async-timeout" "3.0.1" "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f") (mkOverride "attrs" "18.2.0" "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69") - (mkOverride "bcrypt" "3.1.4" - "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d") + (mkOverride "bcrypt" "3.1.5" + "136243dc44e5bab9b61206bd46fff3018bd80980b1a1dfbab64a22ff5745957f") (mkOverride "pyjwt" "1.6.4" "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176") (mkOverride "cryptography" "2.3.1" @@ -38,8 +38,8 @@ let "7723daf30996db26573176bddcdf5fcb98f66dc70df05c9cb29f2c79b8193245") (mkOverride "requests" "2.21.0" "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e") - (mkOverride "ruamel_yaml" "0.15.81" - "6cbe7273a2e7667cd2ca7b12bec1c715a8259ad80f09c6f12c378f664d29fa5e") + (mkOverride "ruamel_yaml" "0.15.85" + "34af6e2f9787acd3937b55c0279f46adff43124c5d72dced84aab6c89d1a960f") (mkOverride "voluptuous" "0.11.5" "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") (mkOverride "voluptuous-serialize" "2.0.0" @@ -87,7 +87,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.85.1"; + hassVersion = "0.86.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -102,7 +102,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0i9s0mgzfs3s6k4vw2zvwgqziz77fghpijrjrxx5nbrmm592h01a"; + sha256 = "13yyzcwz44gz6j0fh1awws83p6fmpib9ribm1453qr172knanhjy"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index d4be40c73685..1ea9e96d8f98 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20190109.1"; + version = "20190121.1"; src = fetchPypi { inherit pname version; - sha256 = "2ca035461c06591dc793c7651ed3f7c17ab3addf5859e89d2f956215433140ba"; + sha256 = "7d1e127249dbefd0c8e101d8b178eeae6bf76a0296d8b22ed33759e23ef07856"; }; propagatedBuildInputs = [ user-agents ]; From 7cc7c5374c1bbad10774d81d81e644662b06acb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Jan 2019 15:52:05 +0100 Subject: [PATCH 021/193] nixos/home-assistant: add lovelaceConfig option --- .../modules/services/misc/home-assistant.nix | 41 +++++++++++++++++-- nixos/tests/home-assistant.nix | 11 +++++ 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 2e9aa33aeeee..48271eeacc38 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -8,7 +8,10 @@ let # cfg.config != null can be assumed here configFile = pkgs.writeText "configuration.json" (builtins.toJSON (if cfg.applyDefaultConfig then - (lib.recursiveUpdate defaultConfig cfg.config) else cfg.config)); + (recursiveUpdate defaultConfig cfg.config) else cfg.config)); + + lovelaceConfigFile = pkgs.writeText "ui-lovelace.json" + (builtins.toJSON cfg.lovelaceConfig); availableComponents = pkgs.home-assistant.availableComponents; @@ -45,6 +48,8 @@ let defaultConfig = { homeassistant.time_zone = config.time.timeZone; http.server_port = (toString cfg.port); + } // optionalAttrs (cfg.lovelaceConfig != null) { + lovelace.mode = "yaml"; }; in { @@ -99,6 +104,31 @@ in { ''; }; + lovelaceConfig = mkOption { + default = null; + type = with types; nullOr attrs; + # from https://www.home-assistant.io/lovelace/yaml-mode/ + example = literalExample '' + { + title = "My Awesome Home"; + views = [ { + title = "Example"; + cards = [ { + type = "markdown"; + title = "Lovelace"; + content = "Welcome to your **Lovelace UI**."; + } ]; + } ]; + } + ''; + description = '' + Your ui-lovelace.yaml as a Nix attribute set. + Setting this option will automatically add + lovelace.mode = "yaml"; to your . + Beware that setting this option will delete your previous ui-lovelace.yaml + ''; + }; + package = mkOption { default = pkgs.home-assistant; defaultText = "pkgs.home-assistant"; @@ -144,11 +174,16 @@ in { systemd.services.home-assistant = { description = "Home Assistant"; after = [ "network.target" ]; - preStart = lib.optionalString (cfg.config != null) '' - config=${cfg.configDir}/configuration.yaml + preStart = optionalString (cfg.config != null) '' + config="${cfg.configDir}/configuration.yaml" rm -f $config ${pkgs.remarshal}/bin/json2yaml -i ${configFile} -o $config chmod 444 $config + '' + optionalString (cfg.lovelaceConfig != null) '' + config="${cfg.configDir}/ui-lovelace.yaml" + rm -f $config + ${pkgs.remarshal}/bin/json2yaml -i ${lovelaceConfigFile} -o $config + chmod 444 $config ''; serviceConfig = { ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 73c1e71eb516..6e8eda30e766 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -50,6 +50,17 @@ in { } ]; }; + lovelaceConfig = { + title = "My Awesome Home"; + views = [ { + title = "Example"; + cards = [ { + type = "markdown"; + title = "Lovelace"; + content = "Welcome to your **Lovelace UI**."; + } ]; + } ]; + }; }; }; }; From f908f6c9827288cdd0dda84d28738d300377a8b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Jan 2019 16:49:06 +0100 Subject: [PATCH 022/193] nixos/home-assistant: don't run json2yaml at every start --- .../modules/services/misc/home-assistant.nix | 22 ++++++++++--------- nixos/tests/home-assistant.nix | 3 ++- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 48271eeacc38..628dd7c39b14 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -6,12 +6,18 @@ let cfg = config.services.home-assistant; # cfg.config != null can be assumed here - configFile = pkgs.writeText "configuration.json" + configJSON = pkgs.writeText "configuration.json" (builtins.toJSON (if cfg.applyDefaultConfig then (recursiveUpdate defaultConfig cfg.config) else cfg.config)); + configFile = pkgs.runCommand "configuration.yaml" { } '' + ${pkgs.remarshal}/bin/json2yaml -i ${configJSON} -o $out + ''; - lovelaceConfigFile = pkgs.writeText "ui-lovelace.json" + lovelaceConfigJSON = pkgs.writeText "ui-lovelace.json" (builtins.toJSON cfg.lovelaceConfig); + lovelaceConfigFile = pkgs.runCommand "ui-lovelace.yaml" { } '' + ${pkgs.remarshal}/bin/json2yaml -i ${lovelaceConfigJSON} -o $out + ''; availableComponents = pkgs.home-assistant.availableComponents; @@ -175,15 +181,11 @@ in { description = "Home Assistant"; after = [ "network.target" ]; preStart = optionalString (cfg.config != null) '' - config="${cfg.configDir}/configuration.yaml" - rm -f $config - ${pkgs.remarshal}/bin/json2yaml -i ${configFile} -o $config - chmod 444 $config + rm -f "${cfg.configDir}/configuration.yaml" + ln -s ${configFile} "${cfg.configDir}/configuration.yaml" '' + optionalString (cfg.lovelaceConfig != null) '' - config="${cfg.configDir}/ui-lovelace.yaml" - rm -f $config - ${pkgs.remarshal}/bin/json2yaml -i ${lovelaceConfigFile} -o $config - chmod 444 $config + rm -f "${cfg.configDir}/ui-lovelace.yaml" + ln -s ${lovelaceConfigFile} "${cfg.configDir}/ui-lovelace.yaml" ''; serviceConfig = { ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 6e8eda30e766..9e97ed4c47e8 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -71,7 +71,8 @@ in { # The config is specified using a Nix attribute set, # but then converted from JSON to YAML - $hass->succeed("test -f ${configDir}/configuration.yaml"); + $hass->succeed("test -L ${configDir}/configuration.yaml"); + $hass->succeed("test -L ${configDir}/ui-lovelace.yaml"); # Check that Home Assistant's web interface and API can be reached $hass->waitForOpenPort(8123); From 048016e8c8c2d3a8e5af21034f8819baca060a84 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 30 Jan 2019 05:04:42 -0500 Subject: [PATCH 023/193] gitAndTools.lab: specify subPackages Otherwise it builds an internal `docs` command. --- .../version-management/git-and-tools/lab/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index f2d1f1d85568..daec9ce9d2af 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -6,6 +6,8 @@ buildGoPackage rec { goPackagePath = "github.com/zaquestion/lab"; + subPackages = [ "." ]; + src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; From d80b81ab5d3505cd5810620e61c8e38fa5e67d90 Mon Sep 17 00:00:00 2001 From: Duarte David Date: Wed, 30 Jan 2019 12:50:31 +0100 Subject: [PATCH 024/193] coredns: 005 -> 1.3.1 --- pkgs/servers/dns/coredns/default.nix | 9 +- pkgs/servers/dns/coredns/deps.nix | 317 ++++----------------------- 2 files changed, 46 insertions(+), 280 deletions(-) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index bc01d9946c71..76452ae9d8d0 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -2,16 +2,15 @@ buildGoPackage rec { name = "coredns-${version}"; - version = "005"; + version = "1.3.1"; - goPackagePath = "github.com/miekg/coredns"; - subPackages = [ "." ]; + goPackagePath = "github.com/coredns/coredns"; src = fetchFromGitHub { - owner = "miekg"; + owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "15q8l4apspaw1xbbb9j1d8s2cc5zrgycan6iq597ga9m0vyf7wiw"; + sha256 = "0aflm0c3qcjcq4dy7yx9f5xlvdm4k0b2awsp3qvbfgyp74by0584"; }; goDeps = ./deps.nix; diff --git a/pkgs/servers/dns/coredns/deps.nix b/pkgs/servers/dns/coredns/deps.nix index 18bd2b1f85d8..4dd8228c8a6a 100644 --- a/pkgs/servers/dns/coredns/deps.nix +++ b/pkgs/servers/dns/coredns/deps.nix @@ -1,119 +1,11 @@ [ - { - goPackagePath = "github.com/cockroachdb/cmux"; - fetch = { - type = "git"; - url = "https://github.com/cockroachdb/cmux"; - rev = "30d10be492927e2dcae0089c374c455d42414fcb"; - sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "5e3acbb5668c4c3deb4842615c4098eb61fb6b1e"; - sha256 = "0kbfr8q7s10z2r01xvbv6i31n4wq6z1qvgfj7njgbcgb65bkjjrh"; - }; - } - { - goPackagePath = "github.com/eapache/go-xerial-snappy"; - fetch = { - type = "git"; - url = "https://github.com/eapache/go-xerial-snappy"; - rev = "bb955e01b9346ac19dc29eb16586c90ded99a98c"; - sha256 = "1zhxcil8hn88hvxr2d6rmj4cls5zgss1scj0ikwiqq89f8vcgwn4"; - }; - } - { - goPackagePath = "github.com/eapache/queue"; - fetch = { - type = "git"; - url = "https://github.com/eapache/queue"; - rev = "44cc805cf13205b55f69e14bcb69867d1ae92f98"; - sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg"; - }; - } - { - goPackagePath = "github.com/flynn/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/flynn/go-shlex"; - rev = "3f9db97f856818214da2e1057f8ad84803971cff"; - sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "a904159b9206978bb6d53fcc7a769e5cd726c737"; - sha256 = "0qq758fcnhlqa1913jki79a1ic7p2iczdx1l2mn8s886nxydn0fi"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "553a641470496b2327abcac10b36396bd98e45c9"; - sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; - sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-syslog"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-syslog"; - rev = "b609c7d9de4658cded34a7336b90886c56f9dbdb"; - sha256 = "1k0dqkizj4vwgdsb7x7fzmcgz9079sczhpn9whd0r3xcnqs7pkkb"; - }; - } - { - goPackagePath = "github.com/klauspost/crc32"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/crc32"; - rev = "1bab8b35b6bb565f92cbc97939610af9369f942a"; - sha256 = "0n71bf2xkrk3b6svzsph3brwvam0cbz21pcwyymdw8scdn7mmyak"; - }; - } { goPackagePath = "github.com/mholt/caddy"; fetch = { type = "git"; url = "https://github.com/mholt/caddy"; - rev = "60838710883baa70cf6aae08e73820b21134ee72"; - sha256 = "15dx12sap8ziwyn2wkgiy7fj1s320444zh0pn32mwjvn065c2k3z"; - }; - } - { - goPackagePath = "github.com/miekg/coredns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/coredns"; - rev = "a7c9fd5d6b5157958a3df8dba0cdc1f24407957b"; - sha256 = "11zbwx74hhgrd3qlwm91gqw6zcj4yf7af54cn3183ca8v66f3xyf"; + rev = "v0.11.1"; + sha256 = "0v35d3dy0f88wgk1vzznbx7p15vjjf7xm3qfi2c3192rsxgzvy0l"; }; } { @@ -121,143 +13,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "75229eecb7af00b2736e93b779a78429dcb19472"; - sha256 = "1vsjy07kkyx11iz4qsihhykac3ddq3ywdgv6bwrv407504f7x6wl"; - }; - } - { - goPackagePath = "github.com/opentracing/opentracing-go"; - fetch = { - type = "git"; - url = "https://github.com/opentracing/opentracing-go"; - rev = "6edb48674bd9467b8e91fda004f2bd7202d60ce4"; - sha256 = "0kwighhdm187b1yzcccm4hpy7m5sv1dij5ckg31n2614xvpippby"; - }; - } - { - goPackagePath = "github.com/openzipkin/zipkin-go-opentracing"; - fetch = { - type = "git"; - url = "https://github.com/openzipkin/zipkin-go-opentracing"; - rev = "6022d4d3ed39632fad842942bda1813a9b4f63c8"; - sha256 = "0gg9g2nxjf9almgzhx5sgqvbcx4zwvs873nl1d62jb6kqhsr8sjd"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "5c9560bfa9ace2bf86080bf40d46b34ae44604df"; - sha256 = "0j74a3xc48ispj8sb9c2sd1h53q99ws0f2x827b5p86xlpam8xyj"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "a1dba9ce8baed984a2495b658c82687f8157b98f"; - sha256 = "1k2460bjzsm238sqx7wi42bym5bk7ybdr4qadk9szdbv65hh8vf6"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "1f30fe9094a513ce4c700b9a54458bbb0c96996c"; - sha256 = "1hvbiaq4b6dqgjz6jkkxglfh9gf71zin6qsg508sh0r0ixfavrzj"; - }; - } - { - goPackagePath = "github.com/Shopify/sarama"; - fetch = { - type = "git"; - url = "https://github.com/Shopify/sarama"; - rev = "1416bd78f804d523005322194994f08c2a0ad797"; - sha256 = "1skfkb1yhwf8w2n31dawr1kk145h3nwdf7xmm6yrwn69vbv8jqns"; - }; - } - { - goPackagePath = "github.com/apache/thrift"; - fetch = { - type = "git"; - url = "https://github.com/apache/thrift"; - rev = "655b9b6ef86c45b423a194abee2a9cd057a16a74"; - sha256 = "1kagirgxy2a9iabm8i32i5hdr36v5p0h651bsbyr0l99970myqfp"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "2533c2a50c4b6114ad6fd4c0000175fac3b6ee06"; - sha256 = "0z8byms8hfn7ncq8sqcw9avn9nfal5hw75ckbladd6gzjc8jay02"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/eapache/go-resiliency"; - fetch = { - type = "git"; - url = "https://github.com/eapache/go-resiliency"; - rev = "b86b1ec0dd4209a588dc1285cdd471e73525c0b3"; - sha256 = "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "d2e1ade2d719b78fe5b061b4c18a9f7111b5bdc8"; - sha256 = "1fh4jyxv1drh9jmadidrlszcnjp4zfazysbq5075lqd1mhq99lz0"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "69b215d01a5606c843240eab4937eab3acee6530"; - sha256 = "1cy9jxqi6ba5qnjmvznlq49n2zzr5vqgky6pa9mckrbli8ssvzw7"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/pierrec/xxHash"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/xxHash"; - rev = "5a004441f897722c627870a981d02b29924215fa"; - sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja"; + rev = "v1.1.3"; + sha256 = "1xs1k9jm9f04y8callww9x4s0jrxmsn7882iyy4br8sbpl3wzkw4"; }; } { @@ -265,8 +22,36 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "6ab3432d241cbe3cb7543da7e7e9a934c7e9fe76"; - sha256 = "19phcsvq1gn53af3nnh1lvvyzg8kpwribka9mszk18jv7l6nq9mf"; + rev = "v0.9.1"; + sha256 = "01gnylazia30pcp069xcng482gwmm3xcx5zgrlwdkhic1lyb6i9l"; + }; + } + # client_golang dependencies + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "347cf4a86c1cb8d262994d8ef5924d4576c5b331"; + sha256 = "0c5j5c2dnj1452653c8nnpx4jwijwafi1p8685g7ddm6kng9q1wz"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c182affec369e30f25d3eb8cd8a478dee585ae7d"; + sha256 = "1xqsf9vpcrd4hp95rl6kgmjvkv1df4aicfw4l5vfcxcwxknfx2xs"; }; } { @@ -274,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; - rev = "6f3806018612930941127f2a7c6c453ba2c527d2"; - sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; + rev = "56726106282f1985ea77d5305743db7231b0c0a8"; + sha256 = "19y4qs9mkxiiab5sh3b7cccjpl3xbp6sy8812ig9f1zg8vzkzj7j"; }; } { @@ -283,35 +68,17 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "3007b6072c17c8d985734e6e19b1dea9174e13d3"; - sha256 = "0jpvnmzqbzy2krwzan7pp3bc8pj9f1qic98lqq4hanccr0g5cmk3"; + rev = "2998b132700a7d019ff618c06a234b47c1f3f681"; + sha256 = "131qmx0rs1nz0ci3qzkks4i6fdmr5c69i48h5cngjizlb9xxwir2"; }; } { - goPackagePath = "github.com/ugorji/go"; + goPackagePath = "github.com/prometheus/procfs"; fetch = { type = "git"; - url = "https://github.com/ugorji/go"; - rev = "c88ee250d0221a57af388746f5cf03768c21d6e2"; - sha256 = "0ylb5p5i9hln8chq8whk5iy8qypjpzyrp07zpwjd1zbf5nsm1nmv"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "6b27048ae5e6ad1ef927e72e437531493de612fe"; - sha256 = "08zk0vavl7g6jzklhxhwrgcjh42mn2flbx2d2rxsblyxkbqri07j"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "075e574b89e4c2d22f2286a7e2b919519c6f3547"; - sha256 = "1p38siwqcbd592lphaqpigl7scshkfy67k6jcwscbcsl6akw51km"; + url = "https://github.com/prometheus/procfs"; + rev = "bf6a532e95b1f7a62adf0ab5050a5bb2237ad2f4"; + sha256 = "0k65i2ikf3jp6863mpc1raf928i78r8jd7zn9djx6f4izls6l6j1"; }; } ] From cec3c69837cf360640b519c7faa24047308e93a3 Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Wed, 30 Jan 2019 13:31:20 +0100 Subject: [PATCH 025/193] mfcl8690cdwlpr: 1.2.0-0 -> 1.3.0-0 --- pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 3b6ae73c70d1..a521b3ea0218 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -3,11 +3,11 @@ makeWrapper, perl, pkgs, stdenv, which }: stdenv.mkDerivation rec { name = "mfcl8690cdwlpr-${version}"; - version = "1.2.0-0"; + version = "1.3.0-0"; src = fetchurl { url = "http://download.brother.com/welcome/dlf103241/${name}.i386.deb"; - sha256 = "02k43nh51pn4lf7gaid9yhil0a3ikpy4krw7dhgphmm5pap907sx"; + sha256 = "0x8zd4b1psmw1znp2ibncs37xm5mljcy9yza2rx8jm8lp0a3l85v"; }; nativeBuildInputs = [ dpkg makeWrapper ]; From a0c9490b3790a0549e264e3edd89e94671642f88 Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Wed, 30 Jan 2019 13:30:49 +0100 Subject: [PATCH 026/193] mfcl8690cdwcupswrapper: 1.3.0-0 -> 1.4.0-0 --- pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix index 9aa127dd6305..17040498acc0 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -3,11 +3,11 @@ mfcl8690cdwlpr, perl, stdenv}: stdenv.mkDerivation rec { name = "mfcl8690cdwcupswrapper-${version}"; - version = "1.3.0-0"; + version = "1.4.0-0"; src = fetchurl { url = "http://download.brother.com/welcome/dlf103250/${name}.i386.deb"; - sha256 = "16nnh3hd5yv0m4191wja9fvxxzngzfccfj2rfhcswbakajyk5ywn"; + sha256 = "1bl9r8mmj4vnanwpfjqgq3c9lf2v46wp5k6r2n9iqprf7ldd1kb2"; }; nativeBuildInputs = [ dpkg makeWrapper ]; From b99cc81d49d7136eca28d350a3033a855234535d Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Wed, 30 Jan 2019 08:30:39 -0500 Subject: [PATCH 027/193] iperf2: 2.0.12 -> 2.0.13 --- pkgs/tools/networking/iperf/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 6d26cf591bae..0c90047e05e4 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.12"; + name = "iperf-2.0.13"; src = fetchurl { url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; - sha256 = "0ii6sgp62x9ly2gyk00w58dy9qwcw2kvhhcfa7v16jr6n4gnazrn"; + sha256 = "1bbq6xr0vrd88zssfiadvw3awyn236yv94fsdl9q2sh9cv4xx2n8"; }; hardeningDisable = [ "format" ]; From 3bdd1156b8738a1f504b17616b0722f63c9bad32 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Wed, 30 Jan 2019 08:30:57 -0500 Subject: [PATCH 028/193] iperf2: enable fastsampling config option From ./configure --help --enable-fastsampling enable support for 100 microsecond report intervals --- pkgs/tools/networking/iperf/2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 0c90047e05e4..9faa0f953510 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { }; hardeningDisable = [ "format" ]; + configureFlags = [ "--enable-fastsampling" ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/iperf/; From 059e5e0ba01d720cadd6678230c13a47f438e4ad Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Wed, 30 Jan 2019 11:29:32 -0800 Subject: [PATCH 029/193] gitlab: add openssh dependency to gitaly --- nixos/modules/services/misc/gitlab.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 769a9526cf64..25c258ebe134 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -497,7 +497,12 @@ in { systemd.services.gitaly = { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv.wrappedRuby ]; + path = with pkgs; [ + openssh + gitAndTools.git + cfg.packages.gitaly.rubyEnv + cfg.packages.gitaly.rubyEnv.wrappedRuby + ]; serviceConfig = { Type = "simple"; User = cfg.user; From cca9df9d11db2c1e9cda6878307715b9d590e2b7 Mon Sep 17 00:00:00 2001 From: Matthijs Steen Date: Tue, 29 Jan 2019 01:33:21 +0100 Subject: [PATCH 030/193] openra: updated engines and mods --- pkgs/games/openra/common.nix | 2 +- pkgs/games/openra/engines.nix | 24 ++-- pkgs/games/openra/mod-launch-game.sh | 2 +- pkgs/games/openra/mod-update.sh | 151 +++++++++++++++++++++++++ pkgs/games/openra/mod.nix | 5 +- pkgs/games/openra/mods.nix | 163 ++++++++++++++------------- 6 files changed, 252 insertions(+), 95 deletions(-) create mode 100755 pkgs/games/openra/mod-update.sh diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index e90f8170e18e..200b9da4a7eb 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -79,7 +79,7 @@ in { dontStrip = true; meta = { - maintainers = with maintainers; [ msteen rardiol ]; + maintainers = with maintainers; [ fusion809 msteen rardiol ]; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/games/openra/engines.nix b/pkgs/games/openra/engines.nix index e0d97f3c548b..7454d32c1139 100644 --- a/pkgs/games/openra/engines.nix +++ b/pkgs/games/openra/engines.nix @@ -11,9 +11,9 @@ let repo = "OpenRA" ; inherit rev sha256 extraPostFetch; }; - } name).overrideAttrs (oldAttrs: { + } name).overrideAttrs (origAttrs: { postInstall = '' - ${oldAttrs.postInstall} + ${origAttrs.postInstall} cp -r mods/ts $out/lib/openra/mods/ cp mods/ts/icon.png $(mkdirp $out/share/pixmaps)/openra-ts.png ( cd $out/share/applications; sed -e 's/Dawn/Sun/g' -e 's/cnc/ts/g' openra-cnc.desktop > openra-ts.desktop ) @@ -21,21 +21,21 @@ let }); in { - release = buildUpstreamOpenRAEngine rec { + release = name: (buildUpstreamOpenRAEngine rec { version = "20181215"; - rev = "release-${version}"; + rev = "${name}-${version}"; sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r"; - }; + } name); - playtest = buildUpstreamOpenRAEngine rec { + playtest = name: (buildUpstreamOpenRAEngine rec { version = "20190106"; - rev = "playtest-${version}"; + rev = "${name}-${version}"; sha256 = "0ps9x379plrrj1hnj4fpr26lc46mzgxknv5imxi0bmrh5y4781ql"; - }; + } name); - bleed = let commit = "6de92de8d982094a766eab97a92225c240d85493"; in buildUpstreamOpenRAEngine { - version = abbrevCommit commit; - rev = commit; - sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r"; + bleed = buildUpstreamOpenRAEngine { + version = "9c9cad1"; + rev = "9c9cad1a15c3a34dc2a61b305e4a9a735381a5f8"; + sha256 = "0100p7wrnnlvkmy581m0gbyg3cvi4i1w3lzx2gq91ndz1sbm8nd2"; }; } diff --git a/pkgs/games/openra/mod-launch-game.sh b/pkgs/games/openra/mod-launch-game.sh index ec03353bee54..c0b6feb69c88 100644 --- a/pkgs/games/openra/mod-launch-game.sh +++ b/pkgs/games/openra/mod-launch-game.sh @@ -21,5 +21,5 @@ mono --debug OpenRA.Game.exe Game.Mod=@name@ Engine.LaunchPath="@out@/bin/openra # Show a crash dialog if something went wrong if [ $? -ne 0 -a $? -ne 1 ]; then - show_error "OpenRA - @title@ has encountered a fatal error.\nPlease refer to the crash logs for more information.\n\nLog files are located in ~/.openra/Logs" + show_error $'OpenRA - @title@ has encountered a fatal error.\nPlease refer to the crash logs for more information.\n\nLog files are located in ~/.openra/Logs' fi diff --git a/pkgs/games/openra/mod-update.sh b/pkgs/games/openra/mod-update.sh new file mode 100755 index 000000000000..52bcada8f9a1 --- /dev/null +++ b/pkgs/games/openra/mod-update.sh @@ -0,0 +1,151 @@ +#!/usr/bin/env bash + +# for mod in $(nix eval --raw '( +# with import { }; +# with lib; +# let mods = attrNames (removeAttrs openraPackages.mods [ "recurseForDerivations" ]); +# in concatStringsSep " " mods +# )'); do +# ./mod-update.sh "$mod" +# done + +# Uses: +# https://github.com/msteen/nix-prefetch +# https://github.com/msteen/nix-update-fetch + +mod=$1 +commit_count=$2 +token= +nixpkgs='' + +die() { + ret=$? + echo "$*" >&2 + exit $ret +} + +curl() { + command curl --silent --show-error "$@" +} + +get_sha1() { + local owner=$1 repo=$2 ref=$3 + # https://developer.github.com/v3/#authentication + curl -H "Authorization: token $token" -H 'Accept: application/vnd.github.VERSION.sha' "https://api.github.com/repos/$owner/$repo/commits/$ref" +} + +[[ -n $token ]] || die "Please edit this script to include a GitHub API access token, which is required for API v4: +https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/" + +# Get current mod_owner and mod_repo. +vars=$(nix-prefetch --file "$nixpkgs" "openraPackages.mods.$mod" --index 0 --quiet --output json --skip-hash > >( + jq --raw-output 'with_entries(select(.value | contains("\n") | not)) | to_entries | .[] | .key + "=" + .value')) || exit + +while IFS='=' read -r key val; do + declare "mod_${key}=${val}" +done <<< "$vars" + +if [[ -n $commit_count ]]; then + query_on_commit='{ + history(first: 10) { + nodes { + abbreviatedOid + oid + } + totalCount + } +}' +else + query_on_commit='{ + history(first: 0) { + totalCount + } + abbreviatedOid + oid +}' +fi + +query='query { + repository(owner: \"'"$mod_owner"'\", name: \"'"$mod_repo"'\") { + defaultBranchRef { + target { + ... on Commit '"$query_on_commit"' + } + } + licenseInfo { + key + } + } +}' + +# Newlines are not allowed in a query. +# https://developer.github.com/v4/guides/forming-calls/#communicating-with-graphql +query=$(echo $query) + +# https://developer.github.com/v4/guides/using-the-explorer/#configuring-graphiql +json=$(curl -H "Authorization: bearer $token" -X POST -d '{ "query": "'"$query"'" }' https://api.github.com/graphql) || exit + +if [[ -n $commit_count ]]; then + json=$(jq "$commit_count"' as $commit_count + | .data.repository.defaultBranchRef.target + |= (.history |= (. | del(.nodes) | .totalCount = $commit_count)) + + (.history | .nodes[.totalCount - $commit_count])' <<< "$json") || exit +fi + +vars=$(jq --raw-output '.data.repository | { + license_key: .licenseInfo.key, +} + (.defaultBranchRef.target | { + version: ((.history.totalCount | tostring) + ".git." + .abbreviatedOid), + rev: .oid, +}) | to_entries | .[] | .key + "=" + (.value | tostring)' <<< "$json") || exit + +while IFS='=' read -r key val; do + declare "mod_${key}=${val}" +done <<< "$vars" + +mod_config=$(curl "https://raw.githubusercontent.com/$mod_owner/$mod_repo/$mod_rev/mod.config") || exit + +while IFS='=' read -r key val; do + declare "${key,,}=$(jq --raw-output . <<< "$val")" +done < <(grep '^\(MOD_ID\|ENGINE_VERSION\|AUTOMATIC_ENGINE_MANAGEMENT\|AUTOMATIC_ENGINE_SOURCE\)=' <<< "$mod_config") + +for var in mod_id engine_version automatic_engine_management automatic_engine_source; do + echo "$var=${!var}" >&2 +done +echo >&2 + +[[ $mod_id == "$mod" ]] || + die "The mod '$mod' reports being mod '$mod_id' instead." +[[ $mod_license_key == gpl-3.0 ]] || +[[ $(echo $(head -2 <(curl "https://raw.githubusercontent.com/$mod_owner/$mod_repo/$mod_rev/COPYING"))) == 'GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007' ]] || + die "The mod '$mod' is licensed under '$mod_license_key' while expecting 'gpl-3.0'." +[[ $automatic_engine_management == True ]] || + die "The mod '$mod' engine is not managed as a read-only dependency." +[[ $automatic_engine_source =~ https://github.com/([a-zA-Z0-9_\-]+)/([a-zA-Z0-9_\-]+)/archive/([a-zA-Z0-9_\-\$\{\}]+).zip ]] || + die "The mod '$mod' engine is not hosted on GitHub as an archive." + +engine_owner=${BASH_REMATCH[1]} +engine_repo=${BASH_REMATCH[2]} +[[ ${BASH_REMATCH[3]} == '${ENGINE_VERSION}' ]] || engine_version=${BASH_REMATCH[3]} +engine_rev=$(get_sha1 "$engine_owner" "$engine_repo" "$engine_version") + +for type in mod engine; do + for name in version owner repo rev; do + var="${type}_${name}" + echo "$var=${!var}" >&2 + done + echo >&2 +done + +i=0 +for type in mod engine; do + fetcher_args=() + for name in owner repo rev; do + var="${type}_${name}" + fetcher_args+=( "--$name" "${!var}" ) + done + var="${type}_version" + version=${!var} + nix-update-fetch --yes --version "$version" "$(nix-prefetch --quiet --file "$nixpkgs" "openraPackages.mods.$mod" --index $i --output json --with-position --diff -- "${fetcher_args[@]}")" + (( i++ )) +done diff --git a/pkgs/games/openra/mod.nix b/pkgs/games/openra/mod.nix index ebc65b2f5c4e..8df5922a4418 100644 --- a/pkgs/games/openra/mod.nix +++ b/pkgs/games/openra/mod.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation (recursiveUpdate packageAttrs rec { make -C ${engineSourceName} install-engine install-common-mod-files DATA_INSTALL_DIR=$out/lib/${pname} - cp -r ${engineSourceName}/mods/{${concatStringsSep "," ([ "common" "modcontent" ] ++ engine.mods)}} mods/${mod.name} \ + cp -r ${engineSourceName}/mods/{${concatStringsSep "," ([ "common" "modcontent" ] ++ engine.mods)}} mods/* \ $out/lib/${pname}/mods/ substitute ${./mod-launch-game.sh} $out/lib/${pname}/launch-game.sh \ @@ -81,7 +81,8 @@ in stdenv.mkDerivation (recursiveUpdate packageAttrs rec { substitute ${./openra-mod.desktop} $(mkdirp $out/share/applications)/${pname}.desktop \ --subst-var-by name ${escapeShellArg mod.name} \ - --subst-var-by title ${escapeShellArg mod.title} + --subst-var-by title ${escapeShellArg mod.title} \ + --subst-var-by description ${escapeShellArg mod.description} cp README.md $(mkdirp $out/share/doc/packages/${pname})/README.md diff --git a/pkgs/games/openra/mods.nix b/pkgs/games/openra/mods.nix index 5bfc5a224a5c..ddc34dbda8f6 100644 --- a/pkgs/games/openra/mods.nix +++ b/pkgs/games/openra/mods.nix @@ -7,22 +7,22 @@ let in { ca = buildOpenRAMod { - version = "93"; + version = "96.git.fc3cf0b"; title = "Combined Arms"; description = "A game that combines units from the official OpenRA Red Alert and Tiberian Dawn mods"; homepage = https://github.com/Inq8/CAmod; src = fetchFromGitHub { owner = "Inq8"; repo = "CAmod"; - rev = "16fb77d037be7005c3805382712c33cec1a2788c"; - sha256 = "11fjyr3692cy2a09bqzk5ya1hf6plh8hmdrgzds581r9xbj0q4pr"; + rev = "fc3cf0baf2b827650eaae9e1d2335a3eed24bac9"; + sha256 = "15w91xs253gyrlzsgid6ixxjazx0fbzick6vlkiay0znb58n883m"; }; - engine = let commit = "b8a7dd52ff893ed8225726d4ed4e14ecad748404"; in { - version = abbrevCommit commit; + engine = { + version = "b8a7dd5"; src = fetchFromGitHub { owner = "Inq8"; repo = "CAengine" ; - rev = commit; + rev = "b8a7dd52ff893ed8225726d4ed4e14ecad748404"; sha256 = "0dyk861qagibx8ldshz7d2nrki9q550f6f0wy8pvayvf1gv1dbxj"; name = "engine"; inherit extraPostFetch; @@ -31,23 +31,23 @@ in { }; d2 = unsafeBuildOpenRAMod rec { - version = "128"; + version = "134.git.69a4aa7"; title = "Dune II"; description = "A modernization of the original ${title} game"; homepage = https://github.com/OpenRA/d2; src = fetchFromGitHub { owner = "OpenRA"; repo = "d2"; - rev = "bc969207b532a2def69e0d6ac09a4e8fb5d4e946"; - sha256 = "18v154kf1fmfk2gnymb3ggsfy73ql8rr7jvbhiw60yhzwx89cdk8"; + rev = "69a4aa708e2c26376469c0048fac13592aa452ca"; + sha256 = "1mfch4s6c05slyqvxllklbxpqq8dqcbx3515n3gyylyq43gq481r"; }; engine = rec { - version = "20181215"; + version = "release-20181215"; mods = [ "cnc" "d2k" "ra" ]; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; - rev = "release-${version}"; + rev = version; sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r"; name = "engine"; inherit extraPostFetch; @@ -60,23 +60,23 @@ in { }; dr = buildOpenRAMod rec { - version = "244"; + version = "266.git.920b476"; title = "Dark Reign"; description = "A re-imagination of the original Command & Conquer: ${title} game"; homepage = https://github.com/drogoganor/DarkReign; src = fetchFromGitHub { owner = "drogoganor"; repo = "DarkReign"; - rev = "e21db398f4d995c91b9e1a0f31ffaa7d54f43742"; - sha256 = "1gzvdf6idmx0rr8afaxd9dsbnxljif2kic6znkd9vcrwnqmp1fjr"; + rev = "920b476be1b7751db087f1f7acd504b8a048d1e2"; + sha256 = "11ir4pnichrnv4z9532fp9g166jl8fvy5kk03a2fgxssp3g40zz2"; }; - engine = let commit = "7fcfb1dcb2bd472fa6680ffa37bd3bbedb2c44c5"; in { - version = abbrevCommit commit; + engine = { + version = "DarkReign"; src = fetchFromGitHub { owner = "drogoganor"; repo = "OpenRA" ; - rev = commit; - sha256 = "0x7k96j3q16dgay4jjlyv9kcgn4sc4v9ksw6ijnjws7q1r2rjs0m"; + rev = "e08b75c2add30439228ea3dd61d6be60d1800329"; + sha256 = "125vf962p69ajrh5pxgfwsi0ksczqwvlw5kn2fvffiwvh8d5in23"; name = "engine"; inherit extraPostFetch; }; @@ -84,71 +84,76 @@ in { }; gen = buildOpenRAMod { - version = "1133"; + version = "1157.git.4f5e11d"; title = "Generals Alpha"; description = "Re-imagination of the original Command & Conquer: Generals game"; homepage = https://github.com/MustaphaTR/Generals-Alpha; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "Generals-Alpha"; - rev = "277d20d5a8b5e11eac9443031af133dc110c653f"; - sha256 = "1k37545l99q7zphnh1ykvimsyp5daykannps07d4dgr2w9l7bmhg"; + rev = "4f5e11d916e4a03d8cf1c97eef484ce2d77d7df2"; + sha256 = "1wnl4qrlhynnlahgdlxwhgsdba5wgdg9yrv9f8hkgi69j60szypd"; }; engine = rec { - version = "gen-20180905"; + version = "gen-20190128_3"; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "OpenRA" ; rev = version; - sha256 = "0wy1h7fg0n8dpy6y91md7x0qnr9rk4xf6155jali4bi8gghw2g5v"; + sha256 = "1x6byz37s8qcpqj902zvkvbv95rv2mv2kj35c12gbpyc92xkqkq0"; name = "generals-alpha-engine"; inherit extraPostFetch; }; }; }; - kknd = buildOpenRAMod rec { - version = "142"; + kknd = let version = "145.git.5530bab"; in name: (buildOpenRAMod rec { + inherit version; title = "Krush, Kill 'n' Destroy"; description = "Re-imagination of the original ${title} game"; homepage = https://kknd-game.com/; src = fetchFromGitHub { owner = "IceReaper"; repo = "KKnD"; - rev = "54d34292168d5c47529688c8d5ca7693c4001ef3"; - sha256 = "1rsdig282cfr8b4iamr9ri6sshgppp8gllfyib6c2hvqqr301720"; + rev = "5530babcb05170e0959e4cf2b079161e9fedde4f"; + sha256 = "07jczrarmgm6zdk0myzwgq200x19yvpjyxrnhdac08mjgyz75zk1"; }; - engine = let commit = "4e8eab4ca00d1910203c8a103dfd2c002714daa8"; in { - version = abbrevCommit commit; + engine = { + version = "4e8eab4ca00d1910203c8a103dfd2c002714daa8"; src = fetchFromGitHub { - owner = "OpenRA"; + owner = "IceReaper"; repo = "OpenRA" ; - rev = commit; + rev = "4e8eab4ca00d1910203c8a103dfd2c002714daa8"; sha256 = "1yyqparf93x8yzy1f46gsymgkj5jls25v2yc7ighr3f7mi3igdvq"; name = "engine"; inherit extraPostFetch; }; }; - }; + } name).overrideAttrs (origAttrs: { + postPatch = '' + ${origAttrs.postPatch} + sed -i 's/{DEV_VERSION}/${version}/' mods/*/mod.yaml + ''; + }); mw = buildOpenRAMod rec { - version = "235"; + version = "257.git.c9be8f2"; title = "Medieval Warfare"; description = "A re-imagination of the original Command & Conquer: ${title} game"; homepage = https://github.com/CombinE88/Medieval-Warfare; src = fetchFromGitHub { owner = "CombinE88"; repo = "Medieval-Warfare"; - rev = "1e4fc7ea24d0806c5a7cd753490e967d804a3567"; - sha256 = "0swa66mzb6wr8vf1yivrss54dl98jzzwh9b8qrjfwmfrq2i356iq"; + rev = "c9be8f2a6f1dd710b1aedd9d5b00b4cf5020e2fe"; + sha256 = "09fp7k95jd6hjqdasbspbd43z5670wkyzbbgqkll9dfsrv0sky0v"; }; - engine = let commit = "9f9617aa359ebc1923252b7a4a79def73ecfa8a2"; in { - version = abbrevCommit commit; + engine = { + version = "MedievalWarfareEngine"; src = fetchFromGitHub { owner = "CombinE88"; repo = "OpenRA" ; - rev = commit; - sha256 = "02h29xnc1cb5zr001cnmaww5qnfnfaza4v28251jgzkby593r32q"; + rev = "52109c0910f479753704c46fb19e8afaab353c83"; + sha256 = "0ga3855j6bc7h81q03cw6laiaiz12915zg8aqah1idvxbzicfy7l"; name = "engine"; inherit extraPostFetch; }; @@ -156,22 +161,22 @@ in { }; ra2 = buildOpenRAMod rec { - version = "876"; + version = "881.git.b37f4f9"; title = "Red Alert 2"; description = "Re-imagination of the original Command & Conquer: ${title} game"; homepage = https://github.com/OpenRA/ra2; src = fetchFromGitHub { owner = "OpenRA"; repo = "ra2"; - rev = "6a864b2a5887ae42291768fb3dec73082fee44ee"; - sha256 = "19m4z9r00dj67746ps2f9a8i1icq8nm0iiww6dl975yl6gaxp5qy"; + rev = "b37f4f9f07404127062d9061966e9cc89dd86445"; + sha256 = "1jiww66ma3qdk9hzyvhbcaa5h4p2mxxk22kvrw92ckpxy0bqba3h"; }; engine = rec { - version = "20180923"; + version = "release-20180923"; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; - rev = "release-${version}"; + rev = version; sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5"; name = "engine"; inherit extraPostFetch; @@ -184,23 +189,23 @@ in { }; raclassic = buildOpenRAMod { - version = "171"; + version = "181.git.8240890"; title = "Red Alert Classic"; description = "A modernization of the original Command & Conquer: Red Alert game"; homepage = https://github.com/OpenRA/raclassic; src = fetchFromGitHub { owner = "OpenRA"; repo = "raclassic"; - rev = "a2319b3dfb367a8d4278bf7baf55a10abf615fbc"; - sha256 = "1k67fx4d9hg8mckzp7pp8lxa6ngqxnnrnbqyfls99dqc4df1iw0a"; + rev = "8240890b32191ce34241c22158b8a79e8c380879"; + sha256 = "0dznyb6qa4n3ab87g1c4bihfc2nx53k6z0kajc7ynjdnwzvx69ww"; }; engine = rec { - version = "20181215"; + version = "playtest-20190106"; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; - rev = "release-${version}"; - sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r"; + rev = version; + sha256 = "0ps9x379plrrj1hnj4fpr26lc46mzgxknv5imxi0bmrh5y4781ql"; name = "engine"; inherit extraPostFetch; }; @@ -208,24 +213,24 @@ in { }; rv = unsafeBuildOpenRAMod { - version = "1294"; + version = "1330.git.9230e6f"; title = "Romanov's Vengeance"; description = "Re-imagination of the original Command & Conquer: Red Alert 2 game"; homepage = https://github.com/MustaphaTR/Romanovs-Vengeance; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "Romanovs-Vengeance"; - rev = "c21cb11579d7e12354c5ccb5c3c47e567c6b3d4f"; - sha256 = "1vmc5b9awx8q0mahwv11fzgplw9w7m8kzvnx5cl7xr1w5wk87428"; + rev = "9230e6f1dd9758467832aee4eda115e18f0e635f"; + sha256 = "0bwbmmlhp1kh8rgk2nx1ca9vqssj849amndacf318d61gksc1w9n"; }; - engine = let commit = "e9e99074b294c32fbe88dd8727581cb8c512c2e2"; in { - version = abbrevCommit commit; + engine = { + version = "f3873ae"; mods = [ "as" ]; src = fetchFromGitHub { - owner = "GraionDilach"; - repo = "OpenRA" ; - rev = commit; - sha256 = "0bibnakpmbxwglf2dka6g04xp8dzwyms1zk5kqlbm8gpdp0aqmxp"; + owner = "AttacqueSuperior"; + repo = "Engine"; + rev = "f3873ae242803051285994d77eb26f4b951594b5"; + sha256 = "02rv29wja0p5d083pd087daz7x7pp5b9ym7sci2fhg3mrnaqgwkp"; name = "engine"; inherit extraPostFetch; }; @@ -237,24 +242,24 @@ in { }; sp = unsafeBuildOpenRAMod { - version = "153"; + version = "176.git.fc89ae8"; title = "Shattered Paradise"; description = "Re-imagination of the original Command & Conquer: Tiberian Sun game"; homepage = https://github.com/ABrandau/OpenRAModSDK; src = fetchFromGitHub { owner = "ABrandau"; repo = "OpenRAModSDK"; - rev = "89148b8cf89bf13911fafb74a1aa2b4cacf027e0"; - sha256 = "1bb8hzd3mhnn76iqiah1161qz98f0yvyryhmrghq03xlbin3mhbi"; + rev = "fc89ae8a10e0f765ac735f923e01aa24dd20e8d2"; + sha256 = "0xyxhipmjlld0kp23fwsdwnspr7fci0mdnjd60gcsh34c7m0341p"; }; - engine = let commit = "82a2f234bdf3b768cea06408e3de30f9fbbe9412"; in { - version = abbrevCommit commit; + engine = { + version = "SP-Bleed-Branch"; mods = [ "as" "ts" ]; src = fetchFromGitHub { owner = "ABrandau"; repo = "OpenRA" ; - rev = commit; - sha256 = "1nl3brvx1bikxm5rmpc7xmd32n722jiyjh86pnar6b6idr1zj2ws"; + rev = "d3545c0b751aea2105748eddaab5919313e35314"; + sha256 = "1jsldl6vnf3r9dzppdm4z7kqbrzkidda5k74wc809i8c4jjnq9rq"; name = "engine"; inherit extraPostFetch; }; @@ -262,23 +267,23 @@ in { }; ss = buildOpenRAMod rec { - version = "72"; + version = "77.git.23e1f3e"; title = "Sole Survivor"; description = "A re-imagination of the original Command & Conquer: ${title} game"; homepage = https://github.com/MustaphaTR/sole-survivor; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "sole-survivor"; - rev = "fad65579c8b487cef9a8145e872390ed77c16c69"; - sha256 = "0h7is7x2qyvq7vqp0jgw5zrdkw8g7ndd82d843ldhnb0a3vyrk34"; + rev = "23e1f3e5d8b98c936797b6680d95d56a69a9e2ab"; + sha256 = "104clmxphchs7r8y7hpmw103bychayz80bqj98bp89i64nv9d89x"; }; - engine = let commit = "becfc154c5cd3891d695339ff86883db8b5790a5"; in { - version = abbrevCommit commit; + engine = { + version = "6de92de"; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; - rev = commit; - sha256 = "0id8vf3cjr7h5pz4sw8pdaz3sc45lxr21k1fk4309kixsrpa7i0y"; + rev = "6de92de8d982094a766eab97a92225c240d85493"; + sha256 = "0ps9x379plrrj1hnj4fpr26lc46mzgxknv5imxi0bmrh5y4781ql"; name = "engine"; inherit extraPostFetch; }; @@ -286,7 +291,7 @@ in { }; ura = buildOpenRAMod { - version = "431"; + version = "431.git.128dc53"; title = "Red Alert Unplugged"; description = "Re-imagination of the original Command & Conquer: Red Alert game"; homepage = http://redalertunplugged.com/; @@ -310,22 +315,22 @@ in { }; yr = unsafeBuildOpenRAMod rec { - version = "117"; + version = "118.git.c26bf14"; homepage = https://github.com/cookgreen/yr; title = "Yuri's Revenge"; description = "Re-imagination of the original Command & Conquer: ${title} game"; src = fetchFromGitHub { owner = "cookgreen"; repo = "yr"; - rev = "1d4beeb0687fe4b39b01ec31f3702cfb90a7f4f7"; - sha256 = "1rd962ja1x72rz68kbmp19yiip3iif50hzlj3v8k1f5l94r2x2pn"; + rev = "c26bf14155d040edf33c6c5eb3677517d07b39f8"; + sha256 = "15k6gv4rx3490n0cs9q7ah7q31z89v0pddsw6nqv0fhcahhvq1bc"; }; engine = rec { - version = "20180923"; + version = "release-20180923"; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; - rev = "release-${version}"; + rev = version; sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5"; name = "engine"; inherit extraPostFetch; From e4d2bc657e48f32af1f2dbd0866751bf98a3c953 Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Wed, 30 Jan 2019 22:59:23 +0100 Subject: [PATCH 031/193] maintainers: added eyJhb to the maintainers list --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cf02bc641518..6670b44f6409 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1495,6 +1495,11 @@ github = "expipiplus1"; name = "Joe Hermaszewski"; }; + eyjhb = { + email = "eyjhbb@gmail.com"; + github = "eyJhb"; + name = "eyJhb"; + }; f--t = { email = "git@f-t.me"; github = "f--t"; From 648c983db6509061f5a4e725f421241dc706097c Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Wed, 30 Jan 2019 23:19:15 +0100 Subject: [PATCH 032/193] maintainers: added eyJhb to maintainers list --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cf02bc641518..6670b44f6409 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1495,6 +1495,11 @@ github = "expipiplus1"; name = "Joe Hermaszewski"; }; + eyjhb = { + email = "eyjhbb@gmail.com"; + github = "eyJhb"; + name = "eyJhb"; + }; f--t = { email = "git@f-t.me"; github = "f--t"; From 31c3d157aeb52814bcf4d6daf0d23978f9693dae Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Wed, 30 Jan 2019 23:19:37 +0100 Subject: [PATCH 033/193] arduino-mk: init at 1.6.0 --- .../arduino/arduino-mk/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/arduino/arduino-mk/default.nix diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix new file mode 100644 index 000000000000..9cefd1dfe54f --- /dev/null +++ b/pkgs/development/arduino/arduino-mk/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "1.6.0"; + name = "arduino-mk-${version}"; + + src = fetchFromGitHub { + owner = "sudar"; + repo = "Arduino-Makefile"; + rev = "${version}"; + sha256 = "0flpl97d2231gp51n3y4qvf3y1l8xzafi1sgpwc305vwc2h4dl2x"; + }; + + phases = ["installPhase"]; + installPhase = "ln -s $src $out"; + + meta = { + description = "Makefile for Arduino sketches"; + homepage = https://github.com/sudar/Arduino-Makefile; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.eyjhb ]; + platforms = stdenv.lib.platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0de7bc686c32..07e3d1b2241b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -507,6 +507,8 @@ in withGui = false; }; + arduino-mk = callPackage ../development/arduino/arduino-mk {}; + apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {}; arguments = callPackage ../development/libraries/arguments { }; From 66601282cca987bb23a8eac95aac0c1e4d3c9e2f Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 30 Jan 2019 23:50:48 +0100 Subject: [PATCH 034/193] qt59.qtvirtualkeyboard: fix CVE-2018-19865 CVE-2018-19865 tracks the issue of qtvirtualkeyboard where it logs all user input. With this commit we are applying the recommended patches form the upstream project. More details can be obtained from the Qt annoucement [1]. [1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/ --- .../libraries/qt-5/5.9/default.nix | 21 ++++++++++++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 4acc6a6393f1..68c6745bcb52 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, makeSetupHook, + stdenv, fetchurl, fetchpatch, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, cf-private, @@ -44,6 +44,25 @@ let qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; qtwebkit = [ ./qtwebkit.patch ]; + qtvirtualkeyboard = [ + (fetchpatch { + name = "CVE-2018-19865-A.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=61780a113f02b3c62fb14516fe8ea47d91f9ed9a"; + sha256 = "0jd4nzaz9ndm9ryvrkav7kjs437l661288diklhbmgh249f8gki0"; + }) + (fetchpatch { + name = "CVE-2018-19865-B.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=c0ac7a4c684e2fed60a72ceee53da89eea3f95a7"; + sha256 = "0yvxrx5vx6845vgnq8ml3q93y61py5j0bvhqj7nqvpbmyj1wy1p3"; + + }) + (fetchpatch { + name = "CVE-2018-19865-C.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=a2e7b8412f56841e12ed20a39f4a38e32d3c1e30"; + sha256 = "1yijysa9gy5xbxndx5ri0dkfrjqja0d1bsx52qz4mhzi4pkbib02"; + }) + ]; + }; mkDerivation = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8970828f43cd..ec95c8b20a47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12080,7 +12080,7 @@ in qt59 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.9) { inherit newScope; - inherit stdenv fetchurl makeSetupHook; + inherit stdenv fetchurl fetchpatch makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzzFull; From 295a210a23b23e165dc2a6f1f845f550ce3a2c74 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 31 Jan 2019 00:21:51 +0100 Subject: [PATCH 035/193] qt56.qtvirtualkeyboard: init at 5.6.3 This adds the "missing" qtvirtualkeyboard module of qt56. I just add this so I can apply (& test) the patches for a CVE in the next commit. This might seem strange but in case anyone decided to add / use this in the future we are on the safe(r) side. --- pkgs/development/libraries/qt-5/5.6/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 9391999f1e90..846ec941b798 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -110,6 +110,7 @@ let /* qtwinextras = not packaged */ qtx11extras = callPackage ../modules/qtx11extras.nix {}; qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; + qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; env = callPackage ../qt-env.nix {}; full = env "qt-full-${qtbase.version}" [ From 066be85d9da2e3c99b0a03882f5c128302df6c4a Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 31 Jan 2019 00:26:03 +0100 Subject: [PATCH 036/193] qt56: fix CVE-2018-{15518,19873,19870,19871,19865,19869} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * CVE-2018-15518, Qt Base: “double free or corruption” in QXmlStreamReader * CVE-2018-19873, Qt Base: QBmpHandler segfault on malformed BMP file * CVE-2018-19870, Qt Base: Check for QImage allocation failure in qgifhandler * CVE-2018-19871, Qt Imageformats: QImage: QTgaFile CPU exhaustion * CVE-2018-19865, Qt Virtual Keyboard: Qt Virtual Keyboard logs all key presses * CVE-2018-19869, Qt Svg: Fix crash when parsing malformed url reference More details can be obtained from the Qt annoucement [1]. [1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/ --- .../libraries/qt-5/5.6/default.nix | 53 ++++++++++++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 846ec941b798..bf0ae42ea1f2 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -26,7 +26,7 @@ existing packages here and modify it as necessary. { newScope, - stdenv, fetchurl, makeSetupHook, + stdenv, fetchurl, fetchpatch, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, @@ -46,13 +46,62 @@ let srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; patches = { - qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ]; + qtbase = [ + ./qtbase.patch + ./qtbase-fixguicmake.patch + (fetchpatch { + name = "CVE-2018-15518.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=28a6e642af2ccb454dd019f551c2908753f76f08"; + sha256 = "0nyssg7d0br7qgzp481f1w8b4p1bj2ggv9iyfrm1mng5v9fypdd7"; + }) + (fetchpatch { + name = "CVE-2018-19873.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=c9b9f663d7243988bcb5fee9180ea9cb3a321a86"; + sha256 = "1q01cafy92c1j8cgrv4sk133mi3d48x8kbg3glbnnbijpc4k6di5"; + }) + (fetchpatch { + name = "CVE-2018-19870.patch"; + url = "http://code.qt.io/cgit/qt/qtbase.git/patch/?id=ac0a910756f91726e03c0e6a89d213bdb4f48fec"; + sha256 = "00qb9yqwvwnp202am3lqirkjxln1cj8v4wvmlyqya6hna176lj2l"; + }) + ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; qtwebengine = [ ./qtwebengine-seccomp.patch ]; qtwebkit = [ ./qtwebkit.patch ]; + qtvirtualkeyboard = [ + (fetchpatch { + name = "CVE-2018-19865-A.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=c02115db1de1f3aba81e109043766d600f886522"; + sha256 = "0ncnyl8f3ypi1kcb9z2i8j33snix111h28njrx8rb49ny01ap8x2"; + }) + (fetchpatch { + name = "CVE-2018-19865-B.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=01fc537adc74d5e102c8cc93384cdf5cb08b4442"; + sha256 = "19z8kxqf2lpjqr8189ingrpadch4niviw3p5v93zgx24v7950q27"; + }) + (fetchpatch { + name = "CVE-2018-19865-C.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=993a21ba03534b172d5354405cc9d50a2a822e24"; + sha256 = "1bipqxr9bvy8z402pv9kj2w1yzcsj1v03l09pg5jyg1xh6jbgiky"; + }) + ]; + qtimageformats = [ + (fetchpatch { + name = "CVE-2018-19871.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtimageformats.git;a=patch;h=9299ab07df61c56b70e047f1fe5f06b6ff541aa3"; + sha256 = "0fd3mxdlc0s405j02bc0g72fvdfvpi31a837xfwf40m5j4jbyndr"; + }) + ]; + qtsvg = [ + (fetchpatch { + name = "CVE-2018-19869.patch"; + url = "http://code.qt.io/cgit/qt/qtsvg.git/patch/?id=c5f1dd14098d1cc2cb52448fb44f53966d331443"; + sha256 = "1kgyfsxw2f0qv5fx9y7wysjsvqikam0qc7wzhklf0406zz6rhxbl"; + }) + ]; }; mkDerivation = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec95c8b20a47..9184e41f439e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12066,7 +12066,7 @@ in qt56 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.6) { inherit newScope; - inherit stdenv fetchurl makeSetupHook; + inherit stdenv fetchurl fetchpatch makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzzFull; From 1a6f3bb19d7503fae771dc558e3367b56514d25e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 30 Jan 2019 18:27:24 -0600 Subject: [PATCH 037/193] sudo-font: init at 0.37 --- pkgs/data/fonts/sudo/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/data/fonts/sudo/default.nix diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix new file mode 100644 index 000000000000..7652f593db49 --- /dev/null +++ b/pkgs/data/fonts/sudo/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchzip }: + +let + version = "0.37"; +in fetchzip rec { + name = "sudo-font-${version}"; + url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; + sha256 = "16x6vs016wz6rmd4p248ri9fn35xq7r3dc8hv4w2c4rz1xl8c099"; + + postFetch = '' + mkdir -p $out/share/fonts/truetype/ + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ + ''; + meta = with stdenv.lib; { + description = "Font for programmers and command line users"; + homepage = https://www.kutilek.de/sudo-font/; + license = licenses.ofl; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1885595c952..86535bc0ad0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15851,6 +15851,8 @@ in source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese; source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese; + sudo-font = callPackage ../data/fonts/sudo { }; + inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { From 16a360099da91b3330ec52738254eaa81c2bb36f Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Wed, 30 Jan 2019 23:00:12 +0100 Subject: [PATCH 038/193] betterlockscreen: init at 3.0.1 --- .../screensavers/betterlockscreen/default.nix | 39 +++++++++++++++++++ .../betterlockscreen/replace-i3lock.patch | 12 ++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 53 insertions(+) create mode 100644 pkgs/misc/screensavers/betterlockscreen/default.nix create mode 100644 pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix new file mode 100644 index 000000000000..26143a5ef442 --- /dev/null +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -0,0 +1,39 @@ +{ + stdenv, makeWrapper, fetchFromGitHub, substituteAll, + imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh +}: + +stdenv.mkDerivation rec { + name = "betterlockscreen-${version}"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "pavanjadhaw"; + repo = "betterlockscreen"; + rev = version; + sha256 = "0jc8ifb69shmd0avx6vny4m1w5dfxkkf5vnm7qcrmc8yflb0s3z6"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + patches = [ ./replace-i3lock.patch ]; + + installPhase = + let + PATH = + stdenv.lib.makeBinPath + [imagemagick i3lock-color xdpyinfo xrandr bc feh]; + in '' + mkdir -p $out/bin + cp betterlockscreen $out/bin/betterlockscreen + wrapProgram "$out/bin/betterlockscreen" --prefix PATH : "$out/bin:${PATH}" + ''; + + meta = with stdenv.lib; { + description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed."; + homepage = https://github.com/pavanjadhaw/betterlockscreen; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ eyjhb ]; + }; +} diff --git a/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch b/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch new file mode 100644 index 000000000000..3bbbfcfd613d --- /dev/null +++ b/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch @@ -0,0 +1,12 @@ +--- a/betterlockscreen ++++ b/betterlockscreen +@@ -76,7 +76,7 @@ prelock() { + lock() { + #$1 image path + +- i3lock \ ++ i3lock-color \ + -t -i "$1" \ + --timepos='x+110:h-70' \ + --datepos='x+43:h-45' \ + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0de7bc686c32..0044ca212be3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17624,6 +17624,8 @@ in i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; + betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { }; + i3minator = callPackage ../tools/misc/i3minator { }; i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; From 2f5d37b77bf39ee22658e65cb748c786a1b6ee2b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 31 Jan 2019 11:00:27 +0100 Subject: [PATCH 039/193] qt511: 5.11.1 -> 5.11.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes * CVE-2018-15518, Qt Base: “double free or corruption” in QXmlStreamReader * CVE-2018-19873, Qt Base: QBmpHandler segfault on malformed BMP file * CVE-2018-19870, Qt Base: Check for QImage allocation failure in qgifhandler * CVE-2018-19871, Qt Imageformats: QImage: QTgaFile CPU exhaustion * CVE-2018-19865, Qt Virtual Keyboard: Qt Virtual Keyboard logs all key presses * CVE-2018-19869, Qt Svg: Fix crash when parsing malformed url reference More details can be obtained from the Qt annoucement [1]. [1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/ --- pkgs/development/libraries/qt-5/5.11/fetch.sh | 2 +- .../libraries/qt-5/5.11/qtbase.patch | 404 +++++++++--------- pkgs/development/libraries/qt-5/5.11/srcs.nix | 320 +++++++------- 3 files changed, 352 insertions(+), 374 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.11/fetch.sh b/pkgs/development/libraries/qt-5/5.11/fetch.sh index ce82e243af77..dc1088fc371c 100644 --- a/pkgs/development/libraries/qt-5/5.11/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.11/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase.patch b/pkgs/development/libraries/qt-5/5.11/qtbase.patch index fa0b2c51c46e..7d8407f6daf8 100644 --- a/pkgs/development/libraries/qt-5/5.11/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.11/qtbase.patch @@ -1,8 +1,7 @@ -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 5208379f9a..92fe29a0ac 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/common/mac.conf qtbase-everywhere-src-5.11.3/mkspecs/common/mac.conf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/common/mac.conf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/common/mac.conf 2019-01-31 00:42:55.843577249 +0100 +@@ -23,7 +23,7 @@ QMAKE_FIX_RPATH = install_name_tool -id @@ -11,11 +10,10 @@ index 5208379f9a..92fe29a0ac 100644 QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 2ed708e085..05e60ff45f 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -21,7 +21,7 @@ load(cmake_functions) +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.11.3/mkspecs/features/create_cmake.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/create_cmake.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/create_cmake.prf 2019-01-31 00:42:55.843577249 +0100 +@@ -21,7 +21,7 @@ # at cmake time whether package has been found via a symlink, and correct # that to an absolute path. This is only done for installations to # the /usr or / prefix. @@ -24,7 +22,7 @@ index 2ed708e085..05e60ff45f 100644 contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake -@@ -51,45 +51,20 @@ split_incpath { +@@ -51,45 +51,20 @@ $$cmake_extra_source_includes.output } @@ -81,7 +79,7 @@ index 2ed708e085..05e60ff45f 100644 static|staticlib:CMAKE_STATIC_TYPE = true -@@ -169,7 +144,7 @@ contains(CONFIG, plugin) { +@@ -169,7 +144,7 @@ cmake_target_file cmake_qt5_plugin_file.files = $$cmake_target_file.output @@ -90,7 +88,7 @@ index 2ed708e085..05e60ff45f 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) { +@@ -316,7 +291,7 @@ cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -99,11 +97,10 @@ index 2ed708e085..05e60ff45f 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 27f4c277d6..18b4813e25 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qtbase-everywhere-src-5.11.3/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-01-31 00:42:55.843577249 +0100 +@@ -3,30 +3,6 @@ message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") endif() @@ -134,7 +131,7 @@ index 27f4c277d6..18b4813e25 100644 !!IF !equals(TEMPLATE, aux) # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") -@@ -52,11 +28,7 @@ endmacro() +@@ -52,11 +28,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -146,7 +143,7 @@ index 27f4c277d6..18b4813e25 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" -@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI +@@ -69,11 +41,7 @@ ) !!IF !isEmpty(CMAKE_WINDOWS_BUILD) @@ -158,7 +155,7 @@ index 27f4c277d6..18b4813e25 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -89,24 +57,13 @@ !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS @@ -187,7 +184,7 @@ index 27f4c277d6..18b4813e25 100644 ) !!ELSE set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -122,7 +79,6 @@ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") !!ENDIF !!ENDIF @@ -195,7 +192,7 @@ index 27f4c277d6..18b4813e25 100644 !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) !!ENDIF -@@ -269,25 +225,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -269,25 +225,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_DEBUG_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -221,7 +218,7 @@ index 27f4c277d6..18b4813e25 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -306,25 +250,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -306,25 +250,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_RELEASE_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -247,7 +244,7 @@ index 27f4c277d6..18b4813e25 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -343,11 +275,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -343,11 +275,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -259,11 +256,10 @@ index 27f4c277d6..18b4813e25 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 21d487f1f9..a0e5c68b7e 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -24,196 +24,3 @@ qt { +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_post.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_post.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_post.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_post.prf 2019-01-31 00:45:14.585621324 +0100 +@@ -62,199 +62,3 @@ } } } @@ -458,12 +454,15 @@ index 21d487f1f9..a0e5c68b7e 100644 -xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX -isEmpty(xcode_product_bundle_identifier_setting.value): \ - xcode_product_bundle_identifier_setting.value = "com.yourcompany" --xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}" +-xcode_product_bundle_target = $$QMAKE_BUNDLE +-isEmpty(xcode_product_bundle_target): \ +- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} +-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf +Only in qtbase-everywhere-src-5.11.3/mkspecs/features/mac: default_post.prf.orig +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_pre.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_pre.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_pre.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_pre.prf 2019-01-31 00:42:55.843577249 +0100 @@ -1,60 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) @@ -525,10 +524,9 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 8360dd8b38..8b13789179 100644 ---- a/mkspecs/features/mac/sdk.prf -+++ b/mkspecs/features/mac/sdk.prf +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/sdk.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/sdk.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/sdk.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/sdk.prf 2019-01-31 00:42:55.843577249 +0100 @@ -1,58 +1 @@ -isEmpty(QMAKE_MAC_SDK): \ @@ -588,11 +586,10 @@ index 8360dd8b38..8b13789179 100644 - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} -diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf -index 4db0040dc5..65d6da1f4d 100644 ---- a/mkspecs/features/qml_module.prf -+++ b/mkspecs/features/qml_module.prf -@@ -23,13 +23,8 @@ for(qmlf, AUX_QML_FILES): fq_aux_qml_files += $$absolute_path($$qmlf, $$_PRO_FIL +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_module.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qml_module.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_module.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qml_module.prf 2019-01-31 00:42:55.843577249 +0100 +@@ -23,13 +23,8 @@ load(qt_build_paths) @@ -608,11 +605,10 @@ index 4db0040dc5..65d6da1f4d 100644 !qml1_target:static: CONFIG += builtin_resources -diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf -index d49f4c49c1..097dcd7d39 100644 ---- a/mkspecs/features/qml_plugin.prf -+++ b/mkspecs/features/qml_plugin.prf -@@ -48,13 +48,8 @@ exists($$QMLTYPEFILE): AUX_QML_FILES += $$QMLTYPEFILE +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_plugin.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qml_plugin.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_plugin.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qml_plugin.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -48,13 +48,8 @@ load(qt_build_paths) @@ -628,11 +624,10 @@ index d49f4c49c1..097dcd7d39 100644 target.path = $$instbase/$$TARGETPATH INSTALLS += target -diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 883f8ca215..81db8eb2d4 100644 ---- a/mkspecs/features/qt_app.prf -+++ b/mkspecs/features/qt_app.prf -@@ -33,7 +33,7 @@ host_build:force_bootstrap { +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_app.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_app.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_app.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -33,7 +33,7 @@ target.path = $$[QT_HOST_BINS] } else { !build_pass:qtConfig(debug_and_release): CONFIG += release @@ -641,11 +636,10 @@ index 883f8ca215..81db8eb2d4 100644 CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable } INSTALLS += target -diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf -index 1848f00e90..2af93675c5 100644 ---- a/mkspecs/features/qt_build_paths.prf -+++ b/mkspecs/features/qt_build_paths.prf -@@ -23,6 +23,6 @@ exists($$MODULE_BASE_INDIR/.git): \ +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_build_paths.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_build_paths.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_build_paths.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_build_paths.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -24,6 +24,6 @@ !force_independent { # If the module is not built independently, everything ends up in qtbase. # This is the case in non-prefix builds, except for selected modules. @@ -654,11 +648,11 @@ index 1848f00e90..2af93675c5 100644 + MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT } -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 415044bb64..7163ef56cd 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) { +Only in qtbase-everywhere-src-5.11.3/mkspecs/features: qt_build_paths.prf.orig +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_common.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_common.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_common.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_common.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -32,8 +32,8 @@ qqt_libdir = \$\$\$\$[QT_HOST_LIBS] qt_libdir = $$[QT_HOST_LIBS] } else { @@ -669,11 +663,10 @@ index 415044bb64..7163ef56cd 100644 } contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { lib_replace.match = "[^ ']*$$rplbase/lib" -diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf -index 3139c443c6..1b4f2fddd8 100644 ---- a/mkspecs/features/qt_docs.prf -+++ b/mkspecs/features/qt_docs.prf -@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_docs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_docs.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_docs.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_docs.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -45,7 +45,7 @@ QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) !build_online_docs: \ @@ -682,7 +675,7 @@ index 3139c443c6..1b4f2fddd8 100644 PREP_DOC_INDEXES = DOC_INDEXES = !isEmpty(QTREPOS) { -@@ -64,8 +64,8 @@ DOC_INDEXES = +@@ -64,8 +64,8 @@ DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) } else { prepare_docs: \ @@ -693,7 +686,7 @@ index 3139c443c6..1b4f2fddd8 100644 } qtattributionsscanner.target = qtattributionsscanner -@@ -88,12 +88,12 @@ prepare_docs { +@@ -88,12 +88,12 @@ qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR @@ -708,11 +701,10 @@ index 3139c443c6..1b4f2fddd8 100644 inst_qch_docs.CONFIG += no_check_exist no_default_install no_build INSTALLS += inst_qch_docs -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 43b58817fe..e635b8f67a 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -88,7 +88,7 @@ sourcefiles += \ +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_example_installs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_example_installs.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_example_installs.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_example_installs.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -88,7 +88,7 @@ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ $$DBUS_ADAPTORS $$DBUS_INTERFACES addInstallFiles(sources.files, $$sourcefiles) @@ -721,11 +713,10 @@ index 43b58817fe..e635b8f67a 100644 INSTALLS += sources check_examples { -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..ae7b585989 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_functions.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_functions.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_functions.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_functions.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -69,7 +69,7 @@ defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { @@ -734,10 +725,9 @@ index 1903e509c8..ae7b585989 100644 exists($${cmd}.pl) { $${1}_EXE = $${cmd}.pl cmd = perl -w $$system_path($${cmd}.pl) -diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf -index 8f98987b99..21b3bb8b32 100644 ---- a/mkspecs/features/qt_installs.prf -+++ b/mkspecs/features/qt_installs.prf +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_installs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_installs.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_installs.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_installs.prf 2019-01-31 00:42:55.844577264 +0100 @@ -12,16 +12,10 @@ #library !qt_no_install_library { @@ -797,11 +787,10 @@ index 8f98987b99..21b3bb8b32 100644 privpritarget.files = $$MODULE_PRIVATE_PRI INSTALLS += privpritarget } -diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index bf90adcf1e..b3de698ff7 100644 ---- a/mkspecs/features/qt_plugin.prf -+++ b/mkspecs/features/qt_plugin.prf -@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_plugin.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_plugin.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_plugin.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_plugin.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -88,7 +88,7 @@ } } @@ -810,84 +799,10 @@ index bf90adcf1e..b3de698ff7 100644 INSTALLS += target TARGET = $$qt5LibraryTarget($$TARGET) -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index e0652fdcf9..450b2a2d28 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) - add_executable(Qt5::qmake IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) - add_executable(Qt5::moc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) - add_executable(Qt5::rcc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain) - !!IF !isEmpty(CMAKE_RELEASE_TYPE) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ENDIF -@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -index c357237d0e..6f0c75de3c 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -index 706304cf34..546420f6ad 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index 4e32f90964..503aeffd0c 100644 ---- a/src/corelib/kernel/qcoreapplication.cpp -+++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2613,6 +2613,15 @@ QStringList QCoreApplication::libraryPaths() +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/kernel/qcoreapplication.cpp qtbase-everywhere-src-5.11.3/src/corelib/kernel/qcoreapplication.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/kernel/qcoreapplication.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/kernel/qcoreapplication.cpp 2019-01-31 00:42:55.845577279 +0100 +@@ -2612,6 +2612,15 @@ QStringList *app_libpaths = new QStringList; coreappdata()->app_libpaths.reset(app_libpaths); @@ -903,11 +818,81 @@ index 4e32f90964..503aeffd0c 100644 const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); if (!libPathEnv.isEmpty()) { QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); -diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index 6a5df6272a..a6136ca4cd 100644 ---- a/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash; +Only in qtbase-everywhere-src-5.11.3/src/corelib/kernel: qcoreapplication.cpp.orig +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtras.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-01-31 00:42:55.844577264 +0100 +@@ -3,7 +3,7 @@ + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -35,7 +35,7 @@ + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -116,7 +116,7 @@ + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -130,7 +130,7 @@ + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-01-31 00:42:55.844577264 +0100 +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-01-31 00:42:55.844577264 +0100 +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/tools/qtimezoneprivate_tz.cpp qtbase-everywhere-src-5.11.3/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/tools/qtimezoneprivate_tz.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-01-31 00:42:55.845577279 +0100 +@@ -70,7 +70,11 @@ // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() { @@ -920,7 +905,7 @@ index 6a5df6272a..a6136ca4cd 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) +@@ -644,12 +648,16 @@ if (!tzif.open(QIODevice::ReadOnly)) return; } else { @@ -942,10 +927,9 @@ index 6a5df6272a..a6136ca4cd 100644 } } -diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d947159e2..b36865fc48 100644 ---- a/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +diff -ur qtbase-everywhere-src-5.11.3-orig/src/dbus/Qt5DBusConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/dbus/Qt5DBusConfigExtras.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/dbus/Qt5DBusConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-01-31 00:42:55.845577279 +0100 @@ -2,11 +2,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) add_executable(Qt5::qdbuscpp2xml IMPORTED) @@ -959,7 +943,7 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ endif() +@@ -17,11 +13,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) add_executable(Qt5::qdbusxml2cpp IMPORTED) @@ -972,10 +956,9 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..fb4183bada 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in +diff -ur qtbase-everywhere-src-5.11.3-orig/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/gui/Qt5GuiConfigExtras.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/gui/Qt5GuiConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/gui/Qt5GuiConfigExtras.cmake.in 2019-01-31 00:42:55.845577279 +0100 @@ -2,7 +2,7 @@ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) @@ -985,7 +968,7 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO +@@ -17,13 +17,13 @@ set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) @@ -1001,11 +984,10 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF -diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -index b5a0a5bbeb..6c20305f4d 100644 ---- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() +diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-01-31 00:42:55.845577279 +0100 +@@ -265,12 +265,9 @@ m_possibleLocations.reserve(7); if (qEnvironmentVariableIsSet("QTCOMPOSE")) m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); @@ -1019,11 +1001,10 @@ index b5a0a5bbeb..6c20305f4d 100644 } QString TableGenerator::findComposeFile() -diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -index cc982b3379..0c5005d3d7 100644 ---- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -@@ -648,9 +648,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) +diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp 2019-01-31 00:42:55.845577279 +0100 +@@ -650,9 +650,14 @@ #if QT_CONFIG(library) extern const QString qt_gl_library_name(); // QLibrary lib(qt_gl_library_name()); @@ -1040,11 +1021,11 @@ index cc982b3379..0c5005d3d7 100644 glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); #endif } -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index b401100dd4..b45a290065 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) +Only in qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx: qglxintegration.cpp.orig +diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/qxcbcursor.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/qxcbcursor.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/qxcbcursor.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-01-31 00:42:55.846577295 +0100 +@@ -316,10 +316,10 @@ #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { @@ -1057,10 +1038,9 @@ index b401100dd4..b45a290065 100644 xcursorFound = xcursorLib.load(); } if (xcursorFound) { -diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp -index fb1c425d8e..bb8bab9795 100644 ---- a/src/plugins/platformthemes/gtk3/main.cpp -+++ b/src/plugins/platformthemes/gtk3/main.cpp +diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platformthemes/gtk3/main.cpp qtbase-everywhere-src-5.11.3/src/plugins/platformthemes/gtk3/main.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/plugins/platformthemes/gtk3/main.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/plugins/platformthemes/gtk3/main.cpp 2019-01-31 00:42:55.846577295 +0100 @@ -39,6 +39,7 @@ #include @@ -1069,7 +1049,7 @@ index fb1c425d8e..bb8bab9795 100644 QT_BEGIN_NAMESPACE -@@ -54,8 +55,22 @@ public: +@@ -54,8 +55,22 @@ QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) { Q_UNUSED(params); @@ -1093,10 +1073,9 @@ index fb1c425d8e..bb8bab9795 100644 return 0; } -diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h -index 6498ea84ef..d821ced7fc 100644 ---- a/src/testlib/qtestassert.h -+++ b/src/testlib/qtestassert.h +diff -ur qtbase-everywhere-src-5.11.3-orig/src/testlib/qtestassert.h qtbase-everywhere-src-5.11.3/src/testlib/qtestassert.h +--- qtbase-everywhere-src-5.11.3-orig/src/testlib/qtestassert.h 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/testlib/qtestassert.h 2019-01-31 00:42:55.846577295 +0100 @@ -44,10 +44,13 @@ QT_BEGIN_NAMESPACE @@ -1113,11 +1092,10 @@ index 6498ea84ef..d821ced7fc 100644 QT_END_NAMESPACE -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2e46..a4eab2aa72 100644 ---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) +diff -ur qtbase-everywhere-src-5.11.3-orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/widgets/Qt5WidgetsConfigExtras.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-01-31 00:42:55.846577295 +0100 +@@ -3,7 +3,7 @@ add_executable(Qt5::uic IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) diff --git a/pkgs/development/libraries/qt-5/5.11/srcs.nix b/pkgs/development/libraries/qt-5/5.11/srcs.nix index b6668a91606c..cff49b180337 100644 --- a/pkgs/development/libraries/qt-5/5.11/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.11/srcs.nix @@ -3,323 +3,323 @@ { qt3d = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qt3d-everywhere-src-5.11.1.tar.xz"; - sha256 = "03fkbrghj40rp8pf5r5979pcvq7qjsj7db446r6fl6slwphmk1nb"; - name = "qt3d-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qt3d-everywhere-src-5.11.3.tar.xz"; + sha256 = "1awyv40jgbb30yp5zxf6j9wq96nmk8zyhbh4fpn9gn35ychmr984"; + name = "qt3d-everywhere-src-5.11.3.tar.xz"; }; }; qtactiveqt = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtactiveqt-everywhere-src-5.11.1.tar.xz"; - sha256 = "1f9w3dc2wvhz7pqhrsb2p908kc2c6xrqsp82ny8akil4xx6nrvn6"; - name = "qtactiveqt-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtactiveqt-everywhere-src-5.11.3.tar.xz"; + sha256 = "0g35yhp01c34m91fp5vzzq0d2kzz0yswpjjk5cg36j0ddnfcsh4d"; + name = "qtactiveqt-everywhere-src-5.11.3.tar.xz"; }; }; qtandroidextras = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtandroidextras-everywhere-src-5.11.1.tar.xz"; - sha256 = "1qiggrz2hdb7vrkvsh71hqdipj3klak0jpn2nq8qpilqxgb9dx76"; - name = "qtandroidextras-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtandroidextras-everywhere-src-5.11.3.tar.xz"; + sha256 = "0clqz10ry70f0v8hbw37fhlwrsr5jddg99yjsk9db250dwbqzq27"; + name = "qtandroidextras-everywhere-src-5.11.3.tar.xz"; }; }; qtbase = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz"; - sha256 = "0ipv18ypbgpxhh49rfplqmflskmnhhwj1bjr5hrwi0jpvar4gl50"; - name = "qtbase-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz"; + sha256 = "071yc9iz14qs4s8yvrwllyfdzp5yjxsdpvbjxdrf0g5q69vqigy6"; + name = "qtbase-everywhere-src-5.11.3.tar.xz"; }; }; qtcanvas3d = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtcanvas3d-everywhere-src-5.11.1.tar.xz"; - sha256 = "1pif3m1f44jrly2nh0hzid6dmdxqiy5qgx645hz6g5fmpl113d8g"; - name = "qtcanvas3d-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtcanvas3d-everywhere-src-5.11.3.tar.xz"; + sha256 = "0f110z7cmkzns9k00aa5zhzq2fpybfxkd7gdlwzcbhc8hn20986m"; + name = "qtcanvas3d-everywhere-src-5.11.3.tar.xz"; }; }; qtcharts = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtcharts-everywhere-src-5.11.1.tar.xz"; - sha256 = "0avscsni84zrzydilkkp456sbaypyzhkn42qygjdq7wcn045zxk2"; - name = "qtcharts-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtcharts-everywhere-src-5.11.3.tar.xz"; + sha256 = "1p4m1nkbbxlkwmbmasx5r83skzssmlcgfzyvj30x2dyrqkmz7627"; + name = "qtcharts-everywhere-src-5.11.3.tar.xz"; }; }; qtconnectivity = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtconnectivity-everywhere-src-5.11.1.tar.xz"; - sha256 = "0mz6mbf069yqdvi6mcvp6izskcn9wzig4s3dzmygwd430pmx93kk"; - name = "qtconnectivity-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtconnectivity-everywhere-src-5.11.3.tar.xz"; + sha256 = "0amks3qad31i7cha85kvcaxvlmmgkc3gm4jdkw2p02ixxfygr30l"; + name = "qtconnectivity-everywhere-src-5.11.3.tar.xz"; }; }; qtdatavis3d = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdatavis3d-everywhere-src-5.11.1.tar.xz"; - sha256 = "0gay0dsz05xfrlx190y95hp9wipzb988h02fqbqvyn00ds3s178w"; - name = "qtdatavis3d-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdatavis3d-everywhere-src-5.11.3.tar.xz"; + sha256 = "1kqwr3avcvcyy4i28vjgxk1bsjj9011zr668hsk1zrjxnnwjwdl3"; + name = "qtdatavis3d-everywhere-src-5.11.3.tar.xz"; }; }; qtdeclarative = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdeclarative-everywhere-src-5.11.1.tar.xz"; - sha256 = "0fjg9ii64mhx2ww70rj44cy65rwwkwyjxcm435kwp3v1pzv5xkwy"; - name = "qtdeclarative-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdeclarative-everywhere-src-5.11.3.tar.xz"; + sha256 = "1rhsf9bma2zwwpixk2fsg31x7c1pmsk144npypgc9w86swhkc9lf"; + name = "qtdeclarative-everywhere-src-5.11.3.tar.xz"; }; }; qtdoc = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdoc-everywhere-src-5.11.1.tar.xz"; - sha256 = "1z0sqmn0pw5g4ycdi8igsi89151cw6p3kv9g97pxl2qx3my1ppmc"; - name = "qtdoc-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdoc-everywhere-src-5.11.3.tar.xz"; + sha256 = "06nl8lzrilj8yify5qy4fm9la6dh71aamg19jhvvi657cshiclsq"; + name = "qtdoc-everywhere-src-5.11.3.tar.xz"; }; }; qtgamepad = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtgamepad-everywhere-src-5.11.1.tar.xz"; - sha256 = "1n97w9rcbg8mzkvjgn3i8jbfmplp7w0p80ykdchpml47gxk1kwma"; - name = "qtgamepad-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtgamepad-everywhere-src-5.11.3.tar.xz"; + sha256 = "1k222cx18zq48sfna91hmy427qzk2n2xz3dlyz59iyz72k6915g9"; + name = "qtgamepad-everywhere-src-5.11.3.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtgraphicaleffects-everywhere-src-5.11.1.tar.xz"; - sha256 = "1ws8aj7bq3rxpzjs370dcyqk8a5v1y6fwvrdhf70j8b2d4v75lnr"; - name = "qtgraphicaleffects-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtgraphicaleffects-everywhere-src-5.11.3.tar.xz"; + sha256 = "1qjpdzkamf27cg5n1wsf0zk939lcgppgydfjzap9s4fxzj1nkn0l"; + name = "qtgraphicaleffects-everywhere-src-5.11.3.tar.xz"; }; }; qtimageformats = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtimageformats-everywhere-src-5.11.1.tar.xz"; - sha256 = "05jnyrq7klr3mdiz0r9c151vl829yc8y9cxfbw5dwbp1rkndwl7b"; - name = "qtimageformats-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtimageformats-everywhere-src-5.11.3.tar.xz"; + sha256 = "0zq8igsjyyhxsjr43vpaasrqjw3x0g6rwqf8kaz7y9vs7ny63ch4"; + name = "qtimageformats-everywhere-src-5.11.3.tar.xz"; }; }; qtlocation = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtlocation-everywhere-src-5.11.1.tar.xz"; - sha256 = "03vrbymwbn4nqsypcmr4ccqv20nvwdfs9gb01pi3jxr6x0wrlb0p"; - name = "qtlocation-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz"; + sha256 = "1sq0f41jwmsimv9a1wl2nk5nifjppm5j92rr4n4s7qwnnjjrir2q"; + name = "qtlocation-everywhere-src-5.11.3.tar.xz"; }; }; qtmacextras = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtmacextras-everywhere-src-5.11.1.tar.xz"; - sha256 = "1wf3n5n4gg8gmjnjq88lmymkssg8q5s3qkrpsxd1hb6pd3n32gpn"; - name = "qtmacextras-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtmacextras-everywhere-src-5.11.3.tar.xz"; + sha256 = "1j9sqmcwswr8v9z8mcbm10bj7nz8nv9mir0xsc5123ik1gw2c3lk"; + name = "qtmacextras-everywhere-src-5.11.3.tar.xz"; }; }; qtmultimedia = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtmultimedia-everywhere-src-5.11.1.tar.xz"; - sha256 = "0369b0mh7sr718l119b07grb1v8xqlq6l4damyd6lrmlj1wbb2zj"; - name = "qtmultimedia-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtmultimedia-everywhere-src-5.11.3.tar.xz"; + sha256 = "0h9wx86zj20n4xc3qnml0i360x2dc1yd2z2af1flj8fwyzppi03j"; + name = "qtmultimedia-everywhere-src-5.11.3.tar.xz"; }; }; qtnetworkauth = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtnetworkauth-everywhere-src-5.11.1.tar.xz"; - sha256 = "05p4pvfp3k5612d54anvpj39bgc7v572x6kgk3fy69xgn7lhbd02"; - name = "qtnetworkauth-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtnetworkauth-everywhere-src-5.11.3.tar.xz"; + sha256 = "0dd35698wzg89975vi2ijl2lym495fjizsl03mjixsjnvb1x0q50"; + name = "qtnetworkauth-everywhere-src-5.11.3.tar.xz"; }; }; qtpurchasing = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtpurchasing-everywhere-src-5.11.1.tar.xz"; - sha256 = "0crm39fy9aqns10mjlbxvkkna9xklic49zfp3f7v7cwl66wap6dc"; - name = "qtpurchasing-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtpurchasing-everywhere-src-5.11.3.tar.xz"; + sha256 = "1fd0gxdj5mrh81iwimq1243i3n47sqv9ik8nslahfh0q3dsx7k8n"; + name = "qtpurchasing-everywhere-src-5.11.3.tar.xz"; }; }; qtquickcontrols = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols-everywhere-src-5.11.1.tar.xz"; - sha256 = "0mn662j0gkpama7zlrsn4h27sjrk49kpbha1h0zxxyiza5cpzsms"; - name = "qtquickcontrols-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols-everywhere-src-5.11.3.tar.xz"; + sha256 = "0dvmy31qbl76yy0j5y8m7mvnmqyg2c01fmlkn0snvc5h5ah5skjf"; + name = "qtquickcontrols-everywhere-src-5.11.3.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols2-everywhere-src-5.11.1.tar.xz"; - sha256 = "0hn4kvrkz5ivwrp9p6yzwlw7cn4j72kcpm2nqyi3dbai1px6dc5x"; - name = "qtquickcontrols2-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols2-everywhere-src-5.11.3.tar.xz"; + sha256 = "11nhpb0xckv5jjkqj5szr94c2rvyjwr89ch58hh64nsqaav30mpl"; + name = "qtquickcontrols2-everywhere-src-5.11.3.tar.xz"; }; }; qtremoteobjects = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtremoteobjects-everywhere-src-5.11.1.tar.xz"; - sha256 = "1yv9f2329nv4viiyqmq7ciz51574wd11grj8s88qm0ndcb36jbgb"; - name = "qtremoteobjects-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtremoteobjects-everywhere-src-5.11.3.tar.xz"; + sha256 = "1d3jzsxfyjhgb6wj9iv1388bv7j6pi08346nmkm1c1a4iykhc0zp"; + name = "qtremoteobjects-everywhere-src-5.11.3.tar.xz"; }; }; qtscript = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtscript-everywhere-src-5.11.1.tar.xz"; - sha256 = "0z6sb4b9ds5lwkr0sxrnx6nim3aq2qx4a8illjy5vclfdv80yhqw"; - name = "qtscript-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtscript-everywhere-src-5.11.3.tar.xz"; + sha256 = "027cvggbcvwyz76cn1bl1zvqg0nq7iica1b7yx7xyy0hb36g715v"; + name = "qtscript-everywhere-src-5.11.3.tar.xz"; }; }; qtscxml = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtscxml-everywhere-src-5.11.1.tar.xz"; - sha256 = "0f1k4fnk2aydagxqvkb636pcsi17sbq2zj2fn0ad50dvq013yiph"; - name = "qtscxml-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtscxml-everywhere-src-5.11.3.tar.xz"; + sha256 = "1mv8mz36v34dckrzy5r41mq3sqznbalrhndk3avz2154xmkjf5qk"; + name = "qtscxml-everywhere-src-5.11.3.tar.xz"; }; }; qtsensors = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtsensors-everywhere-src-5.11.1.tar.xz"; - sha256 = "1yn065l6kzs3fn74950pkxxglqi55lzk7alf15klsd1wnxc0zsfb"; - name = "qtsensors-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtsensors-everywhere-src-5.11.3.tar.xz"; + sha256 = "0n88c8xi9pbyh7q1pcqv4yjv6nx62abflj8qgfr4qzb0sp8m6mx7"; + name = "qtsensors-everywhere-src-5.11.3.tar.xz"; }; }; qtserialbus = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtserialbus-everywhere-src-5.11.1.tar.xz"; - sha256 = "0jjmdd6vkvs5izqazp1rsrad0b1fzk6knrbdjl37lvcsawyfxfyk"; - name = "qtserialbus-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtserialbus-everywhere-src-5.11.3.tar.xz"; + sha256 = "0vf12jk1ma0v0dlpliw1x9i04iaik1kjkiaby7gaxm2abprxwr2n"; + name = "qtserialbus-everywhere-src-5.11.3.tar.xz"; }; }; qtserialport = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtserialport-everywhere-src-5.11.1.tar.xz"; - sha256 = "18v4pbq7bnmrl81m8s11ksbjlvzbb4kw5py6ji2dhmnm44w9k9sn"; - name = "qtserialport-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtserialport-everywhere-src-5.11.3.tar.xz"; + sha256 = "1nkbfsxzgicwns3k11hhzjxy2hgrigj8xcw2by0jc1j71mnmxi4n"; + name = "qtserialport-everywhere-src-5.11.3.tar.xz"; }; }; qtspeech = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtspeech-everywhere-src-5.11.1.tar.xz"; - sha256 = "1nwvbaijg35i98yaiqgnyn5vv0cn4v3wrxhwi1s0hfv9sv3q5iyw"; - name = "qtspeech-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtspeech-everywhere-src-5.11.3.tar.xz"; + sha256 = "158p7zqd0vg55gf88jzc3d4f7649ihh80k0m1q46m2yp6fpdjbxr"; + name = "qtspeech-everywhere-src-5.11.3.tar.xz"; }; }; qtsvg = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtsvg-everywhere-src-5.11.1.tar.xz"; - sha256 = "0drhig0jcss3cf01aqfmafajf8gzf6bh468g1ikyrkh46czgyshx"; - name = "qtsvg-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtsvg-everywhere-src-5.11.3.tar.xz"; + sha256 = "14a4rprbj9f9rhixbk7143xdz34d7d39xh9v2sc1w43q9sf2rsi1"; + name = "qtsvg-everywhere-src-5.11.3.tar.xz"; }; }; qttools = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz"; - sha256 = "1zhl8p29mbabf07rhaks13qcm45zdckzymvz9qn95nxfj9piiyxp"; - name = "qttools-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz"; + sha256 = "13lzdxxi02yhvx4mflhisl6aqv2fiss5m804cqccd1wvp8dyh1f2"; + name = "qttools-everywhere-src-5.11.3.tar.xz"; }; }; qttranslations = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qttranslations-everywhere-src-5.11.1.tar.xz"; - sha256 = "01kid5dc20jnzjmd4ycjmacrsmrw4hsh2s4y5k9y9p34z8m9pn0j"; - name = "qttranslations-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qttranslations-everywhere-src-5.11.3.tar.xz"; + sha256 = "0j8i2kabz22vqb0qj41pkjv848zblqxs71sydc3xcd5av22b517s"; + name = "qttranslations-everywhere-src-5.11.3.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz"; - sha256 = "16xzpdqn07z8j6f8iywy3967djap5bbi2myqp37s4xh9fz60scsv"; - name = "qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz"; + sha256 = "17jb7cbfy5c19fr9frql6q22in3ra3a4fbff0kjykllxb8j40p4c"; + name = "qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz"; }; }; qtwayland = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwayland-everywhere-src-5.11.1.tar.xz"; - sha256 = "1sj4lsza48xji1qhmi1wqpx07jgm1mpa95gmd2w1kxw240hbr6p0"; - name = "qtwayland-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwayland-everywhere-src-5.11.3.tar.xz"; + sha256 = "1chz4wchgkzd45h143i5hkqg0whcgdbj37gkg7j4kj31whllzjb2"; + name = "qtwayland-everywhere-src-5.11.3.tar.xz"; }; }; qtwebchannel = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebchannel-everywhere-src-5.11.1.tar.xz"; - sha256 = "11rfjkb4h8dzxfmk889x7kkc73cbk26smc7h62lnh35f2nppd95r"; - name = "qtwebchannel-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebchannel-everywhere-src-5.11.3.tar.xz"; + sha256 = "1wrdawlqvcw84h8q52mvbjhp1vkd6fhz6c8ijlg9rw0s3fj4y99w"; + name = "qtwebchannel-everywhere-src-5.11.3.tar.xz"; }; }; qtwebengine = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebengine-everywhere-src-5.11.1.tar.xz"; - sha256 = "136lc2kw4af4bilgn7vn9hdckpk62xvyjb4kr0gc2firr919z79q"; - name = "qtwebengine-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebengine-everywhere-src-5.11.3.tar.xz"; + sha256 = "1zmqsdais85cdfh2jh8h4a5jcamp1mzdk3vgqm6xnldqf6nrxd2v"; + name = "qtwebengine-everywhere-src-5.11.3.tar.xz"; }; }; qtwebglplugin = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebglplugin-everywhere-src-5.11.1.tar.xz"; - sha256 = "108yhi3sj6d1ysmlpka69ivb20mx9h6jpra6yq099i3jw4gc753x"; - name = "qtwebglplugin-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebglplugin-everywhere-src-5.11.3.tar.xz"; + sha256 = "0wqz8lycmi7pffzy0pz5960w109lbk4mkbw0l1lh64avl6clq7b9"; + name = "qtwebglplugin-everywhere-src-5.11.3.tar.xz"; }; }; qtwebsockets = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebsockets-everywhere-src-5.11.1.tar.xz"; - sha256 = "1bj82y3f1nd2adnj3ljfr4vlx4bkgdlm3zvhlsas2lz837vi5aks"; - name = "qtwebsockets-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebsockets-everywhere-src-5.11.3.tar.xz"; + sha256 = "1ffmapfy68xwwbxbg19ng6b5h8v42cf78s21j7rgq49gm70r0402"; + name = "qtwebsockets-everywhere-src-5.11.3.tar.xz"; }; }; qtwebview = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebview-everywhere-src-5.11.1.tar.xz"; - sha256 = "18da6a13wpb23vb6mbg9v75gphdf5mjmch7q3v1qjrv2sdwbpjbp"; - name = "qtwebview-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebview-everywhere-src-5.11.3.tar.xz"; + sha256 = "1njmn1n03dp4md8cz58cq2z6bsxd8nwlw0238zmavh7px3jzc9kh"; + name = "qtwebview-everywhere-src-5.11.3.tar.xz"; }; }; qtwinextras = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwinextras-everywhere-src-5.11.1.tar.xz"; - sha256 = "0qxwfhg962a456lb9b6y7xhi6fvvvb42z0li6v7695vfbckifbzz"; - name = "qtwinextras-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwinextras-everywhere-src-5.11.3.tar.xz"; + sha256 = "1xf9gc0wqk9jz2ayx29vx0vmm72x9h4qxp2fvgpclns621wyhw72"; + name = "qtwinextras-everywhere-src-5.11.3.tar.xz"; }; }; qtx11extras = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtx11extras-everywhere-src-5.11.1.tar.xz"; - sha256 = "0rccpmhz48kq4xs441lj9mnwpbi6kxwl8y7dj7w7g5zvpv41kwmw"; - name = "qtx11extras-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtx11extras-everywhere-src-5.11.3.tar.xz"; + sha256 = "11fd2mc20qmnyv1vqhaqad2q6m0i4lmkr432rmqvpkgphpkfp7pr"; + name = "qtx11extras-everywhere-src-5.11.3.tar.xz"; }; }; qtxmlpatterns = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtxmlpatterns-everywhere-src-5.11.1.tar.xz"; - sha256 = "0n5gacpni019i2872m4b1p5qaqibhszsdl3xhw3xsckvr0hf25v1"; - name = "qtxmlpatterns-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtxmlpatterns-everywhere-src-5.11.3.tar.xz"; + sha256 = "1vhfvgi39miqsx3iq7c9sii2sykq0yfng69b70i0smr20zihpl4b"; + name = "qtxmlpatterns-everywhere-src-5.11.3.tar.xz"; }; }; } From 52bd7c5f2a4501c33c72aa89575626a1307f38ae Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 1 Feb 2019 09:17:05 -0500 Subject: [PATCH 040/193] nixos/redmine: add an extraEnv option (which could be used to turn on debug logging, etc...), enable automatic log rotation --- nixos/modules/services/misc/redmine.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 3c322ba1c3e6..d7250c5f35af 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -30,6 +30,13 @@ let ${cfg.extraConfig} ''; + additionalEnvironment = pkgs.writeText "additional_environment.rb" '' + config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576) + config.logger.level = Logger::INFO + + ${cfg.extraEnv} + ''; + unpackTheme = unpack "theme"; unpackPlugin = unpack "plugin"; unpack = id: (name: source: @@ -103,6 +110,19 @@ in ''; }; + extraEnv = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration in additional_environment.rb. + + See https://svn.redmine.org/redmine/trunk/config/additional_environment.rb.example + ''; + example = literalExample '' + config.logger.level = Logger::DEBUG + ''; + }; + themes = mkOption { type = types.attrsOf types.path; default = {}; @@ -249,6 +269,9 @@ in # link in the application configuration ln -fs ${configurationYml} "${cfg.stateDir}/config/configuration.yml" + # link in the additional environment configuration + ln -fs ${additionalEnvironment} "${cfg.stateDir}/config/additional_environment.rb" + # link in all user specified themes rm -rf "${cfg.stateDir}/public/themes/"* From 0d17ecce2c2e7c595583c8c24f3e3e3f72b12fc7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 1 Feb 2019 15:59:12 +0000 Subject: [PATCH 041/193] mkDerivation: cleaner handling of the `name` argument --- pkgs/stdenv/generic/make-derivation.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 9ba06995940c..8f0f12ea1a20 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -12,7 +12,7 @@ rec { # * https://nixos.org/nix/manual/#ssec-derivation # Explanation about derivations in general mkDerivation = - { name ? "" + { # These types of dependencies are all exhaustively documented in # the "Specifying Dependencies" section of the "Standard @@ -21,7 +21,7 @@ rec { # TODO(@Ericson2314): Stop using legacy dep attribute names # host offset -> target offset - , depsBuildBuild ? [] # -1 -> -1 + depsBuildBuild ? [] # -1 -> -1 , depsBuildBuildPropagated ? [] # -1 -> -1 , nativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name , propagatedNativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name @@ -177,14 +177,14 @@ rec { "checkInputs" "installCheckInputs" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) - // (lib.optionalAttrs (name == "")) { + // (lib.optionalAttrs (!(attrs ? name))) { name = "${attrs.pname}-${attrs.version}"; } // (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)) { # Fixed-output derivations like source tarballs shouldn't get a host # suffix. But we have some weird ones with run-time deps that are # just used for their side-affects. Those might as well since the # hash can't be the same. See #32986. - name = "${if name != "" then name else "${attrs.pname}-${attrs.version}"}-${stdenv.hostPlatform.config}"; + name = "${attrs.name or "${attrs.pname}-${attrs.version}"}-${stdenv.hostPlatform.config}"; } // { builder = attrs.realBuilder or stdenv.shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; @@ -274,7 +274,7 @@ rec { meta = { # `name` above includes cross-compilation cruft (and is under assert), # lets have a clean always accessible version here. - name = if name != "" then name else "${attrs.pname}-${attrs.version}"; + name = attrs.name or "${attrs.pname}-${attrs.version}"; # If the packager hasn't specified `outputsToInstall`, choose a default, # which is the name of `p.bin or p.out or p`; From 59949aa55ce23ecdb8661b57df57b8fa2d84d0b7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 1 Feb 2019 15:59:45 +0000 Subject: [PATCH 042/193] Revert "coq-modules: add default to fix eval" This reverts commit e20b65156cee92d30b43f8e339bd686bd83538cb. --- pkgs/development/coq-modules/QuickChick/default.nix | 2 +- pkgs/development/coq-modules/Velisarios/default.nix | 2 +- pkgs/development/coq-modules/category-theory/default.nix | 2 +- pkgs/development/coq-modules/coq-haskell/default.nix | 2 +- pkgs/development/coq-modules/coqprime/default.nix | 2 +- pkgs/development/coq-modules/dpdgraph/default.nix | 2 +- pkgs/development/coq-modules/equations/default.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 34daebcdf528..96954eb43ace 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -28,7 +28,7 @@ let params = propagatedBuildInputs = [ coq-ext-lib simple-io ]; }; }; - param = params."${coq.coq-version}" or params."8.8"; + param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix index aa5ebb32b3ce..cd7ddfefb84a 100644 --- a/pkgs/development/coq-modules/Velisarios/default.nix +++ b/pkgs/development/coq-modules/Velisarios/default.nix @@ -20,7 +20,7 @@ let params = sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; }; }; - param = params."${coq.coq-version}" or params."8.8"; + param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index a8fd91d9d348..59f2295e2153 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -18,7 +18,7 @@ let "8.7" = v20180709; "8.8" = v20181016; }; - param = params."${coq.coq-version}" or params."8.8"; + param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index 784e360a0dab..57f31e1847c1 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -26,7 +26,7 @@ let params = sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; }; }; - param = params."${coq.coq-version}" or params."8.8"; + param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 265b97deca2c..191812b3f2eb 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -14,7 +14,7 @@ let params = "8.8" = v_8_8; "8.9" = v_8_8; }; - param = params."${coq.coq-version}" or params."8.9" + param = params."${coq.coq-version}" ; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 6a06c1b19875..e403f7d4fb5c 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -22,7 +22,7 @@ let params = { sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; }; }; -param = params."${coq.coq-version}" or params."8.8"; +param = params."${coq.coq-version}"; in stdenv.mkDerivation { diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 1bc66fcf272a..86e5687321b4 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -26,7 +26,7 @@ let sha256 = "1sj7vyarmvp1w5kvbhgpgap1yd0yrj4n1jrla0wv70k0jrq5hhpz"; }; }; - param = params."${coq.coq-version}" or params."8.8"; + param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { From 03c66e01dab44be31bacf5ce1570f70458f9bd72 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 1 Feb 2019 19:26:07 +0300 Subject: [PATCH 043/193] parity-beta: 2.3.0 -> 2.3.1 --- pkgs/applications/altcoins/parity/beta.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index f49d1902edc5..591f6ffa86cb 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.3.0"; - sha256 = "0v79nz19riaga6iwj6m59fq8adm5llrkq61xizriz30rw8rkk04z"; - cargoSha256 = "01vdrfqh2nlghbgnbb7qmrazsjmynrb9542qrgchxq589wasb4j2"; + version = "2.3.1"; + sha256 = "13y3gczqb0rb6v17j63j1zp11cnykbv9c674hrk1i6jb3y4am4lv"; + cargoSha256 = "1pj5hzy7k1l9bbw1qpz80vvk89qz4qz4rnnkcvn2rkbmq382gxwy"; in import ./parity.nix { inherit version sha256 cargoSha256; } From d14ce9f90f717b891b7c6a34a9b6bccde7bc4a01 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 1 Feb 2019 19:26:20 +0300 Subject: [PATCH 044/193] parity: 2.2.7 -> 2.2.8 --- pkgs/applications/altcoins/parity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index de43450a41ce..f62e3d5cfdd0 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.2.7"; - sha256 = "0bxq4z84vsb8hmbscr41xiw11m9xg6if231v76c2dmkbyqgpqy8p"; - cargoSha256 = "1izwqg87qxhmmkd49m0k09i7r05sfcb18m5jbpvggjzp57ips09r"; + version = "2.2.8"; + sha256 = "1l2bxra4fkbh8gnph9wnc24ddmzfdclsgcjbx8q6fflhcg6r9hf1"; + cargoSha256 = "10lg0vzikzlj927hpn59x1dz9dvhcaqsl8nz14vj2iz42vfkcm7p"; in import ./parity.nix { inherit version sha256 cargoSha256; } From 895bc4cefea3a1f18ad8a4abdc52ca29521519ba Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 1 Feb 2019 16:28:34 +0100 Subject: [PATCH 045/193] gtk-doc: 1.28 -> 1.29 --- .../tools/documentation/gtk-doc/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 0213eca30d22..c55b2510e650 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which +{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python3, libxml2Python, libxslt, which , docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool , withDblatex ? false, dblatex }: stdenv.mkDerivation rec { name = "gtk-doc-${version}"; - version = "1.28"; + version = "1.29"; src = fetchurl { url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz"; - sha256 = "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"; + sha256 = "1cc6yl8l275qn3zpjl6f0s4fwmkczngjr9hhsdv74mln4h08wmql"; }; patches = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = - [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl + [ pkgconfig perl python3 libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl gnome-doc-utils gettext which itstool ] ++ stdenv.lib.optional withDblatex dblatex; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # Make six available for binaries, python.withPackages creates a wrapper # but scripts are not allowed in shebangs so we link it into sys.path. postInstall = '' - ln -s ${python.pkgs.six}/${python.sitePackages}/* $out/share/gtk-doc/python/ + ln -s ${python3.pkgs.six}/${python3.sitePackages}/* $out/share/gtk-doc/python/ ''; doCheck = false; # requires a lot of stuff From 3ec0eb4bbd783e6f07175c9703ec5a2a70491da9 Mon Sep 17 00:00:00 2001 From: danbst Date: Sat, 2 Feb 2019 01:27:25 +0200 Subject: [PATCH 046/193] all-packages.nix: remove `res.` (next stage super) A bit more consistent version of https://github.com/NixOS/nixpkgs/pull/51527 --- pkgs/top-level/all-packages.nix | 74 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac3f6b64712e..d81e26abe1de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3510,7 +3510,7 @@ in jid = callPackage ../development/tools/jid { }; - jing = res.jing-trang; + jing = jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { }; jira-cli = callPackage ../development/tools/jira_cli { }; @@ -4805,23 +4805,23 @@ in libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_ncurses = res.pinentry.override { + pinentry_ncurses = pinentry.override { gtk2 = null; }; - pinentry_emacs = res.pinentry.override { + pinentry_emacs = pinentry.override { enableEmacs = true; }; - pinentry_gnome = res.pinentry.override { + pinentry_gnome = pinentry.override { inherit gcr; }; - pinentry_qt4 = res.pinentry.override { + pinentry_qt4 = pinentry.override { qt = qt4; }; - pinentry_qt5 = res.pinentry.override { + pinentry_qt5 = pinentry.override { qt = qt5.qtbase; }; @@ -8691,11 +8691,11 @@ in gputils = callPackage ../development/tools/misc/gputils { }; gradleGen = callPackage ../development/tools/build-managers/gradle { }; - gradle = res.gradleGen.gradle_latest; - gradle_2_14 = res.gradleGen.gradle_2_14; - gradle_2_5 = res.gradleGen.gradle_2_5; - gradle_3_5 = res.gradleGen.gradle_3_5; - gradle_4_10 = res.gradleGen.gradle_4_10; + gradle = gradleGen.gradle_latest; + gradle_2_14 = gradleGen.gradle_2_14; + gradle_2_5 = gradleGen.gradle_2_5; + gradle_3_5 = gradleGen.gradle_3_5; + gradle_4_10 = gradleGen.gradle_4_10; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -9179,7 +9179,7 @@ in valgrind = callPackage ../development/tools/analysis/valgrind { inherit (buildPackages.darwin) xnu bootstrap_cmds cctools; }; - valgrind-light = res.valgrind.override { gdb = null; }; + valgrind-light = valgrind.override { gdb = null; }; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; @@ -9753,7 +9753,7 @@ in inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; }; - fltk = res.fltk13; + fltk = fltk13; flyway = callPackage ../development/tools/flyway { }; @@ -9766,7 +9766,7 @@ in freetts = callPackage ../development/libraries/freetts { }; - frog = res.languageMachines.frog; + frog = languageMachines.frog; fstrcmp = callPackage ../development/libraries/fstrcmp { }; @@ -9840,11 +9840,11 @@ in }; gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { - gtk = res.gtk2; + gtk = gtk2; }; gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { - gtk = res.gtk2; + gtk = gtk2; }; geoclue2 = callPackage ../development/libraries/geoclue {}; @@ -10252,7 +10252,7 @@ in gumbo = callPackage ../development/libraries/gumbo { }; gvfs = callPackage ../development/libraries/gvfs { - gnome = res.gnome3; + gnome = gnome3; }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; @@ -11492,7 +11492,7 @@ in libxml2 = callPackage ../development/libraries/libxml2 { }; libxml2Python = pkgs.buildEnv { # slightly hacky - name = "libxml2+py-${res.libxml2.version}"; + name = "libxml2+py-${libxml2.version}"; paths = with libxml2; [ dev bin py ]; inherit (libxml2) passthru; # the hook to find catalogs is hidden by buildEnv @@ -11937,9 +11937,9 @@ in }; pcre = callPackage ../development/libraries/pcre { }; - pcre16 = res.pcre.override { variant = "pcre16"; }; + pcre16 = pcre.override { variant = "pcre16"; }; # pcre32 seems unused - pcre-cpp = res.pcre.override { variant = "cpp"; }; + pcre-cpp = pcre.override { variant = "cpp"; }; pcre2 = callPackage ../development/libraries/pcre2 { }; @@ -15865,7 +15865,7 @@ in inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { - gtk = res.gtk2; + gtk = gtk2; }; themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; @@ -16110,18 +16110,18 @@ in libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { }; - go-ethereum = res.altcoins.go-ethereum; - ethabi = res.altcoins.ethabi; + go-ethereum = altcoins.go-ethereum; + ethabi = altcoins.ethabi; - parity = res.altcoins.parity; - parity-beta = res.altcoins.parity-beta; - parity-ui = res.altcoins.parity-ui; + parity = altcoins.parity; + parity-beta = altcoins.parity-beta; + parity-ui = altcoins.parity-ui; - polkadot = res.altcoins.polkadot; + polkadot = altcoins.polkadot; - stellar-core = res.altcoins.stellar-core; + stellar-core = altcoins.stellar-core; - particl-core = res.altcoins.particl-core; + particl-core = altcoins.particl-core; aumix = callPackage ../applications/audio/aumix { gtkGUI = false; @@ -16907,7 +16907,7 @@ in espeak-classic = callPackage ../applications/audio/espeak { }; espeak-ng = callPackage ../applications/audio/espeak-ng { }; - espeak = res.espeak-ng; + espeak = espeak-ng; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; @@ -17206,7 +17206,7 @@ in inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { + firefox-beta-bin = wrapFirefox firefox-beta-bin-unwrapped { browserName = "firefox"; name = "firefox-beta-bin-" + (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version; @@ -17221,7 +17221,7 @@ in inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { + firefox-devedition-bin = wrapFirefox firefox-devedition-bin-unwrapped { browserName = "firefox"; nameSuffix = "-devedition"; name = "firefox-devedition-bin-" + @@ -21117,7 +21117,7 @@ in ut2004Packages = callPackage ../games/ut2004 { }; - ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ]; + ut2004demo = ut2004Packages.ut2004 [ ut2004Packages.ut2004-demo ]; vapor = callPackage ../games/vapor { love = love_0_8; }; @@ -21254,8 +21254,8 @@ in # Included for backwards compatibility libsoup libwnck gtk-doc gnome-doc-utils; - gtk = res.gtk2; - gtkmm = res.gtkmm2; + gtk = gtk2; + gtkmm = gtkmm2; }); gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); @@ -22309,7 +22309,7 @@ in fakenes = callPackage ../misc/emulators/fakenes { }; - faust = res.faust2; + faust = faust2; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; @@ -22809,7 +22809,7 @@ in samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; - samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; + samsung-unified-linux-driver = samsung-unified-linux-driver_4_01_17; sane-backends = callPackage ../applications/graphics/sane/backends { gt68xxFirmware = config.sane.gt68xxFirmware or null; From 61552cf5991b6f0706990c3e5c5b57ce86e9c562 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 31 Jan 2019 19:06:04 -0600 Subject: [PATCH 047/193] libva{,-utils}: 2.3.0 -> 2.4.0 --- pkgs/development/libraries/libva-utils/default.nix | 2 +- pkgs/development/libraries/libva/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index a31968a5373c..e7216e2e4274 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "01org"; repo = "libva-utils"; rev = version; - sha256 = "0k5v72prcq462x780j9vpqf4ckrpqf536z6say81wpna0l0qbd98"; + sha256 = "1yk9bg1wg4nqva3l01s6bghcvc3hb02gp62p1sy5qk0r9mn5kpik"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 435b7e3c915d..7f17b9af08b3 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.3.0"; + version = "2.4.0"; # update libva-utils and vaapiIntel as well src = fetchFromGitHub { owner = "01org"; repo = "libva"; rev = version; - sha256 = "0zip22b5qwyjygsmrmjq62hdpl9z77d84h5hni8cn6xz5cmbw29z"; + sha256 = "1b58n6rjfsfjfw1s5kdfa0jpfiqs83g2w14s7sfp1qkckkz3988l"; }; outputs = [ "dev" "out" ]; From 63d2dbfe892ac3e8c5b986e84c5bacb180ee8802 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 1 Feb 2019 14:50:21 -0600 Subject: [PATCH 048/193] libva-utils: meson, add x11 and wayland deps --- pkgs/development/libraries/libva-utils/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index e7216e2e4274..e41ca206c510 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, libdrm, libva +{ stdenv, fetchFromGitHub, pkgconfig +, libdrm, libva, libX11, libXext, libXfixes, wayland, meson, ninja }: stdenv.mkDerivation rec { @@ -13,9 +13,15 @@ stdenv.mkDerivation rec { sha256 = "1yk9bg1wg4nqva3l01s6bghcvc3hb02gp62p1sy5qk0r9mn5kpik"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; - buildInputs = [ libdrm libva ]; + buildInputs = [ libdrm libva libX11 libXext libXfixes wayland ]; + + mesonFlags = [ + "-Ddrm=true" + "-Dx11=true" + "-Dwayland=true" + ]; enableParallelBuilding = true; From ebf4f63ff04d2fc8b709830c138c50da468a63bf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 31 Jan 2019 19:00:21 -0600 Subject: [PATCH 049/193] intel-media-driver: 18.3.0 -> 18.4.0 --- .../libraries/intel-media-driver/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 45a90ff520f9..c15a42e3f404 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,20 +5,19 @@ stdenv.mkDerivation rec { name = "intel-media-driver-${version}"; - version = "18.3.0"; + version = "18.4.0"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "15kcyg9ss2v1bbw6yvxqb833h1vs0h659n8ix0x5x03cfm1wsi57"; + sha256 = "0mvb1dq2014gc60lz22dag230flqw859dcqi08hdmmci30qgw88x"; }; - cmakeFlags = [ "-DINSTALL_DRIVER_SYSCONF=OFF" ]; - - preConfigure = '' - cmakeFlags="$cmakeFlags -DLIBVA_DRIVERS_PATH=$out/lib/dri" - ''; + cmakeFlags = [ + "-DINSTALL_DRIVER_SYSCONF=OFF" + "-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri" + ]; nativeBuildInputs = [ cmake pkgconfig ]; From 3f6e49097e1d366960590ef1dbca74ef8d106dbd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 29 Jan 2019 14:09:28 -0600 Subject: [PATCH 050/193] qownnotes: 19.1.8 -> 19.1.11 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 7f65c4cc152a..1f5c002fff4c 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qownnotes"; - version = "19.1.8"; + version = "19.1.11"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "873ed9e3a711bc19744a13b98ac5cb3659bd97e753c7e089fbc49bd044cec4fb"; + sha256 = "fef90401c2de4cf4c69dae30d0799be13c047fa244d08de9c06b7b6cc74bd655"; }; nativeBuildInputs = [ qmake qttools ]; From f7cc6340c8591a7e66b5c342bf898ab7c01b3b89 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 31 Jan 2019 13:54:05 -0600 Subject: [PATCH 051/193] qownnotes: 19.1.11 -> 19.2.0 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 1f5c002fff4c..45cefbf06632 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qownnotes"; - version = "19.1.11"; + version = "19.2.0"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "fef90401c2de4cf4c69dae30d0799be13c047fa244d08de9c06b7b6cc74bd655"; + sha256 = "0n60cnzdfvwn126k8mh5m3wms9avjrnzfrpsvyfhg6l7vm6sbhdi"; }; nativeBuildInputs = [ qmake qttools ]; From 2ebb4a358cd358e1cf2040279a46fbb8056930b4 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 1 Feb 2019 23:31:50 -0500 Subject: [PATCH 052/193] lkl: install liblkl.so and liblkl-hijack.so --- pkgs/applications/virtualization/lkl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 1d22385a2732..d870e2466167 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { cp tools/lkl/{cptofs,fs2tar,lklfuse} $out/bin ln -s cptofs $out/bin/cpfromfs cp -r tools/lkl/include $dev/ - cp tools/lkl/liblkl*.{a,so} $lib/lib + cp tools/lkl/liblkl.a \ + tools/lkl/lib/liblkl.so \ + tools/lkl/lib/hijack/liblkl-hijack.so $lib/lib ''; # We turn off format and fortify because of these errors (fortify implies -O2, which breaks the jitter entropy code): From f00335fea736f9157c690c5e13fc3ac10fe7c9f3 Mon Sep 17 00:00:00 2001 From: CrazedProgrammer Date: Sat, 2 Feb 2019 11:50:14 +0100 Subject: [PATCH 053/193] astah-community: remove Astah Community has been discontinued since september 26th, 2018. Source: http://astah.net/editions/community The downloads are not available anymore since recently, and as such, this derivation does not build. --- .../graphics/astah-community/default.nix | 63 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 65 deletions(-) delete mode 100644 pkgs/applications/graphics/astah-community/default.nix diff --git a/pkgs/applications/graphics/astah-community/default.nix b/pkgs/applications/graphics/astah-community/default.nix deleted file mode 100644 index 72d367d8fea2..000000000000 --- a/pkgs/applications/graphics/astah-community/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, unzip, jre }: - -let - - name = "astah-community"; - version = "7.2.0"; - postfix = "1ff236"; - desktopIcon = fetchurl { - name = "${name}.png"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.png?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87"; - sha256 = "0knlknwfqqnhg63sxxpia5ykn397id31gzr956wnn6yjj58k3ckm"; - }; - mimeXml = fetchurl { - name = "${name}.xml"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.xml?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87"; - sha256 = "096n2r14ddm97r32i4sbp7v4qdmwn9sxy7lwphcx1nydppb0m97b"; - }; - desktopItem = makeDesktopItem { - name = name; - exec = "astah %U"; - icon = "${desktopIcon}"; - comment = "Lightweight, easy-to-use, and free UML2.x modeler"; - desktopName = "Astah* Community"; - genericName = "Astah* Community"; - mimeType = "application/x-astah"; - categories = "Application;Development;"; - extraEntries = "NoDisplay=false"; - }; - -in - -stdenv.mkDerivation { - name = "${name}-${version}"; - - src = fetchurl { - url = "http://cdn.change-vision.com/files/${name}-${stdenv.lib.replaceStrings ["."] ["_"] version}-${postfix}.zip"; - sha256 = "1lkl30jdjiarvh2ap9rjabvrq9qhrlmfrasv3vvkag22y9w4l499"; - }; - - nativeBuildInputs = [ unzip makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,share} - cp -r . $out/share/astah - cp -r ${desktopItem}/share/applications $out/share/applications - - install -D ${desktopIcon} $out/share/pixmaps/${name}.png - install -D ${mimeXml} $out/share/mime/packages/${name}.xml - - makeWrapper ${jre}/bin/java $out/bin/astah \ - --add-flags "-jar $out/share/astah/astah-community.jar" - - runHook postInstall - ''; - - meta = with stdenv.lib; { - description = "Lightweight, easy-to-use, and free UML2.x modeler"; - homepage = http://astah.net/editions/community; - license = licenses.unfree; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac3f6b64712e..a2a49c149986 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16067,8 +16067,6 @@ in aseprite = callPackage ../applications/editors/aseprite { }; aseprite-unfree = aseprite.override { unfree = true; }; - astah-community = callPackage ../applications/graphics/astah-community { }; - astroid = callPackage ../applications/networking/mailreaders/astroid { }; audacious = callPackage ../applications/audio/audacious { }; From 6e77cef7b01e318406931df52d550326d4d51e6e Mon Sep 17 00:00:00 2001 From: CrazedProgrammer Date: Sat, 2 Feb 2019 12:25:12 +0100 Subject: [PATCH 054/193] nixos/release-notes: mention removal of astah-community --- nixos/doc/manual/release-notes/rl-1903.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 7ccbf65dd46a..6c45301b91e1 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -430,6 +430,11 @@ of maintainers. + + + The astah-community package was removed from nixpkgs due to it being discontinued and the downloads not being available anymore. + + The httpd service now saves log files with a .log file extension by default for From 8ad32a7e9883b32dd34476abf9685afe6a214db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 2 Feb 2019 02:42:36 +0100 Subject: [PATCH 055/193] ifdtool: init at 4.9 --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/misc/ifdtool/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/tools/misc/ifdtool/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 669baf681f77..44f94b0e0791 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3485,6 +3485,11 @@ github = "pesterhazy"; name = "Paulus Esterhazy"; }; + petabyteboy = { + email = "me@pbb.lc"; + github = "petabyteboy"; + name = "Milan Pässler"; + }; peterhoeg = { email = "peter@hoeg.com"; github = "peterhoeg"; diff --git a/pkgs/tools/misc/ifdtool/default.nix b/pkgs/tools/misc/ifdtool/default.nix new file mode 100644 index 000000000000..7d15825c27e8 --- /dev/null +++ b/pkgs/tools/misc/ifdtool/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "ifdtool-${version}"; + version = "4.9"; + + src = fetchurl { + url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; + sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij"; + }; + + buildPhase = '' + make -C util/ifdtool + ''; + + installPhase = '' + install -Dm755 util/ifdtool/ifdtool $out/bin/ifdtool + ''; + + meta = with stdenv.lib; { + description = "Extract and dump Intel Firmware Descriptor information"; + homepage = https://www.coreboot.org; + license = licenses.gpl2; + maintainers = [ maintainers.petabyteboy ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac3f6b64712e..baca1a918a6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13855,6 +13855,8 @@ in cbfstool = callPackage ../applications/virtualization/cbfstool { }; + ifdtool = callPackage ../tools/misc/ifdtool { }; + nvramtool = callPackage ../tools/misc/nvramtool { }; vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; From 56e6a52cc7c983e60d7fa6beed1a04cbed184562 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 2 Feb 2019 08:50:42 -0600 Subject: [PATCH 056/193] compton-git: 5 -> 5.1-rc2, fix crashes and other regressions --- pkgs/applications/window-managers/compton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index 9b5e190a692e..2c388c941e6c 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -63,7 +63,7 @@ let gitSource = rec { pname = "compton-git"; - version = "5"; + version = "5.1-rc2"; COMPTON_VERSION = "v${version}"; @@ -73,7 +73,7 @@ let owner = "yshui"; repo = "compton"; rev = COMPTON_VERSION; - sha256 = "1x5r2dch023imgdqhgf1zxi05cc742s7xr7jzpymvl9ldqly8ppa"; + sha256 = "1qpy76kkhz8gfby842ry7lanvxkjxh4ckclkcjk4xi2wsmbhyp08"; }; buildInputs = [ From 5463f4d903d129f928d85163bd3d738d4dcac8d6 Mon Sep 17 00:00:00 2001 From: Roosemberth Palacios Date: Sat, 2 Feb 2019 16:12:44 +0100 Subject: [PATCH 057/193] youtube-dl: 2019.01.17 -> 2019.01.30.1 (#55075) Signed-off-by: Roosembert Palacios --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index dd210498fe75..0598976ec98e 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.01.17"; + version = "2019.01.30.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0fxajwv81b0bjw9qlwmxd4r93yp5nnqll79vhic0vy72ii0093r7"; + sha256 = "0wamv1fs4w8jjx67p60rgrgdi6k04yy0h4p3cwscza5pzhpmvnlf"; }; nativeBuildInputs = [ makeWrapper ]; From 0cb74f6f1400bc7550c1d2ab6a7ccb667b489678 Mon Sep 17 00:00:00 2001 From: aanderse Date: Sat, 2 Feb 2019 10:24:06 -0500 Subject: [PATCH 058/193] kdevelop: 5.2.4 -> 5.3.1, bump llvm version used from 3.8 to 7 (#55015) --- pkgs/applications/editors/kdevelop5/kdevelop.nix | 10 ++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index f0ac79e2d22c..a35bd14f310c 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -9,7 +9,7 @@ let pname = "kdevelop"; - version = "5.2.4"; + version = "5.3.1"; qtVersion = "5.${lib.versions.minor qtbase.version}"; in mkDerivation rec { @@ -17,7 +17,7 @@ mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1jbks7nh9rybz4kg152l39hfj2x0p6mjins8x9mz03bbv8jf8gic"; + sha256 = "1098ra7qpal6578hsv20kvxc63v47sp85wjhqr5rgzr2fm7jf6fr"; }; nativeBuildInputs = [ @@ -37,6 +37,12 @@ mkDerivation rec { shared-mime-info libksysguard konsole kcrash karchive kguiaddons kpurpose ]; + # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b + # required as nixos seems to be unable to find CLANG_BUILTIN_DIR + cmakeFlags = [ + "-DCLANG_BUILTIN_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${(builtins.parseDrvName llvmPackages.clang.name).version}/include" + ]; + postInstall = '' # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. wrapProgram "$out/bin/kdevelop!" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c0d3849b762..9eb901ff3070 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17852,7 +17852,7 @@ in kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {}; kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { - llvmPackages = llvmPackages_38; + llvmPackages = llvmPackages_7; }; keepnote = callPackage ../applications/office/keepnote { }; From 3674bdf204a8d9b2ae800c0f35528a4084a7fc5e Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 2 Feb 2019 17:31:31 +0100 Subject: [PATCH 059/193] nixos/tasks/encrypted-devices: fix regression from #54637 27982b408e465554b8831f492362bc87ed0ec02a introduced a bug when refactoring the encrypted-devices module, causing some encrypted filesystem options to not be recognized anymore. See e.g. https://hydra.nixos.org/build/88145490 --- nixos/modules/tasks/encrypted-devices.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 2ffbb8777068..2c9231f55236 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -19,21 +19,21 @@ let description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry."; }; - options.blkDev = mkOption { + blkDev = mkOption { default = null; example = "/dev/sda1"; type = types.nullOr types.str; description = "Location of the backing encrypted device."; }; - options.label = mkOption { + label = mkOption { default = null; example = "rootfs"; type = types.nullOr types.str; description = "Label of the unlocked encrypted device. Set fileSystems.<name?>.device to /dev/mapper/<label> to mount the unlocked device."; }; - options.keyFile = mkOption { + keyFile = mkOption { default = null; example = "/mnt-root/root/.swapkey"; type = types.nullOr types.str; From 8de375bf7ba8faf9d7051366aa761eb8897a643b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 2 Feb 2019 16:13:56 +0100 Subject: [PATCH 060/193] python.pkgs.wcwidth: improve expression use fetchPypi, pname, and correct indentation --- .../python-modules/wcwidth/default.nix | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index fa993c593e1a..ef453ebbf33c 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchurl, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - name = "wcwidth-${version}"; - version = "0.1.7"; + pname = "wcwidth"; + version = "0.1.7"; - src = fetchurl { - url = "mirror://pypi/w/wcwidth/${name}.tar.gz"; - sha256 = "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx"; + }; - # Checks fail due to missing tox.ini file: - doCheck = false; + # Checks fail due to missing tox.ini file: + doCheck = false; - meta = with stdenv.lib; { - description = "Measures number of Terminal column cells of wide-character codes"; - longDescription = '' - This API is mainly for Terminal Emulator implementors -- any Python - program that attempts to determine the printable width of a string on - a Terminal. It is implemented in python (no C library calls) and has - no 3rd-party dependencies. - ''; - homepage = https://github.com/jquast/wcwidth; - license = licenses.mit; - }; - } + meta = with lib; { + description = "Measures number of Terminal column cells of wide-character codes"; + longDescription = '' + This API is mainly for Terminal Emulator implementors -- any Python + program that attempts to determine the printable width of a string on + a Terminal. It is implemented in python (no C library calls) and has + no 3rd-party dependencies. + ''; + homepage = https://github.com/jquast/wcwidth; + license = licenses.mit; + }; +} From 3b698b537c506eeb1e50edc87bb990f84d6eccc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 2 Feb 2019 16:15:32 +0100 Subject: [PATCH 061/193] python.pkgs.wcwidth: run tests --- pkgs/development/python-modules/wcwidth/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index ef453ebbf33c..861d5bcae21e 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "wcwidth"; @@ -9,8 +9,11 @@ buildPythonPackage rec { sha256 = "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx"; }; - # Checks fail due to missing tox.ini file: - doCheck = false; + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; meta = with lib; { description = "Measures number of Terminal column cells of wide-character codes"; From 196af4b359eb9dc9a9d59937c2f8058e5c247a23 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 2 Feb 2019 12:12:11 -0500 Subject: [PATCH 062/193] Revert "linuxPackages_4_{19,20}: works around bug with overlayfs." This reverts commit de86af48faa03a824917ac90f4776481c7ce9e54. (Manual revert due to conflicts.) See #54509 The patch is causing overlayfs to misbehave. --- pkgs/os-specific/linux/kernel/patches.nix | 11 ++++------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 2ff0d5d26205..f09b9d6ea5b1 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -58,14 +58,11 @@ rec { }; }; - # Reverts a change related to the overlayfs overhaul in 4.19 - # https://github.com/NixOS/nixpkgs/issues/48828#issuecomment-445208626 - revert-vfs-dont-open-real = rec { - name = "revert-vfs-dont-open-real"; + raspberry_pi_wifi_fix = rec { + name = "raspberry-pi-wifi-fix"; patch = fetchpatch { - name = name + ".patch"; - url = https://github.com/samueldr/linux/commit/ee23fa215caaa8102f4ab411d39fcad5858147f2.patch; - sha256 = "0bp4jryihg1y2sl8zlj6w7vvnxj0kmb6xdy42hpvdv43kb6ngiaq"; + url = https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/730522ae76aa57b89fa317c5084613d3d50cf3b8/core/linux-aarch64/0005-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-pr.patch; + sha256 = "0gbfycky28vbdjgys1z71wl5q073dmbrkvbnr6693jsda3qhp6za"; }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9eb901ff3070..e6c96fabf908 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14556,7 +14556,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.revert-vfs-dont-open-real ]; }; @@ -14564,7 +14563,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.revert-vfs-dont-open-real + kernelPatches.raspberry_pi_wifi_fix ]; }; From 048c36ccaa0add5e5de387e9de0d3775d3fdd10d Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 2 Feb 2019 11:58:28 -0500 Subject: [PATCH 063/193] Revert "linuxPackages: 4.14 -> 4.19" This reverts commit b861ebb4c634cd474a1c688b61ab16c9c7eb7257. The current issues (See #54509 and #48828) are causing headaches to users of the unstable branches. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6c96fabf908..43636245869e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14742,7 +14742,7 @@ in }); # The current default kernel / kernel modules. - linuxPackages = linuxPackages_4_19; + linuxPackages = linuxPackages_4_14; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! From 9080b2eadff00772cc4d9aac3c0ec362f9d8748e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 20 Aug 2018 19:34:03 -0400 Subject: [PATCH 064/193] minecraft-server: 1.12.2 -> 1.13.2 Update minecraft client to 1.13.2. The url is not as nice as before but it is the one provided by mojang. Adds 1_13_2, 1_13_1 as well. https://minecraft.net/en-us/download/server --- pkgs/games/minecraft-server/default.nix | 82 ++++++++++++++++--------- pkgs/top-level/all-packages.nix | 8 ++- 2 files changed, 61 insertions(+), 29 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 050e0126fa72..c2f20f53e9a8 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,37 +1,63 @@ { stdenv, fetchurl, jre }: -stdenv.mkDerivation rec { - name = "minecraft-server-${version}"; - version = "1.13.2"; +let + common = { version, sha256, url }: + stdenv.mkDerivation (rec { + name = "minecraft-server-${version}"; + inherit version; - src = fetchurl { - # Old url - # https://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar + src = fetchurl { + inherit url sha256; + }; + + preferLocalBuild = true; + + installPhase = '' + mkdir -p $out/bin $out/lib/minecraft + cp -v $src $out/lib/minecraft/server.jar + + cat > $out/bin/minecraft-server << EOF + #!/bin/sh + exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui + EOF + + chmod +x $out/bin/minecraft-server + ''; + + phases = "installPhase"; + + meta = { + description = "Minecraft Server"; + homepage = "https://minecraft.net"; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice tomberek costrouc]; + }; + }); + +in { + minecraft-server_1_13_2 = common { + version = "1.13.2"; url = "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar"; sha256 = "13h8dxrrgqa1g6sd7aaw26779hcsqsyjm7xm0sknifn54lnamlzz"; }; - preferLocalBuild = true; - - installPhase = '' - mkdir -p $out/bin $out/lib/minecraft - cp -v $src $out/lib/minecraft/server.jar - - cat > $out/bin/minecraft-server << EOF - #!/bin/sh - exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui - EOF - - chmod +x $out/bin/minecraft-server - ''; - - phases = "installPhase"; - - meta = { - description = "Minecraft Server"; - homepage = "https://minecraft.net"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice stdenv.lib.maintainers.tomberek ]; + minecraft-server_1_13_1 = common { + version = "1.13.1"; + url = "https://launcher.mojang.com/mc/game/1.13.1/server/fe123682e9cb30031eae351764f653500b7396c9/server.jar"; + sha256 = "1lak29b7dm0w1cmzjn9gyix6qkszwg8xgb20hci2ki2ifrz099if"; }; + + minecraft-server_1_13_0 = common { + version = "1.13.0"; + url = "https://launcher.mojang.com/mc/game/1.13/server/d0caafb8438ebd206f99930cfaecfa6c9a13dca0/server.jar"; + sha256 = "1fahqnylxzbvc0fdsqk0x15z40mcc5b7shrckab1qcsdj0kkjvz7"; + }; + + minecraft-server_1_12_2 = common { + version = "1.12.2"; + url = "https://s3.amazonaws.com/Minecraft.Download/versions/1.12.2/minecraft_server.1.12.2.jar"; + sha256 = "0zhnac6yvkdgdaag0gb0fgrkgizbwrpf7s76yqdiknfswrs947zy"; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9eb901ff3070..78ba9f9d4427 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20770,7 +20770,13 @@ in minecraft = callPackage ../games/minecraft { }; - minecraft-server = callPackage ../games/minecraft-server { }; + minecraft-server = minecraft-server_1_13_2; + + inherit (callPackages ../games/minecraft-server { }) + minecraft-server_1_13_2 + minecraft-server_1_13_1 + minecraft-server_1_13_0 + minecraft-server_1_12_2; moon-buggy = callPackage ../games/moon-buggy {}; From e856fb31158dd176d58003f4d0723cd2c9f0bf61 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 2 Feb 2019 18:59:12 +0000 Subject: [PATCH 065/193] smplayer: 18.10.0 -> 19.1.0 --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 52876bb1bbc8..00c0d7b6dc22 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-18.10.0"; + name = "smplayer-19.1.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "1sql1rd4h74smkapjf5c686zbdqqaf44h7k7z5bxfvfcsad7rzrd"; + sha256 = "0q23nsmmdhj4kb90axaqrzv5pyj7szbwy8l3skl53yi8r4j3sj3s"; }; buildInputs = [ qtscript ]; From 09af2fb9e0d948dcf71d2008bd8426fa3ee8f25f Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 2 Feb 2019 14:29:01 -0500 Subject: [PATCH 066/193] linux: Removes the previously removed raspberry pi patch There seems to have been an oopsie with the rebase. --- pkgs/os-specific/linux/kernel/patches.nix | 8 -------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f09b9d6ea5b1..4c338b37deca 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -57,12 +57,4 @@ rec { sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; }; }; - - raspberry_pi_wifi_fix = rec { - name = "raspberry-pi-wifi-fix"; - patch = fetchpatch { - url = https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/730522ae76aa57b89fa317c5084613d3d50cf3b8/core/linux-aarch64/0005-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-pr.patch; - sha256 = "0gbfycky28vbdjgys1z71wl5q073dmbrkvbnr6693jsda3qhp6za"; - }; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43636245869e..9bf1fd30b546 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14563,7 +14563,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.raspberry_pi_wifi_fix ]; }; From c85a8a1fad20f95bf60ccb95f562d787ca3a42db Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 2 Feb 2019 15:56:52 -0500 Subject: [PATCH 067/193] postgresql: No need to refer to `super` self.callPackage works fine for now. If/when that changes, we have a repo-wide thing to deal with so no reason to do anything now. --- pkgs/servers/sql/postgresql/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 0624998e5deb..842d01a640cb 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -153,9 +153,9 @@ let ''; }; -in self: super: { +in self: { - postgresql_9_4 = super.callPackage generic { + postgresql_9_4 = self.callPackage generic { version = "9.4.20"; psqlSchema = "9.4"; sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf"; @@ -163,7 +163,7 @@ in self: super: { inherit self; }; - postgresql_9_5 = super.callPackage generic { + postgresql_9_5 = self.callPackage generic { version = "9.5.15"; psqlSchema = "9.5"; sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv"; @@ -171,7 +171,7 @@ in self: super: { inherit self; }; - postgresql_9_6 = super.callPackage generic { + postgresql_9_6 = self.callPackage generic { version = "9.6.11"; psqlSchema = "9.6"; sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q"; @@ -179,7 +179,7 @@ in self: super: { inherit self; }; - postgresql_10 = super.callPackage generic { + postgresql_10 = self.callPackage generic { version = "10.6"; psqlSchema = "10.0"; sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38"; @@ -187,7 +187,7 @@ in self: super: { inherit self; }; - postgresql_11 = super.callPackage generic { + postgresql_11 = self.callPackage generic { version = "11.1"; psqlSchema = "11.1"; sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch"; @@ -195,4 +195,4 @@ in self: super: { inherit self; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d81e26abe1de..6b84b21eb0bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13870,7 +13870,7 @@ in timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; - inherit (import ../servers/sql/postgresql pkgs super) + inherit (import ../servers/sql/postgresql pkgs) postgresql_9_4 postgresql_9_5 postgresql_9_6 From 755e824291623e9610fb1a5b8656dab5901e236c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 2 Feb 2019 15:58:17 -0500 Subject: [PATCH 068/193] all-packages: Just refer to `self`, not `super`, or `res` This ends a years-long process to removoe pointless fixed points in this file! --- pkgs/top-level/all-packages.nix | 20 +++----------------- pkgs/top-level/stage.nix | 5 +---- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b84b21eb0bb..c587082053fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6,25 +6,11 @@ * Hint: ### starts category names. */ { lib, noSysDirs, config}: -res: pkgs: super: +pkgs: with pkgs; -let - self = - builtins.trace '' - It seems that you are using a patched Nixpkgs that references the self - variable in pkgs/top-level/all-packages.nix. This variable was incorrectly - named, so its usage needs attention. Please use pkgs for packages or super - for functions. - '' - res; # Do *NOT* use res in your fork. It will be removed. - - # TODO: turn self into an error - -in { - # Allow callPackage to fill in the pkgs argument inherit pkgs; @@ -16218,7 +16204,7 @@ in }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { inherit (gnome3) zenity; - inherit (res) bitwig-studio1; + inherit (pkgs) bitwig-studio1; }; bitwig-studio = bitwig-studio2; @@ -22528,7 +22514,7 @@ in parameter set to the right value for your deployment target. */ nixos = configuration: - (import (res.path + "/nixos/lib/eval-config.nix") { + (import (pkgs.path + "/nixos/lib/eval-config.nix") { inherit (pkgs.stdenv.hostPlatform) system; modules = [( { lib, ... }: { diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 6ca370e0b9b7..0991c9138bda 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -89,10 +89,7 @@ let splice = self: super: import ./splice.nix lib self (buildPackages != null); allPackages = self: super: - let res = import ./all-packages.nix - { inherit lib noSysDirs config; } - res self super; - in res; + import ./all-packages.nix { inherit lib noSysDirs config; } self; aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super); From ae0c47b4b7b8e09cd7eab8ca25a95bb91113b8ff Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 2 Feb 2019 23:29:42 +0100 Subject: [PATCH 069/193] gitea: 1.7.0 -> 1.7.1 Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.7.1 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 689cf8d8de91..366314490966 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1mbr7pnzn8x05wc288855vqaf86qk2f1py5zh8s63l048bn0fld6"; + sha256 = "1r13l7h4146729lwif45bkzn36sgg6an0qbhgvj8w3zp035c00k3"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' From bb49dca6aa7db491c54197162659a57519b19943 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 2 Feb 2019 23:30:16 +0100 Subject: [PATCH 070/193] cbfstool: 4.7 -> 4.9 also fix source, followup of #55066 --- pkgs/applications/virtualization/cbfstool/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix index e10d54148977..13060a50290b 100644 --- a/pkgs/applications/virtualization/cbfstool/default.nix +++ b/pkgs/applications/virtualization/cbfstool/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit, iasl, flex, bison }: +{ stdenv, fetchurl, iasl, flex, bison }: stdenv.mkDerivation rec { name = "cbfstool-${version}"; - version = "4.7"; + version = "4.9"; - src = fetchgit { - url = "http://review.coreboot.org/p/coreboot"; - rev = "refs/tags/${version}"; - sha256 = "02k63013vf7wgsilslj68fs1x81clvqpn91dydaqhv5aymh73zpi"; + src = fetchurl { + url = "https://coreboot.org/releases/coreboot-${version}.tar.xz"; + sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij"; }; nativeBuildInputs = [ flex bison ]; From 58c89ec26a5d3c34e34bcb9f23db9fc62d7cf98a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 20 Aug 2018 19:35:22 -0400 Subject: [PATCH 071/193] nixos/mincraft-server: refactor - allow for options to (added 2 options): - agree to eula (eula.txt) true/false will create symlink over existing eula.txt to `/nix/store/...`. - whitelist users (optional and will symlink over existing whitelist.json and create backup) - server.properties can be configured with the serverProperties option. If there is an existing server.properties it will copy it to a server.properties.old to keep the old one. server.properties MUST be writable thus symlinking is not an option. - all ports that are stated in `server.properties` are exposed properly in the firewall. (infinisil) nixos/minecraft-server: Fix, refactor and polish Adds an option `declarative` (defaulted to false), in order to stay (mostly) backwards compatible. The only thing that's not backwards compatible is that you now need to agree to the EULA on evaluation time, but that's guarded by an assertion and therefore doesn't need a release note. --- .../services/games/minecraft-server.nix | 201 ++++++++++++++++-- 1 file changed, 181 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index f50d2897843a..7d26d1501650 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -4,8 +4,41 @@ with lib; let cfg = config.services.minecraft-server; -in -{ + + # We don't allow eula=false anyways + eulaFile = builtins.toFile "eula.txt" '' + # eula.txt managed by NixOS Configuration + eula=true + ''; + + whitelistFile = pkgs.writeText "whitelist.json" + (builtins.toJSON + (mapAttrsToList (n: v: { name = n; uuid = v; }) cfg.whitelist)); + + cfgToString = v: if builtins.isBool v then boolToString v else toString v; + + serverPropertiesFile = pkgs.writeText "server.properties" ('' + # server.properties managed by NixOS configuration + '' + concatStringsSep "\n" (mapAttrsToList + (n: v: "${n}=${cfgToString v}") cfg.serverProperties)); + + + # To be able to open the firewall, we need to read out port values in the + # server properties, but fall back to the defaults when those don't exist. + # These defaults are from https://minecraft.gamepedia.com/Server.properties#Java_Edition_3 + defaultServerPort = 25565; + + serverPort = cfg.serverProperties.server-port or defaultServerPort; + + rconPort = if cfg.serverProperties.enable-rcon or false + then cfg.serverProperties."rcon.port" or 25575 + else null; + + queryPort = if cfg.serverProperties.enable-query or false + then cfg.serverProperties."query.port" or 25565 + else null; + +in { options = { services.minecraft-server = { @@ -13,10 +46,32 @@ in type = types.bool; default = false; description = '' - If enabled, start a Minecraft Server. The listening port for - the server is always 25565. The server + If enabled, start a Minecraft Server. The server data will be loaded from and saved to - ${cfg.dataDir}. + . + ''; + }; + + declarative = mkOption { + type = types.bool; + default = false; + description = '' + Whether to use a declarative Minecraft server configuration. + Only if set to true, the options + and + will be + applied. + ''; + }; + + eula = mkOption { + type = types.bool; + default = false; + description = '' + Whether you agree to + + Mojangs EULA. This option must be set to + true to run Minecraft server. ''; }; @@ -24,7 +79,7 @@ in type = types.path; default = "/var/lib/minecraft"; description = '' - Directory to store minecraft database and other state/data files. + Directory to store Minecraft database and other state/data files. ''; }; @@ -32,21 +87,84 @@ in type = types.bool; default = false; description = '' - Whether to open ports in the firewall (if enabled) for the server. + Whether to open ports in the firewall for the server. ''; }; + whitelist = mkOption { + type = let + minecraftUUID = types.strMatching + "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" // { + description = "Minecraft UUID"; + }; + in types.attrsOf minecraftUUID; + default = {}; + description = '' + Whitelisted players, only has an effect when + is + true and the whitelist is enabled + via by + setting white-list to true. + This is a mapping from Minecraft usernames to UUIDs. + You can use to get a + Minecraft UUID for a username. + ''; + example = literalExample '' + { + username1 = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"; + username2 = "yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy"; + }; + ''; + }; + + serverProperties = mkOption { + type = with types; attrsOf (either bool (either int str)); + default = {}; + example = literalExample '' + { + server-port = 43000; + difficulty = 3; + gamemode = 1; + max-players = 5; + motd = "NixOS Minecraft server!"; + white-list = true; + enable-rcon = true; + "rcon.password" = "hunter2"; + } + ''; + description = '' + Minecraft server properties for the server.properties file. Only has + an effect when + is set to true. See + + for documentation on these values. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.minecraft-server; + defaultText = "pkgs.minecraft-server"; + example = literalExample "pkgs.minecraft-server_1_12_2"; + description = "Version of minecraft-server to run."; + }; + jvmOpts = mkOption { - type = types.str; + type = types.separatedString " "; default = "-Xmx2048M -Xms2048M"; - description = "JVM options for the Minecraft Service."; + # Example options from https://minecraft.gamepedia.com/Tutorials/Server_startup_script + example = "-Xmx2048M -Xms4092M -XX:+UseG1GC -XX:+CMSIncrementalPacing " + + "-XX:+CMSClassUnloadingEnabled -XX:ParallelGCThreads=2 " + + "-XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10"; + description = "JVM options for the Minecraft server."; }; }; }; config = mkIf cfg.enable { + users.users.minecraft = { - description = "Minecraft Server Service user"; + description = "Minecraft server service user"; home = cfg.dataDir; createHome = true; uid = config.ids.uids.minecraft; @@ -57,17 +175,60 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - serviceConfig.Restart = "always"; - serviceConfig.User = "minecraft"; - script = '' - cd ${cfg.dataDir} - exec ${pkgs.minecraft-server}/bin/minecraft-server ${cfg.jvmOpts} - ''; + serviceConfig = { + ExecStart = "${cfg.package}/bin/minecraft-server ${cfg.jvmOpts}"; + Restart = "always"; + User = "minecraft"; + WorkingDirectory = cfg.dataDir; + }; + + preStart = '' + ln -sf ${eulaFile} eula.txt + '' + (if cfg.declarative then '' + + if [ -e .declarative ]; then + + # Was declarative before, no need to back up anything + ln -sf ${whitelistFile} whitelist.json + cp -f ${serverPropertiesFile} server.properties + + else + + # Declarative for the first time, backup stateful files + ln -sb --suffix=.stateful ${whitelistFile} whitelist.json + cp -b --suffix=.stateful ${serverPropertiesFile} server.properties + + # server.properties must have write permissions, because every time + # the server starts it first parses the file and then regenerates it.. + chmod +w server.properties + echo "Autogenerated file that signifies that this server configuration is managed declaratively by NixOS" \ + > .declarative + + fi + '' else '' + if [ -e .declarative ]; then + rm .declarative + fi + ''); }; - networking.firewall = mkIf cfg.openFirewall { - allowedUDPPorts = [ 25565 ]; - allowedTCPPorts = [ 25565 ]; - }; + networking.firewall = mkIf cfg.openFirewall (if cfg.declarative then { + allowedUDPPorts = [ serverPort ]; + allowedTCPPorts = [ serverPort ] + ++ optional (! isNull queryPort) queryPort + ++ optional (! isNull rconPort) rconPort; + } else { + allowedUDPPorts = [ defaultServerPort ]; + allowedTCPPorts = [ defaultServerPort ]; + }); + + assertions = [ + { assertion = cfg.eula; + message = "You must agree to Mojangs EULA to run minecraft-server." + + " Read https://account.mojang.com/documents/minecraft_eula and" + + " set `services.minecraft-server.eula` to `true` if you agree."; + } + ]; + }; } From 36682692a087749c8c5f0e77fa77ec197869a55d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Feb 2019 08:59:32 +0100 Subject: [PATCH 072/193] batman-adv: 2018.4 -> 2019.0 --- pkgs/os-specific/linux/batman-adv/alfred.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 390b0c9e4b47..1227d22916c9 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2018.4"; + ver = "2019.0"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0n6cw6inkzlgz8p6jcc83npqjmvhxp4qsh2dhbiv88ax3lh9arcd"; + sha256 = "0sml6z90kpchmn61597j7yag97gk59fscz4xjxdfh9zycd3nfsn0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 1645fbef49bc..b84338ed258b 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2018.4"; + ver = "2019.0"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0mv2vlzcqfh5yavg2sqncca9iqgxi6llv83wwwsf3d38x2jjff74"; + sha256 = "0cdmb3zkjh8xcsicwyrimwzj8f4x3rjsfzk9im7695pkdw4j2xwr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 744d42ea9fd4..52ef018cbfeb 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel }: -let base = "batman-adv-2018.4"; in +let base = "batman-adv-2019.0"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "0ka80l3ajfzi9plq50m79d2qpm1rlir4js5hy3g1mkj1gnyb801m"; + sha256 = "1h5xxf6nkdhk9dxf3d4fsasmiahy0y7bhlicyhnppgfdf6kxi5ry"; }; nativeBuildInputs = kernel.moduleBuildDependencies; From e91a102453024a34b43fd1d3f60f37ecc086ccfd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Feb 2019 09:01:00 +0100 Subject: [PATCH 073/193] i3: 4.16 -> 4.16.1 --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 2e18636c621b..755d1cbf2df8 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.16"; + version = "4.16.1"; src = fetchurl { url = "https://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "1d2mnryn7m9c6d69awd7lwzadliapd0ahi5n8d0ppqy533ssaq6c"; + sha256 = "0xl56y196vxv001gvx35xwfr25zah8m3xwizp9ycdgdc0rfc4rdb"; }; nativeBuildInputs = [ which pkgconfig makeWrapper ]; From 725a9720b1f51b05b1a84217249b2e84e3571714 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jan 2019 16:23:30 -0800 Subject: [PATCH 074/193] ponyc: 0.25.0 -> 0.26.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ponyc/versions --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index d90ddcaacfb0..fbb4db72bd45 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "0ghmjp03q7k58yzfkvnl05xc2i2gmgnzpj3hs6g7ls4ny8n3i6hv"; + sha256 = "1k1ysqk7j8kpysndps2ic9hprvp0z0d32d6jvqlapjrfccghy7dh"; }; buildInputs = [ llvm makeWrapper which ]; From 6802d1e3a55177f9264be753b75990c9efbb73e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jan 2019 23:51:42 -0800 Subject: [PATCH 075/193] nagios: 4.4.2 -> 4.4.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nagios/versions --- pkgs/servers/monitoring/nagios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 9d79e8422ee8..3459a5fe8f7f 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nagios-${version}"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; - sha256 = "0lv8fgqbxza0rwd0gy3jsy85ljgsi3vhvzacr346va3a68zr461l"; + sha256 = "0rwzlj6qp8hq931rw6s255b33ggmc2fcxs74g9x2zxwcvklg1a5v"; }; patches = [ ./nagios.patch ]; From 7b84ac219078c81b0c806527ad9e20a6695ce541 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 00:30:07 -0800 Subject: [PATCH 076/193] mysql57: 5.7.24 -> 5.7.25 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mysql/versions --- pkgs/servers/sql/mysql/5.7.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 51fca3997591..c23bdcd24761 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -7,11 +7,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.24"; + version = "5.7.25"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "11qz8cc4zyi7sxs66c5zlap6fd3vra1srwgzcxdzhz59qs90rgq5"; + sha256 = "0gvjcdnba7nf2dx3fbqk1qyg49zclfvaihb78l8h6qc08di1qxak"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' From 69b22cb67a39481916e581493fdcb49d339b779c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 01:46:41 -0800 Subject: [PATCH 077/193] mysql-workbench: 8.0.13 -> 8.0.14 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mysql-workbench/versions --- pkgs/applications/misc/mysql-workbench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index daeb8b159f7a..8068a8cfd7e9 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -13,12 +13,12 @@ let inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.13"; + version = "8.0.14"; name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "1p4xy2a5cin1l06j4ixpgp1ynhjdj5gax4fjhznspch3c63jp9hj"; + sha256 = "0mz615drx18h0frc6fq9nknqbpq7lr0xlsfmxd5irw2jz629lj76"; }; patches = [ From 8f20c5d3b9b646d7a8546647bee39c6c147cc08b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 13:23:12 -0800 Subject: [PATCH 078/193] debianutils: 4.8.6 -> 4.8.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/debianutils/versions --- pkgs/tools/misc/debianutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index bec0cbbd2b9b..ddd0053f529a 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.8.6"; + version = "4.8.6.1"; name = "debianutils-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz"; - sha256 = "0wrz8ak4896f5i8wirijr9hdvc43xzxpg2gjs0snmpys8iqh82fv"; + sha256 = "1vamrgzsfdb2183xgj1qmfzh710iqj2dlbdsl92n3ckqfa51x7q9"; }; meta = { From 3f864c454a0c39c35d1854db01601fde5129c3cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 15:16:59 -0800 Subject: [PATCH 079/193] gitAndTools.diff-so-fancy: 1.2.0 -> 1.2.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/diff-so-fancy/versions --- .../git-and-tools/diff-so-fancy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 988911d2eb7b..90b83348ef14 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "diff-so-fancy-${version}"; - version = "1.2.0"; + version = "1.2.5"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "0j8dxfl4js7agwdpcvxwigzpp0lik33h7s3vsjg0pd413h2j4mvz"; + sha256 = "1jqq7zd75aypxchrq0vjcw5gyn3wyjqy6w79mq2lzky8m6mqn8vr"; }; # Perl is needed here for patchShebangs From 65bb12e337f0f6b473783ec60c782e677194100a Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Sun, 3 Feb 2019 20:33:13 +1100 Subject: [PATCH 080/193] haskellPackages.these: jailbreak Test require tasty >= 1.2, which isn't in hackage-packages. Maintainer has a stated policy of not publishing revisions/new versions for test dependency changes. 0.7.6 is in hackage but not yet in nixpkgs. --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 58f1f90977a1..4b54ec5685bf 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1185,6 +1185,7 @@ self: super: { # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 + these = doJailbreak super.these; # until these >= 0.7.6 # These patches contain fixes for 8.6 that should be safe for # earlier versions, but we need the relaxed version bounds in GHC From d3855995434f2b45ae79a4302c7bd513f7b50a7c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Jan 2019 20:59:12 -0800 Subject: [PATCH 081/193] mobile-broadband-provider-info: 20151214 -> 20190116 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mobile-broadband-provider-info/versions --- pkgs/data/misc/mobile-broadband-provider-info/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 95c66ed029ef..9f135c423bc8 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let - version = "20151214"; + version = "20190116"; pname = "mobile-broadband-provider-info"; name = "${pname}-${version}"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz"; - sha256 = "1905nab1h8p4hx0m1w0rn4mkg9209x680dcr4l77bngy21pmvr4a"; + sha256 = "16y5lc7pfdvai9c8xwb825zc3v46039gghbip13fqslf5gw11fic"; }; meta = { From b9ce163127b84add78402eab4d96835f2b6a4e0d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 3 Feb 2019 11:14:46 +0100 Subject: [PATCH 082/193] chirp: 20181018 -> 20190201 --- pkgs/applications/misc/chirp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index db67514cd077..acc35131e2d5 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -2,12 +2,12 @@ , pyserial, pygtk }: stdenv.mkDerivation rec { - name = "chirp-daily-${version}"; - version = "20181018"; + pname = "chirp-daily"; + version = "20190201"; src = fetchurl { - url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "0jd7xi6q09b3djn1k7pj1sbqvw24kn7dcp9r6abvxily4pc1xhdr"; + url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; + sha256 = "1ag3qzdq39zhpagviq9gpwk4y3h11z0j40nccsnhlq8h8bxpvwlf"; }; nativeBuildInputs = [ makeWrapper ]; From d96d17eecad56cba3fc137989b88e8eb78eb2006 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 3 Feb 2019 11:30:33 +0100 Subject: [PATCH 083/193] fldigi: 4.0.18 -> 4.1.00 --- pkgs/applications/audio/fldigi/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index fb4454269d78..ad5b120b7883 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.0.18"; + version = "4.1.00"; pname = "fldigi"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0a3z9xj9gsa6fskiai9410kwqfb6156km59y36a31mhyddzk27p7"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1hm2n4p3pdd029kizgzwf3zzgsy1m6z83z7rr2kyjhrq2vp5gf0s"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio From ddc4d153fc4dc4f0c9ef41880228b3ecfc203473 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 3 Feb 2019 11:38:43 +0100 Subject: [PATCH 084/193] flmsg: 4.0.7 -> 4.0.8 --- pkgs/applications/misc/flmsg/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/flmsg/default.nix b/pkgs/applications/misc/flmsg/default.nix index afdf0f91a910..239d392c374e 100644 --- a/pkgs/applications/misc/flmsg/default.nix +++ b/pkgs/applications/misc/flmsg/default.nix @@ -6,13 +6,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.7"; + version = "4.0.8"; pname = "flmsg"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/fldigi/${name}.tar.gz"; - sha256 = "1kdlwhxsw02pas9d0kakkq2713wj1m4q881f6am5aq4x8n01f4xw"; + url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; + sha256 = "1yy9z6mchs7r3x108z5rp0h6a18zjqrn9zq5x72qwqh1byjnfwc8"; }; buildInputs = [ From f2d90080372069190e54ae14639b2952afdf3914 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 3 Feb 2019 11:47:57 +0100 Subject: [PATCH 085/193] flrig: 1.3.41 -> 1.3.42 --- pkgs/applications/misc/flrig/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/flrig/default.nix b/pkgs/applications/misc/flrig/default.nix index 64d2677d4e13..de4b448b5c37 100644 --- a/pkgs/applications/misc/flrig/default.nix +++ b/pkgs/applications/misc/flrig/default.nix @@ -6,13 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.41"; + version = "1.3.42"; pname = "flrig"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/fldigi/${name}.tar.gz"; - sha256 = "0vh14azg3pppyg3fb7kf6q3ighw1ka9m60jf2dzsd77f4hidhqx4"; + url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; + sha256 = "10qn710ms145zq2xzb6z2fnygxmh5pmfmyfdbphrc7mrvd0phzp0"; }; buildInputs = [ From 12fc62dde5b38f544fa917dc8169c2f7ddb573d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 3 Feb 2019 08:52:40 -0200 Subject: [PATCH 086/193] tetra-gtk-theme: 0.2.0 -> 201902 --- pkgs/misc/themes/tetra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/tetra/default.nix b/pkgs/misc/themes/tetra/default.nix index 0d2ddb95166d..9e5e246880a2 100644 --- a/pkgs/misc/themes/tetra/default.nix +++ b/pkgs/misc/themes/tetra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "tetra-gtk-theme-${version}"; - version = "0.2.0"; + version = "201902"; src = fetchFromGitHub { owner = "hrdwrrsk"; repo = "tetra-gtk-theme"; rev = version; - sha256 = "1lzkmswv3ml2zj80z067j1hj1cvpdcl86jllahqx3jwnmr0a4fhd"; + sha256 = "0xvp85mzgh5msr3s6wl9xagz2xxqmy3s9jndbmwh1cc79fycggqv"; }; preBuild = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme."; + description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme"; homepage = https://github.com/hrdwrrsk/tetra-gtk-theme; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; From bd0bb9e4976eb69425ca8effc260bfe1bd47a7fc Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Sun, 3 Feb 2019 13:03:53 +0200 Subject: [PATCH 087/193] postgresql test: fix (#55106) Commit https://github.com/NixOS/nixpkgs/pull/55097 didn't modify all usages of postgresql/default.nix. Also, replaced "random" pg with pg11. Random pg was always pg10. --- nixos/tests/postgresql.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 9e1f4f235af0..cf1de2f6acbf 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -7,7 +7,7 @@ with import ../lib/testing.nix { inherit system pkgs; }; with pkgs.lib; let - postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs pkgs; + postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs; test-sql = pkgs.writeText "postgresql-test" '' CREATE EXTENSION pgcrypto; -- just to check if lib loading works CREATE TABLE sth ( @@ -67,12 +67,7 @@ let }; in - (mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // ( - # just pick one version for the dump all test - let - first = head (attrNames postgresql-versions); - name = "${first}-backup-all"; - in { - ${name} = make-postgresql-test name postgresql-versions.${first} true; - } - ) + (mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // { + postgresql_11-backup-all = make-postgresql-test name postgresql-versions.postgresql_11 true; + } + From d0e940e74d5ace10cb6c4dfa0db4fa154902519b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 3 Feb 2019 12:13:46 +0100 Subject: [PATCH 088/193] xastir: 2.0.8 -> 2.1.0 --- pkgs/applications/misc/xastir/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index c677f7371fca..969661ea7b4e 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "xastir-${version}"; - version = "208"; + pname = "xastir"; + version = "2.1.0"; src = fetchFromGitHub { - owner = "Xastir"; - repo = "Xastir"; - rev = "707f3aa8c7ca3e3fecd32d5a4af3f742437e5dce"; - sha256 = "1mm22vn3hws7dmg9wpaj4s0zkzb77i3aqa2ay3q6kqjkdhv25brl"; + owner = pname; + repo = pname; + rev = "Release-${version}"; + sha256 = "16zsgy3589snawr8f1fa22ymvpnjy6njvxmsck7q8p2xmmz2ry7r"; }; buildInputs = [ From 08be9340fbf464e10c303fae0edd1730f6eeb14c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 3 Feb 2019 12:20:27 +0100 Subject: [PATCH 089/193] xlog: 2.0.15 -> 2.0.17 --- pkgs/applications/misc/xlog/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/xlog/default.nix b/pkgs/applications/misc/xlog/default.nix index c0b0ef63369f..7b9cf0a4ee55 100644 --- a/pkgs/applications/misc/xlog/default.nix +++ b/pkgs/applications/misc/xlog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }: stdenv.mkDerivation rec { - name = "xlog-${version}"; - version = "2.0.15"; - + pname = "xlog"; + version = "2.0.17"; + src = fetchurl { - url = "https://download.savannah.gnu.org/releases/xlog/${name}.tar.gz"; - sha256 = "0an883wqw3zwpw8nqinm9cb17hp2xw9vf603k4l2345p61jqdw2j"; + url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz"; + sha256 = "0vmn8518zk7qk1mbp1h8dm0f8fx0z0jvmy42c1n15il714lj7vsl"; }; buildInputs = [ glib pkgconfig gtk2 hamlib ]; @@ -18,12 +18,11 @@ stdenv.mkDerivation rec { and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files. Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone, location in latitude and longitude and distance and heading in kilometers or miles, - both for short and long path. + both for short and long path. ''; homepage = https://www.nongnu.org/xlog; maintainers = [ maintainers.mafo ]; license = licenses.gpl3; platforms = platforms.unix; }; - } From 055ac8e4955294a3ecf6663628d892a486bba06d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 3 Feb 2019 18:22:22 +0700 Subject: [PATCH 090/193] Partially revert 755e824 Reinstates the error message that helps migration of forks. Same should be done for super *if* it is to be removed. --- pkgs/top-level/all-packages.nix | 16 +++++++++++++++- pkgs/top-level/stage.nix | 5 ++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adf7e603b231..01dccadd3b9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6,11 +6,25 @@ * Hint: ### starts category names. */ { lib, noSysDirs, config}: -pkgs: +res: pkgs: super: with pkgs; +let + self = + builtins.trace '' + It seems that you are using a patched Nixpkgs that references the self + variable in pkgs/top-level/all-packages.nix. This variable was incorrectly + named, so its usage needs attention. Please use pkgs for packages or super + for functions. + '' + res; # Do *NOT* use res in your fork. It will be removed. + + # TODO: turn self into an error + +in { + # Allow callPackage to fill in the pkgs argument inherit pkgs; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 0991c9138bda..6ca370e0b9b7 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -89,7 +89,10 @@ let splice = self: super: import ./splice.nix lib self (buildPackages != null); allPackages = self: super: - import ./all-packages.nix { inherit lib noSysDirs config; } self; + let res = import ./all-packages.nix + { inherit lib noSysDirs config; } + res self super; + in res; aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super); From f85453f060b4756a3d55c2d3a6563be19f41dfe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 3 Feb 2019 12:45:52 +0100 Subject: [PATCH 091/193] nixos/home-assistant: add configWritable option --- .../modules/services/misc/home-assistant.nix | 32 +++++++++++++++++-- nixos/tests/home-assistant.nix | 6 ++-- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 628dd7c39b14..4eabda1d4188 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -110,6 +110,17 @@ in { ''; }; + configWritable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to make configuration.yaml writable. + This only has an effect if is set. + This will allow you to edit it from Home Assistant's web interface. + However, bear in mind that it will be overwritten at every start of the service. + ''; + }; + lovelaceConfig = mkOption { default = null; type = with types; nullOr attrs; @@ -135,6 +146,17 @@ in { ''; }; + lovelaceConfigWritable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to make ui-lovelace.yaml writable. + This only has an effect if is set. + This will allow you to edit it from Home Assistant's web interface. + However, bear in mind that it will be overwritten at every start of the service. + ''; + }; + package = mkOption { default = pkgs.home-assistant; defaultText = "pkgs.home-assistant"; @@ -180,13 +202,17 @@ in { systemd.services.home-assistant = { description = "Home Assistant"; after = [ "network.target" ]; - preStart = optionalString (cfg.config != null) '' + preStart = optionalString (cfg.config != null) (if cfg.configWritable then '' + cp --no-preserve=mode ${configFile} "${cfg.configDir}/configuration.yaml" + '' else '' rm -f "${cfg.configDir}/configuration.yaml" ln -s ${configFile} "${cfg.configDir}/configuration.yaml" - '' + optionalString (cfg.lovelaceConfig != null) '' + '') + optionalString (cfg.lovelaceConfig != null) (if cfg.lovelaceConfigWritable then '' + cp --no-preserve=mode ${lovelaceConfigFile} "${cfg.configDir}/ui-lovelace.yaml" + '' else '' rm -f "${cfg.configDir}/ui-lovelace.yaml" ln -s ${lovelaceConfigFile} "${cfg.configDir}/ui-lovelace.yaml" - ''; + ''); serviceConfig = { ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; User = "hass"; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 9e97ed4c47e8..00a0e82fedc9 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -61,6 +61,7 @@ in { } ]; } ]; }; + lovelaceConfigWritable = true; }; }; }; @@ -70,9 +71,10 @@ in { $hass->waitForUnit("home-assistant.service"); # The config is specified using a Nix attribute set, - # but then converted from JSON to YAML + # converted from JSON to YAML, and linked to the config dir $hass->succeed("test -L ${configDir}/configuration.yaml"); - $hass->succeed("test -L ${configDir}/ui-lovelace.yaml"); + # The lovelace config is copied because lovelaceConfigWritable = true + $hass->succeed("test -f ${configDir}/ui-lovelace.yaml"); # Check that Home Assistant's web interface and API can be reached $hass->waitForOpenPort(8123); From 1bd0e155f1b7766b6cb6f58fc2031ca215efc7e2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 3 Feb 2019 13:18:58 +0100 Subject: [PATCH 092/193] hivex: 1.3.17 -> 1.3.18 --- pkgs/development/libraries/hivex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 3a2e08e4b5bc..7a42ff94fc0f 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "hivex-${version}"; - version = "1.3.17"; + version = "1.3.18"; src = fetchurl { url = "http://libguestfs.org/download/hivex/${name}.tar.gz"; - sha256 = "1nsjijgcpcl6vm7whbbpxqrjycajf7vy0sp5hfg4vmvjmf3lpjqk"; + sha256 = "0ibl186l6rd9qj4rqccfwbg1nnx6z07vspkhk656x6zav67ph7la"; }; patches = [ ./hivex-syms.patch ]; From f1b91b5726c901ccb7056836d0882c7532883b36 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 2 Feb 2019 16:05:12 +0100 Subject: [PATCH 093/193] nixos/tests: add ndppd test --- nixos/tests/ndppd.nix | 61 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 nixos/tests/ndppd.nix diff --git a/nixos/tests/ndppd.nix b/nixos/tests/ndppd.nix new file mode 100644 index 000000000000..9f24eb6d9d45 --- /dev/null +++ b/nixos/tests/ndppd.nix @@ -0,0 +1,61 @@ +import ./make-test.nix ({ pkgs, lib, ...} : { + name = "ndppd"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ fpletz ]; + }; + + nodes = { + upstream = { pkgs, ... }: { + environment.systemPackages = [ pkgs.tcpdump ]; + networking.useDHCP = false; + networking.interfaces = { + eth1 = { + ipv6.addresses = [ + { address = "fd23::1"; prefixLength = 112; } + ]; + ipv6.routes = [ + { address = "fd42::"; + prefixLength = 112; + } + ]; + }; + }; + }; + server = { pkgs, ... }: { + boot.kernel.sysctl = { + "net.ipv6.conf.all.forwarding" = "1"; + "net.ipv6.conf.default.forwarding" = "1"; + }; + environment.systemPackages = [ pkgs.tcpdump ]; + networking.useDHCP = false; + networking.interfaces = { + eth1 = { + ipv6.addresses = [ + { address = "fd23::2"; prefixLength = 112; } + ]; + }; + }; + services.ndppd = { + enable = true; + interface = "eth1"; + network = "fd42::/112"; + }; + containers.client = { + autoStart = true; + privateNetwork = true; + hostAddress = "192.168.255.1"; + localAddress = "192.168.255.2"; + hostAddress6 = "fd42::1"; + localAddress6 = "fd42::2"; + config = {}; + }; + }; + }; + + testScript = '' + startAll; + $server->waitForUnit("multi-user.target"); + $upstream->waitForUnit("multi-user.target"); + $upstream->waitUntilSucceeds("ping -c5 fd42::2"); + ''; +}) From 96881a6c1d069cb657bf6e648ada4dfb00b6dd8a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Feb 2019 13:04:07 +0100 Subject: [PATCH 094/193] hunspellDicts.en-*: 2014.11.17 -> 2018.04.16 --- .../libraries/hunspell/dictionaries.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 9f0a6c34512f..836d0128a8c1 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -137,7 +137,7 @@ let { shortName, shortDescription, dictFileName, src }: mkDict rec { inherit src dictFileName; - version = "2014.11.17"; + version = "2018.04.16"; name = "hunspell-dict-${shortName}-wordlist-${version}"; readmeFile = "README_" + dictFileName + ".txt"; meta = with stdenv.lib; { @@ -259,8 +259,8 @@ in { shortDescription = "English (United States)"; dictFileName = "en_US"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_US-2014.11.17.zip; - sha256 = "4ce88a1af457ce0e256110277a150e5da798213f611929438db059c1c81e20f2"; + url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-2018.04.16.zip; + sha256 = "18hbncvqnckzqarrmnzk58plymjqyi93k4qj98fac5mr71jbmzaf"; }; }; @@ -269,8 +269,8 @@ in { shortDescription = "English (Canada)"; dictFileName = "en_CA"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_CA-2014.11.17.zip; - sha256 = "59950448440657a6fc3ede15720c1b86c0b66c4ec734bf1bd9157f6a1786673b"; + url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-2018.04.16.zip; + sha256 = "06yf3s7y1215jmikbs18cn4j8a13csp4763w3jfgah8zlim6vc47"; }; }; @@ -279,8 +279,8 @@ in { shortDescription = "English (United Kingdom, 'ise' ending)"; dictFileName = "en_GB-ise"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_GB-ise-2014.11.17.zip; - sha256 = "97f3b25102fcadd626ae4af3cdd97f017ce39264494f98b1f36ad7d96b9d5a94"; + url = mirror://sourceforge/wordlist/speller//hunspell-en_GB-ise-2018.04.16.zip; + sha256 = "0ylg1zvfvsawamymcc9ivrqcb9qhlpgpnizm076xc56jz554xc2l"; }; }; @@ -289,8 +289,8 @@ in { shortDescription = "English (United Kingdom, 'ize' ending)"; dictFileName = "en_GB-ize"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_GB-ize-2014.11.17.zip; - sha256 = "84270673ed7c014445f3ba02f9efdb0ac44cea9ee0bfec76e3e10feae55c4e1c"; + url = mirror://sourceforge/wordlist/speller//hunspell-en_GB-ize-2018.04.16.zip; + sha256 = "1rmwy6sxmd400cwjf58az6g14sq28p18f5mlq8ybg8y33q9m42ps"; }; }; From 5b1ed0c62f0f5e699fadfd08f5fc8b9b3dbc0b14 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Feb 2019 13:08:43 +0100 Subject: [PATCH 095/193] nuspell: init at 2.1.0 --- .../development/libraries/nuspell/default.nix | 28 +++++++++++++++++++ .../development/libraries/nuspell/wrapper.nix | 13 +++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 45 insertions(+) create mode 100644 pkgs/development/libraries/nuspell/default.nix create mode 100644 pkgs/development/libraries/nuspell/wrapper.nix diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix new file mode 100644 index 000000000000..1d92a15ce005 --- /dev/null +++ b/pkgs/development/libraries/nuspell/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, icu, catch2 }: + +stdenv.mkDerivation rec { + name = "nuspell-${version}"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "nuspell"; + repo = "nuspell"; + rev = "v${version}"; + sha256 = "0gcw3p1agnx474r7kv27y9jyab20p4j4xx7j9a2yssg54qabm71j"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ boost icu ]; + + enableParallelBuilding = true; + + preBuild = '' + ln -s ${catch2}/include/catch2/*.hpp tests/ + ''; + + meta = with stdenv.lib; { + description = "Free and open source C++ spell checking library"; + homepage = "https://nuspell.github.io/"; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/development/libraries/nuspell/wrapper.nix b/pkgs/development/libraries/nuspell/wrapper.nix new file mode 100644 index 000000000000..4386542ff20e --- /dev/null +++ b/pkgs/development/libraries/nuspell/wrapper.nix @@ -0,0 +1,13 @@ +{ stdenv, lib, nuspell, makeWrapper, dicts ? [] }: +with lib; +let + searchPath = makeSearchPath "share/hunspell" dicts; +in +stdenv.mkDerivation { + name = (appendToName "with-dicts" nuspell).name; + buildInputs = [ makeWrapper ]; + buildCommand = '' + makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${searchPath} + ''; + meta = removeAttrs nuspell.meta ["outputsToInstall"]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01dccadd3b9a..3c5cea676c31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11773,6 +11773,9 @@ in ntrack = callPackage ../development/libraries/ntrack { }; + nuspell = callPackage ../development/libraries/nuspell { }; + nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; }; + nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; @@ -23304,4 +23307,5 @@ in newlibCross = callPackage ../development/misc/newlib { stdenv = crossLibcStdenv; }; + } From 784870046b926f64cdcc6bcf0746e30ed43197c8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 3 Feb 2019 13:55:45 +0100 Subject: [PATCH 096/193] sundials: remove name attribute (pname is present) --- pkgs/development/libraries/sundials/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 40bb8b8c43b7..b33180cec428 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "sundials"; version = "4.0.2"; - name = "${pname}-${version}"; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; @@ -14,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = '' export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$out -DEXAMPLES_INSTALL_PATH=$out/share/examples $cmakeFlags" ''; - + nativeBuildInputs = [ cmake ]; buildInputs = [ python ]; From 4ce1c5938905eedd1050f0be8a0c6a69587f5aac Mon Sep 17 00:00:00 2001 From: elseym Date: Sat, 2 Feb 2019 15:37:48 +0100 Subject: [PATCH 097/193] ndppd module: refactor --- nixos/modules/services/networking/ndppd.nix | 174 ++++++++++++++++---- 1 file changed, 146 insertions(+), 28 deletions(-) diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix index 1d6c48dd8d37..54a6e393657f 100644 --- a/nixos/modules/services/networking/ndppd.nix +++ b/nixos/modules/services/networking/ndppd.nix @@ -5,43 +5,161 @@ with lib; let cfg = config.services.ndppd; - configFile = pkgs.runCommand "ndppd.conf" {} '' - substitute ${pkgs.ndppd}/etc/ndppd.conf $out \ - --replace eth0 ${cfg.interface} \ - --replace 1111:: ${cfg.network} - ''; -in { - options = { - services.ndppd = { - enable = mkEnableOption "daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; + render = s: f: concatStringsSep "\n" (mapAttrsToList f s); + prefer = a: b: if a != null then a else b; + + ndppdConf = prefer cfg.configFile (pkgs.writeText "ndppd.conf" '' + route-ttl ${toString cfg.routeTTL} + ${render cfg.proxies (proxyInterfaceName: proxy: '' + proxy ${prefer proxy.interface proxyInterfaceName} { + router ${boolToString proxy.router} + timeout ${toString proxy.timeout} + ttl ${toString proxy.ttl} + ${render proxy.rules (ruleNetworkName: rule: '' + rule ${prefer rule.network ruleNetworkName} { + ${rule.method}${if rule.method == "iface" then " ${rule.interface}" else ""} + }'')} + }'')} + ''); + + proxy = types.submodule { + options = { interface = mkOption { - type = types.string; - default = "eth0"; - example = "ens3"; - description = "Interface which is on link-level with router."; - }; - network = mkOption { - type = types.string; - default = "1111::"; - example = "2001:DB8::/32"; - description = "Network that we proxy."; - }; - configFile = mkOption { - type = types.nullOr types.path; + type = types.nullOr types.str; + description = '' + Listen for any Neighbor Solicitation messages on this interface, + and respond to them according to a set of rules. + Defaults to the name of the attrset. + ''; default = null; - description = "Path to configuration file."; }; + router = mkOption { + type = types.bool; + description = '' + Turns on or off the router flag for Neighbor Advertisement Messages. + ''; + default = true; + }; + timeout = mkOption { + type = types.int; + description = '' + Controls how long to wait for a Neighbor Advertisment Message before + invalidating the entry, in milliseconds. + ''; + default = 500; + }; + ttl = mkOption { + type = types.int; + description = '' + Controls how long a valid or invalid entry remains in the cache, in + milliseconds. + ''; + default = 30000; + }; + rules = mkOption { + type = types.attrsOf rule; + description = '' + This is a rule that the target address is to match against. If no netmask + is provided, /128 is assumed. You may have several rule sections, and the + addresses may or may not overlap. + ''; + default = {}; + }; + }; + }; + + rule = types.submodule { + options = { + network = mkOption { + type = types.nullOr types.str; + description = '' + This is the target address is to match against. If no netmask + is provided, /128 is assumed. The addresses of serveral rules + may or may not overlap. + Defaults to the name of the attrset. + ''; + default = null; + }; + method = mkOption { + type = types.enum [ "static" "iface" "auto" ]; + description = '' + static: Immediately answer any Neighbor Solicitation Messages + (if they match the IP rule). + iface: Forward the Neighbor Solicitation Message through the specified + interface and only respond if a matching Neighbor Advertisement + Message is received. + auto: Same as iface, but instead of manually specifying the outgoing + interface, check for a matching route in /proc/net/ipv6_route. + ''; + default = "auto"; + }; + interface = mkOption { + type = types.nullOr types.str; + description = "Interface to use when method is iface."; + default = null; + }; + }; + }; + +in { + options.services.ndppd = { + enable = mkEnableOption "daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; + interface = mkOption { + type = types.nullOr types.str; + description = '' + Interface which is on link-level with router. + (Legacy option, use services.ndppd.proxies.<interface>.rules.<network> instead) + ''; + default = null; + example = "eth0"; + }; + network = mkOption { + type = types.nullOr types.str; + description = '' + Network that we proxy. + (Legacy option, use services.ndppd.proxies.<interface>.rules.<network> instead) + ''; + default = null; + example = "1111::/64"; + }; + configFile = mkOption { + type = types.nullOr types.path; + description = "Path to configuration file."; + default = null; + }; + routeTTL = mkOption { + type = types.int; + description = '' + This tells 'ndppd' how often to reload the route file /proc/net/ipv6_route, + in milliseconds. + ''; + default = 30000; + }; + proxies = mkOption { + type = types.attrsOf proxy; + description = '' + This sets up a listener, that will listen for any Neighbor Solicitation + messages, and respond to them according to a set of rules. + ''; + default = {}; + example = { "eth0".rules."1111::/64" = {}; }; }; }; config = mkIf cfg.enable { - systemd.packages = [ pkgs.ndppd ]; - environment.etc."ndppd.conf".source = if (cfg.configFile != null) then cfg.configFile else configFile; + warnings = mkIf (cfg.interface != null && cfg.network != null) [ '' + The options services.ndppd.interface and services.ndppd.network will probably be removed soon, + please use services.ndppd.proxies..rules. instead. + '' ]; + + services.ndppd.proxies = mkIf (cfg.interface != null && cfg.network != null) { + "${cfg.interface}".rules."${cfg.network}" = {}; + }; + systemd.services.ndppd = { - serviceConfig.RuntimeDirectory = [ "ndppd" ]; + after = [ "network-pre.target" ]; wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${pkgs.ndppd}/bin/ndppd -c ${ndppdConf}"; }; }; - - meta.maintainers = with maintainers; [ gnidorah ]; } From c01eeda8e96c0fa63eb23df3df51403cc0589672 Mon Sep 17 00:00:00 2001 From: aanderse Date: Sun, 3 Feb 2019 08:33:31 -0500 Subject: [PATCH 098/193] nixos-generate-config: account for mount points & devices with spaces & tabs in the name (#50234) --- nixos/modules/installer/tools/nixos-generate-config.pl | 4 ++++ nixos/modules/tasks/filesystems.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index e58392ad05b4..3bcf90258d79 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -340,6 +340,8 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { chomp $fs; my @fields = split / /, $fs; my $mountPoint = $fields[4]; + $mountPoint =~ s/\\040/ /g; # account for mount points with spaces in the name (\040 is the escape character) + $mountPoint =~ s/\\011/\t/g; # account for mount points with tabs in the name (\011 is the escape character) next unless -d $mountPoint; my @mountOptions = split /,/, $fields[5]; @@ -355,6 +357,8 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { my $fsType = $fields[$n]; my $device = $fields[$n + 1]; my @superOptions = split /,/, $fields[$n + 2]; + $device =~ s/\\040/ /g; # account for devices with spaces in the name (\040 is the escape character) + $device =~ s/\\011/\t/g; # account for mount points with tabs in the name (\011 is the escape character) # Skip the read-only bind-mount on /nix/store. next if $mountPoint eq "/nix/store" && (grep { $_ eq "rw" } @superOptions) && (grep { $_ eq "ro" } @mountOptions); diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 9e4057b50897..07f8214cea2c 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -231,7 +231,7 @@ in fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ]; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces - escape = string: builtins.replaceStrings [ " " ] [ "\\040" ] string; + escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; in '' # This is a generated file. Do not edit! # From 2746973061f8e62c4decdf8e131c7db06f5c511f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 3 Feb 2019 14:37:55 +0100 Subject: [PATCH 099/193] ndppd: don't use weird upstream systemd service unit --- nixos/modules/services/networking/ndppd.nix | 2 ++ pkgs/applications/networking/ndppd/default.nix | 14 ++------------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix index 54a6e393657f..ba17f1ba825a 100644 --- a/nixos/modules/services/networking/ndppd.nix +++ b/nixos/modules/services/networking/ndppd.nix @@ -157,6 +157,8 @@ in { }; systemd.services.ndppd = { + description = "NDP Proxy Daemon"; + documentation = [ "man:ndppd(1)" "man:ndppd.conf(5)" ]; after = [ "network-pre.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${pkgs.ndppd}/bin/ndppd -c ${ndppdConf}"; diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index a5eb9021048e..6e6315ced7df 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -1,11 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchurl, gzip, ... }: +{ stdenv, fetchFromGitHub, fetchurl, gzip }: -let - serviceFile = fetchurl { - url = "https://raw.githubusercontent.com/DanielAdolfsson/ndppd/f37e8eb33dc68b3385ecba9b36a5efd92755580f/ndppd.service"; - sha256 = "1zf54pzjfj9j9gr48075njqrgad4myd3dqmhvzxmjy4gjy9ixmyh"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "ndppd-${version}"; version = "0.2.5"; @@ -27,11 +22,6 @@ in stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/etc cp ndppd.conf-dist $out/etc/ndppd.conf - - mkdir -p $out/lib/systemd/system - # service file needed for our module is not in release yet - substitute ${serviceFile} $out/lib/systemd/system/ndppd.service \ - --replace /usr/sbin/ndppd $out/sbin/ndppd ''; meta = { From b251a368dd3d1215e925618aa227d56433f99526 Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Sun, 3 Feb 2019 15:51:02 +0200 Subject: [PATCH 100/193] Revert "all-packages.nix: remove `res.` (next stage super)" (#55125) This reverts commit 3ec0eb4bbd783e6f07175c9703ec5a2a70491da9. See https://github.com/NixOS/nixpkgs/pull/55061#issuecomment-460047536 --- pkgs/top-level/all-packages.nix | 74 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c5cea676c31..2a1aa3d30f79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3510,7 +3510,7 @@ in jid = callPackage ../development/tools/jid { }; - jing = jing-trang; + jing = res.jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { }; jira-cli = callPackage ../development/tools/jira_cli { }; @@ -4805,23 +4805,23 @@ in libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_ncurses = pinentry.override { + pinentry_ncurses = res.pinentry.override { gtk2 = null; }; - pinentry_emacs = pinentry.override { + pinentry_emacs = res.pinentry.override { enableEmacs = true; }; - pinentry_gnome = pinentry.override { + pinentry_gnome = res.pinentry.override { inherit gcr; }; - pinentry_qt4 = pinentry.override { + pinentry_qt4 = res.pinentry.override { qt = qt4; }; - pinentry_qt5 = pinentry.override { + pinentry_qt5 = res.pinentry.override { qt = qt5.qtbase; }; @@ -8691,11 +8691,11 @@ in gputils = callPackage ../development/tools/misc/gputils { }; gradleGen = callPackage ../development/tools/build-managers/gradle { }; - gradle = gradleGen.gradle_latest; - gradle_2_14 = gradleGen.gradle_2_14; - gradle_2_5 = gradleGen.gradle_2_5; - gradle_3_5 = gradleGen.gradle_3_5; - gradle_4_10 = gradleGen.gradle_4_10; + gradle = res.gradleGen.gradle_latest; + gradle_2_14 = res.gradleGen.gradle_2_14; + gradle_2_5 = res.gradleGen.gradle_2_5; + gradle_3_5 = res.gradleGen.gradle_3_5; + gradle_4_10 = res.gradleGen.gradle_4_10; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -9179,7 +9179,7 @@ in valgrind = callPackage ../development/tools/analysis/valgrind { inherit (buildPackages.darwin) xnu bootstrap_cmds cctools; }; - valgrind-light = valgrind.override { gdb = null; }; + valgrind-light = res.valgrind.override { gdb = null; }; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; @@ -9753,7 +9753,7 @@ in inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; }; - fltk = fltk13; + fltk = res.fltk13; flyway = callPackage ../development/tools/flyway { }; @@ -9766,7 +9766,7 @@ in freetts = callPackage ../development/libraries/freetts { }; - frog = languageMachines.frog; + frog = res.languageMachines.frog; fstrcmp = callPackage ../development/libraries/fstrcmp { }; @@ -9840,11 +9840,11 @@ in }; gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { - gtk = gtk2; + gtk = res.gtk2; }; gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { - gtk = gtk2; + gtk = res.gtk2; }; geoclue2 = callPackage ../development/libraries/geoclue {}; @@ -10252,7 +10252,7 @@ in gumbo = callPackage ../development/libraries/gumbo { }; gvfs = callPackage ../development/libraries/gvfs { - gnome = gnome3; + gnome = res.gnome3; }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; @@ -11492,7 +11492,7 @@ in libxml2 = callPackage ../development/libraries/libxml2 { }; libxml2Python = pkgs.buildEnv { # slightly hacky - name = "libxml2+py-${libxml2.version}"; + name = "libxml2+py-${res.libxml2.version}"; paths = with libxml2; [ dev bin py ]; inherit (libxml2) passthru; # the hook to find catalogs is hidden by buildEnv @@ -11940,9 +11940,9 @@ in }; pcre = callPackage ../development/libraries/pcre { }; - pcre16 = pcre.override { variant = "pcre16"; }; + pcre16 = res.pcre.override { variant = "pcre16"; }; # pcre32 seems unused - pcre-cpp = pcre.override { variant = "cpp"; }; + pcre-cpp = res.pcre.override { variant = "cpp"; }; pcre2 = callPackage ../development/libraries/pcre2 { }; @@ -15870,7 +15870,7 @@ in inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { - gtk = gtk2; + gtk = res.gtk2; }; themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; @@ -16113,18 +16113,18 @@ in libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { }; - go-ethereum = altcoins.go-ethereum; - ethabi = altcoins.ethabi; + go-ethereum = res.altcoins.go-ethereum; + ethabi = res.altcoins.ethabi; - parity = altcoins.parity; - parity-beta = altcoins.parity-beta; - parity-ui = altcoins.parity-ui; + parity = res.altcoins.parity; + parity-beta = res.altcoins.parity-beta; + parity-ui = res.altcoins.parity-ui; - polkadot = altcoins.polkadot; + polkadot = res.altcoins.polkadot; - stellar-core = altcoins.stellar-core; + stellar-core = res.altcoins.stellar-core; - particl-core = altcoins.particl-core; + particl-core = res.altcoins.particl-core; aumix = callPackage ../applications/audio/aumix { gtkGUI = false; @@ -16910,7 +16910,7 @@ in espeak-classic = callPackage ../applications/audio/espeak { }; espeak-ng = callPackage ../applications/audio/espeak-ng { }; - espeak = espeak-ng; + espeak = res.espeak-ng; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; @@ -17209,7 +17209,7 @@ in inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-beta-bin = wrapFirefox firefox-beta-bin-unwrapped { + firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { browserName = "firefox"; name = "firefox-beta-bin-" + (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version; @@ -17224,7 +17224,7 @@ in inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-devedition-bin = wrapFirefox firefox-devedition-bin-unwrapped { + firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { browserName = "firefox"; nameSuffix = "-devedition"; name = "firefox-devedition-bin-" + @@ -21122,7 +21122,7 @@ in ut2004Packages = callPackage ../games/ut2004 { }; - ut2004demo = ut2004Packages.ut2004 [ ut2004Packages.ut2004-demo ]; + ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ]; vapor = callPackage ../games/vapor { love = love_0_8; }; @@ -21259,8 +21259,8 @@ in # Included for backwards compatibility libsoup libwnck gtk-doc gnome-doc-utils; - gtk = gtk2; - gtkmm = gtkmm2; + gtk = res.gtk2; + gtkmm = res.gtkmm2; }); gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); @@ -22314,7 +22314,7 @@ in fakenes = callPackage ../misc/emulators/fakenes { }; - faust = faust2; + faust = res.faust2; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; @@ -22814,7 +22814,7 @@ in samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; - samsung-unified-linux-driver = samsung-unified-linux-driver_4_01_17; + samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; sane-backends = callPackage ../applications/graphics/sane/backends { gt68xxFirmware = config.sane.gt68xxFirmware or null; From 5b8a861c446078f4564efd6b5af0e5a0f900c6e6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 14:54:09 +0100 Subject: [PATCH 101/193] signing-party: Update meta.homepage The current repository (debian/signing-party) was actually the old one (last activity 4 months ago) and signing-party-team/signing-party is the new upstream repository. --- pkgs/tools/security/signing-party/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index 287ed1edcdae..7202f2aa28a1 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -190,7 +190,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://salsa.debian.org/debian/signing-party; + homepage = https://salsa.debian.org/signing-party-team/signing-party; description = "A collection of several projects relating to OpenPGP"; longDescription = '' This is a collection of several projects relating to OpenPGP. From 614b29a93b51e3438f6dc4c121229fcf2dcc2fbd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 15:09:24 +0100 Subject: [PATCH 102/193] python37Packages.mysql-connector: 8.0.14 -> 8.0.15 --- pkgs/development/python-modules/mysql-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 2c0a83c62e3e..56c1ab227c8d 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.14"; + version = "8.0.15"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1cf0ic2mx339j62579xjlaw5q5sz61dac379c7lsy3ln3krsw3y9"; + sha256 = "1w4j2sf07aid3453529z8kg1ziycbayxi3g2r4wqn0nb3y1caqz6"; }; propagatedBuildInputs = [ protobuf ]; From 038b89819b94e509d5ba32707406e6b8df6802ee Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 11:46:46 +0100 Subject: [PATCH 103/193] wlroots: 0.2 -> 0.3 --- pkgs/development/libraries/wlroots/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 92e8bded8755..d25f1d0b4c8d 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,7 +6,7 @@ let pname = "wlroots"; - version = "0.2"; + version = "0.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,14 +14,9 @@ in stdenv.mkDerivation rec { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "0gfxawjlb736xl90zfv3n6zzf5n1cacgzflqi1zq1wn7wd3j6ppv"; + sha256 = "1iz5lxpiba1lcmkz3hz56r8j6ra3535zgckazqshi4c364nx94zs"; }; - postPatch = '' - substituteInPlace meson.build \ - --replace "version: '0.1.0'" "version: '${version}.0'" - ''; - # $out for the library, $bin for rootston, and $examples for the example # programs (in examples) AND rootston outputs = [ "out" "bin" "examples" ]; @@ -39,6 +34,11 @@ in stdenv.mkDerivation rec { "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled" ]; + postPatch = '' + # It happens from time to time that the version wasn't updated: + sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build + ''; + postInstall = '' # Install rootston (the reference compositor) to $bin and $examples for output in "$bin" "$examples"; do From f73a8b22fbed2193edcc97884f6ddbc167ebe7c4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 11:57:19 +0100 Subject: [PATCH 104/193] sway-beta: 1.0-beta.2 -> 1.0-rc1 --- pkgs/applications/window-managers/sway/beta.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix index fd3e2275b442..8b2acc94ea08 100644 --- a/pkgs/applications/window-managers/sway/beta.nix +++ b/pkgs/applications/window-managers/sway/beta.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , meson, ninja , pkgconfig, scdoc -, wayland, libxkbcommon, pcre, json_c, dbus +, wayland, libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk_pixbuf , wlroots, wayland-protocols , buildDocs ? true @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "sway"; - version = "1.0-beta.2"; + version = "1.0-rc1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0f9rniwizbc3vzxdy6rc47749p6gczfbgfdy4r458134rbl551hw"; + sha256 = "1zigx2yz0i91iz2r2l6csq33hscaybmaq1p19jgxrazms7z213mz"; }; nativeBuildInputs = [ @@ -24,14 +24,17 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional buildDocs scdoc; buildInputs = [ - wayland libxkbcommon pcre json_c dbus + wayland libxkbcommon pcre json_c dbus libevdev pango cairo libinput libcap pam gdk_pixbuf wlroots wayland-protocols ]; enableParallelBuilding = true; - mesonFlags = "-Dsway-version=${version}"; + mesonFlags = [ + "-Dsway-version=${version}" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" + "-Dman-pages=enabled" "-Dtray=enabled" + ]; meta = with stdenv.lib; { description = "i3-compatible window manager for Wayland"; From ebe36008d610c5e26c65d8281489a9c2e5ef8991 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 12:01:42 +0100 Subject: [PATCH 105/193] nixos/sway-beta: Install swaylock and swayidle by default --- nixos/modules/programs/sway-beta.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/sway-beta.nix b/nixos/modules/programs/sway-beta.nix index 7fc5979a38aa..3c235de0ce63 100644 --- a/nixos/modules/programs/sway-beta.nix +++ b/nixos/modules/programs/sway-beta.nix @@ -60,10 +60,11 @@ in { extraPackages = mkOption { type = with types; listOf package; default = with pkgs; [ + swaylock swayidle xwayland rxvt_unicode dmenu ]; defaultText = literalExample '' - with pkgs; [ xwayland rxvt_unicode dmenu ]; + with pkgs; [ swaylock swayidle xwayland rxvt_unicode dmenu ]; ''; example = literalExample '' with pkgs; [ From f7a16402b4dfbe2b702542a0705a1bd604ff3ec7 Mon Sep 17 00:00:00 2001 From: Duarte David Date: Sun, 3 Feb 2019 16:31:30 +0100 Subject: [PATCH 106/193] coredns: Add deltaevo as maintainer --- pkgs/servers/dns/coredns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 76452ae9d8d0..214c3e91f0ef 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { homepage = https://coredns.io; description = "A DNS server that runs middleware"; license = licenses.asl20; - maintainers = [ maintainers.rushmorem maintainers.rtreffer ]; + maintainers = [ maintainers.rushmorem maintainers.rtreffer maintainers.deltaevo ]; }; } From abac6afe93a60c6078c7d86b93fbbace4da3b363 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 3 Feb 2019 15:35:55 +0000 Subject: [PATCH 107/193] pkgconfig: rename to pkg-config (#55094) Package attrs should map to the pname. It's confusing otherwise. pkg-config is also the name used by most distributions: Debian, Homebrew, Guix, OpenSuse other distributions like FreeBSD ports, Fedora and Arch Linux call it "pkgconf" Waiting a few releases to make a tree-wide change to make it easier to back-port things. --- .../misc/{pkgconfig => pkg-config}/2.36.3-not-win32.patch | 0 .../tools/misc/{pkgconfig => pkg-config}/default.nix | 0 .../misc/{pkgconfig => pkg-config}/requires-private.patch | 0 .../tools/misc/{pkgconfig => pkg-config}/setup-hook.sh | 0 pkgs/top-level/all-packages.nix | 6 ++++-- 5 files changed, 4 insertions(+), 2 deletions(-) rename pkgs/development/tools/misc/{pkgconfig => pkg-config}/2.36.3-not-win32.patch (100%) rename pkgs/development/tools/misc/{pkgconfig => pkg-config}/default.nix (100%) rename pkgs/development/tools/misc/{pkgconfig => pkg-config}/requires-private.patch (100%) rename pkgs/development/tools/misc/{pkgconfig => pkg-config}/setup-hook.sh (100%) diff --git a/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch b/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch similarity index 100% rename from pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch rename to pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix similarity index 100% rename from pkgs/development/tools/misc/pkgconfig/default.nix rename to pkgs/development/tools/misc/pkg-config/default.nix diff --git a/pkgs/development/tools/misc/pkgconfig/requires-private.patch b/pkgs/development/tools/misc/pkg-config/requires-private.patch similarity index 100% rename from pkgs/development/tools/misc/pkgconfig/requires-private.patch rename to pkgs/development/tools/misc/pkg-config/requires-private.patch diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkg-config/setup-hook.sh similarity index 100% rename from pkgs/development/tools/misc/pkgconfig/setup-hook.sh rename to pkgs/development/tools/misc/pkg-config/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49c6e774d3e7..1dc927f42b0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8945,11 +8945,13 @@ in pkgconf = callPackage ../development/tools/misc/pkgconf {}; - pkgconfig = callPackage ../development/tools/misc/pkgconfig { + pkg-config = callPackage ../development/tools/misc/pkg-config { fetchurl = fetchurlBoot; }; + pkgconfig = pkg-config; # added 2018-02-02 - pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; }); + pkg-configUpstream = lowPrio (pkg-config.override { vanilla = true; }); + pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 postiats-utilities = callPackage ../development/tools/postiats-utilities {}; From a29294cb95d0784d0380a212610f26dadf8b89c3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 3 Feb 2019 16:47:01 +0100 Subject: [PATCH 108/193] nixos/ndppd: register test --- 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 0c8284eb08d0..96b34755d6f5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -142,6 +142,7 @@ in nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; }; + ndppd = handleTest ./ndppd.nix {}; neo4j = handleTest ./neo4j.nix {}; netdata = handleTest ./netdata.nix {}; networking.networkd = handleTest ./networking.nix { networkd = true; }; From dae8dfd69f4bd8686a22fdbbf026018a87889905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 3 Feb 2019 16:25:17 +0100 Subject: [PATCH 109/193] haxor-news: use patch to allow newer click version --- pkgs/applications/misc/haxor-news/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 1fa016627d4e..e09e65738e5d 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python }: +{ stdenv, python, fetchpatch }: with python.pkgs; @@ -11,6 +11,12 @@ buildPythonApplication rec { sha256 = "5b9af8338a0f8b95a8133b66ef106553823813ac171c0aefa3f3f2dbeb4d7f88"; }; + # allow newer click version + patches = fetchpatch { + url = "${meta.homepage}/commit/5b0d3ef1775756ca15b6d83fba1fb751846b5427.patch"; + sha256 = "1551knh2f7yarqzcpip16ijmbx8kzdna8cihxlxx49ww55f5sg67"; + }; + propagatedBuildInputs = [ click colorama From 769510f9b3f394b0d063f8f9e6c4e2d813c09ea2 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sun, 3 Feb 2019 18:34:41 +0200 Subject: [PATCH 110/193] gpodder: 3.10.6 -> 3.10.7 --- pkgs/applications/audio/gpodder/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 2da60a8bfd8d..2544be383e5d 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.6"; + version = "3.10.7"; format = "other"; src = fetchFromGitHub { - owner = "gpodder"; - repo = "gpodder"; + owner = pname; + repo = pname; rev = version; - sha256 = "11nccsnlxrj8wwl8dyz9a0yrzma6ipx5gwj2lc7m308z60r8wvjs"; + sha256 = "0sx9rj6dpvd2xz7lak2yi0zlgr3lp2ng1fw23s39la9ly4g1835j"; }; postPatch = with stdenv.lib; '' From bda21694d1a8acd8ac06ec8f4ce3830051b42378 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 17:52:53 +0100 Subject: [PATCH 111/193] wlroots: Fix the ELF binaries (rootston + examples) Due to stdenv changes the binaries where broken during the fixup phase (while stripping all binaries). The current solution isn't optimal but there must not be any cyclic dependencies on $out. --- .../development/libraries/wlroots/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index d25f1d0b4c8d..6e7090a9c5b7 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -40,14 +40,21 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - # Install rootston (the reference compositor) to $bin and $examples + # Copy the library to $bin and $examples + for output in "$bin" "$examples"; do + mkdir -p $output/lib + cp -P libwlroots* $output/lib/ + done + ''; + + postFixup = '' + # Install rootston (the reference compositor) to $bin and $examples (this + # has to be done after the fixup phase to prevent broken binaries): for output in "$bin" "$examples"; do mkdir -p $output/bin cp rootston/rootston $output/bin/ - mkdir $output/lib - cp libwlroots* $output/lib/ patchelf \ - --set-rpath "$output/lib:${stdenv.lib.makeLibraryPath buildInputs}" \ + --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \ $output/bin/rootston mkdir $output/etc cp ../rootston/rootston.ini.example $output/etc/rootston.ini @@ -59,10 +66,10 @@ in stdenv.mkDerivation rec { mkdir -p $examples/bin cd ./examples for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do - patchelf \ - --set-rpath "$examples/lib:${stdenv.lib.makeLibraryPath buildInputs}" \ - "$binary" cp "$binary" "$examples/bin/wlroots-$binary" + patchelf \ + --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \ + "$examples/bin/wlroots-$binary" done ''; From b3c994185a46872cd4737b6727ea9480e7af06d0 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 3 Feb 2019 19:19:25 +0100 Subject: [PATCH 112/193] disorderfs: 0.5.5 -> 0.5.6 --- pkgs/tools/filesystems/disorderfs/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index 07a9015fa28e..b8028741d57f 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -2,19 +2,17 @@ stdenv.mkDerivation rec { name = "disorderfs-${version}"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz"; - sha256 = "1y1i7k5mx2pxr9bpijnsjyyw8qd7ak1h48gf6a6ca3dhna9ws6i1"; + url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.bz2"; + sha256 = "0xlsl6cw1p0d92crknrcf4iabgig0185dzp80qxh9iyjy42d27gk"; }; nativeBuildInputs = [ pkgconfig asciidoc ]; buildInputs = [ fuse attr ]; - sourceRoot = "."; - installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { From 13e6180fba4db21906cb17af17416897dc8c9263 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 20:01:03 +0000 Subject: [PATCH 113/193] libcardiacarrest: 12.1-7 -> 12.2.8 --- pkgs/misc/libcardiacarrest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix index 1a07878b3302..7f355bc81560 100644 --- a/pkgs/misc/libcardiacarrest/default.nix +++ b/pkgs/misc/libcardiacarrest/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libcardiacarrest-${version}"; - version = "12.1-7"; # - + version = "12.2.8"; # . src = fetchFromGitHub { owner = "oxij"; repo = "libcardiacarrest"; - rev = "d44288d9a24d6b7793fb36a4c9a548b6b55375ec"; - sha256 = "0j3l5s6r9hgpy5y7q7kx0rkh05rk0bgfdvzbmadqps720lqjs4xm"; + rev = "d89639f5b2d298cf74af26880f5ebf50e645166d"; + sha256 = "0vrigwcw3g8zknqyznv6y3437ahn1w00gv3d303smmygr0p8bd94"; }; outputs = [ "out" "dev" ]; From c77728de7b8b0d42c3f1f961cc55999e82eb52e2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 3 Feb 2019 19:31:25 -0500 Subject: [PATCH 114/193] linux: 5.0-rc4 -> 5.0-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 22e31f2aec1c..b1e74da256b6 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.0-rc4"; - modDirVersion = "5.0.0-rc4"; + version = "5.0-rc5"; + modDirVersion = "5.0.0-rc5"; extraMeta.branch = "5.0"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "061afxv1d29w5kkb1rxrz3ax7pc5x8yhx5yjf9p1dbh7lw64rglh"; + sha256 = "0a60svgiz06cq4hq5z1rmwyjq1748fm7wi87arl659aidp0r0qky"; }; # Should the testing kernels ever be built on Hydra? From bcea7dd394abb03b69c32e8c7719d5111efca958 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 3 Feb 2019 18:56:09 -0600 Subject: [PATCH 115/193] zsh: 5.7 -> 5.7.1 --- pkgs/shells/zsh/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 86f499b4b564..3e4b756044bc 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pcre, fetchpatch }: let - version = "5.7"; + version = "5.7.1"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; - sha256 = "0pgisyi82pg5mycx1k7vfx9hwzl6zq00r5s9v91lg4gqisvlvagh"; + sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh"; }; in @@ -15,18 +15,9 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; - sha256 = "04ynid3ggvy6i5c26bk52mq6x5vyrdwgryid9hggmnb1nf8b41vq"; + sha256 = "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j"; }; - patches = [ - (fetchpatch { - name = "vcs_info.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vcs_info.patch?h=packages/zsh&id=1b7537ff5343819b3110a76bbdd2a1bf9ef80c4a"; - sha256 = "0rc63cdc0qzhmj2dp5jnmxgyl5c47w857s8379fq36z8g0bi3rwq"; - excludes = [ "ChangeLog" ]; - }) - ]; - buildInputs = [ ncurses pcre ]; configureFlags = [ From e27eaf6111842f5e7765d05fa2e7f4c0cdd76e1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 Feb 2019 17:20:27 -0800 Subject: [PATCH 116/193] star: 2.6.1d -> 2.7.0a Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/star/versions --- pkgs/applications/science/biology/star/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index cbe38649503b..4d1d60469f0e 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "star-${version}"; - version = "2.6.1d"; + version = "2.7.0a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "1h0j8qj95a0brv7p3gxmg3z7z6f4670jzjg56kzyc33k8dmzxvli"; + sha256 = "1yx28gra6gqdx1ps5y8mpdinsn8r0dhsc2m3gcvjfrk71i9yhd6l"; }; sourceRoot = "source/source"; From a8da72b01213af6eb40cbea94290ae1c3b0f1600 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 4 Feb 2019 03:56:43 +0100 Subject: [PATCH 117/193] nixos/tests/postgresql: fix regression from #55106 --- nixos/tests/postgresql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index cf1de2f6acbf..ae5d6d095ea2 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -68,6 +68,6 @@ let }; in (mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // { - postgresql_11-backup-all = make-postgresql-test name postgresql-versions.postgresql_11 true; + postgresql_11-backup-all = make-postgresql-test "postgresql_11-backup-all" postgresql-versions.postgresql_11 true; } From f8f14c9a63ff37636ca92cbb133e3acb5cdf5c63 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 Feb 2019 20:02:35 -0800 Subject: [PATCH 118/193] recoll: 1.24.4 -> 1.24.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/recoll/versions --- pkgs/applications/search/recoll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 15c78fd81bb5..b0ac580d1622 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -8,12 +8,12 @@ assert stdenv.hostPlatform.system != "powerpc-linux"; stdenv.mkDerivation rec { - ver = "1.24.4"; + ver = "1.24.5"; name = "recoll-${ver}"; src = fetchurl { url = "https://www.lesbonscomptes.com/recoll/${name}.tar.gz"; - sha256 = "0b1rz679gbv2qy5b5jgr25h1dk8560iac16lq0h2021nrv6ix74q"; + sha256 = "10m3a0ghnyipjcxapszlr8adyy2yaaxx4vgrkxrfmz13814z89cv"; }; configureFlags = [ "--enable-recollq" ] From f81c0c1d8efe3b03a982b9d5ceef58d6f6313005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claes=20Wallin=20=28=E9=9F=8B=E5=98=89=E8=AA=A0=29?= Date: Mon, 4 Feb 2019 06:52:59 +0100 Subject: [PATCH 119/193] racket, racket-minimal: 7.1 -> 7.2 (#54994) The old src/configure has been split into src/lt/configure for classical Racket and src/cs/c/configure for Racket CS (Racket on Chez Scheme). --- pkgs/development/interpreters/racket/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 8ba08b23c259..2d4008d69b98 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { preConfigure = '' unset AR - for f in src/configure src/racket/src/string.c; do + for f in src/lt/configure src/cs/c/configure src/racket/src/string.c; do substituteInPlace "$f" --replace /usr/bin/uname ${coreutils}/bin/uname done mkdir src/build From 76c0ebc710de75ec0aa9687678404a5851b228bf Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Mon, 4 Feb 2019 10:19:14 +0200 Subject: [PATCH 120/193] lxd: fix sh not in path (#55073) lxd: add bash to PATH --- pkgs/tools/admin/lxd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 9eb249bc5879..e48b525caba6 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -3,6 +3,7 @@ , squashfsTools, iproute, iptables, ebtables, libcap, dqlite , sqlite-replication , writeShellScriptBin, apparmor-profiles, apparmor-parser +, bash }: buildGoPackage rec { @@ -30,8 +31,8 @@ buildGoPackage rec { # binaries from test/ rm $bin/bin/{deps,macaroon-identity} - wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [ - acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables + wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ + acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" '') From 787a73639e1dd09d9734db62e91f8a9301e24179 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 4 Feb 2019 00:04:02 -0200 Subject: [PATCH 121/193] Office Code Pro: init at 1.004 --- pkgs/data/fonts/office-code-pro/default.nix | 36 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/data/fonts/office-code-pro/default.nix diff --git a/pkgs/data/fonts/office-code-pro/default.nix b/pkgs/data/fonts/office-code-pro/default.nix new file mode 100644 index 000000000000..564b950784be --- /dev/null +++ b/pkgs/data/fonts/office-code-pro/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "office-code-pro"; + version = "1.004"; + + src = fetchFromGitHub { + owner = "nathco"; + repo = "Office-Code-Pro"; + rev = version; + sha256 = "0znmjjyn5q83chiafy252bhsmw49r2nx2ls2cmhjp4ihidfr6cmb"; + }; + + installPhase = '' + fontDir=$out/share/fonts/opentype + docDir=$out/share/doc/${pname}-${version} + mkdir -p $fontDir $docDir + install -Dm644 README.md $docDir + install -t $fontDir -m644 'Fonts/Office Code Pro/OTF/'*.otf + install -t $fontDir -m644 'Fonts/Office Code Pro D/OTF/'*.otf + ''; + + meta = with stdenv.lib; { + description = "A customized version of Source Code Pro"; + longDescription = '' + Office Code Pro is a customized version of Source Code Pro, the monospaced + sans serif originally created by Paul D. Hunt for Adobe Systems + Incorporated. The customizations were made specifically for text editors + and coding environments, but are still very usable in other applications. + ''; + homepage = https://github.com/nathco/Office-Code-Pro; + license = licenses.ofl; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2ead70e50d7..5e1208d6b0cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15716,6 +15716,8 @@ in numix-cursor-theme = callPackage ../data/icons/numix-cursor-theme { }; + office-code-pro = callPackage ../data/fonts/office-code-pro { }; + oldstandard = callPackage ../data/fonts/oldstandard { }; oldsindhi = callPackage ../data/fonts/oldsindhi { }; From 3bfab849294daeb5b23fcfe7e13bf8e45e1f9b1a Mon Sep 17 00:00:00 2001 From: David Smith Date: Mon, 4 Feb 2019 09:54:25 +0000 Subject: [PATCH 122/193] maintainers: add shmish111 --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bed5a9aa002b..69cdb0b47ccd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5166,4 +5166,9 @@ github = "mredaelli"; name = "Massimo Redaelli"; }; + shmish111 = { + email = "shmish111@gmail.com"; + github = "shmish111"; + name = "David Smith"; + }; } From 2ba891788bacfb2c52f25a7a119b88c6cc298e35 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 4 Feb 2019 20:30:58 +0900 Subject: [PATCH 123/193] Lua generate nix packages from luarocks (#54978) * lua: generate packages from luarocks * luarocks-nix: update * removed packages already available in nixpkgs * adressing reviews update script can now accept another csv file as input with -c * Remove obsolete comment --- maintainers/scripts/luarocks-packages.csv | 21 + maintainers/scripts/update-luarocks-packages | 112 ++++ .../interpreters/lua-5/build-lua-package.nix | 182 +++++++ .../interpreters/lua-5/setup-hook.sh | 6 +- .../interpreters/lua-5/wrap-lua.nix | 19 + pkgs/development/interpreters/lua-5/wrap.sh | 99 ++++ .../interpreters/lua-5/wrapper.nix | 2 +- pkgs/development/lua-modules/default.nix | 17 +- .../lua-modules/generated-packages.nix | 482 ++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 33 ++ .../tools/misc/luarocks/luarocks-nix.nix | 4 +- pkgs/top-level/lua-packages.nix | 12 + 12 files changed, 981 insertions(+), 8 deletions(-) create mode 100644 maintainers/scripts/luarocks-packages.csv create mode 100755 maintainers/scripts/update-luarocks-packages create mode 100644 pkgs/development/interpreters/lua-5/build-lua-package.nix create mode 100644 pkgs/development/interpreters/lua-5/wrap-lua.nix create mode 100644 pkgs/development/interpreters/lua-5/wrap.sh create mode 100644 pkgs/development/lua-modules/generated-packages.nix create mode 100644 pkgs/development/lua-modules/overrides.nix diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv new file mode 100644 index 000000000000..e7c42925c5b2 --- /dev/null +++ b/maintainers/scripts/luarocks-packages.csv @@ -0,0 +1,21 @@ +ansicolors, +argparse, +dkjson +lrexlib-gnu, +lrexlib-posix, +ltermbox, +lua-cmsgpack, +lua_cliargs, +lua-term, +luaffi,http://luarocks.org/dev, +luuid, +penlight, +say, +luv, +luasystem, +mediator_lua,http://luarocks.org/manifests/teto +mpack,http://luarocks.org/manifests/teto +nvim-client,http://luarocks.org/manifests/teto +busted,http://luarocks.org/manifests/teto +luassert,http://luarocks.org/manifests/teto +coxpcall,https://luarocks.org/manifests/hisham,1.17.0-1 diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages new file mode 100755 index 000000000000..aa922c19860f --- /dev/null +++ b/maintainers/scripts/update-luarocks-packages @@ -0,0 +1,112 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix-prefetch-scripts luarocks-nix -i bash + +# You'll likely want to use +# `` +# nixpkgs $ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix +# `` +# to update all libraries in that folder. +# to debug, redirect stderr to stdout with 2>&1 + + +# stop the script upon C-C +set -eu -o pipefail + +if [ $# -lt 1 ]; then + print_help + exit 1 +fi + +CSV_FILE="maintainers/scripts/luarocks-packages.csv" +TMP_FILE="$(mktemp)" + +exit_trap() +{ + local lc="$BASH_COMMAND" rc=$? + test $rc -eq 0 || echo -e "*** error $rc: $lc.\nGenerated temporary file in $TMP_FILE" >&2 +} +trap exit_trap EXIT + +print_help() { + echo "Usage: $0 " + echo "(most likely pkgs/development/lua-modules/generated-packages.nix)" + echo "" + echo " -c to set the list of luarocks package to generate" + exit 1 +} + + +while getopts ":hc:" opt; do + case $opt in + h) + print_help + ;; + c) + echo "Loading package list from $OPTARG !" >&2 + CSV_FILE="$OPTARG" + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + ;; + esac + shift $((OPTIND-1)) +done + +GENERATED_NIXFILE="$1" + +HEADER=" +/* ${GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! +Regenerate it with: +nixpkgs$ ${0} ${GENERATED_NIXFILE} + +These packages are manually refined in lua-overrides.nix +*/ +{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +self: super: +with self; +{ +" + +FOOTER=" +} +/* GENERATED */ +" + + +function convert_pkg () { + pkg="$1" + server="" + if [ ! -z "$2" ]; then + server=" --server=$2" + fi + + version="${3:-}" + + echo "looking at $pkg (version $version) from server [$server]" >&2 + cmd="luarocks nix $server $pkg $version" + drv="$($cmd)" + if [ $? -ne 0 ]; then + echo "Failed to convert $pkg" >&2 + echo "$drv" >&2 + else + echo "$drv" | tee -a "$TMP_FILE" + fi +} + +# params needed when called via callPackage +echo "$HEADER" | tee "$TMP_FILE" + +# list of packages with format +# name,server,version +while IFS=, read -r pkg_name server version +do + if [ -z "$pkg_name" ]; then + echo "Skipping empty package name" >&2 + fi + convert_pkg "$pkg_name" "$server" "$version" +done < "$CSV_FILE" + +# close the set +echo "$FOOTER" | tee -a "$TMP_FILE" + +cp "$TMP_FILE" "$GENERATED_NIXFILE" diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix new file mode 100644 index 000000000000..0bed5efe4f79 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -0,0 +1,182 @@ +# Generic builder for lua packages +{ lib +, lua +, stdenv +, wrapLua +, unzip +, writeText +# Whether the derivation provides a lua module or not. +, toLuaModule +}: + +{ +name ? "${attrs.pname}-${attrs.version}" + +, version + +# by default prefix `name` e.g. "lua5.2-${name}" +, namePrefix ? "lua" + lua.luaversion + "-" + +# Dependencies for building the package +, buildInputs ? [] + +# Dependencies needed for running the checkPhase. +# These are added to buildInputs when doCheck = true. +, checkInputs ? [] + +# propagate build dependencies so in case we have A -> B -> C, +# C can import package A propagated by B +, propagatedBuildInputs ? [] +, propagatedNativeBuildInputs ? [] + +# used to disable derivation, useful for specific lua versions +, disabled ? false + +# Additional arguments to pass to the makeWrapper function, which wraps +# generated binaries. +, makeWrapperArgs ? [] +, external_deps ? propagatedBuildInputs ++ buildInputs + +# Skip wrapping of lua programs altogether +, dontWrapLuaPrograms ? false + +, meta ? {} + +, passthru ? {} +, doCheck ? false + +# appended to the luarocks generated config +# in peculiar variables like { EVENT_INCDIR } can be useful to work around +# luarocks limitations, ie, luarocks consider include/lib folders to be subfolders of the same package in external_deps_dirs +# as explained in https://github.com/luarocks/luarocks/issues/766 +, extraConfig ? "" + +# relative to srcRoot, path to the rockspec to use when using rocks +, rockspecFilename ? "../*.rockspec" + +# must be set for packages that don't have a rock +, knownRockspec ? null + +, ... } @ attrs: + + +# Keep extra attributes from `attrs`, e.g., `patchPhase', etc. +if disabled +then throw "${name} not supported for interpreter ${lua}" +else + +let + + deps_dirs= lib.concatStringsSep ", " ( + map (x: "\"${builtins.toString x}\"") external_deps + ); + + # TODO + # - add rocktrees (look at torch-distro.nix/https://github.com/luarocks/luarocks/wiki/Config-file-format) + # - silence warnings + luarocks_config = "luarocksConfig"; + luarocks_content = '' + local_cache = "" + -- array of strings + external_deps_dirs = { + ${deps_dirs} + } + rocks_trees = { + } + ${extraConfig} + ''; +in +toLuaModule ( lua.stdenv.mkDerivation ( +builtins.removeAttrs attrs ["disabled" "checkInputs"] // { + + name = namePrefix + name; + + buildInputs = [ wrapLua lua.pkgs.luarocks ] + ++ buildInputs + ++ lib.optionals doCheck checkInputs + ; + + # propagate lua to active setup-hook in nix-shell + propagatedBuildInputs = propagatedBuildInputs ++ [ lua ]; + doCheck = false; + + # enabled only for src.rock + setSourceRoot= let + name_only=(builtins.parseDrvName name).name; + in + lib.optionalString (knownRockspec == null) '' + # format is rockspec_basename/source_basename + # rockspec can set it via spec.source.dir + folder=$(find . -mindepth 2 -maxdepth 2 -type d -path '*${name_only}*/*'|head -n1) + sourceRoot="$folder" + ''; + + configurePhase = '' + runHook preConfigure + + cat > ${luarocks_config} <= 1 )); then + LUAROCKS="$LUAROCKS --verbose" + fi + + patchShebangs . + + runHook postBuild + ''; + + postFixup = lib.optionalString (!dontWrapLuaPrograms) '' + wrapLuaPrograms + '' + attrs.postFixup or ''''; + + installPhase = attrs.installPhase or '' + runHook preInstall + + # luarocks make assumes sources are available in cwd + # After the build is complete, it also installs the rock. + # If no argument is given, it looks for a rockspec in the current directory + # but some packages have several rockspecs in their source directory so + # we force the use of the upper level since it is + # the sole rockspec in that folder + # maybe we could reestablish dependency checking via passing --rock-trees + + nix_debug "ROCKSPEC $rockspecFilename" + nix_debug "cwd: $PWD" + $LUAROCKS make --deps-mode=none --tree $out ''${rockspecFilename} + + # to prevent collisions when creating environments + # also added -f as it doesn't always exist + # don't remove the whole directory as + rm -rf $out/lib/luarocks/rocks/manifest + + runHook postInstall + ''; + + passthru = { + inherit lua; # The lua interpreter + } // passthru; + + meta = with lib.maintainers; { + platforms = lua.meta.platforms; + # add extra maintainer(s) to every package + maintainers = (meta.maintainers or []) ++ [ ]; + } // meta; +})) diff --git a/pkgs/development/interpreters/lua-5/setup-hook.sh b/pkgs/development/interpreters/lua-5/setup-hook.sh index 5e37bd27f617..3989bedffdb1 100644 --- a/pkgs/development/interpreters/lua-5/setup-hook.sh +++ b/pkgs/development/interpreters/lua-5/setup-hook.sh @@ -1,7 +1,7 @@ # set -e nix_print() { - if (( "${NIX_DEBUG:-0}" >= $1 )); then + if [ ${NIX_DEBUG:-0} -ge $1 ]; then echo "$2" fi } @@ -32,13 +32,13 @@ addToLuaPath() { cd "$dir" for pattern in @luapathsearchpaths@; do - addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern" + addToLuaSearchPathWithCustomDelimiter NIX_LUA_PATH "$PWD/$pattern" done # LUA_CPATH for pattern in @luacpathsearchpaths@; do - addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern" + addToLuaSearchPathWithCustomDelimiter NIX_LUA_CPATH "$PWD/$pattern" done cd - >/dev/null } diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/pkgs/development/interpreters/lua-5/wrap-lua.nix new file mode 100644 index 000000000000..f00e0d5ac336 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -0,0 +1,19 @@ +{ lib +, lua +, makeSetupHook +, makeWrapper +}: + +with lib; + +# defined in trivial-builders.nix +# imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput +makeSetupHook { + deps = makeWrapper; + substitutions.executable = lua.interpreter; + substitutions.lua = lua; + substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; + substitutions.LuaCPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; + +} ./wrap.sh + diff --git a/pkgs/development/interpreters/lua-5/wrap.sh b/pkgs/development/interpreters/lua-5/wrap.sh new file mode 100644 index 000000000000..545a0ae271c4 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/wrap.sh @@ -0,0 +1,99 @@ +# Inspired by python/wrapper.nix +# Wrapper around wrapLuaProgramsIn, below. The $luaPath +# variable is passed in from the buildLuarocksPackage function. +set -e + +wrapLuaPrograms() { + wrapLuaProgramsIn "$out/bin" "$out $luaPath" +} + +# Builds environment variables like LUA_PATH and PATH walking through closure +# of dependencies. +buildLuaPath() { + local luaPath="$1" + local path + + # Create an empty table of paths (see doc on loadFromPropagatedInputs + # for how this is used). Build up the program_PATH and program_LUA_PATH + # variables. + declare -A luaPathsSeen=() + program_PATH= + luaPathsSeen["@lua@"]=1 + addToSearchPath program_PATH @lua@/bin + for path in $luaPath; do + addToLuaPath "$path" + done +} + + +# with an executable shell script which will set some environment variables +# and then call into the original binary (which has been given a .wrapped suffix). +# luaPath is a list of directories +wrapLuaProgramsIn() { + local dir="$1" + local luaPath="$2" + local f + + buildLuaPath "$luaPath" + + if [ ! -d "$dir" ]; then + nix_debug "$dir not a directory" + return + fi + + nix_debug "wrapping programs in [$dir]" + + # Find all regular files in the output directory that are executable. + find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do + # Rewrite "#! .../env lua" to "#! /nix/store/.../lua". + # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which + # Lua to use besides one with this hook anyway. + if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then + sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^" + fi + + # wrapProgram creates the executable shell script described + # above. The script will set LUA_(C)PATH and PATH variables! + # (see pkgs/build-support/setup-hooks/make-wrapper.sh) + local -a wrap_args=("$f" + --prefix PATH ':' "$program_PATH" + --prefix LUA_PATH ';' "$NIX_LUA_PATH" + --prefix LUA_CPATH ';' "$NIX_LUA_CPATH" + ) + + # Add any additional arguments provided by makeWrapperArgs + # argument to buildLuaPackage. + # makeWrapperArgs + local -a user_args="($makeWrapperArgs)" + local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") + + # see setup-hooks/make-wrapper.sh + wrapProgram "${wrapProgramArgs[@]}" + + done +} + +# Adds the lib and bin directories to the LUA_PATH and PATH variables, +# respectively. Recurses on any paths declared in +# `propagated-native-build-inputs`, while avoiding duplicating paths by +# flagging the directories it has visited in `luaPathsSeen`. +loadFromPropagatedInputs() { + local dir="$1" + # Stop if we've already visited here. + if [ -n "${luaPathsSeen[$dir]}" ]; then + return; + fi + luaPathsSeen[$dir]=1 + + addToLuaPath "$dir" + addToSearchPath program_PATH $dir/bin + + # Inspect the propagated inputs (if they exist) and recur on them. + local prop="$dir/nix-support/propagated-native-build-inputs" + if [ -e "$prop" ]; then + local new_path + for new_path in $(cat $prop); do + loadFromPropagatedInputs "$new_path" + done + fi +} diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix index 9abbd77d575e..7f584c0f0aff 100644 --- a/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -44,7 +44,7 @@ let rm -f "$out/bin/$prg" if [ -x "$prg" ]; then nix_debug "Making wrapper $prg" - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$NIX_LUA_PATH" --suffix LUA_CPATH ';' "$NIX_LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/pkgs/development/lua-modules/default.nix b/pkgs/development/lua-modules/default.nix index c20d4d02c65f..372d609792c2 100644 --- a/pkgs/development/lua-modules/default.nix +++ b/pkgs/development/lua-modules/default.nix @@ -6,12 +6,25 @@ let - inherit (lib) extends makeExtensible; + inherit (lib) extends; initialPackages = (pkgs.callPackage ../../top-level/lua-packages.nix { inherit lua; }); - extensible-self = makeExtensible initialPackages; + overridenPackages = import ./overrides.nix { inherit pkgs; }; + + generatedPackages = if (builtins.pathExists ./generated-packages.nix) then + pkgs.callPackage ./generated-packages.nix { } else (self: super: {}); + + extensible-self = lib.makeExtensible + (extends overrides + (extends overridenPackages + (extends generatedPackages + initialPackages + ) + ) + ) + ; in extensible-self diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix new file mode 100644 index 000000000000..353eaa6e9601 --- /dev/null +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -0,0 +1,482 @@ + +/* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT! +Regenerate it with: +nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix + +These packages are manually refined in lua-overrides.nix +*/ +{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +self: super: +with self; +{ + +ansicolors = buildLuarocksPackage { + pname = "ansicolors"; + version = "1.0.2-3"; + + src = fetchurl { + url = https://luarocks.org/ansicolors-1.0.2-3.src.rock; + sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/kikito/ansicolors.lua"; + description="Library for color Manipulation."; + license = { + fullName = "MIT "; + }; + }; +}; +argparse = buildLuarocksPackage { + pname = "argparse"; + version = "0.6.0-1"; + + src = fetchurl { + url = https://luarocks.org/argparse-0.6.0-1.src.rock; + sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4"; + }; + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/mpeterv/argparse"; + description="A feature-rich command-line argument parser"; + license = { + fullName = "MIT"; + }; + }; +}; +dkjson = buildLuarocksPackage { + pname = "dkjson"; + version = "2.5-2"; + + src = fetchurl { + url = https://luarocks.org/dkjson-2.5-2.src.rock; + sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; + }; + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://dkolf.de/src/dkjson-lua.fsl/"; + description="David Kolf's JSON module for Lua"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +lrexlib-gnu = buildLuarocksPackage { + pname = "lrexlib-gnu"; + version = "2.9.0-1"; + + src = fetchurl { + url = https://luarocks.org/lrexlib-gnu-2.9.0-1.src.rock; + sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://github.com/rrthomas/lrexlib"; + description="Regular expression library binding (GNU flavour)."; + license = { + fullName = "MIT/X11"; + }; + }; +}; +lrexlib-posix = buildLuarocksPackage { + pname = "lrexlib-posix"; + version = "2.9.0-1"; + + src = fetchurl { + url = https://luarocks.org/lrexlib-posix-2.9.0-1.src.rock; + sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://github.com/rrthomas/lrexlib"; + description="Regular expression library binding (POSIX flavour)."; + license = { + fullName = "MIT/X11"; + }; + }; +}; +ltermbox = buildLuarocksPackage { + pname = "ltermbox"; + version = "0.2-1"; + + src = fetchurl { + url = https://luarocks.org/ltermbox-0.2-1.src.rock; + sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://code.google.com/p/termbox"; + description="A termbox library package"; + license = { + fullName = "New BSD License"; + }; + }; +}; +lua-cmsgpack = buildLuarocksPackage { + pname = "lua-cmsgpack"; + version = "0.4.0-0"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec; + sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/antirez/lua-cmsgpack.git", + "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", + "date": "2018-06-14T11:56:56+02:00", + "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://github.com/antirez/lua-cmsgpack"; + description="MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; + license = { + fullName = "Two-clause BSD"; + }; + }; +}; +lua_cliargs = buildLuarocksPackage { + pname = "lua_cliargs"; + version = "3.0-2"; + + src = fetchurl { + url = https://luarocks.org/lua_cliargs-3.0-2.src.rock; + sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/amireh/lua_cliargs"; + description="A command-line argument parser."; + license = { + fullName = "MIT "; + }; + }; +}; +lua-term = buildLuarocksPackage { + pname = "lua-term"; + version = "0.7-1"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/lua-term-0.7-1.rockspec; + sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; + }).outPath; + + src = fetchurl { + url = https://github.com/hoelzro/lua-term/archive/0.07.tar.gz; + sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; + }; + + + + buildType="builtin"; + + meta = { + homepage = "https://github.com/hoelzro/lua-term"; + description="Terminal functions for Lua"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +luaffi = buildLuarocksPackage { + pname = "luaffi"; + version = "scm-1"; + + src = fetchurl { + url = http://luarocks.org/dev/luaffi-scm-1.src.rock; + sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/facebook/luaffifb"; + description="FFI library for calling C functions from lua"; + license = { + fullName = "BSD"; + }; + }; +}; +luuid = buildLuarocksPackage { + pname = "luuid"; + version = "20120509-2"; + + src = fetchurl { + url = https://luarocks.org/luuid-20120509-2.src.rock; + sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; + }; + disabled = ( luaOlder "5.2") || ( luaAtLeast "5.4"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"; + description="A library for UUID generation"; + license = { + fullName = "Public domain"; + }; + }; +}; +penlight = buildLuarocksPackage { + pname = "penlight"; + version = "1.5.4-1"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/penlight-1.5.4-1.rockspec; + sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p"; + }).outPath; + + src = fetchurl { + url = http://stevedonovan.github.io/files/penlight-1.5.4.zip; + sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q"; + }; + + + propagatedBuildInputs = [luafilesystem ]; + buildType="builtin"; + + meta = { + homepage = "http://stevedonovan.github.com/Penlight"; + description="Lua utility libraries loosely based on the Python standard libraries"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +say = buildLuarocksPackage { + pname = "say"; + version = "1.3-1"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/say-1.3-1.rockspec; + sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; + }).outPath; + + src = fetchurl { + url = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz; + sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; + }; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/busted/"; + description="Lua String Hashing/Indexing Library"; + license = { + fullName = "MIT "; + }; + }; +}; +luv = buildLuarocksPackage { + pname = "luv"; + version = "1.22.0-1"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/luv-1.22.0-1.rockspec; + sha256 = "0yxjy9wj4aqbv1my8fkciy2xar5si6bcsszipgyls24rl6lnmga3"; + }).outPath; + + src = fetchurl { + url = https://github.com/luvit/luv/releases/download/1.22.0-1/luv-1.22.0-1.tar.gz; + sha256 = "1xvz4a0r6kd1xqxwm55g9n6imprxb79600x7dhyillrz7p5nm217"; + }; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="cmake"; + + meta = { + homepage = "https://github.com/luvit/luv"; + description="Bare libuv bindings for lua"; + license = { + fullName = "Apache 2.0"; + }; + }; +}; +luasystem = buildLuarocksPackage { + pname = "luasystem"; + version = "0.2.1-0"; + + src = fetchurl { + url = https://luarocks.org/luasystem-0.2.1-0.src.rock; + sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/luasystem/"; + description="Platform independent system calls for Lua."; + license = { + fullName = "MIT "; + }; + }; +}; +mediator_lua = buildLuarocksPackage { + pname = "mediator_lua"; + version = "1.1.2-0"; + + src = fetchurl { + url = http://luarocks.org/manifests/teto/mediator_lua-1.1.2-0.src.rock; + sha256 = "18j49vvs94yfk4fw0xsq4v3j4difr6c99gfba0kxairmcqamd1if"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/mediator_lua/"; + description="Event handling through channels"; + license = { + fullName = "MIT "; + }; + }; +}; +mpack = buildLuarocksPackage { + pname = "mpack"; + version = "1.0.7-0"; + + src = fetchurl { + url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock; + sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7"; + }; + + + buildType="builtin"; + + meta = { + homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; + description="Lua binding to libmpack"; + license = { + fullName = "MIT"; + }; + }; +}; +nvim-client = buildLuarocksPackage { + pname = "nvim-client"; + version = "0.1.0-1"; + + src = fetchurl { + url = https://luarocks.org/nvim-client-0.1.0-1.src.rock; + sha256 = "1p57mrvm0ny3yi5cydr3z9qwzyg124rjp5w7vdflf2i23z39mkma"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua mpack luv coxpcall ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/neovim/lua-client/archive/0.1.0-1.tar.gz"; + description="Lua client to Nvim"; + license = { + fullName = "Apache"; + }; + }; +}; +busted = buildLuarocksPackage { + pname = "busted"; + version = "2.0.rc13-0"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/busted-2.0.rc13-0.rockspec; + sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5"; + }).outPath; + + src = fetchurl { + url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz; + sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; + }; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/busted/"; + description="Elegant Lua unit testing."; + license = { + fullName = "MIT "; + }; + }; +}; +luassert = buildLuarocksPackage { + pname = "luassert"; + version = "1.7.11-0"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/luassert-1.7.11-0.rockspec; + sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s"; + }).outPath; + + src = fetchurl { + url = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz; + sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; + }; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua say ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/busted/"; + description="Lua Assertions Extension"; + license = { + fullName = "MIT "; + }; + }; +}; +coxpcall = buildLuarocksPackage { + pname = "coxpcall"; + version = "1.17.0-1"; + + src = fetchurl { + url = https://luarocks.org/manifests/hisham/coxpcall-1.17.0-1.src.rock; + sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; + }; + + + buildType="builtin"; + + meta = { + homepage = "http://keplerproject.github.io/coxpcall"; + description="Coroutine safe xpcall and pcall"; + license = { + fullName = "MIT/X11"; + }; + }; +}; + +} +/* GENERATED */ + diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix new file mode 100644 index 000000000000..20a24681b6ae --- /dev/null +++ b/pkgs/development/lua-modules/overrides.nix @@ -0,0 +1,33 @@ +{ pkgs, ... }@args: +self: super: +with super; +{ + ##########################################3 + #### manual fixes for generated packages + ##########################################3 + + ltermbox = super.ltermbox.override( { + disabled = !isLua51 || isLuaJIT; + }); + + lua-cmsgpack = super.lua-cmsgpack.override({ + # TODO this should work with luajit once we fix luajit headers ? + disabled = (!isLua51) || isLuaJIT; + }); + + lrexlib-posix = super.lrexlib-posix.override({ + buildInputs = [ pkgs.glibc.dev ]; + }); + lrexlib-gnu = super.lrexlib-gnu.override({ + buildInputs = [ pkgs.gnulib ]; + }); + luv = super.luv.overrideAttrs(oa: { + propagatedBuildInputs = oa.propagatedBuildInputs ++ [ pkgs.libuv ]; + }); + + busted = super.busted.overrideAttrs(oa: { + postInstall = '' + install -D completions/zsh/_busted $out/share/zsh/site-functions/_busted + ''; + }); + } diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 3728caf193ae..a918cb0c6475 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -3,7 +3,7 @@ luarocks.overrideAttrs(old: { src = fetchFromGitHub { owner = "teto"; repo = "luarocks"; - rev = "d669e8e118e6ca8bff05f32dbc9e5589e6ac45d2"; - sha256 = "1lay3905a5sx2a4y68lbys0913qs210hcj9kn2lbqinw86c1vyc3"; + rev = "f9dc7892214bff6bce822d94aca3331048e61df0"; + sha256 = "117qqbiv87p2qw0zwapl7b0p4wgnn9f8k0qpppkj3653a1bwli05"; }; }) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 50dd4d1fcd9a..11e05b504b43 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -56,6 +56,12 @@ let else if stdenv.isSunOS then "solaris" else throw "unsupported platform"; + buildLuaApplication = args: buildLuarocksPackage ({namePrefix="";} // args ); + + buildLuarocksPackage = with pkgs.lib; makeOverridable( callPackage ../development/interpreters/lua-5/build-lua-package.nix { + inherit toLuaModule; + inherit lua writeText; + }); in with self; { @@ -79,9 +85,15 @@ with self; { inherit toLuaModule lua-setup-hook; + inherit buildLuarocksPackage buildLuaApplication; inherit requiredLuaModules luaOlder luaAtLeast isLua51 isLua52 isLuaJIT lua callPackage; + # wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH + wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix { + inherit lua; inherit (pkgs) makeSetupHook makeWrapper; + }; + luarocks = callPackage ../development/tools/misc/luarocks { inherit lua; }; From 9f0ee6c60640e8da18dda4db547ea867b76b18a0 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Mon, 4 Feb 2019 13:03:50 +0100 Subject: [PATCH 124/193] primesieve: init at 7.3 --- .../science/math/primesieve/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/science/math/primesieve/default.nix diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix new file mode 100644 index 000000000000..65569b9f3bdb --- /dev/null +++ b/pkgs/development/libraries/science/math/primesieve/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + name = "primesieve-${version}"; + version = "7.3"; + + nativeBuildInputs = [cmake]; + + src = fetchurl { + url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz"; + sha256 = "0l7h5r4c7hijh0c0nsdxvjqzc9dbhlx535b87fglf2i2p9la1x5v"; + }; + + meta = with stdenv.lib; { + description = "Fast C/C++ prime number generator"; + homepage = "https://primesieve.org/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2ead70e50d7..6808df9f0c10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12014,6 +12014,8 @@ in portmidi = callPackage ../development/libraries/portmidi {}; + primesieve = callPackage ../development/libraries/science/math/primesieve { }; + prison = callPackage ../development/libraries/prison { }; proj = callPackage ../development/libraries/proj { }; From 3652cfec28a7694b3608614e0b8773bad463fa52 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Mon, 4 Feb 2019 13:04:06 +0100 Subject: [PATCH 125/193] haskellPackages.primesieve: fix build Temporaries changes in `configuration-common.nix` to fix the cabal file which does not specify that the haskell library depends on the C++ shared library. Pull request had been sent upstream. --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4b54ec5685bf..c5ddd18ff49b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1196,4 +1196,11 @@ self: super: { beam-migrate = appendPatch super.beam-migrate ./patches/beam-migrate-fix-ghc-8.6.x-build.patch; beam-postgres = appendPatch super.beam-postgres ./patches/beam-postgres-fix-ghc-8.6.x-build.patch; beam-sqlite = appendPatch super.beam-sqlite ./patches/beam-sqlite-fix-ghc-8.6.x-build.patch; + + # https://github.com/sighingnow/computations/pull/1 + primesieve = appendPatch super.primesieve (pkgs.fetchpatch { + url = "https://github.com/sighingnow/computations/commit/1f96788367c879b999afe733e2fe28d919d17702.patch"; + sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x"; + stripLen = 1; + }); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From c6f8f8d98de092f6e6540822849dee994f41dde5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 4 Feb 2019 09:15:03 -0500 Subject: [PATCH 126/193] make-derivation: only modify name when name is given MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This preserves Nix’s native error handling of missing name: error: derivation name missing --- pkgs/stdenv/generic/make-derivation.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 8f0f12ea1a20..fdb3a2ce35a2 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -177,9 +177,9 @@ rec { "checkInputs" "installCheckInputs" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) - // (lib.optionalAttrs (!(attrs ? name))) { + // (lib.optionalAttrs (!(attrs ? name) && attrs ? pname && attrs ? version)) { name = "${attrs.pname}-${attrs.version}"; - } // (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)) { + } // (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix && (attrs ? name || (attrs ? pname && attrs ? version)))) { # Fixed-output derivations like source tarballs shouldn't get a host # suffix. But we have some weird ones with run-time deps that are # just used for their side-affects. Those might as well since the From c7369800d11519d229f376c729957fb0c0a21782 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Feb 2019 14:34:51 +0100 Subject: [PATCH 127/193] LTS Haskell 13.6 --- .../configuration-hackage2nix.yaml | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e4848f0283eb..64262b12d65c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.5 + # LTS Haskell 13.6 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -515,7 +515,7 @@ default-package-overrides: - cublas ==0.5.0.0 - cuckoo-filter ==0.2.0.2 - cuda ==0.10.0.0 - - cue-sheet ==2.0.0 + - cue-sheet ==2.0.1 - cufft ==0.9.0.1 - curl ==1.3.8 - currencies ==0.2.0.0 @@ -725,7 +725,7 @@ default-package-overrides: - fixed-vector ==1.2.0.0 - fixed-vector-hetero ==0.5.0.0 - flac ==0.1.2 - - flac-picture ==0.1.1 + - flac-picture ==0.1.2 - flat-mcmc ==1.5.0 - flay ==0.4 - flexible-defaults ==0.0.2 @@ -834,7 +834,7 @@ default-package-overrides: - githash ==0.1.3.1 - github-release ==1.2.4 - github-types ==0.2.1 - - github-webhooks ==0.10.0 + - github-webhooks ==0.10.1 - gitrev ==1.3.1 - gi-vte ==2.91.19 - gl ==0.8.0 @@ -1030,7 +1030,7 @@ default-package-overrides: - http-client ==0.5.14 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - - http-conduit ==2.3.4 + - http-conduit ==2.3.5 - http-date ==0.0.8 - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3.1 @@ -1124,8 +1124,8 @@ default-package-overrides: - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 - - io-streams ==1.5.0.1 - - io-streams-haproxy ==1.0.0.2 + - io-streams ==1.5.1.0 + - io-streams-haproxy ==1.0.1.0 - ip ==1.4.1 - ip6addr ==1.0.0 - iproute ==1.7.7 @@ -1319,7 +1319,7 @@ default-package-overrides: - mixpanel-client ==0.1.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - - mmark ==0.0.6.0 + - mmark ==0.0.6.1 - mmark-cli ==0.0.5.0 - mmark-ext ==0.2.1.1 - mmorph ==1.1.2 @@ -1357,7 +1357,7 @@ default-package-overrides: - monoid-extras ==0.5 - monoid-subclasses ==0.4.6.1 - monoid-transformer ==0.0.4 - - mono-traversable ==1.0.10.0 + - mono-traversable ==1.0.11.0 - mono-traversable-instances ==0.1.0.0 - mountpoints ==1.0.2 - mtl ==2.2.2 @@ -1458,7 +1458,7 @@ default-package-overrides: - OpenGLRaw ==3.3.2.0 - openpgp-asciiarmor ==0.1.1 - opensource ==0.1.1.0 - - openssl-streams ==1.2.1.3 + - openssl-streams ==1.2.2.0 - open-witness ==0.4.0.1 - operational ==0.2.3.5 - operational-class ==0.3.0.0 @@ -1467,7 +1467,7 @@ default-package-overrides: - options ==1.2.1.1 - optparse-applicative ==0.14.3.0 - optparse-generic ==1.3.0 - - optparse-simple ==0.1.1 + - optparse-simple ==0.1.1.1 - optparse-text ==0.1.1.0 - overhang ==1.0.0 - packcheck ==0.4.1 @@ -1518,7 +1518,7 @@ default-package-overrides: - persistent ==2.9.1 - persistent-iproute ==0.2.3 - persistent-mysql ==2.9.0 - - persistent-mysql-haskell ==0.5.1 + - persistent-mysql-haskell ==0.5.2 - persistent-postgresql ==2.9.0 - persistent-sqlite ==2.9.2 - persistent-template ==2.5.4 @@ -1651,7 +1651,7 @@ default-package-overrides: - range ==0.2.1.1 - range-set-list ==0.1.3 - rank1dynamic ==0.4.0 - - rank2classes ==1.2 + - rank2classes ==1.2.1 - Rasterific ==0.7.4.2 - rasterific-svg ==0.3.3.2 - ratel ==1.0.8 @@ -1668,7 +1668,7 @@ default-package-overrides: - rebase ==1.3 - record-dot-preprocessor ==0.1.4 - records-sop ==0.1.0.2 - - recursion-schemes ==5.1 + - recursion-schemes ==5.1.1 - reducers ==3.12.3 - refact ==0.3.0.2 - references ==0.3.3.1 @@ -1688,7 +1688,7 @@ default-package-overrides: - regex-tdfa ==1.2.3.1 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.2.3 + - registry ==0.1.2.6 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.1.0 @@ -1768,7 +1768,7 @@ default-package-overrides: - semirings ==0.2.1.1 - semiring-simple ==1.0.0.1 - semver ==0.3.3.1 - - sendfile ==0.7.9 + - sendfile ==0.7.10 - seqalign ==0.2.0.4 - serf ==0.1.1.0 - serialise ==0.2.1.0 @@ -1851,7 +1851,7 @@ default-package-overrides: - smoothie ==0.4.2.9 - smtp-mail ==0.1.4.6 - snap-blaze ==0.2.1.5 - - snap-core ==1.0.3.2 + - snap-core ==1.0.4.0 - snap-server ==1.1.0.0 - snowflake ==0.1.1.1 - soap ==0.2.3.6 @@ -1934,10 +1934,10 @@ default-package-overrides: - sv-cassava ==0.3 - sv-core ==0.3.1 - svg-builder ==0.1.1 - - SVGFonts ==1.7 + - SVGFonts ==1.7.0.1 - svg-tree ==0.6.2.3 - swagger ==0.3.0 - - swagger2 ==2.3.1 + - swagger2 ==2.3.1.1 - swish ==0.10.0.1 - syb ==0.7 - symbol ==0.2.4 @@ -1998,10 +1998,10 @@ default-package-overrides: - test-framework-th ==0.2.4 - testing-feat ==1.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.11.1.2 + - texmath ==0.11.2 - text ==1.2.3.1 - text-binary ==0.2.1.1 - - text-builder ==0.6.4 + - text-builder ==0.6.5 - text-conversions ==0.3.0 - text-format ==0.3.2 - text-icu ==0.7.0.1 @@ -2020,7 +2020,7 @@ default-package-overrides: - th-abstraction ==0.2.10.0 - th-data-compat ==0.0.2.7 - th-desugar ==1.9 - - these ==0.7.5 + - these ==0.7.6 - th-expand-syns ==0.4.4.0 - th-extras ==0.0.0.4 - th-lift ==0.7.11 @@ -2217,10 +2217,10 @@ default-package-overrides: - web-routes-hsp ==0.24.6.1 - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 - - websockets ==0.12.5.2 + - websockets ==0.12.5.3 - websockets-snap ==0.10.3.0 - weigh ==0.0.13 - - wide-word ==0.1.0.7 + - wide-word ==0.1.0.8 - wikicfp-scraper ==0.1.0.9 - wild-bind ==0.1.2.3 - wild-bind-x11 ==0.2.0.6 @@ -2298,7 +2298,7 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1 - yesod-auth-oauth2 ==0.6.1.0 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.10.1 + - yesod-core ==1.6.11 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 From 0f68f393bfdc8177fade06493b6607180992163f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 3 Feb 2019 02:30:57 +0100 Subject: [PATCH 128/193] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.1 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/6098061825a432f3f458481497b2a1b8859286e8. --- .../haskell-modules/hackage-packages.nix | 1002 ++++++----------- 1 file changed, 356 insertions(+), 646 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c8ba2138d928..f82f49dd8912 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -15563,6 +15563,8 @@ self: { pname = "Ranged-sets"; version = "0.3.0"; sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l"; + revision = "1"; + editedCabalFile = "0xv8ph5vfwfcvk5hbkcxbsf9vwhpikxzkz7zsr7c5ky2bw707gfv"; libraryHaskellDepends = [ base HUnit QuickCheck ]; description = "Ranged sets for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -16288,28 +16290,6 @@ self: { }) {}; "SVGFonts" = callPackage - ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg - , bytestring, cereal, cereal-vector, containers, data-default-class - , diagrams-core, diagrams-lib, directory, parsec, split, text - , vector, xml - }: - mkDerivation { - pname = "SVGFonts"; - version = "1.7"; - sha256 = "1k9ili7l9pp5a009jh55vigb917wdnsl6iaz0ggp6d4nw1jwsg6s"; - revision = "1"; - editedCabalFile = "1w687f4lk4l07wqgldhpg7ycid0fs099x8vrylcxqdgfrzmm04dg"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec base blaze-markup blaze-svg bytestring cereal - cereal-vector containers data-default-class diagrams-core - diagrams-lib directory parsec split text vector xml - ]; - description = "Fonts from the SVG-Font format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "SVGFonts_1_7_0_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg , bytestring, cereal, cereal-vector, containers, data-default-class , diagrams-core, diagrams-lib, directory, parsec, split, text @@ -16327,7 +16307,6 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SVGPath" = callPackage @@ -27775,6 +27754,8 @@ self: { pname = "apecs"; version = "0.7.1"; sha256 = "0cvjqv6zbjzvp01ikfx5lkwb7fbq25555rbvfriwhsfjqanw5pj7"; + revision = "1"; + editedCabalFile = "14v5704fhysxpip0s7bfsg073kfbal3b0335s9nb14nwwak7bsyn"; libraryHaskellDepends = [ base containers mtl template-haskell vector ]; @@ -27828,6 +27809,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apecs-stm" = callPackage + ({ mkDerivation, apecs, base, containers, list-t, stm + , stm-containers, template-haskell, vector + }: + mkDerivation { + pname = "apecs-stm"; + version = "0.1.1"; + sha256 = "0d0l48fynsk84y2ifb004dpr39s2hdcwrgfp1ds3qff6784sh66b"; + libraryHaskellDepends = [ + apecs base containers list-t stm stm-containers template-haskell + vector + ]; + description = "STM stores for apecs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "apelsin" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , directory, filepath, glib, gtk, HTTP, mtl, network, process @@ -30058,6 +30055,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) assimp;}; + "assoc" = callPackage + ({ mkDerivation, base, bifunctors }: + mkDerivation { + pname = "assoc"; + version = "1"; + sha256 = "0i1jj6lrabl0fhh1iya4nxr2hw1s4xmhca5qnim93ng5znziv9n2"; + libraryHaskellDepends = [ base bifunctors ]; + description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "assoc-list" = callPackage ({ mkDerivation, base, contravariant, doctest, hedgehog }: mkDerivation { @@ -30602,8 +30610,8 @@ self: { }: mkDerivation { pname = "atom-conduit"; - version = "0.5.0.2"; - sha256 = "14gf11z7zmgczrdshmywrkpzrsy68wgaxx5jsn2m0q6797m9yzzd"; + version = "0.5.0.3"; + sha256 = "0hj9r6akwaxdhlaqnapfpa00d61vk4b7di67vn1h5jlscvzgrrc2"; libraryHaskellDepends = [ base blaze-builder conduit lens-simple mono-traversable parsers safe-exceptions text time timerep uri-bytestring xml-conduit @@ -33790,6 +33798,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "basement_0_0_9" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "basement"; + version = "0.0.9"; + sha256 = "0fx9zw20id9lmv5likmsy1xs9cy286zd284wcd721xwvl74bg040"; + revision = "1"; + editedCabalFile = "0f5syvnp7g108adssmsqz7v8pgaasknvbi88g1lnm1ygn65kwpv1"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "Foundation scrap box of array & string"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "basen-bytestring" = callPackage ({ mkDerivation, base, bytestring, QuickCheck }: mkDerivation { @@ -40247,6 +40269,8 @@ self: { pname = "bson"; version = "0.3.2.7"; sha256 = "0avzr3aa3mbr9hcjwd0nr0pnpiym7s35qw7nghz51mrzb76rsci7"; + revision = "1"; + editedCabalFile = "1y6gy4rq2wb123p1qc35p0hnk8dqh2hnlys2c97znwcjjsd5p203"; libraryHaskellDepends = [ base binary bytestring cryptohash data-binary-ieee754 mtl network text time @@ -40444,6 +40468,8 @@ self: { pname = "buffer"; version = "0.5.3"; sha256 = "0bf9y6rb3q26rk6qd7a2mjlb1gd1gp2k080ywhp5g48l474h6p26"; + revision = "1"; + editedCabalFile = "19v3zis3fqirsacacqnn7ypgvddgi6i8dj8bkbap2ln2mmqkvlh0"; libraryHaskellDepends = [ base base-prelude bug bytestring ]; testHaskellDepends = [ bug quickcheck-instances rerebase tasty tasty-hunit @@ -41989,6 +42015,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-bundle-clib" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , process, temporary, text, time + }: + mkDerivation { + pname = "cabal-bundle-clib"; + version = "0.1.0"; + sha256 = "02fwpasnvpc2np7aibwmgpmy0yz638iya8w6sy6szxzfzmn2kscm"; + libraryHaskellDepends = [ + base bytestring Cabal directory filepath process temporary text + time + ]; + description = "Bundling C/C++ projects in Cabal package made easy"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cabal-cargs" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-lenses, cmdargs , directory, filepath, lens, system-fileio, system-filepath, tasty @@ -43234,8 +43276,8 @@ self: { }: mkDerivation { pname = "cairo-core"; - version = "1.16.3"; - sha256 = "1dap6697r6izvags7k43b88z7m9i9yy0znrf1lgkrwv23mg6qxmj"; + version = "1.16.4"; + sha256 = "1f4ps76mxgnk2y0gqk28kgs6qrslwccbisl6wrk2qwxd13cfwk86"; setupHaskellDepends = [ base bytestring Cabal directory filepath haskell-src-exts http-client http-client-tls hxt hxt-xpath @@ -50830,6 +50872,8 @@ self: { pname = "compact-string-fix"; version = "0.3.2"; sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n"; + revision = "1"; + editedCabalFile = "1akx1kzpirl1fc3lfcrsa88jvrk023f9qyj2b2fbpz4p11d07qfc"; libraryHaskellDepends = [ base bytestring ]; description = "Same as compact-string except with a small fix so it builds on ghc-6.12"; license = stdenv.lib.licenses.bsd3; @@ -57373,31 +57417,6 @@ self: { }) {cudd = null;}; "cue-sheet" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec - , mtl, QuickCheck, text - }: - mkDerivation { - pname = "cue-sheet"; - version = "2.0.0"; - sha256 = "1w6gmxwrqz7jlm7f0rccrik86w0syhjk5w5cvg29gi2yzj3grnql"; - revision = "1"; - editedCabalFile = "0cnlyy7psk8qcwahiqfdpaybvrw899bv106p0i53lrdjxfdsmf4g"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers data-default-class exceptions megaparsec - mtl QuickCheck text - ]; - testHaskellDepends = [ - base bytestring exceptions hspec hspec-megaparsec megaparsec - QuickCheck text - ]; - testToolDepends = [ hspec-discover ]; - description = "Support for construction, rendering, and parsing of CUE sheets"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cue-sheet_2_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, hspec , hspec-discover, hspec-megaparsec, megaparsec, mtl, QuickCheck , text @@ -57418,7 +57437,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Support for construction, rendering, and parsing of CUE sheets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cufft" = callPackage @@ -63739,8 +63757,8 @@ self: { pname = "diagrams-postscript"; version = "1.4.1"; sha256 = "171c53msr2x8da87fghl7jikbmrwy7gdxwhdviixc2y3k4fijn57"; - revision = "1"; - editedCabalFile = "0z0rh7lwyr3vx6llq6q9s5f1vzqk4zxpcg5ibfn5jdp274kfd7r1"; + revision = "2"; + editedCabalFile = "0s6z3kaj1dm5kifaydnd2nx97g5qbc6jjqy3wn4dwa9rm7w49753"; libraryHaskellDepends = [ base containers data-default-class diagrams-core diagrams-lib dlist hashable lens monoid-extras mtl semigroups split statestack @@ -73184,20 +73202,21 @@ self: { }) {}; "ewe" = callPackage - ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty - , transformers + ({ mkDerivation, alex, array, base, Cabal, containers, happy, mtl + , pretty, transformers, uuagc, uuagc-cabal, uulib }: mkDerivation { pname = "ewe"; - version = "0.1.0.46"; - sha256 = "06pz56a4r4j601p100lnvih7pi1hfpvd6hr23mz5wk5dbkm9ng6f"; + version = "0.3.1.1"; + sha256 = "1kxjsxl0idy82xynjbafw7695m9aylgs9bpkr2gvcmzs5lpyni8p"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ base Cabal uuagc uuagc-cabal uulib ]; executableHaskellDepends = [ - array base containers mtl pretty transformers + array base containers mtl pretty transformers uuagc-cabal ]; - executableToolDepends = [ alex happy ]; - description = "A language for teaching simple programming languages"; + executableToolDepends = [ alex happy uuagc ]; + description = "An interpreter for EWE programming language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -77780,27 +77799,6 @@ self: { }) {FLAC = null;}; "flac-picture" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, directory - , flac, hspec, JuicyPixels, temporary - }: - mkDerivation { - pname = "flac-picture"; - version = "0.1.1"; - sha256 = "1kn1zvv5izinyidmxij7zqml94a8q52bbm2icg7704sj906gh71w"; - revision = "1"; - editedCabalFile = "02vdh61nzig0yrv6ja6fjlgfcznj5k4iqh3i5f9g5p078ycqb17w"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base bytestring flac JuicyPixels ]; - testHaskellDepends = [ - base bytestring data-default-class directory flac hspec JuicyPixels - temporary - ]; - description = "Support for writing picture to FLAC metadata blocks with JuicyPixels"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "flac-picture_0_1_2" = callPackage ({ mkDerivation, base, bytestring, directory, flac, hspec , hspec-discover, JuicyPixels, temporary }: @@ -78401,7 +78399,7 @@ self: { description = "FLTK bindings"; license = stdenv.lib.licenses.mit; }) {inherit (pkgs) fltk14; inherit (pkgs) libGLU_combined; - inherit (pkgs) pkgconfig;}; + pkgconfig = null;}; "fltkhs-demos" = callPackage ({ mkDerivation, base, bytestring, directory, fltkhs, process, stm @@ -79717,6 +79715,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foundation_0_0_22" = callPackage + ({ mkDerivation, base, basement, gauge, ghc-prim }: + mkDerivation { + pname = "foundation"; + version = "0.0.22"; + sha256 = "1a66abjm0qy90i1kc0zik373gy83p14vxw0q7qx2yd8yqf2kf28j"; + revision = "1"; + editedCabalFile = "18kk8h7d0gr57p95b6y9ax6ngbj76gd68rc3br85sk90nl89zxjz"; + libraryHaskellDepends = [ base basement ghc-prim ]; + testHaskellDepends = [ base basement ]; + benchmarkHaskellDepends = [ base basement gauge ]; + description = "Alternative prelude with batteries and no dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foundation-edge" = callPackage ({ mkDerivation, bytestring, foundation, text }: mkDerivation { @@ -79776,6 +79790,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fpe" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, integer-logarithms + , vector + }: + mkDerivation { + pname = "fpe"; + version = "0.1.1"; + sha256 = "1rzd1g6zk98l5bz5d7pr66i10gd2kx6vrv9py06wcnz3b5svkx2l"; + libraryHaskellDepends = [ + base bytestring integer-logarithms vector + ]; + testHaskellDepends = [ + base bytestring cryptonite integer-logarithms vector + ]; + description = "Format-preserving encryption"; + license = stdenv.lib.licenses.mit; + }) {}; + "fpipe" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -81476,8 +81508,8 @@ self: { ({ mkDerivation, base, tagged }: mkDerivation { pname = "function-builder"; - version = "0.1.0.4"; - sha256 = "1iiz1fx8m152wg55k6vgv8sf3zf9wvc9zmx2wca8yc38bki43h61"; + version = "0.1.1.0"; + sha256 = "1qj78l8j6f9wnvapmkijhgby45g23r0w2wwwwlnkbnrvy869fr4p"; libraryHaskellDepends = [ base tagged ]; description = "Create poly variadic functions for monoidal results"; license = stdenv.lib.licenses.bsd3; @@ -82204,16 +82236,21 @@ self: { }) {}; "gamma" = callPackage - ({ mkDerivation, base, continued-fractions, converge - , template-haskell, vector + ({ mkDerivation, base, continued-fractions, converge, erf, numbers + , QuickCheck, template-haskell, test-framework + , test-framework-quickcheck2, vector }: mkDerivation { pname = "gamma"; - version = "0.9.0.2"; - sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq"; + version = "0.10.0.0"; + sha256 = "17pdnff340hgmq0dyxf5jrnkrhrgzp96pisc2fppvjbhdw8ndm65"; libraryHaskellDepends = [ base continued-fractions converge template-haskell vector ]; + testHaskellDepends = [ + base erf numbers QuickCheck test-framework + test-framework-quickcheck2 + ]; description = "Gamma function and related functions"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -87541,24 +87578,6 @@ self: { }) {}; "github-webhooks" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time - , vector - }: - mkDerivation { - pname = "github-webhooks"; - version = "0.10.0"; - sha256 = "1pvif863yi6qxwjd43insjvrzizaz78b3kf8l13rmy3irjlqljh8"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite deepseq - deepseq-generics memory text time vector - ]; - testHaskellDepends = [ aeson base bytestring hspec text vector ]; - description = "Aeson instances for GitHub Webhook payloads"; - license = stdenv.lib.licenses.mit; - }) {}; - - "github-webhooks_0_10_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time , vector @@ -87574,7 +87593,6 @@ self: { testHaskellDepends = [ aeson base bytestring hspec text vector ]; description = "Aeson instances for GitHub Webhook payloads"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "githud" = callPackage @@ -92877,8 +92895,8 @@ self: { }: mkDerivation { pname = "gscholar-rss"; - version = "0.1.0.0"; - sha256 = "17ki6wvrjvxl77zjpkxjq8yr4ljdrwlszrzwdv3arlq2c0mgl7yy"; + version = "0.2.1.0"; + sha256 = "0a4hhcggfbgxraq2jj40gvrg64nw37h7y6jj7pgswa623m85040j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95847,8 +95865,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.12.5.0"; - sha256 = "097i49pg3wcy2407ysakhrlm67jj68wl9bm5f807gq9pi5qisa06"; + version = "4.12.5.1"; + sha256 = "0zxl99qrzzngc6z08hpl4rxssb7djqdbccjay76sgq8akw40x720"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -98256,6 +98274,8 @@ self: { pname = "hashable-orphans"; version = "0"; sha256 = "0mpvfhf07swhj7vb9mrrrbq4a4il0i49nlzh2157kf66a891ih47"; + revision = "1"; + editedCabalFile = "00ngp3hqp3i0xbx00vdgv92pq0n1q5dffjfjni5bnb3rzlafsvvl"; libraryHaskellDepends = [ base hashable sorted-list time ]; description = "Provides instances missing from Hashable"; license = stdenv.lib.licenses.bsd3; @@ -101968,21 +101988,23 @@ self: { }) {}; "haskus-binary" = callPackage - ({ mkDerivation, base, bytestring, cereal, criterion, haskus-utils - , haskus-utils-data, haskus-utils-types, mtl, QuickCheck, tasty - , tasty-quickcheck + ({ mkDerivation, base, bytestring, cereal, criterion, directory + , doctest, ghc-prim, haskus-utils, haskus-utils-data + , haskus-utils-types, megaparsec, mtl, primitive, QuickCheck, tasty + , tasty-quickcheck, template-haskell, transformers }: mkDerivation { pname = "haskus-binary"; - version = "1.2"; - sha256 = "0wk9hh7snj6spadivikx5w1val076ngkca908z64z5yqqfiq0pcg"; + version = "1.3"; + sha256 = "06smbrvkpiz3rwmlsrxv6a5zh5952ivpl7wg85li6bc90dnz04rm"; libraryHaskellDepends = [ - base bytestring cereal haskus-utils haskus-utils-data - haskus-utils-types mtl + base bytestring cereal directory ghc-prim haskus-utils + haskus-utils-data haskus-utils-types megaparsec mtl primitive + template-haskell transformers ]; testHaskellDepends = [ - base bytestring haskus-utils haskus-utils-data QuickCheck tasty - tasty-quickcheck + base bytestring doctest haskus-utils haskus-utils-data QuickCheck + tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Haskus binary format manipulation"; @@ -102031,6 +102053,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskus-utils-compat" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , haskus-binary, haskus-utils-data, template-haskell + }: + mkDerivation { + pname = "haskus-utils-compat"; + version = "1.0"; + sha256 = "0mgklzs26xhq06gij4cn9iz69z028apmrhafd8cqar3kg75lisyx"; + libraryHaskellDepends = [ + base bytestring directory filepath haskus-binary haskus-utils-data + template-haskell + ]; + description = "Compatibility modules with other external packages (ByteString, etc.)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskus-utils-data" = callPackage ({ mkDerivation, base, containers, extra, haskus-utils-types, mtl , recursion-schemes, transformers @@ -102079,6 +102117,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskus-web" = callPackage + ({ mkDerivation, base, bytestring, clay, happstack-server + , happstack-server-tls, haskus-utils-compat, lucid, text + }: + mkDerivation { + pname = "haskus-web"; + version = "1.1"; + sha256 = "15d2718d7iqfxkdl6ggdyl81lp98s3djsgd37wmyx1xx9v03lg3g"; + libraryHaskellDepends = [ + base bytestring clay happstack-server happstack-server-tls + haskus-utils-compat lucid text + ]; + description = "Haskus web"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskyapi" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, containers , directory, http-conduit, markdown, mtl, network, parsec @@ -108037,7 +108091,7 @@ self: { "hledger" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat-batteries , bytestring, cmdargs, containers, criterion, data-default, Decimal - , Diff, directory, easytest, filepath, hashable, haskeline, here + , Diff, directory, easytest, filepath, hashable, haskeline , hledger-lib, html, lucid, math-functions, megaparsec, mtl , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa , safe, shakespeare, split, tabular, temporary, terminfo @@ -108047,22 +108101,22 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.13"; - sha256 = "1dhyc439r0ff3jdnbfcb06wb7xlxwvczn9p2spn5316wdza8lk53"; + version = "1.13.2"; + sha256 = "0dxw5zhynhdhangib5awcciz7qlgmnx9km4dph7nrw2ikj6ffmwv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal Diff directory easytest filepath - hashable haskeline here hledger-lib lucid math-functions megaparsec - mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe + hashable haskeline hledger-lib lucid math-functions megaparsec mtl + mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo text time transformers unordered-containers utf8-string utility-ht wizards ]; executableHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal directory easytest filepath - haskeline here hledger-lib math-functions megaparsec mtl mtl-compat + haskeline hledger-lib math-functions megaparsec mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo text time transformers unordered-containers utf8-string utility-ht wizards @@ -108070,7 +108124,7 @@ self: { testHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal directory easytest filepath - haskeline here hledger-lib math-functions megaparsec mtl mtl-compat + haskeline hledger-lib math-functions megaparsec mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo test-framework test-framework-hunit text time transformers unordered-containers @@ -108079,8 +108133,8 @@ self: { benchmarkHaskellDepends = [ ansi-terminal base base-compat-batteries bytestring cmdargs containers criterion data-default Decimal directory easytest - filepath haskeline here hledger-lib html math-functions megaparsec - mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe + filepath haskeline hledger-lib html math-functions megaparsec mtl + mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo text time timeit transformers unordered-containers utf8-string utility-ht wizards ]; @@ -108153,8 +108207,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.7"; - sha256 = "1x80f427mvgak1jz8mc7zmx4fz801dwxvij9zy93jw2h4yf7a16b"; + version = "1.3.8"; + sha256 = "02dfi6drhipj1an2smalhgjp52scmcy6ndixakjk5y0zpvkxzzbx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108217,27 +108271,27 @@ self: { , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec , cmdargs, containers, data-default, Decimal, deepseq, directory , doctest, easytest, extra, file-embed, filepath, Glob, hashtables - , here, megaparsec, mtl, mtl-compat, old-time, parsec - , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular - , template-haskell, text, time, transformers, uglymemo, utf8-string + , megaparsec, mtl, mtl-compat, old-time, parsec, parser-combinators + , pretty-show, regex-tdfa, safe, split, tabular, template-haskell + , text, time, transformers, uglymemo, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.13"; - sha256 = "1pfqfc7kfy3sni5i8h73i6gj0yf3fsbn1lf1g1zx2jfpgxm36wgg"; + version = "1.13.1"; + sha256 = "1g98gikpvx002zjc1smj21lz4x9ghfa2965rb0vlnqmwcz5pqak7"; libraryHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers data-default Decimal deepseq directory easytest extra file-embed - filepath Glob hashtables here megaparsec mtl mtl-compat old-time - parsec parser-combinators pretty-show regex-tdfa safe split tabular + filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec + parser-combinators pretty-show regex-tdfa safe split tabular template-haskell text time transformers uglymemo utf8-string ]; testHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers data-default Decimal deepseq directory doctest easytest extra - file-embed filepath Glob hashtables here megaparsec mtl mtl-compat + file-embed filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec parser-combinators pretty-show regex-tdfa safe split tabular template-haskell text time transformers uglymemo utf8-string @@ -108255,8 +108309,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.13"; - sha256 = "1dmziyffx3bjam40j1jxbbg0wm15fkci9zpsdpdbzx39264c0n40"; + version = "1.13.1"; + sha256 = "0jafgvnc88r24zab8kijj1v0jj8y2481ybsya3gnf3bfcb7p7xyp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117055,36 +117109,6 @@ self: { }) {}; "http-conduit" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring - , case-insensitive, conduit, conduit-extra, connection, cookie - , data-default-class, hspec, http-client, http-client-tls - , http-types, HUnit, mtl, network, resourcet, streaming-commons - , temporary, text, time, transformers, unliftio, unliftio-core - , utf8-string, wai, wai-conduit, warp, warp-tls - }: - mkDerivation { - pname = "http-conduit"; - version = "2.3.4"; - sha256 = "03si9ymgnv1252q3wyj8cblbzx56shcvmi1hx51p90a2aiqbhj15"; - revision = "1"; - editedCabalFile = "1c0cz9qxq3a0avcccqx07knnnxjjxgq81fp5wlxb6z5q6r3cpxag"; - libraryHaskellDepends = [ - aeson base bytestring conduit conduit-extra http-client - http-client-tls http-types mtl resourcet transformers unliftio-core - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive conduit - conduit-extra connection cookie data-default-class hspec - http-client http-types HUnit network resourcet streaming-commons - temporary text time transformers unliftio utf8-string wai - wai-conduit warp warp-tls - ]; - doCheck = false; - description = "HTTP client package with conduit interface and HTTPS support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-conduit_2_3_5" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, hspec, http-client, http-client-tls @@ -117112,7 +117136,6 @@ self: { doCheck = false; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-conduit-browser" = callPackage @@ -121960,19 +121983,18 @@ self: { , blaze-markup, bytestring, case-insensitive, conduit, connection , containers, directory, dyre, fast-logger, filepath, hashable , HaskellNet, HaskellNet-SSL, http-client, http-client-tls - , http-types, lifted-base, microlens, mime-mail, monad-time - , mono-traversable, monoid-subclasses, mtl, network, opml-conduit - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , rss-conduit, safe-exceptions, stm, streaming-bytestring - , streaming-with, streamly, text, time, timerep, tls, transformers - , transformers-base, uri-bytestring, xml, xml-conduit, xml-types + , http-types, lifted-base, microlens, mime-mail, monad-control + , monad-time, mono-traversable, monoid-subclasses, mtl, network + , opml-conduit, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, rss-conduit, safe-exceptions, stm + , streaming-bytestring, streaming-with, streamly, text, time + , timerep, tls, transformers-base, uri-bytestring, xml, xml-conduit + , xml-types }: mkDerivation { pname = "imm"; - version = "1.3.0.0"; - sha256 = "1rkndzm0mmc0qpg4i08jkmp00w5jhh4az02y3vzwaaqjfd32jxar"; - revision = "1"; - editedCabalFile = "02g2cpwqp9fqggzjv5y2gyvxayqbrfjai133jn7y2laa9bxia3x4"; + version = "1.4.0.0"; + sha256 = "0dz7zss373gc80xlng11agsr2yx51l0pdab72605w9rpn0znplrg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121980,12 +122002,11 @@ self: { case-insensitive conduit connection containers directory dyre fast-logger filepath hashable HaskellNet HaskellNet-SSL http-client http-client-tls http-types lifted-base microlens mime-mail - monad-time mono-traversable monoid-subclasses mtl network - opml-conduit optparse-applicative prettyprinter + monad-control monad-time mono-traversable monoid-subclasses mtl + network opml-conduit optparse-applicative prettyprinter prettyprinter-ansi-terminal rss-conduit safe-exceptions stm streaming-bytestring streaming-with streamly text time timerep tls - transformers transformers-base uri-bytestring xml xml-conduit - xml-types + transformers-base uri-bytestring xml xml-conduit xml-types ]; executableHaskellDepends = [ base ]; description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; @@ -124356,34 +124377,6 @@ self: { }) {}; "io-streams" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder - , deepseq, directory, filepath, HUnit, mtl, network, primitive - , process, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers, vector - , zlib, zlib-bindings - }: - mkDerivation { - pname = "io-streams"; - version = "1.5.0.1"; - sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx"; - revision = "2"; - editedCabalFile = "1mcab95d6hm098myh9gp7sh10srigjphgvm8s9pfs7jg5hzghy14"; - configureFlags = [ "-fNoInteractiveTests" ]; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-builder network primitive - process text time transformers vector zlib-bindings - ]; - testHaskellDepends = [ - attoparsec base bytestring bytestring-builder deepseq directory - filepath HUnit mtl network primitive process QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - time transformers vector zlib zlib-bindings - ]; - description = "Simple, composable, and easy-to-use stream I/O"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "io-streams_1_5_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , deepseq, directory, filepath, HUnit, mtl, network, primitive , process, QuickCheck, test-framework, test-framework-hunit @@ -124407,31 +124400,9 @@ self: { ]; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "io-streams-haproxy" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams - , network, test-framework, test-framework-hunit, transformers - }: - mkDerivation { - pname = "io-streams-haproxy"; - version = "1.0.0.2"; - sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp"; - revision = "4"; - editedCabalFile = "06c51a057n5bc9xfbp2m4jz5ds4z1xvmsx5mppch6qfwbz7x5i9l"; - libraryHaskellDepends = [ - attoparsec base bytestring io-streams network transformers - ]; - testHaskellDepends = [ - attoparsec base bytestring HUnit io-streams network test-framework - test-framework-hunit transformers - ]; - description = "HAProxy protocol 1.5 support for io-streams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "io-streams-haproxy_1_0_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams , network, test-framework, test-framework-hunit, transformers }: @@ -124448,7 +124419,6 @@ self: { ]; description = "HAProxy protocol 1.5 support for io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "io-streams-http" = callPackage @@ -133586,6 +133556,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "leanpub-concepts" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "leanpub-concepts"; + version = "1.0.0.1"; + sha256 = "1vf62iryqmj8ll16cm5xpwaqzlhw8rb7p6pshm87assm9lnw3k8c"; + libraryHaskellDepends = [ base bytestring text ]; + description = "Types for the Leanpub API"; + license = stdenv.lib.licenses.mit; + }) {}; + + "leanpub-wreq" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions + , leanpub-concepts, lens, rando, text, time, transformers + , unordered-containers, wreq + }: + mkDerivation { + pname = "leanpub-wreq"; + version = "1.0.0.0"; + sha256 = "060ilipz2aj7rci6yiy2r6j8c10hlv8q8qv5wm7ic9rjl2gvx4ra"; + libraryHaskellDepends = [ + aeson base bytestring exceptions leanpub-concepts lens rando text + time transformers unordered-containers wreq + ]; + description = "Use the Leanpub API via Wreq"; + license = stdenv.lib.licenses.mit; + }) {}; + "leapseconds" = callPackage ({ mkDerivation, base, tasty, tasty-hunit, time }: mkDerivation { @@ -134741,6 +134739,8 @@ self: { pname = "libgraph"; version = "1.14"; sha256 = "0grzimgy946mnwggmlc3sja567v2s21ymcwzlwf110k11pjqp5xp"; + revision = "1"; + editedCabalFile = "12xyrvvyh73b93k74lj55zwaygsvd93p4bm51kcd54m0pv0lclbq"; libraryHaskellDepends = [ array base containers monads-tf process union-find ]; @@ -135356,6 +135356,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) taglib;}; + "libtelnet" = callPackage + ({ mkDerivation, base, bytestring, libtelnet }: + mkDerivation { + pname = "libtelnet"; + version = "0.1.0.0"; + sha256 = "0s2ldi4ikjdvki8r190mnkjd0jkahn8ln6gvqb8bn5d291j19nmc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ libtelnet ]; + description = "Bindings to libtelnet"; + license = stdenv.lib.licenses.gpl3Plus; + }) {inherit (pkgs) libtelnet;}; + "libvirt-hs" = callPackage ({ mkDerivation, base, c2hs, libvirt, syb, unix }: mkDerivation { @@ -145685,37 +145699,6 @@ self: { }) {}; "mmark" = callPackage - ({ mkDerivation, aeson, base, case-insensitive, containers - , criterion, data-default-class, deepseq, dlist, email-validate - , foldl, hashable, hspec, hspec-discover, hspec-megaparsec - , html-entity-map, lucid, megaparsec, microlens, microlens-th - , modern-uri, mtl, parser-combinators, QuickCheck, text - , text-metrics, unordered-containers, weigh, yaml - }: - mkDerivation { - pname = "mmark"; - version = "0.0.6.0"; - sha256 = "0ifz40fv5fdlj17cb4646amc4spy9dq7xn0bbscljskm7n7n1pxv"; - revision = "2"; - editedCabalFile = "1nxw8vfqji8x63qkrcjnjc2rq1japrylz2wi1s76dm86pcs6hfw1"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base case-insensitive containers data-default-class deepseq - dlist email-validate foldl hashable html-entity-map lucid - megaparsec microlens microlens-th modern-uri mtl parser-combinators - text text-metrics unordered-containers yaml - ]; - testHaskellDepends = [ - aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri - QuickCheck text - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion text weigh ]; - description = "Strict markdown processor for writers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mmark_0_0_6_1" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec , hspec-discover, hspec-megaparsec, html-entity-map, lucid @@ -145742,7 +145725,6 @@ self: { benchmarkHaskellDepends = [ base criterion text weigh ]; description = "Strict markdown processor for writers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmark-cli" = callPackage @@ -147787,10 +147769,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "1.0.10.0"; - sha256 = "04c8gcksxkrfdll2lm3aaj1dgz7snvfa8avsccs3h6v5ygvdp5h0"; - revision = "1"; - editedCabalFile = "1hgwrmq7r8d1nq9283wis67lg0wlid2sgqnr9vpsv2wpnd4n1rdl"; + version = "1.0.11.0"; + sha256 = "1lipj4ld99cb3sc9i8va9w7cfki89h436dysyr5ifcb1l0kxg861"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -157935,27 +157915,6 @@ self: { }) {}; "openssl-streams" = callPackage - ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams - , network, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "openssl-streams"; - version = "1.2.1.3"; - sha256 = "0pwghr7ygv59k572xsj1j97rilkbjz66qaiyj0ra2wfg6pl70wfw"; - revision = "2"; - editedCabalFile = "1004kgdryflpkp19dv4ikilhcn0xbfc5dsp6v3ib34580pcfj7wy"; - libraryHaskellDepends = [ - base bytestring HsOpenSSL io-streams network - ]; - testHaskellDepends = [ - base bytestring HsOpenSSL HUnit io-streams network test-framework - test-framework-hunit - ]; - description = "OpenSSL network support for io-streams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "openssl-streams_1_2_2_0" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams , network, test-framework, test-framework-hunit }: @@ -157972,7 +157931,6 @@ self: { ]; description = "OpenSSL network support for io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory" = callPackage @@ -158594,24 +158552,6 @@ self: { }) {}; "optparse-simple" = callPackage - ({ mkDerivation, base, bytestring, directory, githash - , optparse-applicative, template-haskell, transformers - }: - mkDerivation { - pname = "optparse-simple"; - version = "0.1.1"; - sha256 = "192mw3dn43vcckjbhmmrbs3r6vaaa74xqsp6c5bvmv2wafm1plq3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base githash optparse-applicative template-haskell transformers - ]; - testHaskellDepends = [ base bytestring directory ]; - description = "Simple interface to optparse-applicative"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "optparse-simple_0_1_1_1" = callPackage ({ mkDerivation, base, bytestring, directory, githash , optparse-applicative, template-haskell, transformers }: @@ -158627,7 +158567,6 @@ self: { testHaskellDepends = [ base bytestring directory ]; description = "Simple interface to optparse-applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-text" = callPackage @@ -161965,8 +161904,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.2.0"; - sha256 = "04cvvff88ga3s22rcsjiyifdggjqpymfkbbcay7ibjhmiqwhisfq"; + version = "0.8.2.2"; + sha256 = "03k4njhn7sasr02446qj8x69hh8af7l35900lrvxr7qv741rc006"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -163827,30 +163766,6 @@ self: { }) {}; "persistent-mysql-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , io-streams, monad-logger, mysql-haskell, network, persistent - , persistent-template, resource-pool, resourcet, text, time, tls - , transformers, unliftio-core - }: - mkDerivation { - pname = "persistent-mysql-haskell"; - version = "0.5.1"; - sha256 = "1hl0igjcq9clwhn1dl6nix9gy8ka1mb2alb80cixz8gm8q6bx1dc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring conduit containers io-streams monad-logger - mysql-haskell network persistent resource-pool resourcet text time - tls transformers unliftio-core - ]; - executableHaskellDepends = [ - base monad-logger persistent persistent-template transformers - ]; - description = "A pure haskell backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; - }) {}; - - "persistent-mysql-haskell_0_5_2" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-logger, mysql-haskell, network, persistent , persistent-template, resource-pool, resourcet, text, time, tls @@ -163872,7 +163787,6 @@ self: { ]; description = "A pure haskell backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-odbc" = callPackage @@ -164720,8 +164634,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.27.0"; - sha256 = "1kx06kf700a849ivfnr36zs1sk7a5al71hx1h7w8b1agklf1kvzn"; + version = "0.0.28.0"; + sha256 = "106y0j3a3xnz76pdv1vdag1wqn21ybypxzygs66jm1qv6vlragcn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169206,8 +169120,8 @@ self: { }: mkDerivation { pname = "postgrest"; - version = "5.1.0"; - sha256 = "1x6jipc8ixv9wic5l0nlsirm3baddmrhphrr3snil1by5kz208g6"; + version = "5.2.0"; + sha256 = "0h4167jr0k398paf2sgnxkm4iziqf3a9i61cbh7d0ix86z2v8a53"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169222,14 +169136,14 @@ self: { ]; executableHaskellDepends = [ auto-update base base64-bytestring bytestring hasql hasql-pool - protolude retry text time unix warp + hasql-transaction protolude retry text time unix warp ]; testHaskellDepends = [ aeson aeson-qq async auto-update base base64-bytestring bytestring case-insensitive cassava containers contravariant hasql hasql-pool - heredoc hjsonschema hspec hspec-wai hspec-wai-json http-types lens - lens-aeson monad-control process protolude regex-tdfa time - transformers-base wai wai-extra + hasql-transaction heredoc hjsonschema hspec hspec-wai + hspec-wai-json http-types lens lens-aeson monad-control process + protolude regex-tdfa time transformers-base wai wai-extra ]; description = "REST API for any Postgres database"; license = stdenv.lib.licenses.mit; @@ -170732,7 +170646,7 @@ self: { description = "FFI bindings for the primesieve library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {primesieve = null;}; + }) {inherit (pkgs) primesieve;}; "primitive_0_5_1_0" = callPackage ({ mkDerivation, base, ghc-prim }: @@ -176699,25 +176613,6 @@ self: { }) {}; "rank2classes" = callPackage - ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit - , template-haskell, transformers - }: - mkDerivation { - pname = "rank2classes"; - version = "1.2"; - sha256 = "1qaqsg4xfvhdvffr42y1r95lkvm2spj27pwxz4vrhkxq56fkbj2p"; - libraryHaskellDepends = [ - base distributive template-haskell transformers - ]; - testHaskellDepends = [ - base distributive doctest tasty tasty-hunit - ]; - description = "standard type constructor class hierarchy, only with methods of rank 2 types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "rank2classes_1_2_1" = callPackage ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit , template-haskell, transformers }: @@ -178376,14 +178271,14 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.1"; - sha256 = "1lpk8mkh3vd2j56f0fmaj64indgf5m1db9355fgimcb4xfw13nq1"; + version = "5.1.1"; + sha256 = "0qw112jkl6jzy3wcyxvv5liv16mxiiqi5v5zyzazl9p8h2wy1rb0"; libraryHaskellDepends = [ base base-orphans comonad free template-haskell th-abstraction transformers ]; testHaskellDepends = [ base HUnit template-haskell transformers ]; - description = "Generalized bananas, lenses and barbed wire"; + description = "Representing common recursion patterns as higher-order functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180024,31 +179919,6 @@ self: { }) {}; "registry" = callPackage - ({ mkDerivation, async, base, containers, exceptions, hashable - , hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl - , protolude, random, resourcet, semigroupoids, semigroups, tasty - , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base - }: - mkDerivation { - pname = "registry"; - version = "0.1.2.3"; - sha256 = "17jzvbig0zcmhb1vf2g286px35j3kh544rpsap0094lmj9yac7ni"; - libraryHaskellDepends = [ - base containers exceptions hashable mtl protolude resourcet - semigroupoids semigroups text transformers-base - ]; - testHaskellDepends = [ - async base containers exceptions hashable hedgehog hedgehog-corpus - io-memoize MonadRandom mtl protolude random resourcet semigroupoids - semigroups tasty tasty-discover tasty-hedgehog tasty-th text - transformers-base - ]; - testToolDepends = [ tasty-discover ]; - description = "data structure for assembling components"; - license = stdenv.lib.licenses.mit; - }) {}; - - "registry_0_1_2_6" = callPackage ({ mkDerivation, async, base, containers, exceptions, hashable , hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl , protolude, random, resourcet, semigroupoids, semigroups, tasty @@ -180071,7 +179941,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "data structure for assembling components"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regress" = callPackage @@ -181300,8 +181169,8 @@ self: { pname = "req-conduit"; version = "1.0.0"; sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx"; - revision = "4"; - editedCabalFile = "13chmpfq1m1fgmgf7nxgs4dgfkpsv2khp4ma3cqqki76j1s8rq3p"; + revision = "5"; + editedCabalFile = "1vbki857d5xj54s83r7kqirrg9a738xr55d40xqcaxxm7ki4s63i"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -188330,26 +188199,16 @@ self: { }) {}; "sendfile" = callPackage - ({ mkDerivation, base, bytestring, network }: - mkDerivation { - pname = "sendfile"; - version = "0.7.9"; - sha256 = "0hnw1ym81cff49dwww19kgbs4s0kpandbvn6h5cml3y0p1nxybqh"; - libraryHaskellDepends = [ base bytestring network ]; - description = "A portable sendfile library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sendfile_0_7_10" = callPackage ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "sendfile"; version = "0.7.10"; sha256 = "1wnfmq64sq13siig0rrnln2bmk1aygnsgdwh5dh32agv9csrk4ab"; + revision = "1"; + editedCabalFile = "08k4clhyfa4h5ja9bz1mzg2wdx5337cg8bxd6lz25781f65llq7d"; libraryHaskellDepends = [ base bytestring network ]; description = "A portable sendfile library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sendgrid-haskell" = callPackage @@ -190872,8 +190731,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.2"; sha256 = "1a1wk90vm6mq8byxz4syr03l1rf6qj8zhda7lnp23pn5d270xkd2"; - revision = "1"; - editedCabalFile = "0dd97qvi5w1y90ln58pk0y2vb5f1bhwsix9ym3cnnq8h0snfda4p"; + revision = "2"; + editedCabalFile = "02yxnvd54wcykhswivhg5sr67njz0p3raxmp5nqmijwwxh0iqdvc"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -195338,6 +195197,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "slack-web_0_2_0_10" = callPackage + ({ mkDerivation, aeson, base, containers, errors, hspec + , http-api-data, http-client, http-client-tls, megaparsec, mtl + , servant, servant-client, servant-client-core, text, time + , transformers + }: + mkDerivation { + pname = "slack-web"; + version = "0.2.0.10"; + sha256 = "0dcvy6x08xm3kgxh65p7kvp7r4f1n819g933vna37sjwy94mmqh1"; + libraryHaskellDepends = [ + aeson base containers errors http-api-data http-client + http-client-tls megaparsec mtl servant servant-client + servant-client-core text time transformers + ]; + testHaskellDepends = [ + aeson base containers errors hspec http-api-data megaparsec text + time + ]; + description = "Bindings for the Slack web API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "slate" = callPackage ({ mkDerivation, base, directory, filepath, htoml , optparse-applicative, process, string-conversions @@ -196219,42 +196102,6 @@ self: { }) {}; "snap-core" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder - , case-insensitive, containers, deepseq, directory, filepath - , hashable, HUnit, io-streams, lifted-base, monad-control, mtl - , network, network-uri, old-locale, parallel, QuickCheck, random - , readable, regex-posix, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector - , zlib - }: - mkDerivation { - pname = "snap-core"; - version = "1.0.3.2"; - sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc"; - revision = "3"; - editedCabalFile = "0wlhn33r7c9g7j23y006ddq9d87lkmianvvfrbl8jd8mvjvj2gfa"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-builder case-insensitive - containers directory filepath hashable HUnit io-streams lifted-base - monad-control mtl network network-uri old-locale random readable - regex-posix text time transformers transformers-base unix-compat - unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring bytestring-builder case-insensitive - containers deepseq directory filepath hashable HUnit io-streams - lifted-base monad-control mtl network network-uri old-locale - parallel QuickCheck random readable regex-posix test-framework - test-framework-hunit test-framework-quickcheck2 text time - transformers transformers-base unix-compat unordered-containers - vector zlib - ]; - description = "Snap: A Haskell Web Framework (core interfaces and types)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "snap-core_1_0_4_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , case-insensitive, containers, deepseq, directory, filepath , hashable, HUnit, io-streams, lifted-base, monad-control, mtl @@ -196286,7 +196133,6 @@ self: { ]; description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-cors" = callPackage @@ -196511,6 +196357,8 @@ self: { pname = "snap-server"; version = "1.1.1.0"; sha256 = "0kjdsdgpxxsp5r4gpx8wdq5qn1b1y80mgkl9ahjbhlahjf5xyf6k"; + revision = "2"; + editedCabalFile = "1p39ngr6ynmhwgln2cappkgmb5mfxn23i6qwwid6gak62wipldk4"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -205647,39 +205495,6 @@ self: { }) {}; "swagger2" = callPackage - ({ mkDerivation, aeson, base, base-compat-batteries, bytestring - , Cabal, cabal-doctest, containers, cookie, doctest, generics-sop - , Glob, hashable, hspec, hspec-discover, http-media, HUnit - , insert-ordered-containers, lens, mtl, network, QuickCheck - , quickcheck-instances, scientific, template-haskell, text, time - , transformers, transformers-compat, unordered-containers - , utf8-string, uuid-types, vector - }: - mkDerivation { - pname = "swagger2"; - version = "2.3.1"; - sha256 = "0717i4bv97sywbdf94bszh2g858wznvl8q7ngv0zirnlvx8a27y6"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson base base-compat-batteries bytestring containers cookie - generics-sop hashable http-media insert-ordered-containers lens mtl - network QuickCheck scientific template-haskell text time - transformers transformers-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - aeson base base-compat-batteries bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - quickcheck-instances template-haskell text time - unordered-containers utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Swagger 2.0 data model"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "swagger2_2_3_1_1" = callPackage ({ mkDerivation, aeson, base, base-compat-batteries, bytestring , Cabal, cabal-doctest, containers, cookie, doctest, generics-sop , Glob, hashable, hspec, hspec-discover, http-media, HUnit @@ -207985,6 +207800,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tapioca" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, cassava + , errors, hspec, lens, unordered-containers, vector + }: + mkDerivation { + pname = "tapioca"; + version = "0.1.1.0"; + sha256 = "12rx22dixl4i48jmicvax0ix5h2savcmdni4bxh5c3pm2ic1330m"; + libraryHaskellDepends = [ + attoparsec base binary bytestring cassava errors lens + unordered-containers vector + ]; + testHaskellDepends = [ base hspec vector ]; + description = "A tasty enhancement to cassava for easy csv exporting"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tar_0_4_1_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, old-time }: mkDerivation { @@ -210837,28 +210669,6 @@ self: { }) {}; "texmath" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.11.1.2"; - sha256 = "1wac48qlcwrfm5j1yng27929iqnj2x0zkj7ffrwkj3rchf0i4grp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - description = "Conversion between formats used to represent mathematics"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "texmath_0_11_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, split, syb, temporary, text , utf8-string, xml @@ -210878,7 +210688,6 @@ self: { ]; description = "Conversion between formats used to represent mathematics"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -210982,29 +210791,6 @@ self: { }) {}; "text-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion - , deferred-folds, QuickCheck, quickcheck-instances, rerebase - , semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , transformers - }: - mkDerivation { - pname = "text-builder"; - version = "0.6.4"; - sha256 = "0s3rphrp9d3pbagmlzz3xdm4fym38j8vg55wlqw1j1pkbdvm2cgg"; - libraryHaskellDepends = [ - base base-prelude bytestring deferred-folds semigroups text - transformers - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict text builder"; - license = stdenv.lib.licenses.mit; - }) {}; - - "text-builder_0_6_5" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion , deferred-folds, QuickCheck, quickcheck-instances, rerebase , semigroups, tasty, tasty-hunit, tasty-quickcheck, text @@ -211025,7 +210811,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict text builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-containers" = callPackage @@ -212562,32 +212347,6 @@ self: { }) {}; "these" = callPackage - ({ mkDerivation, aeson, base, bifunctors, binary, containers - , data-default-class, deepseq, hashable, keys, mtl, profunctors - , QuickCheck, quickcheck-instances, semigroupoids, tasty - , tasty-quickcheck, transformers, transformers-compat - , unordered-containers, vector, vector-instances - }: - mkDerivation { - pname = "these"; - version = "0.7.5"; - sha256 = "1yrmxkpka0b6hzb7h2j603rjvyzhldrsq8h7336jr7b0ml929b6v"; - libraryHaskellDepends = [ - aeson base bifunctors binary containers data-default-class deepseq - hashable keys mtl profunctors QuickCheck semigroupoids transformers - transformers-compat unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - aeson base bifunctors binary containers hashable QuickCheck - quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "these_0_7_6" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, data-default-class, deepseq, hashable, keys, lens , mtl, QuickCheck, quickcheck-instances, semigroupoids, tasty @@ -214030,6 +213789,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timer-wheel_0_2_0" = callPackage + ({ mkDerivation, atomic-primops, base, ghc-prim, primitive + , psqueues, random + }: + mkDerivation { + pname = "timer-wheel"; + version = "0.2.0"; + sha256 = "0i1n9qbichgalrw9sp6qwhd9p4179havlp4gqbck2w9sbans05hp"; + libraryHaskellDepends = [ + atomic-primops base ghc-prim primitive psqueues + ]; + testHaskellDepends = [ base random ]; + description = "A timer wheel"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "timerep" = callPackage ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, text, time @@ -224087,6 +223863,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "vector-builder_0_3_7" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, QuickCheck + , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "vector-builder"; + version = "0.3.7"; + sha256 = "06n33dzszqx2yzf9q9n0ap0avb0ljfyx8b6mp7k80vmakxfxdxds"; + libraryHaskellDepends = [ base base-prelude semigroups vector ]; + testHaskellDepends = [ + attoparsec QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Vector builder"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-bytes-instances" = callPackage ({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }: mkDerivation { @@ -225578,8 +225373,8 @@ self: { }: mkDerivation { pname = "waargonaut"; - version = "0.5.2.1"; - sha256 = "0siyqgw634sw9zz3zb7akl691g3yznvm0851avn44nfrj6xp1nq1"; + version = "0.5.2.2"; + sha256 = "06kkgn6p28c29f9i3qs2wxmbsg449d7awi4h7giakws6ny1min95"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors bytestring containers contravariant digit @@ -228712,40 +228507,6 @@ self: { }) {}; "websockets" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , bytestring, bytestring-builder, case-insensitive, containers - , criterion, entropy, HUnit, network, QuickCheck, random, SHA - , streaming-commons, test-framework, test-framework-hunit - , test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; - version = "0.12.5.2"; - sha256 = "0wacifjbskkfv6xq1sbmc8p60wn767xcjhz8hn8hyijxrrmjabci"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive containers entropy network - random SHA streaming-commons text - ]; - testHaskellDepends = [ - attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive containers entropy HUnit - network QuickCheck random SHA streaming-commons test-framework - test-framework-hunit test-framework-quickcheck2 text - ]; - benchmarkHaskellDepends = [ - attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive containers criterion entropy - network random SHA text - ]; - doCheck = false; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets_0_12_5_3" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , bytestring, bytestring-builder, case-insensitive, containers , criterion, entropy, HUnit, network, QuickCheck, random, SHA @@ -228777,7 +228538,6 @@ self: { doCheck = false; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-rpc" = callPackage @@ -229182,18 +228942,6 @@ self: { }) {}; "wide-word" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog }: - mkDerivation { - pname = "wide-word"; - version = "0.1.0.7"; - sha256 = "0qqam1sxssxq43r8i586lrs2zslm2qnw5yhjdqj5zxksk2jrcxrd"; - libraryHaskellDepends = [ base deepseq ghc-prim ]; - testHaskellDepends = [ base bytestring ghc-prim hedgehog ]; - description = "Data types for large but fixed width signed and unsigned integers"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "wide-word_0_1_0_8" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog , primitive, QuickCheck, quickcheck-classes, semirings }: @@ -229208,7 +228956,6 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wigner-symbols" = callPackage @@ -235135,42 +234882,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, fast-logger, gauge, hspec, hspec-expectations - , http-types, HUnit, monad-logger, mtl, network, parsec - , path-pieces, primitive, random, resourcet, rio, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , unix-compat, unliftio, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.10.1"; - sha256 = "0xkfzdy1r07w7xqai4r5b96rrk51gr5ndwrf20nhdnjjms4928li"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types monad-logger mtl - parsec path-pieces primitive random resourcet rio shakespeare - template-haskell text time transformers unix-compat unliftio - unordered-containers vector wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_11" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, byteable, bytestring, case-insensitive, cereal , clientsession, conduit, conduit-extra, containers, cookie @@ -235204,7 +234915,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage From aa4af45d3963d4bd19071fc7c530291efe17345b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Feb 2019 18:12:11 +0100 Subject: [PATCH 129/193] all-cabal-hashes: update to Hackage at 2019-02-04T16:43:55Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index e6c8b1a388a3..c50c511e7363 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c400563a55894c34ae0d7dec415ac8994aa74aa0.tar.gz"; - sha256 = "0mqgfw8sc0h4p031gcs4m3n6rbd31zrqx2lh1xgplhxldhw5gg8p"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e95fefd56a6b8de585e92cd34de4870e31fb7bc7.tar.gz"; + sha256 = "08pzxwsc4incrl5mv8572xs9332206p2cw2mynxks33n7nh98vmx"; } From 30c40858bd7fb2bd59636c94472c9466705f320b Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 4 Feb 2019 18:30:25 +0100 Subject: [PATCH 130/193] gitlab-runner: 11.6.0 -> 11.7.0 --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 93f389e6879a..ae9fa6b3690c 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.6.0"; + version = "11.7.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "16xwj962biny18ci8lvfc6r6jq9vcdlc8vs6w7d5yzvd9x55rvwd"; + sha256 = "1q8m2hi85kh01lz6agp76ppny3ik5m61v5l3ipha4jf6k90140k8"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "05wb7imly0c5zqmxrgdpls8izsq1g409nh31yf6j0sr76m8qkvf9"; + sha256 = "1325jh984hv7yhc977d271866i5gq78lmw4h16sj5i8zny4wzgz5"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1g9wyi9n9xvynvn7c8kjzm5pznyw7w4ziklxjniaa69idzgvbl5g"; + sha256 = "119azvkbx6gmmh7y166jxaja0a6n8lghmslsyar95dxw8akxrfzz"; }; patches = [ ./fix-shell-path.patch ]; From b015c68deffba99822620b5f3ba091c2d9d03d27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 Feb 2019 15:15:37 -0800 Subject: [PATCH 131/193] verilator: 4.008 -> 4.010 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/verilator/versions --- pkgs/applications/science/electronics/verilator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index fdee3e013ded..d2246f656db0 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "4.008"; + version = "4.010"; src = fetchurl { url = "https://www.veripool.org/ftp/${name}.tgz"; - sha256 = "1b0cj7bb2a3hrfaziix7p9idcpbygapdl0nrfr3pbdxxsgnzdknm"; + sha256 = "0wfmazhxb6bf6qznh7v756fv7jayjgkzar33gazkwdwfwa7p8lan"; }; enableParallelBuilding = true; From a7d9dcab7e2f759a7ff1ff7fb99f92fba75631f0 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 5 Feb 2019 02:59:42 +0900 Subject: [PATCH 132/193] nixos/nextcloud: use matching nginx package when configuring nginx NixOS currently defaults services.nginx.package to nginxStable. Including configuration files from nginxMainline could potentially cause incompatible configuration. --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index ecb1c5615d58..ee1354d6a997 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -426,7 +426,7 @@ in { "~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\\.php(?:$|/)" = { priority = 500; extraConfig = '' - include ${pkgs.nginxMainline}/conf/fastcgi.conf; + include ${config.services.nginx.package}/conf/fastcgi.conf; fastcgi_split_path_info ^(.+\.php)(/.*)$; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param HTTPS ${if cfg.https then "on" else "off"}; From 8dda7e9215b2a4f40e32e17492bf3ae3c2da0160 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 00:06:46 -0800 Subject: [PATCH 133/193] python37Packages.rasterio: 1.0.13 -> 1.0.15 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-rasterio/versions --- pkgs/development/python-modules/rasterio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 02848856eb1f..6b9ed24488fd 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.0.13"; + version = "1.0.15"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "1l1ppclmcq4cmbqvplrpx9sscxfpjlba6w0114y1ma675w30bgfb"; + sha256 = "0waxkqdkaxxmqnkpj397niq193l2bg8s9isal4c7q12jbm6mf7f7"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ]; From 4a3f06a6526c0e0e0da21c8fca678fb29a19a27d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 4 Feb 2019 10:49:29 -0600 Subject: [PATCH 134/193] swift: 4.2.1 -> 4.2.2 --- pkgs/development/compilers/swift/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 02b100fe6130..468c04b5c96c 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -34,7 +34,7 @@ }: let - v_base = "4.2.1"; + v_base = "4.2.2"; version = "${v_base}-RELEASE"; version_friendly = "${v_base}"; @@ -84,7 +84,7 @@ let }; foundation = fetch { repo = "swift-corelibs-foundation"; - sha256 = "1bfnkj8s3v327cy0czkngz0ryzmz7amjzkkxbsg2zyrhf9a9f0f7"; + sha256 = "1ki9vc723r13zgm6bcmif43aypavb2hz299gbhp93qkndz8hqkx5"; }; libdispatch = fetch { repo = "swift-corelibs-libdispatch"; @@ -93,7 +93,7 @@ let }; swift = fetch { repo = "swift"; - sha256 = "0y277wi0m6zp1yph9s14mmc65m21q5fm6lgzkn2rkrbaz25fdzak"; + sha256 = "1hwi6hi9ss1kj1s65v5q8v8d872c0914qfy1018xijd029lwq694"; }; }; From 23319c67465235651dd887e224bb424547fa6150 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 4 Feb 2019 20:09:06 +0100 Subject: [PATCH 135/193] vimPlugins: Update --- pkgs/misc/vim-plugins/generated.nix | 220 ++++++++++++++-------------- 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b4a0081910df..3ea855bfae6a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-01-27"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "067601e9db7e0c2ab6c8394c9be74769463c6da9"; - sha256 = "18pgwcsryd2p6gw37iw4q0km1d174wgl1nb0ibb55xpzxgpcs1nf"; + rev = "4d426bf2873c6e1cd2c71e478c756903307628d3"; + sha256 = "044nzg672rmbamvzmc41i6klgs7qwdv1a3gl2l18cbli8jr4q8c2"; }; }; @@ -83,12 +83,12 @@ let ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2019-01-09"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "e5b9acf212536b9be77a5460a757aee50420c9fa"; - sha256 = "086i8dcz8sxad0k4dzpnp7sjfkys7j3j2sjn8k0b9jaq360ygmk7"; + rev = "dec377ddffd6616aa156029a5f065496582f697b"; + sha256 = "1rmji65skhnf1658f67kaxbhfiwcc7yf91n96ni74djsp26mqfzm"; }; }; @@ -105,12 +105,12 @@ let auto-pairs = buildVimPluginFrom2Nix { pname = "auto-pairs"; - version = "2019-01-28"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "jiangmiao"; repo = "auto-pairs"; - rev = "1c3f4c8171ee30fcdbfd474c8e6bc6842a22be4d"; - sha256 = "0zsw6zvd4x2hnx1p99qkhkqxgv06j79vzi50drgn5ipfpk1ipp4x"; + rev = "40ba005829450406e92ec6277d4308ab532dd256"; + sha256 = "0pxrsmrcnci2k3crmj6ldb0faiai5f9ic1ywx513v148cl4vh8h1"; }; }; @@ -326,12 +326,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2019-01-11"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "502f03ddb1b519d7581d9119b2cdaef59c0bf32a"; - sha256 = "022nz1aii4vpyfg27bq415368dpnc3dlhh11gbqqncy99an40nvk"; + rev = "ea2685eb1c522dc7ea51ca0a1f215d4107d9978d"; + sha256 = "1kzavi4ja0ivw4jiqm2cyhb018x0npshr912jdkjwihklcrz26vb"; }; }; @@ -403,12 +403,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-01-28"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "613e33123b8aa2abd8e020867c26a5e6d9ea47d4"; - sha256 = "1apy2jm2837qvyy6fygkgspp4k64wv5yhc3mh4n93ips02fyygva"; + rev = "334fce21f798a3c4c7b33a37b107df28069e2bd7"; + sha256 = "01nbbsp62jqff7pm85lbi3kmwgq83cpm87p3bn8nbb7iw8ivkiva"; }; }; @@ -494,12 +494,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-01-28"; + version = "2019-02-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "067ed5acdc77d200fb6c2bb28caee63f5781bba3"; - sha256 = "10b4z3r93ivdadvf235syh44zqrkq7ggsl6lnixcpjwki0ry5j5d"; + rev = "1d577d43feae8eae88176c7909e7891297acc8de"; + sha256 = "1hbwz2mkxzq213bpgvrnpf784f193s9bk479nhysrv6704dpqb4v"; }; }; @@ -606,12 +606,12 @@ let ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2019-01-15"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "db3358f25d2dea3cf65ef28f5cf7b0d5fa2bd857"; - sha256 = "1lnd3sa3cw0sdkkc4784rvn9iq17qbzvrq1rmsr75c3r0p086jww"; + rev = "023b441f7aab72166ab5436ff5b6d1500be472b1"; + sha256 = "1a10l1fkgwpi8dm1wfsbllpcb3dnj1p6lg3xp2l5qg10bsjng1lk"; }; }; @@ -872,12 +872,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2019-01-21"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "a7402031c6f6eefc77c16e570cbd0e411923679a"; - sha256 = "07ys787kkwy7dy9kwbjrqf2srfbc39ivmccb5yfdhxaxdrjr90bp"; + rev = "84104d0d55db347be045927e71cf9b0a88e72c2f"; + sha256 = "1bbpi9ndapp14qvbk7qr2xzih0sg6i7rx4sadf3zryasjaxxbfv4"; }; }; @@ -1103,12 +1103,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2018-12-30"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "e83470ab925a76c9f1bde4904c682c49ae4f939e"; - sha256 = "0mxfg2pcrcy4198klvib188zipb38bxg2pf3nypsngcsbmxql0yv"; + rev = "e57ec7889bfb4371c5a4241183204d0bd1f8aea8"; + sha256 = "0ynln0wn0kg5s6n3v31bijwkr0cghv5jzlkawaj4ihxnx44lf839"; }; }; @@ -1125,12 +1125,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-01-25"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "856b272bc09850835e3cd6c47ab5b91b995bd993"; - sha256 = "063v107d738ggbf85iswiz0j9c7nb6vazghbdkr2sq2c55zsh8l0"; + rev = "5fc1f982a5172705038e0a65adf587d9e43c160e"; + sha256 = "1r8mfn95s9kmswbkqsk03n2y2zzi8msqfkl9nzy2l9af9hvf9gwr"; }; }; @@ -1158,23 +1158,23 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2019-01-28"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "a3c618221999a64997d32563fc6bdabdb63e898d"; - sha256 = "0ck05cvz7n9brzrnmpyqr0hq0ik0papny61pbqs8ccdvxcwm1yqg"; + rev = "c9b41fe9b8cca4b6a11cc0cbe71eecb94fa8a30f"; + sha256 = "1dn09s5jyi0k521llbi4qg5kpmza55i6bxxfvaizkdzdcimnmwxq"; }; }; neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2019-01-22"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "b4156bd3208c1b96efe53b5407ecda0cf5b5d0f8"; - sha256 = "1jc8r5367yfa8zkb9wra8mc400hkr56s98q009iyns6zcp84kmji"; + rev = "372401281a45eb1389de523440ed38df2c059515"; + sha256 = "1487fbz7hbslr7n7kj3v49476rzzmc3l294gkhgf90ymyv1s8phn"; }; }; @@ -1202,23 +1202,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2018-12-26"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "371e4d0e099abb86a3016fefd1efae28a4e13856"; - sha256 = "0rdfjkd85w1d22mnfxy4ly35d7vi7q09i32hypxnhk7120hjmzdg"; + rev = "3427b2f4ef5f28c9886b7fed54eb9b1cd417fbdf"; + sha256 = "1mfb34z37bl5rqs5q0jmgjqmiqkjl7fw7plik8qfnwgbaspxhfv3"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2018-12-12"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "72c3656799289d4635520c28e17f737066ce19d6"; - sha256 = "1dy77vjj2prn0cl2k3cf7bd240nvh95m6h6lpv0zshjzjap7m1fx"; + rev = "8cc154d4b0cf28f73815050b9782e6ac5a4d733d"; + sha256 = "0cfasf1g4xns1pasriy14k16w6v2j7cb2zbxh62d6cra0jra70i0"; }; }; @@ -1290,12 +1290,12 @@ let onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; - version = "2019-01-28"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "d8790c28aa6e574e5e00307acf8c2f5286dfd6de"; - sha256 = "1b3cvrljsswalhlvxph7qh8ffcjwzmqk014cn0nivwargfck0ai8"; + rev = "5d489606484decb862d4c943d845595be3fe7a0f"; + sha256 = "1qsr470h772xvfxs8bfimb58g77015n0h0ggqjsr3hmm43qj8mal"; }; }; @@ -1455,12 +1455,12 @@ let Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; - version = "2018-10-22"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "28195f7d1047515438c43a3ae8ac39648376412b"; - sha256 = "03jd3jzq0b1djym448vyg0bvrkfrhk86djkbkyzajrsfj46ygs8q"; + rev = "493d80ef7a4f16926d10b8c3923cf69c5209fe34"; + sha256 = "0nqs98g6lq45yrrlwgxckkgq90n73s7nibih2906s0zvsr1x95s8"; }; }; @@ -1642,12 +1642,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2019-01-28"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "1cbf03ac9bbb3817e6ab3cf9ba9cea41d0d2b06e"; - sha256 = "123agkbwvvjnci9c3vdy7zwz5gcv5ybrjq1779q8is3m8jycjvyy"; + rev = "7274363a7267bf168ec21a50375102d602fd1232"; + sha256 = "0x6jn1hqxjlhhsykqqrlx910x53xcrwd3qa1jx0a9yighws9b01i"; }; }; @@ -1752,12 +1752,12 @@ let tlib_vim = buildVimPluginFrom2Nix { pname = "tlib_vim"; - version = "2018-04-08"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "tomtom"; repo = "tlib_vim"; - rev = "ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b"; - sha256 = "08vvd1wpa9k5bid2hh279jjkir2c59ga3527qzinxngmlx8wsbhx"; + rev = "857858deae98c31c766446bd54f73e636691eecb"; + sha256 = "04b8m6hzh8rgdy5h3n39mi9fqm38x8r7zn76h3inm2mw85h86jla"; }; }; @@ -1818,23 +1818,23 @@ let undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2019-01-22"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "63734df2a33eb809a985657662e3a7c671480177"; - sha256 = "0rrrsxs8bxzg3a2lqsrq9s4n2qy2h6fmj61pgy7ckly1gn0kk691"; + rev = "db0223fc6857c160b2394489094355feb20318f2"; + sha256 = "0ncqwn0gdz23gp9avdqkd8l0z6zc87m0xmi63b0axarp1lfazr56"; }; }; unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2018-12-14"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "f08df66abda88a83f0436e0bd1ffa05009a9645a"; - sha256 = "15mrmawxa1gwhirb11w10lw1prl3sjr6xy7xgsfjja2fzz5wm1jy"; + rev = "b55994a18b19499f8de19cf7ea48670113a45e4f"; + sha256 = "1mcspmnd7qvscf1zxn0i7gzb4yxa5xcpg7piyvssx9nbb8w57jr1"; }; }; @@ -2082,12 +2082,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-01-28"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "98bc6abde3860600e599c7ad17fdfb80809c04af"; - sha256 = "029f63gxppgnwx1ymwra1bn0xvqfdp4rm0dxbiafdyh5h7c3zb14"; + rev = "40786883051429053d22ad0da4e04b52e900aaba"; + sha256 = "09igzw2wg2m55bq9l343wgxdgjmhjg62sz3fr2wjgmr5ji4kpkn4"; }; }; @@ -2148,12 +2148,12 @@ let vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; - version = "2018-01-11"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "vim-bazel"; - rev = "ecafb17d5d1d3756e5ac0bd9f4812a450b8c91a3"; - sha256 = "0ixhx9ssfygjy2v2ss02w28rcjxnvhj0caffj32cv3snwnpcz6fy"; + rev = "9a555405baaccc3fa4cad2fc6c627eb43f3be939"; + sha256 = "15kzi9b30l6xhz71r376w3vgml7g4vpi046ff9fvl1i6vi4ny78f"; }; }; @@ -2313,12 +2313,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2018-06-21"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "ea5bbf0e2a960965accfa50a516773406a5b6b26"; - sha256 = "1v365j4an1k82gk06ikgqy2dw0ir80kj0svs1fymgklc117xgqsg"; + rev = "7cbdd2b68ff9bc6d4da74e9872b12adf32b1bc2f"; + sha256 = "00g6cy2ly26fmzjdjga987k2apkkhpy1jkndj6d1hg35kwv7bihv"; }; }; @@ -2511,12 +2511,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-01-27"; + version = "2019-02-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "d27dbc40d4264525b1c812482bf0efecfed53f28"; - sha256 = "12r1s10z74sy7a76bs5mwazb4yy29ym2mfzm6xdz3nadngxlbb8v"; + rev = "ed07f9a503e53ec3ca4d5e255acb078675f2ff0e"; + sha256 = "0ykzawd9axa68109mwl3c7177si8sxy6b5x0xwf4z80c1xnc8czx"; }; }; @@ -2555,12 +2555,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-01-25"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "afa4f2ddf0fecb37914ec37357636abb18013422"; - sha256 = "1bf2bxn967sw1x4mxfy43p0k4cgi719pg3gsk7yqih8imb22ihdl"; + rev = "fd834e48eed21cc3c3ab66779a2296a16f41cbca"; + sha256 = "1q8263cxa7ic3bijl0zlz14pxa8mqww1isb6a9gpwmlmxrfwhl7x"; }; }; @@ -2775,12 +2775,12 @@ let vim-jade = buildVimPluginFrom2Nix { pname = "vim-jade"; - version = "2019-01-13"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "digitaltoad"; repo = "vim-jade"; - rev = "2eb75dc5c31e4f84e9c7a0d7d02c6cdd905bf79e"; - sha256 = "1vgw9fs6j0fzv4y9kj2njnw2izymbmv3wgz004alb1h0khhzgaw2"; + rev = "0b4f42ac1ae491adac2b99b81eddd2bfd79337ee"; + sha256 = "0xr54p19fr8z6ywaw2mlmw0c92dlc7xjsnif19bafjxrlz3l0aq9"; }; }; @@ -3341,8 +3341,8 @@ let src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "2a332fed835c3286139756a1377c3aa05f4e935f"; - sha256 = "1rvqc25834yr16b300lwadgn5p7ksba6x4nxilxmaiksbhj3j8gn"; + rev = "4f640daecbb1d0b4f6c02675bfc0fa958102f5be"; + sha256 = "1rja2kc3i364d7bfq8d1z5yck6sjzyjxrciv5cb4ww1v6njp4ay5"; }; }; @@ -3414,12 +3414,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-01-25"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "a1ddf6d524a244bbccdded1a6c03771972422b29"; - sha256 = "11sldd2vv3b71qrdc2jhag4k3amg8s9n5jhyj8lhhh86ky6wp47z"; + rev = "768f52319212b6e2964e4f11d1baf7092066d504"; + sha256 = "14b9s7plj9h55n1ddqvjy13mfciviq2ngmjs3x22vrpwgsga2zik"; }; }; @@ -3436,12 +3436,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2019-01-22"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "06525ceee2457bed7c7718fef0b4fe715651c392"; - sha256 = "09ldx1d12cwpdxfyfzl7hxi2ds3jysfpy57yxvv073bldkhv6c7q"; + rev = "8717c21b270cfd7396de54a256c7be3a30e70cc1"; + sha256 = "01yl8pl59yksdz9z6ry70m441w847cjwx92z0qf3ipv5038dsngs"; }; }; @@ -3469,12 +3469,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-01-27"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "54e76dd36c8341197cd7284c37e21b61561f081a"; - sha256 = "1i7swgd8izzihkni6hq6cg1q7bkgi3kl2sqnm1q7a9v30k9lrcav"; + rev = "075e97b6b6c1f981a15f7a887d7c006141fccbfc"; + sha256 = "19hifbhdg2hp7b719vjrpkk0zndmswp1px2r94blvyd82gn21y42"; }; }; @@ -3513,12 +3513,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-01-13"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "06f2f59d4fc6d56b034f98cecd8702168b674020"; - sha256 = "12y4sbjay3xpckhcik4nc7ahishg5firclrl08sgbsrx3rly2sm6"; + rev = "69e835d1f779140f7c0a27f6fd30ae4d1f9dac77"; + sha256 = "0s4938xrmn6ivm4dvkhpqc5gdx42hk2m206fkhayxagvwnxsfiwb"; }; }; @@ -3612,12 +3612,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-01-20"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "7e5e118720be538fd560dee8bf34c3f139f2b037"; - sha256 = "11k0dvbs4kc448ff2a61q7rgprhiv28rxbbs1g20ljhafzfz52q3"; + rev = "ae44000a0e556a6b4c95d75b6ad39ffc1dd5f066"; + sha256 = "02h1y59wzb7kxyqr2405y72sq0bf6yn16vw2qxfnbp7shdhxr2sa"; }; }; @@ -3645,12 +3645,12 @@ let vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2018-11-03"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "9f7d1588b04644d8a1671d2325fefbb4f772e466"; - sha256 = "08nxa5v56zmsjbx0zld1i9nwydxmb3r6qmxb9hgnvzg4aylmbxlc"; + rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42"; + sha256 = "1b8sgbzl4pcpaabqk254n97mjz767ganrmqbsr6rqzz3j9a3s1fv"; }; }; @@ -3821,12 +3821,12 @@ let vimpreviewpandoc = buildVimPluginFrom2Nix { pname = "vimpreviewpandoc"; - version = "2018-11-05"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "tex"; repo = "vimpreviewpandoc"; - rev = "61d34f27b6d47da6523b682e32a155f65867d46e"; - sha256 = "08hszn4mjp64b1qcfc868cyrrylil2257sjzs19w61p10l6j6skm"; + rev = "90e39ff676c78bc6f3dde2a76b56fe86aa38d39c"; + sha256 = "0xaaq565wfd2bx64wm1cy0k18jrm6l9snwkvmgbp7p10zjxnqfhs"; }; }; @@ -3854,12 +3854,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-01-24"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "48c2927ffad12d487129da718f1d4a7386a02cdf"; - sha256 = "0jq1pkrj2d1ajd9bh6288f0d0pz5zyhl01icx0xpvjk8dilplk14"; + rev = "97b02bb024b23501302f50c068e89b058faace6b"; + sha256 = "1yd6xl7a2gbazgr6fs9n00b9msz1w7szl42h0pn80nmgp0pmjmcp"; }; }; @@ -3876,12 +3876,12 @@ let vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2019-01-20"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "4e6db92d2c5a3ff24e64f6ba88220e7000f6c2b3"; - sha256 = "0wd6kvryx95knx3k5z2f2ii0sckhb7k5w11z4swig3s11pv62cfs"; + rev = "417490f30b3aaec600c19cfa59018cf2368dd87b"; + sha256 = "12mkk48kgjd7ijz81drmd4fimd9881r4nhhffckqqkv0r0mvg8x8"; }; }; @@ -4043,12 +4043,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-01-02"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "6e8b24f97152952e89979eb2638dd0963b3a1567"; - sha256 = "0y5f6lbkizspab35dym3f634b24vjfda8zi09ayvy9bi8g0zmmx3"; + rev = "09e0bceb7be1488318df9441a5499f1dde644e72"; + sha256 = "1g1s0176s3cz0ynyrx5a3r0jnbmqgln318v7hw5qvgalf3k99c5c"; }; }; From 722af384ea4979c3245161f25abf8463d405f507 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 4 Feb 2019 21:47:13 +0100 Subject: [PATCH 136/193] nixos/ndppd: add short changelog entry --- nixos/doc/manual/release-notes/rl-1903.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 6c45301b91e1..eca280afdf18 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -476,6 +476,14 @@ + + + The ndppd module + now supports all config options provided by the current + upstream version as service options. Additionally the ndppd package doesn't contain + the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now. + + From ff06495bfed8a687bc86281f73a08818932a77ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 12:48:12 -0800 Subject: [PATCH 137/193] papirus-icon-theme: 20190106 -> 20190203 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/papirus-icon-theme/versions --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 89ec5ec54de1..3b1c9a1131ed 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20190106"; + version = "20190203"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = version; - sha256 = "0i5dmpqq65nipps800iijxd6krnvrdbnd6zrf7f145dg7r6hfk8p"; + sha256 = "02vx8sqpd3rpcypjd99rqkci0fj1bcjznn46p660vpdddpadxya4"; }; nativeBuildInputs = [ gtk3 ]; From 9edc2d4dbb4a87ecb8c608cb49a72cbe30872421 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 4 Feb 2019 22:43:48 +0100 Subject: [PATCH 138/193] xcodeenv: enable Xcode 10.1 support --- .../development/mobile/xcodeenv/build-app.nix | 20 +++++++++++++------ .../mobile/xcodeenv/compose-xcodewrapper.nix | 3 ++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index 90fa307fbf23..b88f806d5866 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -1,7 +1,7 @@ {stdenv, composeXcodeWrapper}: { name , src -, sdkVersion ? "11.3" +, sdkVersion ? "12.1" , target ? null , configuration ? null , scheme ? null @@ -11,6 +11,7 @@ , certificateFile ? null , certificatePassword ? null , provisioningProfile ? null +, codeSignIdentity ? null , signMethod ? null , generateIPA ? false , generateXCArchive ? false @@ -21,7 +22,7 @@ , ... }@args: -assert release -> certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null; +assert release -> certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null && codeSignIdentity != null; assert enableWirelessDistribution -> installURL != null && bundleId != null && appVersion != null; let @@ -53,8 +54,11 @@ let in stdenv.mkDerivation ({ name = stdenv.lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed - buildInputs = [ xcodewrapper ]; buildPhase = '' + # Be sure that the Xcode wrapper has priority over everything else. + # When using buildInputs this does not seem to be the case. + export PATH=${xcodewrapper}/bin:$PATH + ${stdenv.lib.optionalString release '' export HOME=/Users/$(whoami) keychainName="$(basename $out)" @@ -85,9 +89,9 @@ stdenv.mkDerivation ({ ''} # Do the building - export LD=clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works + export LD=/usr/bin/clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works - xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then ''PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} + xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} ${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString generateIPA '' @@ -97,11 +101,15 @@ stdenv.mkDerivation ({ + signingCertificate + ${codeSignIdentity} provisioningProfiles - ${bundleId} + ${stdenv.lib.toLower bundleId} $PROVISIONING_PROFILE + signingStyle + manual method ${signMethod} ${stdenv.lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") '' diff --git a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix index d0093ffac91b..dea1b77211bd 100644 --- a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix @@ -1,5 +1,5 @@ {stdenv}: -{version ? "9.3", xcodeBaseDir ? "/Applications/Xcode.app"}: +{version ? "10.1", xcodeBaseDir ? "/Applications/Xcode.app"}: assert stdenv.isDarwin; @@ -13,6 +13,7 @@ stdenv.mkDerivation { ln -s /usr/bin/codesign ln -s /usr/bin/xcrun ln -s /usr/bin/plutil + ln -s /usr/bin/clang ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild" ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator" From 8cec070f8c43905473435709aa04c9aeada53851 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 4 Feb 2019 22:50:36 +0100 Subject: [PATCH 139/193] titaniumenv: add Xcode 10.1 and Titanium 7.5.1 support --- .../mobile/titaniumenv/build-app.nix | 12 ++- .../mobile/titaniumenv/default.nix | 11 +- .../mobile/titaniumenv/titaniumsdk-7.5.nix | 102 ++++++++++++++++++ 3 files changed, 122 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 472f85fbc453..aac94fe6130b 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,7 +1,7 @@ {stdenv, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}: { name, src, preBuild ? "", target, tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "11.3", iosBuildStore ? false +, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "12.1", iosBuildStore ? false , enableWirelessDistribution ? false, installURL ? null , xcodeBaseDir ? "/Applications/Xcode.app" , androidsdkArgs ? {} @@ -15,7 +15,7 @@ assert enableWirelessDistribution -> installURL != null; let realAndroidsdkArgs = { - platformVersions = [ "26" ]; + platformVersions = [ "28" ]; } // androidsdkArgs; androidsdk = (composeAndroidPackages realAndroidsdkArgs).androidsdk; @@ -46,6 +46,14 @@ stdenv.mkDerivation ({ buildPhase = '' ${preBuild} + ${stdenv.lib.optionalString stdenv.isDarwin '' + # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error. + alloy=$(dirname $(type -p alloy))/.. + cp -rv $alloy/* alloy + chmod -R u+w alloy + export PATH=$(pwd)/alloy/bin:$PATH + ''} + export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"} ${stdenv.lib.optionalString (tiVersion != null) '' diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index e9f6344680b7..1d5df87f6eec 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,8 +1,17 @@ -{pkgs, pkgs_i686, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}: +{pkgs, pkgs_i686, tiVersion ? "7.1.0.GA"}: rec { + androidenv = import ../../nix-androidenvtests/androidenv { + inherit pkgs pkgs_i686; + }; + + xcodeenv = import ../../nix-xcodeenvtests/xcodeenv { + inherit (pkgs) stdenv; + }; + titaniumsdk = let titaniumSdkFile = if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix + else if tiVersion == "7.5.1.GA" then ./titaniumsdk-7.5.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix new file mode 100644 index 000000000000..cff1d73d3024 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -0,0 +1,102 @@ +{stdenv, fetchurl, unzip, makeWrapper}: + +let + # Gradle is a build system that bootstraps itself. This is what it actually + # downloads in the bootstrap phase. + gradleAllZip = fetchurl { + url = http://services.gradle.org/distributions/gradle-4.1-all.zip; + sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw"; + }; + + # A Titanium-Android build requires proguard plugins. We create a fake + # repository so that Gradle does not attempt to download them in the builder. + # Since there are only 3 plugins required, this is still (sort of) manageable + # without a generator. + proguardVersion = "5.3.3"; + + proguardGradlePOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom"; + sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj"; + }; + proguardGradleJAR = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar"; + sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk"; + }; + proguardParentPOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom"; + sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202"; + }; + proguardBasePOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom"; + sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5"; + }; + proguardBaseJAR = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar"; + sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx"; + }; + + # Put the downloaded plugins in a fake Maven repository + fakeMavenRepo = stdenv.mkDerivation { + name = "fake-maven-repo"; + buildCommand = '' + mkdir -p $out + cd $out + mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion} + cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom + cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar + mkdir -p net/sf/proguard/proguard-parent/${proguardVersion} + cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom + mkdir -p net/sf/proguard/proguard-base/${proguardVersion} + cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom + cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar + ''; + }; +in +stdenv.mkDerivation { + name = "mobilesdk-7.5.1.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-linux.zip; + sha256 = "1ihyh6szl9a2gbdgv13msd3g7i3xi9ifmgsh6v562hqlfi4lixng"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-osx.zip; + sha256 = "1whs1j7fkk2hxr4nxq50d7ic5wj83b1i1jl0p722sqbvkmgxssa2"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + (yes y | unzip $src) || true + + # Rename ugly version number + cd mobilesdk/* + mv * 7.5.1.GA + cd * + + # Patch bundled gradle build infrastructure to make shebangs work + patchShebangs android/templates/gradle + + # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app + sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties + cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip + echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties + + # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts + sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 + '' + else ""} + ''; +} From 7a8b65d216d069f8f594151fc47162b179227a86 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 4 Feb 2019 23:07:04 +0100 Subject: [PATCH 140/193] titaniumenv: fix broken function header --- pkgs/development/mobile/titaniumenv/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 1d5df87f6eec..336194cf0a81 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,14 +1,6 @@ -{pkgs, pkgs_i686, tiVersion ? "7.1.0.GA"}: +{pkgs, pkgs_i686, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}: rec { - androidenv = import ../../nix-androidenvtests/androidenv { - inherit pkgs pkgs_i686; - }; - - xcodeenv = import ../../nix-xcodeenvtests/xcodeenv { - inherit (pkgs) stdenv; - }; - titaniumsdk = let titaniumSdkFile = if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix else if tiVersion == "7.5.1.GA" then ./titaniumsdk-7.5.nix From b93477087fcf6eab780c629c3d62d1916d6f7c5c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 14:15:49 -0800 Subject: [PATCH 141/193] notejot: 1.5.3 -> 1.5.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/notejot/versions --- pkgs/applications/misc/notejot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 9e2f4bf7f2e4..fa5477697db0 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "notejot"; - version = "1.5.3"; + version = "1.5.4"; name = "${pname}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1n41sg9a38p9qp8pz3lx9rnb8kc069vkbwf963zzpzs2745h6s9v"; + sha256 = "1lv4s2mqddi6lz414kqpp4vcwnkjibc0k2xhnczaa1wf3azlxjgf"; }; nativeBuildInputs = [ From 091de08e7908dab94f88149fa6b1e4dbc509c3ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 12:28:00 -0800 Subject: [PATCH 142/193] gnome3.orca: 3.30.1 -> 3.30.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/orca/versions --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index f52215fa4a26..5533bf6eeded 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -9,7 +9,7 @@ let pname = "orca"; - version = "3.30.1"; + version = "3.30.2"; in buildPythonApplication rec { name = "${pname}-${version}"; @@ -17,7 +17,7 @@ in buildPythonApplication rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1b9s69frjmghjm1p9a4rrvknl9m0qlwr7mr4lsxkvjnblhsnw0g7"; + sha256 = "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53"; }; patches = [ From 904e9ab04859f976dbf3b84e1274a9e41a9cfc50 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 07:55:21 -0800 Subject: [PATCH 143/193] pythia: 8.235 -> 8.240 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pythia/versions --- pkgs/development/libraries/physics/pythia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 3f9f3f8498bd..e84aaf373255 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pythia-${version}"; - version = "8.235"; + version = "8.240"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "17cfgs7v469pdnnzvlmdagcdhi0h419znqmaws90l9d8cmhhsbz8"; + sha256 = "13cd86030j1f00n4xw30g26cgir3a5lsn9n0z13dh1vprbc9ax6j"; }; buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; From c02564e37c6159408d09ef762ad2dde854bef50c Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Thu, 13 Dec 2018 18:08:56 -0500 Subject: [PATCH 144/193] nixos/munin: fix documentation links Since this module was written, Munin has moved their documentation from munin-monitoring.org/wiki to guide.munin-monitoring.org. Most of the links were broken, and the ones that weren't went to "please use the new site" pages. --- nixos/modules/services/monitoring/munin.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 2b265d5b5a90..fb1a11a44f92 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -4,7 +4,7 @@ # TODO: LWP/Pg perl libs aren't recognized # TODO: support fastcgi -# http://munin-monitoring.org/wiki/CgiHowto2 +# http://guide.munin-monitoring.org/en/latest/example/webserver/apache-cgi.html # spawn-fcgi -s /run/munin/fastcgi-graph.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-graph # spawn-fcgi -s /run/munin/fastcgi-html.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-html # https://paste.sh/vofcctHP#-KbDSXVeWoifYncZmLfZzgum @@ -86,7 +86,7 @@ in Enable Munin Node agent. Munin node listens on 0.0.0.0 and by default accepts connections only from 127.0.0.1 for security reasons. - See . + See . ''; }; @@ -95,7 +95,7 @@ in type = types.lines; description = '' munin-node.conf extra configuration. See - + ''; }; @@ -121,9 +121,9 @@ in default = ""; description = '' munin.conf extra global configuration. - See . + See . Useful to setup notifications, see - + ''; example = '' contact.email.command mail -s "Munin notification for ''${var:host}" someone@example.com @@ -137,8 +137,8 @@ in ''; description = '' Definitions of hosts of nodes to collect data from. Needs at least one - hosts for cron to succeed. See - + host for cron to succeed. See + ''; }; @@ -173,7 +173,7 @@ in environment.MUNIN_PLUGSTATE = "/run/munin"; environment.MUNIN_LOGDIR = "/var/log/munin"; preStart = '' - echo "updating munin plugins..." + echo "Updating munin plugins..." mkdir -p /etc/munin/plugins rm -rf /etc/munin/plugins/* From c74abf763af37fd453a2dd5aa8390da8256e4f8e Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Thu, 13 Dec 2018 18:14:21 -0500 Subject: [PATCH 145/193] nixos/munin: add extraPluginConfig option This lets you specify additional plugin-specific configuration to go in plugin-conf.d, and complements the extraConfig and extraGlobalConfig options. --- nixos/modules/services/monitoring/munin.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index fb1a11a44f92..47ccf9b0a343 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -63,6 +63,8 @@ let [ipmi*] user root group root + + ${nodeCfg.extraPluginConfig} ''; pluginConfDir = pkgs.stdenv.mkDerivation { @@ -100,6 +102,18 @@ in }; # TODO: add option to add additional plugins + extraPluginConfig = mkOption { + default = ""; + type = types.lines; + description = '' + plugin-conf.d extra plugin configuration. See + + ''; + example = '' + [fail2ban_*] + user root + ''; + }; }; From 0c3208a8e462c95a1deeb5bd7ab3c467ff2eec49 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Thu, 13 Dec 2018 18:16:07 -0500 Subject: [PATCH 146/193] nixos/munin: add disabledPlugins option This is just a set of globs to remove from the active plugins directory after autoconfiguration is complete. I also removed the hard-coded disabling of "diskstats", since it seems to work just fine now. --- nixos/modules/services/monitoring/munin.nix | 21 +++++++++++++++++++-- nixos/tests/munin.nix | 4 +--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 47ccf9b0a343..dcdad6fac1ba 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -115,6 +115,17 @@ in ''; }; + disabledPlugins = mkOption { + default = []; + type = with types; listOf string; + description = '' + Munin plugins to disable, even if + munin-node-configure --suggest tries to enable + them. To disable a wildcard plugin, use an actual wildcard, as in + the example. + ''; + example = [ "diskstats" "zfs_usage_*" ]; + }; }; services.munin-cron = { @@ -191,10 +202,16 @@ in mkdir -p /etc/munin/plugins rm -rf /etc/munin/plugins/* + + # Autoconfigure builtin plugins ${pkgs.munin}/bin/munin-node-configure --suggest --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${pkgs.munin}/lib/plugins --servicedir=/etc/munin/plugins --sconfdir=${pluginConfDir} 2>/dev/null | ${pkgs.bash}/bin/bash - # NOTE: we disable disktstats because plugin seems to fail and it hangs html generation (100% CPU + memory leak) - rm /etc/munin/plugins/diskstats || true + + ${lib.optionalString (nodeCfg.disabledPlugins != []) '' + # Disable plugins + cd /etc/munin/plugins + rm -f ${toString nodeCfg.disabledPlugins} + ''} ''; serviceConfig = { ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/ --sconfdir=${pluginConfDir}"; diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 9f66005292ab..95cecf17b8cc 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -15,9 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : { munin-node = { enable = true; # disable a failing plugin to prevent irrelevant error message, see #23049 - extraConfig = '' - ignore_file ^apc_nis$ - ''; + disabledPlugins = [ "apc_nis" ]; }; munin-cron = { enable = true; From b5b82b2caee7bb2c0ea80353397fc7fadf470025 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Thu, 13 Dec 2018 18:17:21 -0500 Subject: [PATCH 147/193] nixos/munin: require DejaVu fonts if enabled munin-graph is hardcoded to use DejaVu Mono for the graph legends; if it can't find it, there's no guarantee it finds a monospaced font at all, and if it can't find a monospaced font the legends come out badly misformatted. --- nixos/modules/services/monitoring/munin.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index dcdad6fac1ba..431d03975460 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -223,6 +223,10 @@ in }) (mkIf cronCfg.enable { + # Munin is hardcoded to use DejaVu Mono and the graphs come out wrong if + # it's not available. + fonts.fonts = [ pkgs.dejavu_fonts ]; + systemd.timers.munin-cron = { description = "batch Munin master programs"; wantedBy = [ "timers.target" ]; From 6c907851f4fbb1252b7d667b46389989e3207cac Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Thu, 13 Dec 2018 19:58:12 -0500 Subject: [PATCH 148/193] nixos/munin: add extraPlugins and extraAutoPlugins options [#17895] extraAutoPlugins lets you list plugins and plugin directories to be autoconfigured, and extraPlugins lets you enable plugins on a one-by-one basis. This can be used to enable plugins from contrib (although you'll need to download and check out contrib yourself, then point these options at it), or plugins you've written yourself. --- nixos/modules/services/monitoring/munin.nix | 108 +++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 431d03975460..af3562befde1 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -74,6 +74,46 @@ let ln -s ${pluginConf} $out/nixos-config ''; }; + + # Copy one Munin plugin into the Nix store with a specific name. + # This is suitable for use with plugins going directly into /etc/munin/plugins, + # i.e. munin.extraPlugins. + internOnePlugin = name: path: + "cp -a '${path}' '${name}'"; + + # Copy an entire tree of Munin plugins into a single directory in the Nix + # store, with no renaming. + # This is suitable for use with munin-node-configure --suggest, i.e. + # munin.extraAutoPlugins. + internManyPlugins = name: path: + "find '${path}' -type f -perm /a+x -exec cp -a -t . '{}' '+'"; + + # Use the appropriate intern-fn to copy the plugins into the store and patch + # them afterwards in an attempt to get them to run on NixOS. + internAndFixPlugins = name: intern-fn: paths: + pkgs.runCommand name {} '' + mkdir -p "$out" + cd "$out" + ${lib.concatStringsSep "\n" + (lib.attrsets.mapAttrsToList intern-fn paths)} + chmod -R u+w . + find . -type f -exec sed -E -i ' + s,(/usr)?/s?bin/,/run/current-system/sw/bin/,g + ' '{}' '+' + ''; + + # TODO: write a derivation for munin-contrib, so that for contrib plugins + # you can just refer to them by name rather than needing to include a copy + # of munin-contrib in your nixos configuration. + extraPluginDir = internAndFixPlugins "munin-extra-plugins.d" + internOnePlugin nodeCfg.extraPlugins; + + extraAutoPluginDir = internAndFixPlugins "munin-extra-auto-plugins.d" + internManyPlugins + (builtins.listToAttrs + (map + (path: { name = baseNameOf path; value = path; }) + nodeCfg.extraAutoPlugins)); in { @@ -101,7 +141,6 @@ in ''; }; - # TODO: add option to add additional plugins extraPluginConfig = mkOption { default = ""; type = types.lines; @@ -115,6 +154,66 @@ in ''; }; + extraPlugins = mkOption { + default = {}; + type = with types; attrsOf path; + description = '' + Additional Munin plugins to activate. Keys are the name of the plugin + symlink, values are the path to the underlying plugin script. You + can use the same plugin script multiple times (e.g. for wildcard + plugins). + + Note that these plugins do not participate in autoconfiguration. If + you want to autoconfigure additional plugins, use + . + + Plugins enabled in this manner take precedence over autoconfigured + plugins. + + Plugins will be copied into the Nix store, and it will attempt to + modify them to run properly by fixing hardcoded references to + /bin, /usr/bin, + /sbin, and /usr/sbin. + ''; + example = literalExample '' + { + zfs_usage_bigpool = /src/munin-contrib/plugins/zfs/zfs_usage_; + zfs_usage_smallpool = /src/munin-contrib/plugins/zfs/zfs_usage_; + zfs_list = /src/munin-contrib/plugins/zfs/zfs_list; + }; + ''; + }; + + extraAutoPlugins = mkOption { + default = []; + type = with types; listOf path; + description = '' + Additional Munin plugins to autoconfigure, using + munin-node-configure --suggest. These should be + the actual paths to the plugin files (or directories containing them), + not just their names. + + If you want to manually enable individual plugins instead, use + . + + Note that only plugins that have the 'autoconfig' capability will do + anything if listed here, since plugins that cannot autoconfigure + won't be automatically enabled by + munin-node-configure. + + Plugins will be copied into the Nix store, and it will attempt to + modify them to run properly by fixing hardcoded references to + /bin, /usr/bin, + /sbin, and /usr/sbin. + ''; + example = literalExample '' + [ + /src/munin-contrib/plugins/zfs + /src/munin-contrib/plugins/ssh + ]; + ''; + }; + disabledPlugins = mkOption { default = []; type = with types; listOf string; @@ -206,6 +305,13 @@ in # Autoconfigure builtin plugins ${pkgs.munin}/bin/munin-node-configure --suggest --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${pkgs.munin}/lib/plugins --servicedir=/etc/munin/plugins --sconfdir=${pluginConfDir} 2>/dev/null | ${pkgs.bash}/bin/bash + # Autoconfigure extra plugins + ${pkgs.munin}/bin/munin-node-configure --suggest --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${extraAutoPluginDir} --servicedir=/etc/munin/plugins --sconfdir=${pluginConfDir} 2>/dev/null | ${pkgs.bash}/bin/bash + + ${lib.optionalString (nodeCfg.extraPlugins != {}) '' + # Link in manually enabled plugins + ln -f -s -t /etc/munin/plugins ${extraPluginDir}/* + ''} ${lib.optionalString (nodeCfg.disabledPlugins != []) '' # Disable plugins From c4437fee7e41d54d58ef680546cc8814b0da3575 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Thu, 13 Dec 2018 21:55:41 -0500 Subject: [PATCH 149/193] nixos/munin: add extraCSS option This permits custom styling of the generated HTML without needing to build your own Munin package from source. Also comes with an example that works as a passable dark theme for Munin. --- nixos/modules/services/monitoring/munin.nix | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index af3562befde1..c65432b4bbf0 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -24,6 +24,8 @@ let logdir /var/log/munin rundir /run/munin + ${lib.optionalString (cronCfg.extraCSS != "") "staticdir ${customStaticDir}"} + ${cronCfg.extraGlobalConfig} ${cronCfg.hosts} @@ -114,6 +116,14 @@ let (map (path: { name = baseNameOf path; value = path; }) nodeCfg.extraAutoPlugins)); + + customStaticDir = pkgs.runCommand "munin-custom-static-data" {} '' + cp -a "${pkgs.munin}/etc/opt/munin/static" "$out" + cd "$out" + chmod -R u+w . + echo "${cronCfg.extraCSS}" >> style.css + echo "${cronCfg.extraCSS}" >> style-new.css + ''; in { @@ -266,6 +276,24 @@ in ''; }; + extraCSS = mkOption { + default = ""; + type = types.lines; + description = '' + Custom styling for the HTML that munin-cron generates. This will be + appended to the CSS files used by munin-cron and will thus take + precedence over the builtin styles. + ''; + example = '' + /* A simple dark theme. */ + html, body { background: #222222; } + #header, #footer { background: #333333; } + img.i, img.iwarn, img.icrit, img.iunkn { + filter: invert(100%) hue-rotate(-30deg); + } + ''; + }; + }; }; From e7c1449ae92646723296bf3da12dcc53af8aa272 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Fri, 14 Dec 2018 19:24:00 -0500 Subject: [PATCH 150/193] nixos/munin: add types to Munin options Some options were missing their types. --- nixos/modules/services/monitoring/munin.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index c65432b4bbf0..bf1be56ee9e1 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -134,6 +134,7 @@ in enable = mkOption { default = false; + type = types.bool; description = '' Enable Munin Node agent. Munin node listens on 0.0.0.0 and by default accepts connections only from 127.0.0.1 for security reasons. @@ -241,6 +242,7 @@ in enable = mkOption { default = false; + type = types.bool; description = '' Enable munin-cron. Takes care of all heavy lifting to collect data from nodes and draws graphs to html. Runs munin-update, munin-limits, @@ -253,6 +255,7 @@ in extraGlobalConfig = mkOption { default = ""; + type = types.lines; description = '' munin.conf extra global configuration. See . @@ -265,15 +268,17 @@ in }; hosts = mkOption { - example = '' - [''${config.networking.hostName}] - address localhost - ''; + default = ""; + type = types.lines; description = '' Definitions of hosts of nodes to collect data from. Needs at least one host for cron to succeed. See ''; + example = '' + [''${config.networking.hostName}] + address localhost + ''; }; extraCSS = mkOption { From ace4855cf6998d43c2d347aec03a65d0089201ed Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Fri, 14 Dec 2018 19:26:02 -0500 Subject: [PATCH 151/193] nixos/munin: enable munin_update and disable munin_stats munin_update relies on a stats file that exists, but isn't found in the default location on NixOS; the appropriate plugin configuration is added. munin_stats relies on munin-cron writing a logfile, which the NixOS build of munin does not. (This is probably fixable in the munin package, but I don't have time to dig into that right now.) --- nixos/modules/services/monitoring/munin.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index bf1be56ee9e1..f67986327245 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -66,6 +66,9 @@ let user root group root + [munin*] + env.UPDATE_STATSFILE /var/lib/munin/munin-update.stats + ${nodeCfg.extraPluginConfig} ''; @@ -226,13 +229,20 @@ in }; disabledPlugins = mkOption { - default = []; + # TODO: figure out why Munin isn't writing the log file and fix it. + # In the meantime this at least suppresses a useless graph full of + # NaNs in the output. + default = [ "munin_stats" ]; type = with types; listOf string; description = '' Munin plugins to disable, even if munin-node-configure --suggest tries to enable them. To disable a wildcard plugin, use an actual wildcard, as in the example. + + munin_stats is disabled by default as it tries to read + /var/log/munin/munin-update.log for timing + information, and the NixOS build of Munin does not write this file. ''; example = [ "diskstats" "zfs_usage_*" ]; }; @@ -312,6 +322,7 @@ in description = "Munin monitoring user"; group = "munin"; uid = config.ids.uids.munin; + home = "/var/lib/munin"; }]; users.groups = [{ From 85cdd06e0c079369a46351a126ef67f9a7142a80 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Sat, 15 Dec 2018 15:02:54 -0500 Subject: [PATCH 152/193] munin: 2.0.37 -> 2.0.43 Also creates the RELEASE file in preBuild so that munin knows its own version number at runtime. --- pkgs/servers/monitoring/munin/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 032789ef05d0..5153fcc5ef61 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.37"; + version = "2.0.43"; name = "munin-${version}"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "10niyzckx90dwdr4d7vj07d1qjy3nk7xzp30nqnlxzbaww7n5v78"; + sha256 = "1ydhf9hcb3n5h0ss5f1zf9yz4r4njqxazlz931ixvx5gyhj9gq5l"; }; buildInputs = [ @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { ]; preBuild = '' + echo "${version}" > RELEASE substituteInPlace "Makefile" \ --replace "/bin/pwd" "pwd" \ --replace "HTMLOld.3pm" "HTMLOld.3" From 770e014574245b8892208629785cee6c8632732b Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Mon, 4 Feb 2019 21:47:15 -0800 Subject: [PATCH 153/193] amass: 2.8.5 -> 2.9.1 --- pkgs/tools/networking/amass/default.nix | 4 +- pkgs/tools/networking/amass/deps.nix | 284 ++++++++++++++++++++++-- 2 files changed, 265 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 16e87d2a5c97..f031cf09884c 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { name = "amass-${version}"; - version = "2.8.5"; + version = "2.9.1"; goPackagePath = "github.com/OWASP/Amass"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "OWASP"; repo = "Amass"; rev = version; - sha256 = "1nsqg1p7hcv369d53n13xps3ks6fgzkkp6v9q87l04yj32nbr5qy"; + sha256 = "07vs741vmhi735ba26wscldwdx0i2yamr2g8bq7jr3sjik8ncd29"; }; outputs = [ "bin" "out" "wordlists" ]; diff --git a/pkgs/tools/networking/amass/deps.nix b/pkgs/tools/networking/amass/deps.nix index e9b5acf618e2..c81a603e39ce 100644 --- a/pkgs/tools/networking/amass/deps.nix +++ b/pkgs/tools/networking/amass/deps.nix @@ -1,101 +1,343 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ + + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "v0.34.0"; + sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; + }; + } + { goPackagePath = "github.com/PuerkitoBio/fetchbot"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/fetchbot"; - rev = "1f502d610659b899a007858812b601e715f531eb"; - sha256 = "0yzv0xh3cwq87jv9whs5rmhaj8b2nqdm76vwppzn8mm34fg41n8s"; + rev = "v1.1.2"; + sha256 = "1xw8jszjmhf8wsyc02wfplyvvcaq3wjwbzr131afcsvc4i4nlrqq"; }; } + { goPackagePath = "github.com/PuerkitoBio/goquery"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/goquery"; - rev = "2d2796f41742ece03e8086188fa4db16a3a0b458"; - sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; + rev = "v1.4.1"; + sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; }; } + { goPackagePath = "github.com/andybalholm/cascadia"; fetch = { type = "git"; url = "https://github.com/andybalholm/cascadia"; - rev = "680b6a57bda4f657485ad44bdea42342ead737bc"; - sha256 = "0v95plagirbjlc4p00y9brhpvv4nm8q0gr63gcfs3shyh1a8xwbm"; + rev = "v1.0.0"; + sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; }; } + { goPackagePath = "github.com/asaskevich/EventBus"; fetch = { type = "git"; url = "https://github.com/asaskevich/EventBus"; - rev = "d46933a94f05c6657d7b923fcf5ac563ee37ec79"; + rev = "d46933a94f05"; sha256 = "130mjlsc6jf17zdx8ymhxis70a13l2zbjmjzgvjdr6pb0jzxsqha"; }; } + + { + goPackagePath = "github.com/caffix/cloudflare-roundtripper"; + fetch = { + type = "git"; + url = "https://github.com/caffix/cloudflare-roundtripper"; + rev = "4c29d231c9cb"; + sha256 = "0i8z9p8wfvjphsgj88jcgpbyyb10hq24a72df4kdw7xl6189chra"; + }; + } + + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "v2.1.1"; + sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; + }; + } + + { + goPackagePath = "github.com/dghubble/go-twitter"; + fetch = { + type = "git"; + url = "https://github.com/dghubble/go-twitter"; + rev = "7fd79e2bcc65"; + sha256 = "0vk66ndhwvqq23v5xfla9npcrrxgphp318n7hn8vaw7zayznmfy7"; + }; + } + + { + goPackagePath = "github.com/dghubble/sling"; + fetch = { + type = "git"; + url = "https://github.com/dghubble/sling"; + rev = "v1.2.0"; + sha256 = "0ns17xy7xig3zdcjqkxn33nzar1ybqpw2arc016i5vv09b1yypj6"; + }; + } + { goPackagePath = "github.com/fatih/color"; fetch = { type = "git"; url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; }; } + + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "v1.41.0"; + sha256 = "1pm4s8j5azafvminc7ll0ncvfznwn9cvq2zhmxri5waffwr1sdxg"; + }; + } + + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.0"; + sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; + }; + } + + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "v1.4.0"; + sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; + }; + } + { goPackagePath = "github.com/irfansharif/cfilter"; fetch = { type = "git"; url = "https://github.com/irfansharif/cfilter"; - rev = "d07d951ff29d52840ca5e798a17e80db4de8c820"; - sha256 = "11gicb8jbpnsc7wylv7qs9dgc91qc3rld6ahsylb491knxr78yb2"; + rev = "v0.1.1"; + sha256 = "0hfxp57m37wygqy3y72fm9ydvfymkmqnif48spssc3zqaqvhcgkz"; }; } + { goPackagePath = "github.com/johnnadratowski/golang-neo4j-bolt-driver"; fetch = { type = "git"; url = "https://github.com/johnnadratowski/golang-neo4j-bolt-driver"; - rev = "6b24c0085aaeaf3b2844acd18066864e24b57387"; - sha256 = "0dmfgy0ci0k0s4hxp9v5j4j0mab5x1nsc83icgq9ldb2446mn0fk"; + rev = "c68f22031e42"; + sha256 = "0v9cxzmj5r0zkh8p61rbknrw17zbciy3fvmg9d6srg1hb7wizp5c"; }; } + + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.0"; + sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; + }; + } + + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { goPackagePath = "github.com/miekg/dns"; fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "1c9c9bf4c93ee029810272d3e5b8a126aee5bf1f"; - sha256 = "002z8l5crsipdn2zkavjkjzxrj6c4132yqgbg1zk7w7gkv40q7wr"; + rev = "v1.0.8"; + sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx"; }; } + + { + goPackagePath = "github.com/qasaur/gremgo"; + fetch = { + type = "git"; + url = "https://github.com/qasaur/gremgo"; + rev = "fa23ada7c5da"; + sha256 = "1cqz1zqwvcgnq3dfv9zcyjgmla8d9vbh0s31x8iv2r8jdzfgqik4"; + }; + } + + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "15f95af6e78d"; + sha256 = "07j7l340lmqwpfscwyb8llk3k37flvs20a4a8vzc85f16xyd9npf"; + }; + } + + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "v1.2.0"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + + { + goPackagePath = "github.com/temoto/robotstxt"; + fetch = { + type = "git"; + url = "https://github.com/temoto/robotstxt"; + rev = "9e4646fa7053"; + sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0"; + }; + } + { goPackagePath = "github.com/temoto/robotstxt-go"; fetch = { type = "git"; url = "https://github.com/temoto/robotstxt-go"; - rev = "97ee4a9ee6ea01ed0bbf0325dd789f74cac6cb94"; - sha256 = "1nfnwz5lm9dgicsjh99gs4gh4gbrxdl16srz505f04mab51kd51r"; + rev = "9e4646fa7053"; + sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0"; }; } + + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c126467f60eb"; + sha256 = "0xvvzwxqi1dbrnsvq00klx4bnjalf90haf1slnxzrdmbadyp992q"; + }; + } + { goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "adae6a3d119ae4890b46832a2e88a95adc62b8e7"; - sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; + rev = "1e06a53dbb7e"; + sha256 = "0lpqqvdccby48nixihvmn8ig1z48b950m1bxfqxn78air308qc3j"; }; } + + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "99b60b757ec1"; + sha256 = "119py9nia7957kf51gg9qvh34d18jb1a293zwfgvdf5inl1ja6y6"; + }; + } + + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "37e7f081c4d4"; + sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + }; + } + { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "ec83556a53fe16b65c452a104ea9d1e86a671852"; - sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f"; + rev = "e072cadbbdc8"; + sha256 = "17l1diq0526zpdpwfmjs7w9w8sg6prv6sjnvmg869yrj26b1xdcc"; + }; + } + + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "4d8a0ac9f66c"; + sha256 = "12cyxcijjsdg4wxl8hvxfbwdkqapvl1f7994963i6rf0qvh41qym"; + }; + } + + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.4.0"; + sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; + }; + } + + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/sourcemap.v1"; + rev = "v1.0.5"; + sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; }; } ] From aae923a255e913c439bfc13eb9616fc405bbdad0 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Mon, 4 Feb 2019 21:54:03 -0800 Subject: [PATCH 154/193] Revert "amass: 2.8.5 -> 2.9.1" I did not intend to push directly to master, I'm going to revert this and go through a pull request instead! This reverts commit 770e014574245b8892208629785cee6c8632732b. --- pkgs/tools/networking/amass/default.nix | 4 +- pkgs/tools/networking/amass/deps.nix | 284 ++---------------------- 2 files changed, 23 insertions(+), 265 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index f031cf09884c..16e87d2a5c97 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { name = "amass-${version}"; - version = "2.9.1"; + version = "2.8.5"; goPackagePath = "github.com/OWASP/Amass"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "OWASP"; repo = "Amass"; rev = version; - sha256 = "07vs741vmhi735ba26wscldwdx0i2yamr2g8bq7jr3sjik8ncd29"; + sha256 = "1nsqg1p7hcv369d53n13xps3ks6fgzkkp6v9q87l04yj32nbr5qy"; }; outputs = [ "bin" "out" "wordlists" ]; diff --git a/pkgs/tools/networking/amass/deps.nix b/pkgs/tools/networking/amass/deps.nix index c81a603e39ce..e9b5acf618e2 100644 --- a/pkgs/tools/networking/amass/deps.nix +++ b/pkgs/tools/networking/amass/deps.nix @@ -1,343 +1,101 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ - - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "v0.34.0"; - sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; - }; - } - { goPackagePath = "github.com/PuerkitoBio/fetchbot"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/fetchbot"; - rev = "v1.1.2"; - sha256 = "1xw8jszjmhf8wsyc02wfplyvvcaq3wjwbzr131afcsvc4i4nlrqq"; + rev = "1f502d610659b899a007858812b601e715f531eb"; + sha256 = "0yzv0xh3cwq87jv9whs5rmhaj8b2nqdm76vwppzn8mm34fg41n8s"; }; } - { goPackagePath = "github.com/PuerkitoBio/goquery"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/goquery"; - rev = "v1.4.1"; - sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; + rev = "2d2796f41742ece03e8086188fa4db16a3a0b458"; + sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; }; } - { goPackagePath = "github.com/andybalholm/cascadia"; fetch = { type = "git"; url = "https://github.com/andybalholm/cascadia"; - rev = "v1.0.0"; - sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; + rev = "680b6a57bda4f657485ad44bdea42342ead737bc"; + sha256 = "0v95plagirbjlc4p00y9brhpvv4nm8q0gr63gcfs3shyh1a8xwbm"; }; } - { goPackagePath = "github.com/asaskevich/EventBus"; fetch = { type = "git"; url = "https://github.com/asaskevich/EventBus"; - rev = "d46933a94f05"; + rev = "d46933a94f05c6657d7b923fcf5ac563ee37ec79"; sha256 = "130mjlsc6jf17zdx8ymhxis70a13l2zbjmjzgvjdr6pb0jzxsqha"; }; } - - { - goPackagePath = "github.com/caffix/cloudflare-roundtripper"; - fetch = { - type = "git"; - url = "https://github.com/caffix/cloudflare-roundtripper"; - rev = "4c29d231c9cb"; - sha256 = "0i8z9p8wfvjphsgj88jcgpbyyb10hq24a72df4kdw7xl6189chra"; - }; - } - - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v2.1.1"; - sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; - }; - } - - { - goPackagePath = "github.com/dghubble/go-twitter"; - fetch = { - type = "git"; - url = "https://github.com/dghubble/go-twitter"; - rev = "7fd79e2bcc65"; - sha256 = "0vk66ndhwvqq23v5xfla9npcrrxgphp318n7hn8vaw7zayznmfy7"; - }; - } - - { - goPackagePath = "github.com/dghubble/sling"; - fetch = { - type = "git"; - url = "https://github.com/dghubble/sling"; - rev = "v1.2.0"; - sha256 = "0ns17xy7xig3zdcjqkxn33nzar1ybqpw2arc016i5vv09b1yypj6"; - }; - } - { goPackagePath = "github.com/fatih/color"; fetch = { type = "git"; url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; + sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; }; } - - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "v1.41.0"; - sha256 = "1pm4s8j5azafvminc7ll0ncvfznwn9cvq2zhmxri5waffwr1sdxg"; - }; - } - - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "v1.0.0"; - sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; - }; - } - - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.0"; - sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; - }; - } - - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.0"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { goPackagePath = "github.com/irfansharif/cfilter"; fetch = { type = "git"; url = "https://github.com/irfansharif/cfilter"; - rev = "v0.1.1"; - sha256 = "0hfxp57m37wygqy3y72fm9ydvfymkmqnif48spssc3zqaqvhcgkz"; + rev = "d07d951ff29d52840ca5e798a17e80db4de8c820"; + sha256 = "11gicb8jbpnsc7wylv7qs9dgc91qc3rld6ahsylb491knxr78yb2"; }; } - { goPackagePath = "github.com/johnnadratowski/golang-neo4j-bolt-driver"; fetch = { type = "git"; url = "https://github.com/johnnadratowski/golang-neo4j-bolt-driver"; - rev = "c68f22031e42"; - sha256 = "0v9cxzmj5r0zkh8p61rbknrw17zbciy3fvmg9d6srg1hb7wizp5c"; + rev = "6b24c0085aaeaf3b2844acd18066864e24b57387"; + sha256 = "0dmfgy0ci0k0s4hxp9v5j4j0mab5x1nsc83icgq9ldb2446mn0fk"; }; } - - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.0"; - sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; - }; - } - - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { goPackagePath = "github.com/miekg/dns"; fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "v1.0.8"; - sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx"; + rev = "1c9c9bf4c93ee029810272d3e5b8a126aee5bf1f"; + sha256 = "002z8l5crsipdn2zkavjkjzxrj6c4132yqgbg1zk7w7gkv40q7wr"; }; } - - { - goPackagePath = "github.com/qasaur/gremgo"; - fetch = { - type = "git"; - url = "https://github.com/qasaur/gremgo"; - rev = "fa23ada7c5da"; - sha256 = "1cqz1zqwvcgnq3dfv9zcyjgmla8d9vbh0s31x8iv2r8jdzfgqik4"; - }; - } - - { - goPackagePath = "github.com/robertkrimen/otto"; - fetch = { - type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "15f95af6e78d"; - sha256 = "07j7l340lmqwpfscwyb8llk3k37flvs20a4a8vzc85f16xyd9npf"; - }; - } - - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "v1.2.0"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; - }; - } - - { - goPackagePath = "github.com/temoto/robotstxt"; - fetch = { - type = "git"; - url = "https://github.com/temoto/robotstxt"; - rev = "9e4646fa7053"; - sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0"; - }; - } - { goPackagePath = "github.com/temoto/robotstxt-go"; fetch = { type = "git"; url = "https://github.com/temoto/robotstxt-go"; - rev = "9e4646fa7053"; - sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0"; + rev = "97ee4a9ee6ea01ed0bbf0325dd789f74cac6cb94"; + sha256 = "1nfnwz5lm9dgicsjh99gs4gh4gbrxdl16srz505f04mab51kd51r"; }; } - - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c126467f60eb"; - sha256 = "0xvvzwxqi1dbrnsvq00klx4bnjalf90haf1slnxzrdmbadyp992q"; - }; - } - { goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "1e06a53dbb7e"; - sha256 = "0lpqqvdccby48nixihvmn8ig1z48b950m1bxfqxn78air308qc3j"; + rev = "adae6a3d119ae4890b46832a2e88a95adc62b8e7"; + sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; }; } - - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "99b60b757ec1"; - sha256 = "119py9nia7957kf51gg9qvh34d18jb1a293zwfgvdf5inl1ja6y6"; - }; - } - - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "e072cadbbdc8"; - sha256 = "17l1diq0526zpdpwfmjs7w9w8sg6prv6sjnvmg869yrj26b1xdcc"; - }; - } - - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "4d8a0ac9f66c"; - sha256 = "12cyxcijjsdg4wxl8hvxfbwdkqapvl1f7994963i6rf0qvh41qym"; - }; - } - - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.4.0"; - sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; - }; - } - - { - goPackagePath = "gopkg.in/sourcemap.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/sourcemap.v1"; - rev = "v1.0.5"; - sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; + rev = "ec83556a53fe16b65c452a104ea9d1e86a671852"; + sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f"; }; } ] From 23c0d79673e7016c737fa295ef7a1940ca536f6c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 22:38:25 -0800 Subject: [PATCH 155/193] kubectx: 0.6.2 -> 0.6.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kubectx/versions --- pkgs/development/tools/kubectx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index c2eaa28a2d9a..0f9fb36a3f4e 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubectx"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "0kmzj8nmjzjfl5jgdnlizn3wmgp980xs6m9pvpplafjshx9k159c"; + sha256 = "0nb867llpvjmkxv5bbqnyjrc4z74kibqg1d3dw7m47d5a5hn8525"; }; buildInputs = [ makeWrapper ]; From 60e4f936e2d95a65b644d3ef0de2e9d36d9f27bc Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 4 Feb 2019 11:50:27 +0000 Subject: [PATCH 156/193] pulseaudio-modules-bt: Use pulseaudioFull as pulseaudio This is more likely to give binary cache hits for users --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2a7d5185c14..5578106651f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14245,7 +14245,10 @@ in bluez5 = callPackage ../os-specific/linux/bluez { }; - pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { }; + pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { + # pulseaudio-modules-bt is most likely to be used with pulseaudioFull + pulseaudio = pulseaudioFull; + }; bluez = bluez5; From 013173be9625295908bd73e920b46cc9e7dacde7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Feb 2019 23:33:51 -0800 Subject: [PATCH 157/193] libtommath: 1.0.1 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libtommath/versions --- pkgs/development/libraries/libtommath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 8c88dd97ec41..15c392fa7923 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libtommath-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz"; - sha256 = "0sbccdwbkfc680id2fi0x067j23biqcjqilwkk7y9339knrjy0s7"; + sha256 = "1bbyagqzfdbg37k1n08nsqzdf44z8zsnjjinqbsyj7rxg246qilh"; }; nativeBuildInputs = [ libtool ]; From c7df612e2a566679250fe0e044b26ad2ffac28f2 Mon Sep 17 00:00:00 2001 From: dywedir Date: Tue, 5 Feb 2019 09:39:57 +0200 Subject: [PATCH 158/193] ncdu: 1.13 -> 1.14 --- pkgs/tools/misc/ncdu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index b167d0f2c475..bb7924515647 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "ncdu-${version}"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = "https://dev.yorhel.nl/download/${name}.tar.gz"; - sha256 = "0ni56ymlii577src4dzfbrq1mznbf6i0nka4bvh2sb1971f2ingl"; + sha256 = "0i4cap2z3037xx2rdzhrlazl2igk3xy4ncddp9j7xqi1mcx7i566"; }; buildInputs = [ ncurses ]; meta = with stdenv.lib; { - description = "Ncurses disk usage analyzer"; + description = "Disk usage analyzer with an ncurses interface"; homepage = https://dev.yorhel.nl/ncdu; license = licenses.mit; platforms = platforms.all; From 1c2ceb724b73281e5feaad34862f71501e51205b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 00:44:10 -0800 Subject: [PATCH 159/193] kubernetes: 1.13.2 -> 1.13.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kubernetes/versions --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index d39585ce8b42..597c2c183092 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1j5yyzn3c481ba6bbyx6gsa41zhg3x35sdbajlnxmbnid0g21g8g"; + sha256 = "1fcp27c501ql4v7fl7rl5qyjlw1awk139rwwm0jqdpgh3sd22l2z"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; From 56dba36eb5bc783c314d0fa627585cab42cebe7a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Feb 2019 13:42:21 +0100 Subject: [PATCH 160/193] rustc: 1.31.0 -> 1.32.0 --- pkgs/development/compilers/rust/bootstrap.nix | 16 ++++++++-------- pkgs/development/compilers/rust/cargo.nix | 8 ++++---- pkgs/development/compilers/rust/default.nix | 11 +++-------- .../rust/patches/disable-test-inherit-env.patch | 10 ---------- pkgs/development/compilers/rust/rustc.nix | 8 ++------ 5 files changed, 17 insertions(+), 36 deletions(-) delete mode 100644 pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 9528d798618f..03b77c90fe9a 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.30.1"; + version = "1.31.0"; - # fetch hashes by running `print-hashes.sh 1.30.0` + # fetch hashes by running `print-hashes.sh 1.31.0` hashes = { - i686-unknown-linux-gnu = "c61655977fb16decf0ceb76043b9ae2190927aa9cc24f013d444384dcab99bbf"; - x86_64-unknown-linux-gnu = "a01a493ed8946fc1c15f63e74fc53299b26ebf705938b4d04a388a746dfdbf9e"; - armv7-unknown-linux-gnueabihf = "9b3b6df02a2a92757e4993a7357fdd02e07b60101a748b4618e6ae1b90bc1b6b"; - aarch64-unknown-linux-gnu = "6d87d81561285abd6c1987e07b60b2d723936f037c4b46eedcc12e8566fd3874"; - i686-apple-darwin = "a7c14b18e96406d9f43d69d0f984b2fa6f92cc7b7b37e2bb7b70b6f44b02b083"; - x86_64-apple-darwin = "3ba1704a7defe3d9a6f0c1f68792c084da83bcba85e936d597bac0c019914b94"; + i686-unknown-linux-gnu = "46333e8feec55bc1f99fd03028370f6163ef1e33e483da0389a9c424ec9634ed"; + x86_64-unknown-linux-gnu = "c8a2016109ffdc12a488660edc5f30c1643729efc15abe311ebb187437e506bf"; + armv7-unknown-linux-gnueabihf = "60bb75649b457ad971e94dd14c666b59deeee2176b14ae0f98e2fa435c172c1e"; + aarch64-unknown-linux-gnu = "4e68c70aba58004d9e86c2b4463e88466affee51242349a038b456cf6f4be5c9"; + i686-apple-darwin = "ec8d08eeea97d78d37430e9b32511e87854aad502f4e3e77e806788246b36e6f"; + x86_64-apple-darwin = "5d4035e3cecb7df13e728bcff125b52b43b126e91f8311c66b143f353362606f"; }; platform = diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 02ea7ebbbfbf..65aa4ea9292f 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -10,8 +10,8 @@ rustPlatform.buildRustPackage rec { inherit version src patches; # the rust source tarball already has all the dependencies vendored, no need to fetch them again - cargoVendorDir = "src/vendor"; - preBuild = "cd src; pushd tools/cargo"; + cargoVendorDir = "vendor"; + preBuild = "pushd src/tools/cargo"; postBuild = "popd"; passthru.rustc = rustc; @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; - LIBGIT2_SYS_USE_PKG_CONFIG=1; + LIBGIT2_SYS_USE_PKG_CONFIG = 1; # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel - RUSTC_BOOTSTRAP=1; + RUSTC_BOOTSTRAP = 1; # FIXME: Use impure version of CoreFoundation because of missing symbols. # CFURLSetResourcePropertyForKey is defined in the headers but there's no diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 1f24157eea42..9640cd9b577e 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,11 +7,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.31.0"; - cargoVersion = "1.31.0"; + version = "1.32.0"; + cargoVersion = "1.32.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "01pg2619bwjnhjbphryrbkwaz0lw8cfffm4xlz35znzipb04vmcs"; + sha256 = "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"; }; in rec { rustc = callPackage ./rustc.nix { @@ -22,11 +22,6 @@ in rec { # Re-evaluate if this we need to disable this one #./patches/stdsimd-disable-doctest.patch - - # Fails on hydra - not locally; the exact reason is unknown. - # Comments in the test suggest that some non-reproducible environment - # variables such $RANDOM can make it fail. - ./patches/disable-test-inherit-env.patch ]; withBundledLLVM = false; diff --git a/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch b/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch deleted file mode 100644 index fcb75ed098ec..000000000000 --- a/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- rustc-1.26.2-src.org/src/libstd/process.rs 2018-06-01 21:40:11.000000000 +0100 -+++ rustc-1.26.2-src/src/libstd/process.rs 2018-06-08 07:50:23.023828658 +0100 -@@ -1745,6 +1745,7 @@ - } - - #[test] -+ #[ignore] - fn test_inherit_env() { - use env; - diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index c6350e42bc23..19d5156e02fb 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, targetPackages, removeReferencesTo , fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps -, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl +, llvm, ncurses, darwin, rustPlatform, git, cmake, curl , which, libffi, gdb , version , withBundledLLVM ? false @@ -20,8 +20,6 @@ let llvmShared = llvm.override { enableSharedLibraries = true; }; - prefixedJemalloc = jemalloc.override { stripPrefix = false; }; - target = builtins.replaceStrings [" "] [","] (builtins.toString targets); in @@ -62,7 +60,6 @@ stdenv.mkDerivation { configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" "--enable-vendor" - "--jemalloc-root=${prefixedJemalloc}/lib" "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ] ++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ] ++ optional (targets != []) "--target=${target}"; @@ -85,7 +82,6 @@ stdenv.mkDerivation { patchShebangs src/etc ${optionalString (!withBundledLLVM) ''rm -rf src/llvm''} - rm -rf src/jemalloc # Fix the configure script to not require curl as we won't use it sed -i configure \ @@ -97,7 +93,7 @@ stdenv.mkDerivation { # https://github.com/rust-lang/rust/issues/39522 echo removing gdb-version-sensitive tests... find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete - rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums-pre-gdb-7-7.rs,generic-enum-with-different-disr-sizes.rs} + rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,generic-enum-with-different-disr-sizes.rs} # Useful debugging parameter # export VERBOSE=1 From 7fff567ee99c1f343ecdd82fef2e35fb6f50e423 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Feb 2019 13:42:54 +0100 Subject: [PATCH 161/193] rustfmt: 1.0.0 -> 1.0.1 --- pkgs/development/tools/rust/rustfmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 4684841cf478..dac00aa4c969 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rustfmt-${version}"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustfmt"; rev = "${version}"; - sha256 = "17ady2zq4jcbgawgpfszrkp6kxabb2f261g82y2az7nfax1h1pwy"; + sha256 = "1l18ycbq3125sq8v3wgma630wd6kclarlf8f51cmi9blk322jg9p"; }; - cargoSha256 = "0v8iq50h9368kai3m710br5cxc3p6mpbwz1v6gaf5802n48liqs8"; + cargoSha256 = "1557783icdzlwn02c5zl4362yl85r5zj4nkjv80p6896yli9hk9h"; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; From b8a9c3fbfddca622326c5f072c8f5a35a071f2cf Mon Sep 17 00:00:00 2001 From: aanderse Date: Tue, 5 Feb 2019 06:51:33 -0500 Subject: [PATCH 162/193] redmine: 3.4.8 -> 4.0.1 (#55234) * redmine: 3.4.8 -> 4.0.1 * nixos/redmine: update nixos test to run against both redmine 3.x and 4.x series * nixos/redmine: default new installs from 19.03 onward to redmine 4.x series, while keeping existing installs on redmine 3.x series * nixos/redmine: add comment about default redmine package to 19.03 release notes * redmine: add aandersea as a maintainer --- nixos/doc/manual/release-notes/rl-1903.xml | 7 + nixos/modules/services/misc/redmine.nix | 14 +- nixos/tests/redmine.nix | 94 +-- .../version-management/redmine/4.x/Gemfile | 71 ++ .../redmine/4.x/Gemfile.lock | 204 ++++++ .../redmine/4.x/default.nix | 43 ++ .../version-management/redmine/4.x/gemset.nix | 622 ++++++++++++++++++ .../version-management/redmine/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 + 9 files changed, 1017 insertions(+), 42 deletions(-) create mode 100644 pkgs/applications/version-management/redmine/4.x/Gemfile create mode 100644 pkgs/applications/version-management/redmine/4.x/Gemfile.lock create mode 100644 pkgs/applications/version-management/redmine/4.x/default.nix create mode 100644 pkgs/applications/version-management/redmine/4.x/gemset.nix diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index eca280afdf18..943b9d2a6081 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -484,6 +484,13 @@ the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now. + + + New installs of NixOS will default to the Redmine 4.x series unless otherwise specified in + services.redmine.package while existing installs of NixOS will default to + the Redmine 3.x series. + + diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index d7250c5f35af..98e9c8953c84 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -61,12 +61,20 @@ in description = "Enable the Redmine service."; }; + # default to the 4.x series not forcing major version upgrade of those on the 3.x series package = mkOption { type = types.package; - default = pkgs.redmine; + default = if versionAtLeast config.system.stateVersion "19.03" + then pkgs.redmine_4 + else pkgs.redmine + ; defaultText = "pkgs.redmine"; - description = "Which Redmine package to use."; - example = "pkgs.redmine.override { ruby = pkgs.ruby_2_3; }"; + description = '' + Which Redmine package to use. This defaults to version 3.x if + system.stateVersion < 19.03 and version 4.x + otherwise. + ''; + example = "pkgs.redmine_4.override { ruby = pkgs.ruby_2_4; }"; }; user = mkOption { diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix index 330f72854cac..ea72a0121d11 100644 --- a/nixos/tests/redmine.nix +++ b/nixos/tests/redmine.nix @@ -1,40 +1,58 @@ -import ./make-test.nix ({ pkgs, lib, ... }: +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing.nix { inherit system pkgs; }; +with pkgs.lib; + +let + redmineTest = package: makeTest { + machine = + { config, pkgs, ... }: + { services.mysql.enable = true; + services.mysql.package = pkgs.mariadb; + services.mysql.ensureDatabases = [ "redmine" ]; + services.mysql.ensureUsers = [ + { name = "redmine"; + ensurePermissions = { "redmine.*" = "ALL PRIVILEGES"; }; + } + ]; + + services.redmine.enable = true; + services.redmine.package = package; + services.redmine.database.socket = "/run/mysqld/mysqld.sock"; + services.redmine.plugins = { + redmine_env_auth = pkgs.fetchurl { + url = https://github.com/Intera/redmine_env_auth/archive/0.7.zip; + sha256 = "1xb8lyarc7mpi86yflnlgyllh9hfwb9z304f19dx409gqpia99sc"; + }; + }; + services.redmine.themes = { + dkuk-redmine_alex_skin = pkgs.fetchurl { + url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip; + sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; + }; + }; + }; + + testScript = '' + startAll; + + $machine->waitForUnit('redmine.service'); + $machine->waitForOpenPort('3000'); + $machine->succeed("curl --fail http://localhost:3000/"); + ''; + }; +in { - name = "redmine"; - meta.maintainers = [ lib.maintainers.aanderse ]; + redmine_3 = redmineTest pkgs.redmine // { + name = "redmine_3"; + meta.maintainers = [ maintainers.aanderse ]; + }; - machine = - { config, pkgs, ... }: - { services.mysql.enable = true; - services.mysql.package = pkgs.mariadb; - services.mysql.ensureDatabases = [ "redmine" ]; - services.mysql.ensureUsers = [ - { name = "redmine"; - ensurePermissions = { "redmine.*" = "ALL PRIVILEGES"; }; - } - ]; - - services.redmine.enable = true; - services.redmine.database.socket = "/run/mysqld/mysqld.sock"; - services.redmine.plugins = { - redmine_env_auth = pkgs.fetchurl { - url = https://github.com/Intera/redmine_env_auth/archive/0.6.zip; - sha256 = "0yyr1yjd8gvvh832wdc8m3xfnhhxzk2pk3gm2psg5w9jdvd6skak"; - }; - }; - services.redmine.themes = { - dkuk-redmine_alex_skin = pkgs.fetchurl { - url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip; - sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; - }; - }; - }; - - testScript = '' - startAll; - - $machine->waitForUnit('redmine.service'); - $machine->waitForOpenPort('3000'); - $machine->succeed("curl --fail http://localhost:3000/"); - ''; -}) + redmine_4 = redmineTest pkgs.redmine_4 // { + name = "redmine_4"; + meta.maintainers = [ maintainers.aanderse ]; + }; +} diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile b/pkgs/applications/version-management/redmine/4.x/Gemfile new file mode 100644 index 000000000000..3fd176007abf --- /dev/null +++ b/pkgs/applications/version-management/redmine/4.x/Gemfile @@ -0,0 +1,71 @@ +source 'https://rubygems.org' + +gem "bundler", ">= 1.5.0" + +gem "rails", "5.2.2" +gem "rouge", "~> 3.3.0" +gem "request_store", "1.0.5" +gem "mini_mime", "~> 1.0.1" +gem "actionpack-xml_parser" +gem "roadie-rails", "~> 1.3.0" +gem "mimemagic" +gem "mail", "~> 2.7.1" +gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6" + +gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1") +gem "i18n", "~> 0.7.0" + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] +gem "rbpdf", "~> 1.19.6" + +# Optional gem for LDAP authentication +group :ldap do + gem "net-ldap", "~> 0.16.0" +end + +# Optional gem for OpenID authentication +group :openid do + gem "ruby-openid", "~> 2.3.0", :require => "openid" + gem "rack-openid" +end + +platforms :mri, :mingw, :x64_mingw do + # Optional gem for exporting the gantt to a PNG file, not supported with jruby + group :rmagick do + gem "rmagick", ">= 2.14.0" + end + + # Optional Markdown support, not for JRuby + group :markdown do + gem "redcarpet", "~> 3.4.0" + end +end + +# Include database gems for the database adapters NixOS supports +gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] +gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw] + +group :development do + gem "yard" +end + +group :test do + gem "rails-dom-testing" + gem "mocha" + gem "simplecov", "~> 0.14.1", :require => false + # For running system tests + gem 'puma', '~> 3.7' + gem "capybara", '~> 2.13' + gem "selenium-webdriver" +end + +local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") +if File.exists?(local_gemfile) + eval_gemfile local_gemfile +end + +# Load plugins' Gemfiles +Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| + eval_gemfile file +end diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock new file mode 100644 index 000000000000..8c569ddb3227 --- /dev/null +++ b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock @@ -0,0 +1,204 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.2) + actionpack (= 5.2.2) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.2) + actionview (= 5.2.2) + activesupport (= 5.2.2) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionpack-xml_parser (2.0.1) + actionpack (>= 5.0) + railties (>= 5.0) + actionview (5.2.2) + activesupport (= 5.2.2) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.2) + activesupport (= 5.2.2) + globalid (>= 0.3.6) + activemodel (5.2.2) + activesupport (= 5.2.2) + activerecord (5.2.2) + activemodel (= 5.2.2) + activesupport (= 5.2.2) + arel (>= 9.0) + activestorage (5.2.2) + actionpack (= 5.2.2) + activerecord (= 5.2.2) + marcel (~> 0.3.1) + activesupport (5.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + arel (9.0.0) + builder (3.2.3) + capybara (2.18.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (>= 2.0, < 4.0) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + concurrent-ruby (1.1.4) + crass (1.0.4) + css_parser (1.6.0) + addressable + csv (3.0.4) + docile (1.1.5) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + htmlentities (4.3.4) + i18n (0.7.0) + json (2.1.0) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + metaclass (0.0.4) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + mocha (1.8.0) + metaclass (~> 0.0.1) + mysql2 (0.5.2) + net-ldap (0.16.1) + nio4r (2.3.1) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.6) + rack-openid (1.4.2) + rack (>= 1.1.0) + ruby-openid (>= 2.1.8) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.2) + actioncable (= 5.2.2) + actionmailer (= 5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) + activemodel (= 5.2.2) + activerecord (= 5.2.2) + activestorage (= 5.2.2) + activesupport (= 5.2.2) + bundler (>= 1.3.0) + railties (= 5.2.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.2) + actionpack (= 5.2.2) + activesupport (= 5.2.2) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rbpdf (1.19.8) + htmlentities + rbpdf-font (~> 1.19.0) + rbpdf-font (1.19.1) + redcarpet (3.4.0) + request_store (1.0.5) + rmagick (2.16.0) + roadie (3.4.0) + css_parser (~> 1.4) + nokogiri (~> 1.5) + roadie-rails (1.3.0) + railties (>= 3.0, < 5.3) + roadie (~> 3.1) + rouge (3.3.0) + ruby-openid (2.3.0) + rubyzip (1.2.2) + selenium-webdriver (3.141.0) + childprocess (~> 0.5) + rubyzip (~> 1.2, >= 1.2.2) + simplecov (0.14.1) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + yard (0.9.18) + +PLATFORMS + ruby + +DEPENDENCIES + actionpack-xml_parser + bundler (>= 1.5.0) + capybara (~> 2.13) + csv (~> 3.0.1) + i18n (~> 0.7.0) + mail (~> 2.7.1) + mimemagic + mini_mime (~> 1.0.1) + mocha + mysql2 (~> 0.5.0) + net-ldap (~> 0.16.0) + nokogiri (~> 1.10.0) + pg (~> 1.1.4) + puma (~> 3.7) + rack-openid + rails (= 5.2.2) + rails-dom-testing + rbpdf (~> 1.19.6) + redcarpet (~> 3.4.0) + request_store (= 1.0.5) + rmagick (>= 2.14.0) + roadie-rails (~> 1.3.0) + rouge (~> 3.3.0) + ruby-openid (~> 2.3.0) + selenium-webdriver + simplecov (~> 0.14.1) + tzinfo-data + yard + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix new file mode 100644 index 000000000000..ba9f96f5a30c --- /dev/null +++ b/pkgs/applications/version-management/redmine/4.x/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, bundlerEnv, ruby }: + +let + version = "4.0.1"; + rubyEnv = bundlerEnv { + name = "redmine-env-${version}"; + + inherit ruby; + gemdir = ./.; + groups = [ "ldap" "openid" ]; + }; +in + stdenv.mkDerivation rec { + name = "redmine-${version}"; + + src = fetchurl { + url = "https://www.redmine.org/releases/${name}.tar.gz"; + sha256 = "1zzn9rkh7x1h9f2shcc8qhb693hp0hpah0z53i6gfgg5p8k5hns1"; + }; + + buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; + + buildPhase = '' + mv config config.dist + mv public/themes public/themes.dist + ''; + + installPhase = '' + mkdir -p $out/share + cp -r . $out/share/redmine + for i in config files log plugins public/plugin_assets public/themes tmp; do + rm -rf $out/share/redmine/$i + ln -fs /run/redmine/$i $out/share/redmine/$i + done + ''; + + meta = with stdenv.lib; { + homepage = http://www.redmine.org/; + platforms = platforms.linux; + maintainers = [ maintainers.garbas maintainers.aanderse ]; + license = licenses.gpl2; + }; + } diff --git a/pkgs/applications/version-management/redmine/4.x/gemset.nix b/pkgs/applications/version-management/redmine/4.x/gemset.nix new file mode 100644 index 000000000000..ce21a58b5564 --- /dev/null +++ b/pkgs/applications/version-management/redmine/4.x/gemset.nix @@ -0,0 +1,622 @@ +{ + actioncable = { + dependencies = ["actionpack" "nio4r" "websocket-driver"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0826k5ch0l03f9yrkxy69aiv039z4qi00lnahw2rzywd2iz6r68x"; + type = "gem"; + }; + version = "5.2.2"; + }; + actionmailer = { + dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sfpb8s95cmkpp9ybyp2c88r55r5llscmmnkfwcwgasz9ncjiq5n"; + type = "gem"; + }; + version = "5.2.2"; + }; + actionpack = { + dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iwhbqqn0cm39dq040iwq8cfyclqk3kyzwlp5k3j5cz8k2668wws"; + type = "gem"; + }; + version = "5.2.2"; + }; + actionpack-xml_parser = { + dependencies = ["actionpack" "railties"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rnm6jrw3mzcf2g3q498igmhsn0kfkxq79w0nm532iclx4g4djs0"; + type = "gem"; + }; + version = "2.0.1"; + }; + actionview = { + dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lz04drbi1z0xhvb8jnr14pbf505lilr02arahxq7y3mxiz0rs8z"; + type = "gem"; + }; + version = "5.2.2"; + }; + activejob = { + dependencies = ["activesupport" "globalid"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jjkl62x2aprg55x9rpm0h2c82vr2qr989hg3l9r21l01q4822ir"; + type = "gem"; + }; + version = "5.2.2"; + }; + activemodel = { + dependencies = ["activesupport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xmwi3mw8g4shbjvkhk72ra3r5jccbdsd4piphqka2y1h8s7sxvi"; + type = "gem"; + }; + version = "5.2.2"; + }; + activerecord = { + dependencies = ["activemodel" "activesupport" "arel"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19a0sns6a5wz2wym25lb1dv4lbrrl5sd1n15s5ky2636znmhz30y"; + type = "gem"; + }; + version = "5.2.2"; + }; + activestorage = { + dependencies = ["actionpack" "activerecord" "marcel"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c72837098sw384vk6dmrb2p7q3wx4swnibk6sw9dp4hn1vc4p31"; + type = "gem"; + }; + version = "5.2.2"; + }; + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz"; + type = "gem"; + }; + version = "5.2.2"; + }; + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; + type = "gem"; + }; + version = "2.6.0"; + }; + arel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; + type = "gem"; + }; + version = "9.0.0"; + }; + builder = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + type = "gem"; + }; + version = "3.2.3"; + }; + capybara = { + dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yv77rnsjlvs8qpfn9n5vf1h6b9agxwhxw09gssbiw9zn9j20jh8"; + type = "gem"; + }; + version = "2.18.0"; + }; + childprocess = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; + type = "gem"; + }; + version = "0.9.0"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + type = "gem"; + }; + version = "1.1.4"; + }; + crass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"; + type = "gem"; + }; + version = "1.0.4"; + }; + css_parser = { + dependencies = ["addressable"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61"; + type = "gem"; + }; + version = "1.6.0"; + }; + csv = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19m22vlxddva301z2izvg06hldlc37nyzhin3kjjfcnlbb8imj33"; + type = "gem"; + }; + version = "3.0.4"; + }; + docile = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + type = "gem"; + }; + version = "1.1.5"; + }; + erubi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1"; + type = "gem"; + }; + version = "1.8.0"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + type = "gem"; + }; + version = "1.10.0"; + }; + globalid = { + dependencies = ["activesupport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; + type = "gem"; + }; + version = "0.4.2"; + }; + htmlentities = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + i18n = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; + type = "gem"; + }; + version = "0.7.0"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + loofah = { + dependencies = ["crass" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg"; + type = "gem"; + }; + version = "2.2.3"; + }; + mail = { + dependencies = ["mini_mime"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + type = "gem"; + }; + version = "2.7.1"; + }; + marcel = { + dependencies = ["mimemagic"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; + type = "gem"; + }; + version = "0.3.3"; + }; + metaclass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5"; + type = "gem"; + }; + version = "0.0.4"; + }; + method_source = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + type = "gem"; + }; + version = "0.9.2"; + }; + mimemagic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw"; + type = "gem"; + }; + version = "0.3.3"; + }; + mini_mime = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; + type = "gem"; + }; + version = "1.0.1"; + }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + type = "gem"; + }; + version = "2.4.0"; + }; + minitest = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + type = "gem"; + }; + version = "5.11.3"; + }; + mocha = { + dependencies = ["metaclass"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12aglpiq1h18j5a4rlwvnsvnsi2f3407v5xm59lgcg3ymlyak4al"; + type = "gem"; + }; + version = "1.8.0"; + }; + mysql2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a2kdjgzwh1p2rkcmxaawy6ibi32b04wbdd5d4wr8i342pq76di4"; + type = "gem"; + }; + version = "0.5.2"; + }; + net-ldap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "016igqz81a8zcwqzp5bbhryqmb2skmyf57ij3nb5z8sxwhw22jgh"; + type = "gem"; + }; + version = "0.16.1"; + }; + nio4r = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr"; + type = "gem"; + }; + version = "2.3.1"; + }; + nokogiri = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; + type = "gem"; + }; + version = "1.10.1"; + }; + pg = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"; + type = "gem"; + }; + version = "1.1.4"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + type = "gem"; + }; + version = "3.0.3"; + }; + puma = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq"; + type = "gem"; + }; + version = "3.12.0"; + }; + rack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm"; + type = "gem"; + }; + version = "2.0.6"; + }; + rack-openid = { + dependencies = ["rack" "ruby-openid"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sg85yn981j3a0iri3ch4znzdwscvz29l7vrk3dafqw4fdg31llc"; + type = "gem"; + }; + version = "1.4.2"; + }; + rack-test = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + type = "gem"; + }; + version = "1.1.0"; + }; + rails = { + dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m9cszds68dsiycciiayd3c9g90s2yzn1izkr3gpgqkfw6dmvzyr"; + type = "gem"; + }; + version = "5.2.2"; + }; + rails-dom-testing = { + dependencies = ["activesupport" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + type = "gem"; + }; + version = "2.0.3"; + }; + rails-html-sanitizer = { + dependencies = ["loofah"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; + type = "gem"; + }; + version = "1.0.4"; + }; + railties = { + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00pnylmbz4c46mxw5lhxi8h39lndfg6fs1hpd0qd6swnjhkqsr1l"; + type = "gem"; + }; + version = "5.2.2"; + }; + rake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; + type = "gem"; + }; + version = "12.3.2"; + }; + rbpdf = { + dependencies = ["htmlentities" "rbpdf-font"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fnhcn4z2zz6ic1yvl5hmhwmkdnybh8f8fnk1ni7bvl2s4ig5195"; + type = "gem"; + }; + version = "1.19.8"; + }; + rbpdf-font = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pxlr0l4vf785qpy55m439dyii63a26l0sd0yyhbwwcy9zm9hd1v"; + type = "gem"; + }; + version = "1.19.1"; + }; + redcarpet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + type = "gem"; + }; + version = "3.4.0"; + }; + request_store = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ky19wb6mpq6dxb81a0h4hnzx7a4ka99n9ay2syi68djbr4bkbbh"; + type = "gem"; + }; + version = "1.0.5"; + }; + rmagick = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m9x15cdlkcb9826s3s2jd97hxf50hln22p94x8hcccxi1lwklq6"; + type = "gem"; + }; + version = "2.16.0"; + }; + roadie = { + dependencies = ["css_parser" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l3s80394yijvz0fsvfkw0azsi9yxsdkxd8lpas0bd7wlndjvmxx"; + type = "gem"; + }; + version = "3.4.0"; + }; + roadie-rails = { + dependencies = ["railties" "roadie"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02km0ama85mkw7kkn6qif86b781pglfdmqrwx5s6hwjlzk16qih3"; + type = "gem"; + }; + version = "1.3.0"; + }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + type = "gem"; + }; + version = "3.3.0"; + }; + ruby-openid = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yzaf2c1i88757554wk38rxqmj0xzgmwk2zx7gi98w2zx42d17pn"; + type = "gem"; + }; + version = "2.3.0"; + }; + rubyzip = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + type = "gem"; + }; + version = "1.2.2"; + }; + selenium-webdriver = { + dependencies = ["childprocess" "rubyzip"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs"; + type = "gem"; + }; + version = "3.141.0"; + }; + simplecov = { + dependencies = ["docile" "json" "simplecov-html"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r9fnsnsqj432cmrpafryn8nif3x0qg9mdnvrcf0wr01prkdlnww"; + type = "gem"; + }; + version = "0.14.1"; + }; + simplecov-html = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn"; + type = "gem"; + }; + version = "0.10.2"; + }; + sprockets = { + dependencies = ["concurrent-ruby" "rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + type = "gem"; + }; + version = "3.7.2"; + }; + sprockets-rails = { + dependencies = ["actionpack" "activesupport" "sprockets"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; + type = "gem"; + }; + version = "3.2.1"; + }; + thor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + version = "0.20.3"; + }; + thread_safe = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + type = "gem"; + }; + version = "1.2.5"; + }; + websocket-driver = { + dependencies = ["websocket-extensions"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn"; + type = "gem"; + }; + version = "0.7.0"; + }; + websocket-extensions = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270"; + type = "gem"; + }; + version = "0.1.3"; + }; + xpath = { + dependencies = ["nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; + type = "gem"; + }; + version = "3.2.0"; + }; + yard = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f"; + type = "gem"; + }; + version = "0.9.18"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 6e5a2dbbdf70..02ae5da0f3f0 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -37,7 +37,7 @@ in meta = with stdenv.lib; { homepage = http://www.redmine.org/; platforms = platforms.linux; - maintainers = [ maintainers.garbas ]; + maintainers = [ maintainers.garbas maintainers.aanderse ]; license = licenses.gpl2; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5578106651f8..5c2ed177d328 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5086,6 +5086,8 @@ in redir = callPackage ../tools/networking/redir { }; redmine = callPackage ../applications/version-management/redmine { ruby = pkgs.ruby_2_4; }; + # failed to build websocket-driver gem with ruby 2.6, so sticking to 2.5 for now + redmine_4 = callPackage ../applications/version-management/redmine/4.x { ruby = pkgs.ruby_2_5; }; redsocks = callPackage ../tools/networking/redsocks { }; From 99bb42651af97109acdaa8b0bdb0079c1b580afd Mon Sep 17 00:00:00 2001 From: Vonfry <3413119+Vonfry@users.noreply.github.com> Date: Tue, 5 Feb 2019 21:07:27 +0800 Subject: [PATCH 163/193] fortune: 1.99.1 -> 2.6.2 (#55171) fortune: 1.99.1 -> 2.6.2 --- pkgs/tools/misc/fortune/default.nix | 33 ++++++++++++++++++----------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 8e9557335982..45d27e7b7c82 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -1,26 +1,35 @@ -{ stdenv, fetchurl, recode }: +{ stdenv, fetchurl, cmake, recode, perl }: +let srcs = { + fortune = fetchurl { + url = "https://github.com/shlomif/fortune-mod/archive/fortune-mod-${version}.tar.gz"; + sha256 = "89223bb649ea62b030527f181539182d6a17a1a43b0cc499a52732b839f7b691"; + }; + shlomifCommon = fetchurl { + url = https://bitbucket.org/shlomif/shlomif-cmake-modules/raw/default/shlomif-cmake-modules/Shlomif_Common.cmake; + sha256 = "62f188a9f1b7ab0e757eb0bc6540d9c0026d75edc7acc1c3cdf7438871d0a94f"; + }; + }; + version = "2.6.2"; +in stdenv.mkDerivation { - name = "fortune-mod-1.99.1"; + name = "fortune-mod-${version}"; - src = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1.orig.tar.gz; - sha256 = "1kpa2hgbglj5dbfasvl9wc1q3xpl91mqn3sfby46r4rwyzhswlgw"; - }; + src = srcs.fortune; + + sourceRoot = "fortune-mod-fortune-mod-${version}/fortune-mod"; + + nativeBuildInputs = [ cmake perl ]; buildInputs = [ recode ]; preConfigure = '' - sed -i "s|/usr/|$out/|" Makefile - ''; - - preBuild = '' - makeFlagsArray=("CC=$CC" "REGEXDEFS=-DHAVE_REGEX_H -DPOSIX_REGEX" "LDFLAGS=") + cp ${srcs.shlomifCommon} cmake/Shlomif_Common.cmake ''; postInstall = '' mv $out/games/fortune $out/bin/fortune - rmdir $out/games + rm -r $out/games ''; meta = with stdenv.lib; { From a0a203eb5c1bc8a380d0270e3fe8dff502aecd64 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 3 Feb 2019 16:50:04 +0100 Subject: [PATCH 164/193] sdnotify-wrapper: init at unversioned --- .../linux/sdnotify-wrapper/default.nix | 37 ++++ .../linux/sdnotify-wrapper/sdnotify-wrapper.c | 172 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 212 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/sdnotify-wrapper/default.nix create mode 100644 pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix b/pkgs/os-specific/linux/sdnotify-wrapper/default.nix new file mode 100644 index 000000000000..28e1f0257897 --- /dev/null +++ b/pkgs/os-specific/linux/sdnotify-wrapper/default.nix @@ -0,0 +1,37 @@ +{ lib, fetchurl, runCommandCC, skawarePackages }: + +with skawarePackages; + +let + # From https://skarnet.org/software/misc/sdnotify-wrapper.c, + # which is unversioned. + src = ./sdnotify-wrapper.c; + +in runCommandCC "sdnotify-wrapper" { + + outputs = [ "bin" "doc" "out" ]; + + meta = { + homepage = "https://skarnet.org/software/misc/sdnotify-wrapper.c"; + description = "Use systemd sd_notify without having to link against libsystemd"; + platforms = lib.platforms.all; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ Profpatsch ]; + }; + +} '' + mkdir -p $bin/bin + mkdir $out + + # just dynamic for now + $CC \ + -o $bin/bin/sdnotify-wrapper \ + -I${skalibs.dev}/include \ + -L${skalibs.lib}/lib \ + -lskarnet \ + ${src} + + mkdir -p $doc/share/doc/sdnotify-wrapper + # copy the documentation comment + sed -ne '/Usage:/,/*\//p' ${src} > $doc/share/doc/sdnotify-wrapper/README +'' diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c b/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c new file mode 100644 index 000000000000..0d1ae96068a4 --- /dev/null +++ b/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c @@ -0,0 +1,172 @@ +/* + Copyright: (C)2015-2017 Laurent Bercot. http://skarnet.org/ + ISC license. See http://opensource.org/licenses/ISC + + Build-time requirements: skalibs. http://skarnet.org/software/skalibs/ + Run-time requirements: none, if you link skalibs statically. + + Compilation: + gcc -o sdnotify-wrapper -L/usr/lib/skalibs sdnotify-wrapper.c -lskarnet + Use /usr/lib/skalibs/libskarnet.a instead of -lskarnet to link statically. + Adapt gcc's -I and -L options to your skalibs installation paths. + + Usage: if a daemon would be launched by systemd as "foobard args...", + launch it as "sdnotify-wrapper foobard args..." instead, and you can now + tell systemd that this daemon supports readiness notification. + + Instead of using sd_notify() and having to link against the systemd + library, the daemon notifies readiness by writing whatever it wants + to a file descriptor (by default: stdout), then a newline. (Then it + should close that file descriptor.) The simplest way is something like + int notify_readiness() { write(1, "\n", 1) ; close(1) ; } + This mechanism is understandable by any notification readiness framework. + + Readiness notification occurs when the newline is written, not when + the descriptor is closed; but since sdnotify-wrapper stops reading + after the first newline and will exit, any subsequent writes will + fail and it's best to simply close the descriptor right away. + + sdnotify-wrapper sees the notification when it occurs and sends it + to systemd using the sd_notify format. + + Options: + -d fd: the daemon will write its notification on descriptor fd. + Default is 1. + -f: do not doublefork. Use if the daemon waits for children it does + not know it has (for instance, superservers do this). When in doubt, + do not use that option, or you may have a zombie hanging around. + -t timeout: if the daemon has not sent a notification after timeout + milliseconds, give up and exit; systemd will not be notified. + -k: keep the NOTIFY_SOCKET environment variable when execing into the + daemon. By default, the variable is unset: the daemon should not need it. + + Notes: + sdnotify-wrapper does not change the daemon's pid. It runs as a + (grand)child of the daemon. + If the NOTIFY_SOCKET environment variable is not set, sdnotify-wrapper + does nothing - it only execs into the daemon. + sdnotify-wrapper is more liberal than sd_notify(). It will accept + a relative path in NOTIFY_SOCKET. +*/ + + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define USAGE "sdnotify-wrapper [ -d fd ] [ -f ] [ -t timeout ] [ -k ] prog..." +#define dieusage() strerr_dieusage(100, USAGE) + +#define VAR "NOTIFY_SOCKET" + +static inline int ipc_sendto (int fd, char const *s, size_t len, char const *path) +{ + struct sockaddr_un sa ; + size_t l = strlen(path) ; + if (l > IPCPATH_MAX) return (errno = ENAMETOOLONG, 0) ; + memset(&sa, 0, sizeof sa) ; + sa.sun_family = AF_UNIX ; + memcpy(sa.sun_path, path, l+1) ; + if (path[0] == '@') sa.sun_path[0] = 0 ; + return sendto(fd, s, len, MSG_NOSIGNAL, (struct sockaddr *)&sa, sizeof sa) >= 0 ; +} + +static inline void notify_systemd (pid_t pid, char const *socketpath) +{ + size_t n = 16 ; + char fmt[16 + PID_FMT] = "READY=1\nMAINPID=" ; + int fd = ipc_datagram_b() ; + if (fd < 0) strerr_diefu1sys(111, "create socket") ; + n += pid_fmt(fmt + n, pid) ; + fmt[n++] = '\n' ; + if (!ipc_sendto(fd, fmt, n, socketpath)) + strerr_diefu2sys(111, "send notification message to ", socketpath) ; + close(fd) ; +} + +static inline int run_child (int fd, unsigned int timeout, pid_t pid, char const *s) +{ + char dummy[4096] ; + iopause_fd x = { .fd = fd, .events = IOPAUSE_READ } ; + tain_t deadline ; + tain_now_g() ; + if (timeout) tain_from_millisecs(&deadline, timeout) ; + else deadline = tain_infinite_relative ; + tain_add_g(&deadline, &deadline) ; + for (;;) + { + int r = iopause_g(&x, 1, &deadline) ; + if (r < 0) strerr_diefu1sys(111, "iopause") ; + if (!r) return 99 ; + r = sanitize_read(fd_read(fd, dummy, 4096)) ; + if (r < 0) + if (errno == EPIPE) return 1 ; + else strerr_diefu1sys(111, "read from parent") ; + else if (r && memchr(dummy, '\n', r)) break ; + } + close(fd) ; + notify_systemd(pid, s) ; + return 0 ; +} + +int main (int argc, char const *const *argv, char const *const *envp) +{ + char const *s = env_get2(envp, VAR) ; + unsigned int fd = 1 ; + unsigned int timeout = 0 ; + int df = 1, keep = 0 ; + PROG = "sdnotify-wrapper" ; + { + subgetopt_t l = SUBGETOPT_ZERO ; + for (;;) + { + register int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ; + if (opt == -1) break ; + switch (opt) + { + case 'd' : if (!uint0_scan(l.arg, &fd)) dieusage() ; break ; + case 'f' : df = 0 ; break ; + case 't' : if (!uint0_scan(l.arg, &timeout)) dieusage() ; break ; + case 'k' : keep = 1 ; break ; + default : dieusage() ; + } + } + argc -= l.ind ; argv += l.ind ; + } + if (!argc) dieusage() ; + + if (!s) xpathexec_run(argv[0], argv, envp) ; + else + { + pid_t parent = getpid() ; + pid_t child ; + int p[2] ; + if (pipe(p) < 0) strerr_diefu1sys(111, "pipe") ; + child = df ? doublefork() : fork() ; + if (child < 0) strerr_diefu1sys(111, df ? "doublefork" : "fork") ; + else if (!child) + { + PROG = "sdnotify-wrapper (child)" ; + close(p[1]) ; + return run_child(p[0], timeout, parent, s) ; + } + close(p[0]) ; + if (fd_move((int)fd, p[1]) < 0) strerr_diefu1sys(111, "move descriptor") ; + if (keep) xpathexec_run(argv[0], argv, envp) ; + else xpathexec_r(argv, envp, env_len(envp), VAR, sizeof(VAR)) ; + } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c2ed177d328..5bfb7c71b545 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12451,6 +12451,8 @@ in SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; + sdnotify-wrapper = skawarePackages.sdnotify-wrapper; + sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {}; selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { }; @@ -12509,7 +12511,7 @@ in nsss = callPackage ../development/libraries/nsss { }; utmps = callPackage ../development/libraries/utmps { }; - + sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { }; }; skydive = callPackage ../tools/networking/skydive { }; From 3aca219535514ee1ed34eb1bfe48dc0e55a81ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Tue, 5 Feb 2019 14:58:09 +0100 Subject: [PATCH 165/193] ranger: add pillow dependency Pillow is required to display images with kitty terminal To test it, add these 2 lines to your rc.conf: set preview_images true set preview_images_method kitty --- pkgs/applications/misc/ranger/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 7527fe963abb..7045228d6a2f 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -19,7 +19,8 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; checkInputs = with python3Packages; [ pytest ]; - propagatedBuildInputs = [ file ]; + propagatedBuildInputs = [ file ] + ++ lib.optional (imagePreviewSupport) [ python3Packages.pillow ]; checkPhase = '' py.test tests From 0058ce53693fbdbb516e72804a4f49ad168aac72 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 06:37:22 -0800 Subject: [PATCH 166/193] python37Packages.cysignals: 1.8.1 -> 1.9.0 (#55216) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-cysignals/versions --- pkgs/development/python-modules/cysignals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index f9d7ba8a8513..c1f85ce75ac4 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -9,11 +9,11 @@ assert pariSupport -> pari != null; buildPythonPackage rec { pname = "cysignals"; - version = "1.8.1"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1hnkcrrxgh6g8a197v2yw61xz43iyv81jbl6jpy19ql3k66w81zx"; + sha256 = "15ix8crpad26cfl1skyg7qajqqfdrm8q5ahhmlfmqi1aw0jqj2g2"; }; # explicit check: From aaeaa6d1c6052938c302c07407e441e5b5794e48 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 00:00:19 +0900 Subject: [PATCH 167/193] Add checkPhase for neovim (disabled by default) (#55266) * neovim-unwrapped: now use lua environments * mpv: use lua environments * luaPackages.inspect: init at 3.1.1-0 * luaPackages.lgi: mark as a lua module * luaPackages.vicious: mark as a lua module --- maintainers/scripts/luarocks-packages.csv | 1 + pkgs/applications/editors/neovim/default.nix | 49 +++++++++++++------ pkgs/applications/video/mpv/default.nix | 19 +++---- .../lua-modules/generated-packages.nix | 20 ++++++++ pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/lua-packages.nix | 8 +-- 6 files changed, 68 insertions(+), 33 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index e7c42925c5b2..e6817a060560 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,6 +1,7 @@ ansicolors, argparse, dkjson +inspect lrexlib-gnu, lrexlib-posix, ltermbox, diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index d7932dc4dcfc..ee7a79517850 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,15 +1,25 @@ { stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv -, libuv, luaPackages, ncurses, pkgconfig +, libuv, lua, ncurses, pkgconfig , unibilium, xsel, gperf , libvterm-neovim , withJemalloc ? true, jemalloc +, glibcLocales ? null, procps ? null + +# now defaults to false because some tests can be flaky (clipboard etc) +, doCheck ? false }: with stdenv.lib; let - - neovim = stdenv.mkDerivation rec { + neovimLuaEnv = lua.withPackages(ps: + (with ps; [ mpack lpeg luabitop ] + ++ optionals doCheck [ + nvim-client luv coxpcall busted luafilesystem penlight inspect + ] + )); +in + stdenv.mkDerivation rec { name = "neovim-unwrapped-${version}"; version = "0.3.4"; @@ -36,11 +46,20 @@ let ncurses libvterm-neovim unibilium - luaPackages.lua gperf + neovimLuaEnv ] ++ optional withJemalloc jemalloc ++ optional stdenv.isDarwin libiconv - ++ lualibs; + ++ optionals doCheck [ glibcLocales procps ] + ; + + inherit doCheck; + + # to be exhaustive, one could run + # make oldtests too + checkPhase = '' + make functionaltest + ''; nativeBuildInputs = [ cmake @@ -48,10 +67,6 @@ let pkgconfig ]; - LUA_PATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaPath lualibs); - LUA_CPATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaCPath lualibs); - - lualibs = [ luaPackages.mpack luaPackages.lpeg luaPackages.luabitop ]; # nvim --version output retains compilation flags and references to build tools postPatch = '' @@ -61,9 +76,11 @@ let disallowedReferences = [ stdenv.cc ]; cmakeFlags = [ - "-DLUA_PRG=${luaPackages.lua}/bin/lua" + "-DLUA_PRG=${neovimLuaEnv}/bin/lua" "-DGPERF_PRG=${gperf}/bin/gperf" - ]; + ] + ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" + ; # triggers on buffer overflow bug while running tests hardeningDisable = [ "fortify" ]; @@ -81,6 +98,11 @@ let $out/bin/nvim ''; + # export PATH=$PWD/build/bin:${PATH} + shellHook='' + export VIMRUNTIME=$PWD/runtime + ''; + meta = { description = "Vim text editor fork focused on extensibility and agility"; longDescription = '' @@ -104,7 +126,4 @@ let # https://nix-cache.s3.amazonaws.com/log/9ahcb52905d9d417zsskjpc331iailpq-neovim-unwrapped-0.2.2.drv broken = stdenv.isAarch64; }; - }; - -in - neovim + } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 4e4c623ca607..ffbaa9fffdf7 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs, mujs -, lua, luasocket, libuchardet, libiconv ? null, darwin +, lua, libuchardet, libiconv ? null, darwin , waylandSupport ? false , wayland ? null @@ -92,6 +92,8 @@ let "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; sha256 = "0j7sbn3w6bgslvwwh5v9527w3gi2sd08kskrgxamx693y0b0i3ia"; }; + luaEnv = lua.withPackages(ps: with ps; [ luasocket]); + in stdenv.mkDerivation rec { name = "mpv-${version}"; version = "0.29.1"; @@ -139,7 +141,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ffmpeg_4 freetype libass libpthreadstubs - lua luasocket libuchardet mujs + luaEnv libuchardet mujs ] ++ optional alsaSupport alsaLib ++ optional archiveSupport libarchive ++ optional bluraySupport libbluray @@ -183,16 +185,9 @@ in stdenv.mkDerivation rec { # Ensure youtube-dl is available in $PATH for mpv wrapperFlags = - let - getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" + - "${luasocket}/share/lua/${lua.luaversion}/?.${type}"; - luaPath = getPath "lua"; - luaCPath = getPath "so"; - in - '' - --prefix LUA_PATH : "${luaPath}" \ - --prefix LUA_CPATH : "${luaCPath}" \ - '' + optionalString youtubeSupport '' + + ''--prefix PATH : "${luaEnv}/bin" \'' + + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 353eaa6e9601..dc15a7a9ad67 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -70,6 +70,26 @@ dkjson = buildLuarocksPackage { }; }; }; +inspect = buildLuarocksPackage { + pname = "inspect"; + version = "3.1.1-0"; + + src = fetchurl { + url = https://luarocks.org/inspect-3.1.1-0.src.rock; + sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/kikito/inspect.lua"; + description="Lua table visualizer, ideal for debugging"; + license = { + fullName = "MIT "; + }; + }; +}; lrexlib-gnu = buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.0-1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdd54e2ea9c2..a1adb32cded1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18354,7 +18354,7 @@ in }; mpv = callPackage ../applications/video/mpv rec { - inherit (luaPackages) luasocket; + inherit lua; waylandSupport = stdenv.isLinux; alsaSupport = !stdenv.isDarwin; pulseSupport = !stdenv.isDarwin; @@ -19816,7 +19816,7 @@ in wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; neovim-unwrapped = callPackage ../applications/editors/neovim { - luaPackages = luajitPackages; + lua = luajit; }; neovim = wrapNeovim neovim-unwrapped { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 11e05b504b43..de68c139dc28 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -972,7 +972,7 @@ with self; { }; }; - lgi = stdenv.mkDerivation rec { + lgi = toLuaModule(stdenv.mkDerivation rec { name = "lgi-${version}"; version = "0.9.2"; @@ -1007,7 +1007,7 @@ with self; { maintainers = with maintainers; [ lovek323 rasendubi ]; platforms = platforms.unix; }; - }; + }); mpack = buildLuaPackage rec { name = "mpack-${version}"; @@ -1105,7 +1105,7 @@ with self; { }; }; - vicious = stdenv.mkDerivation rec { + vicious = toLuaModule(stdenv.mkDerivation rec { name = "vicious-${version}"; version = "2.3.1"; @@ -1131,7 +1131,7 @@ with self; { maintainers = with maintainers; [ makefu mic92 ]; platforms = platforms.linux; }; - }; + }); }); in (lib.extends overrides packages) From 16994118ba0666c22c45f20f50775741dc6f1caa Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 5 Feb 2019 17:38:02 +0100 Subject: [PATCH 168/193] minio: 2019-01-23T23-18-58Z -> 2019-01-31T00-31-19Z --- pkgs/servers/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 1f8b750c125c..1dcac1f9a822 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "minio-${version}"; - version = "2019-01-23T23-18-58Z"; + version = "2019-01-31T00-31-19Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "07clcsxm4xgp7df5y6zkkgflp2f5mnzrl8fkzr6b08ij3cpmi2ws"; + sha256 = "0rvvjgnbk9khi443bahrg6iqa5lhmv8gydg96vgkrby13r1yy84k"; }; goPackagePath = "github.com/minio/minio"; From d60c38ad9bc441336d51d08e49f5e302d14e1fb6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 5 Feb 2019 17:38:18 +0100 Subject: [PATCH 169/193] minio-client: 2018-12-27T00-37-49Z -> 2019-01-30T19-57-22Z --- pkgs/tools/networking/minio-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 7234d73e1144..3a3ca03f18ae 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "minio-client-${version}"; - version = "2018-12-27T00-37-49Z"; + version = "2019-01-30T19-57-22Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "1hbw3yam5lc9414f3f8yh32ycj0wz2xc934ksvjnrhkk4xzyal6h"; + sha256 = "1w0ig0daf0zxpkz449xq2hm7ajhzn8hlnnmpac6ip82qy53xnbm4"; }; goPackagePath = "github.com/minio/mc"; From 400aa7b86a17a5685913caf3432983964da9aef5 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 5 Feb 2019 17:38:34 +0100 Subject: [PATCH 170/193] minio: add test to nixos/tests/all-tests.nix --- 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 96b34755d6f5..4450cafd2800 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -129,6 +129,7 @@ in matrix-synapse = handleTest ./matrix-synapse.nix {}; memcached = handleTest ./memcached.nix {}; mesos = handleTest ./mesos.nix {}; + minio = handleTest ./minio.nix {}; misc = handleTest ./misc.nix {}; mongodb = handleTest ./mongodb.nix {}; morty = handleTest ./morty.nix {}; From 50087e01c43a8a5d97352a30fbcdfe8531b6c9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?TG=20=E2=8A=97=20=CE=98?= <*@tg-x.net> Date: Tue, 5 Feb 2019 18:25:25 +0100 Subject: [PATCH 171/193] idrisPackages.tparsec: 2018-11-09 -> 2018-12-21 --- pkgs/development/idris-modules/tparsec.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index fcf25f0fb93e..8aa413b51c31 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -4,15 +4,15 @@ }: build-idris-package { name = "tparsec"; - version = "2018-11-09"; + version = "2018-12-21"; ipkgName = "TParsec"; src = fetchFromGitHub { owner = "gallais"; repo = "idris-tparsec"; - rev = "fc5bc1e0bf21a53ec854990ed799c4c73e304b06"; - sha256 = "0ladks6x1qhs884w4rsxnzpq8dpijyqfqbvhk55kq10xh6w1smrz"; + rev = "6fafcaa894def6f2af86bc799e507013b56e7741"; + sha256 = "0alnw0hqjs200gvb5f58lb16rna48j1v6wnvq4q7zbw99dcxsxwn"; }; meta = { From f392a07e61c13fce1f1401616c634a3e30c1dcd7 Mon Sep 17 00:00:00 2001 From: scalavision Date: Tue, 5 Feb 2019 14:29:54 +0100 Subject: [PATCH 172/193] singularity: 2.6.0 -> 2.6.1 --- pkgs/applications/virtualization/singularity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index cc543d2e94a1..f56c15d0b99c 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "singularity-${version}"; - version = "2.6.0"; + version = "2.6.1"; enableParallelBuilding = true; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { owner = "singularityware"; repo = "singularity"; rev = version; - sha256 = "0bi7acgppbkfbra8r29s1ldq02lazdww0z2h1rfvv8spr8dzzi94"; + sha256 = "0q8qq9l3s6mv74km9h8gsn5mpd0m98dhmx8vph1jp6wnrr4xyfqf"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; From bea326e8de42ecf1162532e9b24982f062224795 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 13:13:22 -0800 Subject: [PATCH 173/193] latte-dock: 0.8.4 -> 0.8.5 (#55254) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/latte-dock/versions --- pkgs/applications/misc/latte-dock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 773030bcd60a..ec571c0284b6 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.8.4"; + version = "0.8.5"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; - sha256 = "0zm2xckyaymd53a38mf1bh9in4bh2bshbr3z8z9gn6mp7c60jay3"; + sha256 = "1yhnmppp65xy8skainn438q3hwlpsz8qcj4ksvl8xdz5jzn7gs7k"; name = "${name}.tar.xz"; }; From f08b99c42f02a99ac3fa580d4bd38781bcf7b309 Mon Sep 17 00:00:00 2001 From: scalavision Date: Tue, 5 Feb 2019 20:12:28 +0000 Subject: [PATCH 174/193] singularity: rewrite path to cp in bootstrap script --- pkgs/applications/virtualization/singularity/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index f56c15d0b99c..985f46ed9607 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's/-static//g' src/Makefile.am patchShebangs . + substituteInPlace libexec/bootstrap-scripts/deffile-sections.sh \ + --replace /bin/cp ${coreutils}/bin/cp ''; configureFlags = [ "--localstatedir=/var" ]; From 970376555617db75e3d22c151495afb8d0006e7e Mon Sep 17 00:00:00 2001 From: markuskowa Date: Tue, 5 Feb 2019 22:57:29 +0100 Subject: [PATCH 175/193] molden: 5.8.2 -> 5.9.3 (#55044) --- pkgs/applications/science/chemistry/molden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 76a19d410ef8..99a8c777cd0e 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { - version = "5.8.2"; + version = "5.9.3"; name = "molden-${version}"; src = fetchurl { url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; - sha256 = "1lhjx8fa8xynnlk5g6ipvchhfnz6j5lgqxlsifx82pbbnbm6mps4"; + sha256 = "18fz44g7zkm0xcx3w9hm049jv13af67ww7mb5b3kdhmza333a16q"; }; nativeBuildInputs = [ which ]; From 46503d069af84cab9373ee3e72dedfcc22545897 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 5 Feb 2019 23:29:36 +0100 Subject: [PATCH 176/193] swaylock: 1.2 -> 1.3 --- pkgs/applications/window-managers/sway/lock.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index b99721ba19e3..a275e411c6e3 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub , meson, ninja, pkgconfig, scdoc -, wayland, wayland-protocols, wlroots, libxkbcommon, cairo, pango, gdk_pixbuf, pam +, wayland, wayland-protocols, libxkbcommon, cairo, gdk_pixbuf, pam }: stdenv.mkDerivation rec { name = "swaylock-${version}"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; rev = version; - sha256 = "1nqirrkkdhb6b2hc78ghi2yzblcx9jcgc9qwm1jvnk2iqwqbzclg"; + sha256 = "093nv1y9wyg48rfxhd36qdljjry57v1vkzrlc38mkf6zvsq8j7wb"; }; nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; - buildInputs = [ wayland wayland-protocols wlroots libxkbcommon cairo pango - gdk_pixbuf pam - ]; + buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk_pixbuf pam ]; - mesonFlags = "-Dsway-version=${version}"; # TODO: Should probably be swaylock-version + mesonFlags = [ "-Dswaylock-version=${version}" + "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" + ]; meta = with stdenv.lib; { description = "Screen locker for Wayland"; From d2aa09f26d1f32defdfce8fa896963561864579a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 5 Feb 2019 23:32:50 +0100 Subject: [PATCH 177/193] swayidle: 1.1 -> 1.2 --- pkgs/applications/window-managers/sway/idle.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 8227f4a8fa7e..86af7fc629a0 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -5,18 +5,20 @@ stdenv.mkDerivation rec { name = "swayidle-${version}"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "swayidle"; rev = version; - sha256 = "1xmcd5wajyrxc8171pl7vhxqg4da482k5n1h0x1j9n07wz50wjqm"; + sha256 = "0b65flajwn2i6k2kdxxgw25w7ikzzmm595f4j5x1wac1rb0yah9w"; }; nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; buildInputs = [ wayland wayland-protocols systemd ]; + mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ]; + meta = with stdenv.lib; { description = "Idle management daemon for Wayland"; longDescription = '' From 8c043d3c7bc136864d2de5eed05184d9653670c3 Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Tue, 5 Feb 2019 11:40:41 -0800 Subject: [PATCH 178/193] gitlab: 11.6.3 -> 11.7.4 --- .../version-management/gitlab/data.json | 32 ++-- .../gitlab/gitaly/Gemfile.lock | 2 +- .../gitlab/gitaly/default.nix | 4 +- .../gitlab/gitaly/gemset.nix | 4 +- .../gitlab/gitlab-shell/default.nix | 4 +- .../gitlab/gitlab-workhorse/default.nix | 6 +- .../remove-hardcoded-paths.patch | 12 -- .../gitlab/rubyEnv-ce/Gemfile | 62 +++----- .../gitlab/rubyEnv-ce/Gemfile.lock | 147 ++++++++--------- .../gitlab/rubyEnv-ce/gemset.nix | 114 +++++++------- .../gitlab/rubyEnv-ee/Gemfile | 65 +++----- .../gitlab/rubyEnv-ee/Gemfile.lock | 149 +++++++++--------- .../gitlab/rubyEnv-ee/gemset.nix | 122 +++++++------- 13 files changed, 346 insertions(+), 377 deletions(-) delete mode 100644 pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 7504adcbf4f1..b5a5a9feb76b 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,32 +1,32 @@ { "ce": { - "version": "11.6.3", - "repo_hash": "0bvmccfybgzbd85bdvwikmxh4asj5ly8yhxazhaqkwmnymnxa4k2", - "deb_hash": "11blasjkdi85sivfjb0s6cssh1p13fyxhqimcx1dsvb5q5v0m6as", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.6.3-ce.0_amd64.deb/download.deb", + "version": "11.7.4", + "repo_hash": "0qq9snykdlpkpbznwpkv0n7bz1rsgz4z7lcjl4xkjxkf2gkf8pxp", + "deb_hash": "1j76jya0ydyg7v3vcdfjmcr5ir23yzdwmg9fxlirvgh74py7q85c", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.4-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.6.3", + "rev": "v11.7.4", "passthru": { - "GITALY_SERVER_VERSION": "1.7.1", + "GITALY_SERVER_VERSION": "1.12.2", "GITLAB_PAGES_VERSION": "1.3.1", - "GITLAB_SHELL_VERSION": "8.4.3", - "GITLAB_WORKHORSE_VERSION": "7.6.0" + "GITLAB_SHELL_VERSION": "8.4.4", + "GITLAB_WORKHORSE_VERSION": "8.0.1" } }, "ee": { - "version": "11.6.3", - "repo_hash": "0j31h5i74j94f7qlcxk6pvwaxqqcjbm02lnqslnfs3zs8k2bmd35", - "deb_hash": "1ivap84d5xphxfmzff8i663pf6kw5rh2zxv1bcwn62p8dccr7hcc", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.6.3-ee.0_amd64.deb/download.deb", + "version": "11.7.4", + "repo_hash": "0riqww094ylbbwb9mhjpsqhrdpxlcf6rc5p796p7x7f46p31mcjb", + "deb_hash": "02hnhhyrm4a3lgwnl399byka2dr5q3pjirki447373270ca93h5i", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.4-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.6.3-ee", + "rev": "v11.7.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.7.1", + "GITALY_SERVER_VERSION": "1.12.2", "GITLAB_PAGES_VERSION": "1.3.1", - "GITLAB_SHELL_VERSION": "8.4.3", - "GITLAB_WORKHORSE_VERSION": "7.6.0" + "GITLAB_SHELL_VERSION": "8.4.4", + "GITLAB_WORKHORSE_VERSION": "8.0.1" } } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 73dab9a33928..59f8ad69f223 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -82,7 +82,7 @@ GEM nokogumbo (1.5.0) nokogiri parallel (1.12.1) - parser (2.5.1.2) + parser (2.5.3.0) ast (~> 2.4.0) posix-spawn (0.3.13) powerpack (0.1.2) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 19b1d3cab948..349b75f19347 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "1.7.1"; + version = "1.12.2"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1ravy308b5h9gsbb3ka159f68ghyjkb4bj1ngj7ighb9dd84vlf4"; + sha256 = "0pg3pm34jnssvh8m99d6w3ap1kn6kn3akqaa17zxv9y0xryvchpy"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 34c2e5ed036a..c06be7891ffb 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -352,10 +352,10 @@ dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zp89zg7iypncszxsjp8kiccrpbdf728jl449g6cnfkz990fyb5k"; + sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f"; type = "gem"; }; - version = "2.5.1.2"; + version = "2.5.3.0"; }; posix-spawn = { source = { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index dca9630b04c7..895e1e13bec8 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "8.4.3"; + version = "8.4.4"; name = "gitlab-shell-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "0ah039xpff1gmj36rm1ns8lb1k3di49lmnphl54bc45wnj72lw57"; + sha256 = "1a6p13g38f4gqqfjgymcvf09k4mnr2bfpj8mqz0x6rz7q67lllcq"; }; buildInputs = [ ruby bundler go ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index ea864d700d4c..96ea361a2548 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,19 +3,17 @@ stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "7.6.0"; + version = "8.0.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "13wr2az3bp6qnb05505sb5qn0fl2syaclc40dwjcdwwmhaalj2m4"; + sha256 = "1aslcadag1q2rdirf9m0dl5vfaz8v3yy1232mvyjyvy1wb51pf4q"; }; buildInputs = [ git go ]; - patches = [ ./remove-hardcoded-paths.patch ]; - makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch b/pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch deleted file mode 100644 index d8313ecb433a..000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/internal/git/command.go b/internal/git/command.go -index 0e5496c..5778294 100644 ---- a/internal/git/command.go -+++ b/internal/git/command.go -@@ -19,6 +19,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd { - cmd.Env = []string{ - fmt.Sprintf("HOME=%s", os.Getenv("HOME")), - fmt.Sprintf("PATH=%s", os.Getenv("PATH")), -+ fmt.Sprintf("GITLAB_SHELL_CONFIG_PATH=%s", os.Getenv("GITLAB_SHELL_CONFIG_PATH")), - fmt.Sprintf("LD_LIBRARY_PATH=%s", os.Getenv("LD_LIBRARY_PATH")), - fmt.Sprintf("GL_PROTOCOL=http"), - } diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index a7f5deadb866..f59e61208ac3 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -1,22 +1,6 @@ -# --- Special code for migrating to Rails 5.0 --- -def rails5? - !%w[0 false].include?(ENV["RAILS5"]) -end - -gem_versions = {} -gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' -gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.11' -gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' - -# The 2.0.6 version of rack requires monkeypatch to be present in -# `config.ru`. This can be removed once a new update for Rack -# is available that contains https://github.com/rack/rack/pull/1201. -gem_versions['rack'] = rails5? ? '2.0.6' : '1.6.11' -# --- The end of special code for migrating to Rails 5.0 --- - source 'https://rubygems.org' -gem 'rails', gem_versions['rails'] +gem 'rails', '5.0.7.1' gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Improves copy-on-write performance for MRI @@ -28,11 +12,7 @@ gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -if rails5? - gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' -else - gem 'default_value_for', '~> 3.0.0' -end +gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql @@ -54,7 +34,7 @@ gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.3' gem 'omniauth-gitlab', '~> 1.0.2' -gem 'omniauth-google-oauth2', '~> 0.5.3' +gem 'omniauth-google-oauth2', '~> 0.6.0' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 1.10' @@ -63,7 +43,7 @@ gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.3' gem 'rack-oauth2', '~> 1.2.1' -gem 'jwt', '~> 1.5.6' +gem 'jwt', '~> 2.1.0' # Spam and anti-bot protection gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' @@ -77,6 +57,7 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.6' +gem 'rubyzip', '~> 1.2.2', require: 'zip' # Browser detection gem 'browser', '~> 2.5' @@ -109,9 +90,7 @@ gem 'kaminari', '~> 1.0' gem 'hamlit', '~> 2.8.8' # Files attachments -# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged. -# config/initializers/carrierwave_patch.rb can be removed once that change is released. -gem 'carrierwave', '= 1.2.3' +gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups @@ -149,7 +128,7 @@ gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 3.1' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.2' +gem 'nokogiri', '~> 1.8.5' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -159,7 +138,10 @@ gem 'icalendar' gem 'diffy', '~> 3.1.0' # Application server -gem 'rack', gem_versions['rack'] +# The 2.0.6 version of rack requires monkeypatch to be present in +# `config.ru`. This can be removed once a new update for Rack +# is available that contains https://github.com/rack/rack/pull/1201. +gem 'rack', '2.0.6' group :unicorn do gem 'unicorn', '~> 5.1.0' @@ -278,6 +260,7 @@ gem 'webpack-rails', '~> 0.9.10' gem 'rack-proxy', '~> 0.6.0' gem 'sass-rails', '~> 5.0.6' +gem 'sass', '~> 3.5' gem 'uglifier', '~> 2.7.2' gem 'addressable', '~> 2.5.2' @@ -297,7 +280,7 @@ gem 'premailer-rails', '~> 1.9.7' # I18n gem 'ruby_parser', '~> 3.8', require: false -gem 'rails-i18n', gem_versions['rails-i18n'] +gem 'rails-i18n', '~> 5.1' gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.2.2', require: false, group: :development @@ -307,7 +290,7 @@ gem 'batch-loader', '~> 1.2.2' # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' -gem 'peek-mysql2', '~> 1.1.0', group: :mysql +gem 'peek-mysql2', '~> 1.2.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' @@ -340,13 +323,13 @@ end group :development, :test do gem 'bootsnap', '~> 1.3' gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] - gem 'pry-byebug', '~> 3.4.1', platform: :mri + gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.4' gem 'awesome_print', require: false gem 'fuubar', '~> 2.2.0' - gem 'database_cleaner', '~> 1.5.0' + gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 4.8.2' gem 'rspec-rails', '~> 3.7.0' gem 'rspec-retry', '~> 0.4.5' @@ -355,13 +338,13 @@ group :development, :test do gem 'rspec-parameterized', require: false # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.7.0' + gem 'minitest', '~> 5.11.0' # Generate Fake data gem 'ffaker', '~> 2.10' - gem 'capybara', '~> 2.15' - gem 'capybara-screenshot', '~> 1.0.0' + gem 'capybara', '~> 2.16.1' + gem 'capybara-screenshot', '~> 1.0.18' gem 'selenium-webdriver', '~> 3.12' gem 'spring', '~> 2.0.0' @@ -382,7 +365,7 @@ group :development, :test do gem 'license_finder', '~> 5.4', require: false gem 'knapsack', '~> 1.17' - gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] + gem 'activerecord_sane_schema_dumper', '1.0' gem 'stackprof', '~> 0.2.10', require: false @@ -396,8 +379,7 @@ group :test do gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' gem 'webmock', '~> 2.3.2' - gem 'rails-controller-testing' if rails5? # Rails5 only gem. - gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0. + gem 'rails-controller-testing' gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 0.2.5' @@ -435,7 +417,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.3.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly' gem 'grpc', '~> 1.15.0' gem 'google-protobuf', '~> 3.6' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index 96bbfa7d4e1d..77b4360cf413 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -4,41 +4,41 @@ GEM RedCloth (4.3.2) abstract_type (0.0.7) ace-rails-ap (4.1.2) - actioncable (5.0.7) - actionpack (= 5.0.7) + actioncable (5.0.7.1) + actionpack (= 5.0.7.1) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) + actionmailer (5.0.7.1) + actionpack (= 5.0.7.1) + actionview (= 5.0.7.1) + activejob (= 5.0.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7) - actionview (= 5.0.7) - activesupport (= 5.0.7) + actionpack (5.0.7.1) + actionview (= 5.0.7.1) + activesupport (= 5.0.7.1) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7) - activesupport (= 5.0.7) + actionview (5.0.7.1) + activesupport (= 5.0.7.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.7) - activesupport (= 5.0.7) + activejob (5.0.7.1) + activesupport (= 5.0.7.1) globalid (>= 0.3.6) - activemodel (5.0.7) - activesupport (= 5.0.7) - activerecord (5.0.7) - activemodel (= 5.0.7) - activesupport (= 5.0.7) + activemodel (5.0.7.1) + activesupport (= 5.0.7.1) + activerecord (5.0.7.1) + activemodel (= 5.0.7.1) + activesupport (= 5.0.7.1) arel (~> 7.0) activerecord_sane_schema_dumper (1.0) rails (>= 5, < 6) - activesupport (5.0.7) + activesupport (5.0.7.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -97,18 +97,18 @@ GEM bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (9.0.6) - capybara (2.15.1) + byebug (9.1.0) + capybara (2.16.1) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.14) - capybara (>= 1.0, < 3) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.2.3) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) @@ -140,7 +140,7 @@ GEM css_parser (1.5.0) addressable daemons (1.2.6) - database_cleaner (1.5.3) + database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) deckar01-task_list (2.0.0) @@ -274,7 +274,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.3.0) + gitaly-proto (1.5.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -381,7 +381,7 @@ GEM json (~> 1.8) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.1.1) + i18n (1.2.0) concurrent-ruby (~> 1.0) icalendar (2.4.1) ice_nine (0.11.2) @@ -403,7 +403,7 @@ GEM bindata json-schema (2.8.0) addressable (>= 2.4) - jwt (1.5.6) + jwt (2.1.0) kaminari (1.0.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.0.1) @@ -449,7 +449,7 @@ GEM loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) mail_room (0.9.1) memoist (0.16.0) @@ -463,7 +463,7 @@ GEM mini_magick (4.8.0) mini_mime (1.0.1) mini_portile2 (2.3.0) - minitest (5.7.0) + minitest (5.11.3) msgpack (1.2.4) multi_json (1.13.1) multi_xml (0.6.0) @@ -483,24 +483,24 @@ GEM nokogiri numerizer (0.1.1) oauth (0.5.4) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + oauth2 (1.4.1) + faraday (>= 0.8, < 0.16.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) octokit (4.9.0) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.8.1) - hashie (>= 3.4.6, < 3.6.0) + omniauth (1.9.0) + hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) omniauth-auth0 (2.0.0) omniauth-oauth2 (~> 1.4) omniauth-authentiq (0.3.3) jwt (>= 1.5) omniauth-oauth2 (>= 1.5) - omniauth-azure-oauth2 (0.0.9) - jwt (~> 1.0) + omniauth-azure-oauth2 (0.0.10) + jwt (>= 1.0, < 3.0) omniauth (~> 1.0) omniauth-oauth2 (~> 1.4) omniauth-cas3 (1.1.4) @@ -515,8 +515,8 @@ GEM omniauth-gitlab (1.0.3) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.5.3) - jwt (>= 1.5) + omniauth-google-oauth2 (0.6.0) + jwt (>= 2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) omniauth-kerberos (0.3.0) @@ -527,9 +527,9 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.5.0) + omniauth-oauth2 (1.6.0) oauth2 (~> 1.1) - omniauth (~> 1.2) + omniauth (~> 1.9) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) omniauth-saml (1.10.0) @@ -558,8 +558,9 @@ GEM railties (>= 4.0.0) peek-gc (0.0.2) peek - peek-mysql2 (1.1.0) - atomic (>= 1.0.0) + peek-mysql2 (1.2.0) + concurrent-ruby + concurrent-ruby-ext mysql2 peek peek-pg (1.3.0) @@ -594,8 +595,8 @@ GEM pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.4.3) - byebug (>= 9.0, < 9.1) + pry-byebug (3.5.1) + byebug (~> 9.1) pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) @@ -623,17 +624,17 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (5.0.7) - actioncable (= 5.0.7) - actionmailer (= 5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) - activemodel (= 5.0.7) - activerecord (= 5.0.7) - activesupport (= 5.0.7) + rails (5.0.7.1) + actioncable (= 5.0.7.1) + actionmailer (= 5.0.7.1) + actionpack (= 5.0.7.1) + actionview (= 5.0.7.1) + activejob (= 5.0.7.1) + activemodel (= 5.0.7.1) + activerecord (= 5.0.7.1) + activesupport (= 5.0.7.1) bundler (>= 1.3.0) - railties (= 5.0.7) + railties (= 5.0.7.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -649,15 +650,15 @@ GEM rails-i18n (5.1.1) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.0.7) - actionpack (= 5.0.7) - activesupport (= 5.0.7) + railties (5.0.7.1) + actionpack (= 5.0.7.1) + activesupport (= 5.0.7.1) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) raindrops (0.18.0) - rake (12.3.1) + rake (12.3.2) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -962,9 +963,9 @@ DEPENDENCIES browser (~> 2.5) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) - capybara (~> 2.15) - capybara-screenshot (~> 1.0.0) - carrierwave (= 1.2.3) + capybara (~> 2.16.1) + capybara-screenshot (~> 1.0.18) + carrierwave (~> 1.3) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) @@ -972,7 +973,7 @@ DEPENDENCIES concurrent-ruby (~> 1.1) connection_pool (~> 2.0) creole (~> 0.5.0) - database_cleaner (~> 1.5.0) + database_cleaner (~> 1.7.0) deckar01-task_list (= 2.0.0) device_detector devise (~> 4.4) @@ -1007,7 +1008,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.3.0) + gitaly-proto (~> 1.5.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.6.5) @@ -1040,7 +1041,7 @@ DEPENDENCIES jquery-atwho-rails (~> 1.3.2) js_regex (~> 2.2.1) json-schema (~> 2.8.0) - jwt (~> 1.5.6) + jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) kubeclient (~> 4.0.0) @@ -1053,12 +1054,12 @@ DEPENDENCIES method_source (~> 0.8) mimemagic (~> 0.3.2) mini_magick - minitest (~> 5.7.0) + minitest (~> 5.11.0) mysql2 (~> 0.4.10) nakayoshi_fork (~> 0.0.4) net-ldap net-ssh (~> 5.0) - nokogiri (~> 1.8.2) + nokogiri (~> 1.8.5) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1069,7 +1070,7 @@ DEPENDENCIES omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.3) omniauth-gitlab (~> 1.0.2) - omniauth-google-oauth2 (~> 0.5.3) + omniauth-google-oauth2 (~> 0.6.0) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) omniauth-saml (~> 1.10) @@ -1079,14 +1080,14 @@ DEPENDENCIES org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) - peek-mysql2 (~> 1.1.0) + peek-mysql2 (~> 1.2.0) peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) - pry-byebug (~> 3.4.1) + pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) puma (~> 3.12) puma_worker_killer @@ -1095,7 +1096,7 @@ DEPENDENCIES rack-cors (~> 1.0.0) rack-oauth2 (~> 1.2.1) rack-proxy (~> 0.6.0) - rails (= 5.0.7) + rails (= 5.0.7.1) rails-controller-testing rails-deprecated_sanitizer (~> 1.0.3) rails-i18n (~> 5.1) @@ -1126,9 +1127,11 @@ DEPENDENCIES ruby-prof (~> 0.17.0) ruby-progressbar ruby_parser (~> 3.8) + rubyzip (~> 1.2.2) rufus-scheduler (~> 3.4) rugged (~> 0.27) sanitize (~> 4.6) + sass (~> 3.5) sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) @@ -1169,4 +1172,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index abaecb432245..10b8c3f25ead 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -19,64 +19,64 @@ dependencies = ["actionpack" "nio4r" "websocket-driver"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2znw81zf11f7kqyks80ha4sb4aiqrs1mia0jnf3xfn5zgx28y0"; + sha256 = "1443cal16yzc94hfxcx9ljagdbs5xs54bmr55wzmg84wx28bgvrb"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d9f3kwk1z3p6sa9d8vl7yqa689ihm24cy7lp4h6v478dbr156sz"; + sha256 = "077g5yg8l10rcs8r63pmmikakma1nr2bvxa1ifly1vbry8lajmhm"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nin3f817dpkjlw94sh4rsvayqy4z6ij7fak82wqdqv5mcd9q08"; + sha256 = "1zn3gw1naz1l6kcb4h5all24kisdv8fk733vm1niiaq2zmwbvlrw"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12vvq439jjj4byhkvckrk7ap4krrfsbpw54n5xxfwh7fr5y0087b"; + sha256 = "053z1r9lbyqb7a8mvi7ppwgphqg1pn9ynhklwxavq65cym8qn9a1"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mdqdgwmcx28jznc5mfmqzz42y03mx6i6fs6m4nka0ic61rmp8g8"; + sha256 = "0w9rspq9y5a99kyljzam7k0cpvkxpzhfmlvs1j6a4flxn14qy7lv"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activemodel = { dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11ycnzi32cd92ylxhqwqfchqk3m7y9z7sfiyf8b7830lzfxv2dgy"; + sha256 = "1i808lgn542x0lyk2dlnziiqcf1nmxhxqf6125dq6brr08yxgr0c"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ri32lhmmd4waphpynwj53ysy9xlhx743lnlsnp8l499kvarqd66"; + sha256 = "1qva7vdv9arliza0155k0xh5w1q6rzdajj3rmj7hv0f86ybd674c"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activerecord_sane_schema_dumper = { dependencies = ["rails"]; @@ -91,10 +91,10 @@ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yx73l984y3ri5ndj37l1dfarcdvbhra7vhz9fcww4za24is95d5"; + sha256 = "02dnmcmkvzijbzm5nlmrd55s5586b78s087kvpvkada3791b9agb"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -367,37 +367,37 @@ byebug = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kbfcn65rgdhi72n8x9l393b89rvi5z542459k7d1ggchpb0idb0"; + sha256 = "1vv7s88w8jb1qg4qz3jrs3x3y5d9jfyyl7wfiz78b5x95ydvx41q"; type = "gem"; }; - version = "9.0.6"; + version = "9.1.0"; }; capybara = { dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bahhwrd1rpfhci1x57yz0df9plziipljbw3p4k6mlash4wq6w92"; + sha256 = "0hkl6p07gf29952biv07fy88vjz46ng2h37wwx5ks0mk9kn8vvvf"; type = "gem"; }; - version = "2.15.1"; + version = "2.16.1"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xy79lf3rwn3602r4hqm9s8a03bhlf6hzwdi6345dzrkmhwwj2ij"; + sha256 = "1x90lh7nf3zi54arjf430s9xdxr3c12xjq1l28izgxqdk8s40q7q"; type = "gem"; }; - version = "1.0.14"; + version = "1.0.22"; }; carrierwave = { dependencies = ["activemodel" "activesupport" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9kla5ncygm97vn33lsrs7ch5zy4qqhhvc8m3khm986yaqh75qs"; + sha256 = "10rz94kajilffp83sb767lr62b5f8l4jzqq80cr92wqxdgbszdks"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.1"; }; cause = { source = { @@ -562,10 +562,10 @@ database_cleaner = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0fx6zmqznklmkbjl6f713jyl11d4g9q220rcl86m2jp82r8kfwjj"; + sha256 = "05i0nf2aj70m61y3fspypdkc6d1qgibf5kav05a71b5gjz0k7y5x"; type = "gem"; }; - version = "1.5.3"; + version = "1.7.0"; }; debug_inspector = { source = { @@ -1085,10 +1085,10 @@ dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17fg29j089k94ssim9hfzpd5lycvhimbpvz12d73ywrbwz7a7680"; + sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0"; type = "gem"; }; - version = "1.3.0"; + version = "1.5.0"; }; github-markup = { source = { @@ -1427,10 +1427,10 @@ dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7"; + sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.0"; }; icalendar = { source = { @@ -1520,10 +1520,10 @@ jwt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; + sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky"; type = "gem"; }; - version = "1.5.6"; + version = "2.1.0"; }; kaminari = { dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; @@ -1661,10 +1661,10 @@ dependencies = ["mini_mime"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz"; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; mail_room = { source = { @@ -1751,10 +1751,10 @@ minitest = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0rxqfakp629mp3vwda7zpgb57lcns5znkskikbfd0kriwv8i1vq8"; + sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; type = "gem"; }; - version = "5.7.0"; + version = "5.11.3"; }; msgpack = { source = { @@ -1891,10 +1891,10 @@ dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "094hmmfms8vpm6nwglpl7jmlv85nlfzl0kik4fizgx1rg70a6mr5"; + sha256 = "0av6nlb5y2sm6m8fx669ywrqa9858yqaqfqzny75nqp3anag89qh"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; octokit = { dependencies = ["sawyer"]; @@ -1909,10 +1909,10 @@ dependencies = ["hashie" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1msqr4qq7mfdvl3rg89529isrv595hvjpj2gi0say4b8nwqfggmg"; + sha256 = "1p16h1rp8by05k8gfw17xjhgwp60dk8qmj1xalv1n23kmxfsxb1x"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; omniauth-auth0 = { dependencies = ["omniauth-oauth2"]; @@ -1936,10 +1936,10 @@ dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck5616fjik0dw89xvak1mi8ijcv10lsh6n9h4107l5dys2g3jfx"; + sha256 = "1a3iqy63l1jd6na4y0bj4a8mlp7gcn3a0awnz9g79fa8n4v2g8n4"; type = "gem"; }; - version = "0.0.9"; + version = "0.0.10"; }; omniauth-cas3 = { dependencies = ["addressable" "nokogiri" "omniauth"]; @@ -1981,10 +1981,10 @@ dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rvdac08vgrxcblq8w2hqj080v2cwv3cigxdzs11gz4d538zjnym"; + sha256 = "03v2gqpsbdhkqaxhvzr83za885awm6pgskv3mkyfvang7mr321df"; type = "gem"; }; - version = "0.5.3"; + version = "0.6.0"; }; omniauth-kerberos = { dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; @@ -2017,10 +2017,10 @@ dependencies = ["oauth2" "omniauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kscjf1y0lnggsl4z3w5bwllqshqjlsl5kmcya5haydajdnzvdjr"; + sha256 = "11mi36l9d97r77q99jnafdc1yaa0a9wahhpp7dj7ank8q52g7g79"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; omniauth-oauth2-generic = { dependencies = ["omniauth-oauth2"]; @@ -2136,13 +2136,13 @@ version = "0.0.2"; }; peek-mysql2 = { - dependencies = ["atomic" "mysql2" "peek"]; + dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "mysql2" "peek"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fzx3dwj7k6sc87jwhjk8vzp8dskv49j141xx15vvkg603j8k"; + sha256 = "0avmwm3yw0kx0z8gh4cpqj79jb5aicd0h3yzrcdfpzwks56h1k9z"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; peek-pg = { dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"]; @@ -2252,10 +2252,10 @@ dependencies = ["byebug" "pry"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g820bqmlq8vvh78895zgrzgmj3g6n63px7cba11s02lpz56630n"; + sha256 = "1f9kj1qp14qb8crg2rdzf22pr6ngxvy4n6ipymla8q1yjr842625"; type = "gem"; }; - version = "3.4.3"; + version = "3.5.1"; }; pry-rails = { dependencies = ["pry"]; @@ -2373,10 +2373,10 @@ dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "117z277m78cw6bm43dyzxhjmx8awpidmqcjjx99kpj4rgqm5m0bn"; + sha256 = "0blacnfcn2944cml69wji2ywp9c13qjiciavnfsa9vpimk8ixq9w"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2427,10 +2427,10 @@ dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j6v5ylwgqmxs4pllgip5yxdsivdqs1w00cs8jfqyw5v7pn9b2z0"; + sha256 = "1cfh2ijfalxj8hhf0rfw8bqhazsq6km7barsxczsvyl2a9islanr"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; rainbow = { source = { @@ -2451,10 +2451,10 @@ rake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg"; + sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; type = "gem"; }; - version = "12.3.1"; + version = "12.3.2"; }; rb-fsevent = { source = { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index 8258596ed6bd..f01944a0e877 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -1,22 +1,6 @@ -# --- Special code for migrating to Rails 5.0 --- -def rails5? - !%w[0 false].include?(ENV["RAILS5"]) -end - -gem_versions = {} -gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' -gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.11' -gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' - -# The 2.0.6 version of rack requires monkeypatch to be present in -# `config.ru`. This can be removed once a new update for Rack -# is available that contains https://github.com/rack/rack/pull/1201. -gem_versions['rack'] = rails5? ? '2.0.6' : '1.6.11' -# --- The end of special code for migrating to Rails 5.0 --- - source 'https://rubygems.org' -gem 'rails', gem_versions['rails'] +gem 'rails', '5.0.7.1' gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Improves copy-on-write performance for MRI @@ -28,11 +12,7 @@ gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -if rails5? - gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' -else - gem 'default_value_for', '~> 3.0.0' -end +gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql @@ -54,7 +34,7 @@ gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.3' gem 'omniauth-gitlab', '~> 1.0.2' -gem 'omniauth-google-oauth2', '~> 0.5.3' +gem 'omniauth-google-oauth2', '~> 0.6.0' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 1.10' @@ -63,7 +43,7 @@ gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.3' gem 'rack-oauth2', '~> 1.2.1' -gem 'jwt', '~> 1.5.6' +gem 'jwt', '~> 2.1.0' # Kerberos authentication. EE-only gem 'gssapi', group: :kerberos @@ -80,6 +60,7 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.6' +gem 'rubyzip', '~> 1.2.2', require: 'zip' # Browser detection gem 'browser', '~> 2.5' @@ -112,9 +93,7 @@ gem 'kaminari', '~> 1.0' gem 'hamlit', '~> 2.8.8' # Files attachments -# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged. -# config/initializers/carrierwave_patch.rb can be removed once that change is released. -gem 'carrierwave', '= 1.2.3' +gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups @@ -159,7 +138,7 @@ gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 3.1' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.2' +gem 'nokogiri', '~> 1.8.5' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -169,7 +148,10 @@ gem 'icalendar' gem 'diffy', '~> 3.1.0' # Application server -gem 'rack', gem_versions['rack'] +# The 2.0.6 version of rack requires monkeypatch to be present in +# `config.ru`. This can be removed once a new update for Rack +# is available that contains https://github.com/rack/rack/pull/1201. +gem 'rack', '2.0.6' group :unicorn do gem 'unicorn', '~> 5.1.0' @@ -288,6 +270,7 @@ gem 'webpack-rails', '~> 0.9.10' gem 'rack-proxy', '~> 0.6.0' gem 'sass-rails', '~> 5.0.6' +gem 'sass', '~> 3.5' gem 'uglifier', '~> 2.7.2' gem 'addressable', '~> 2.5.2' @@ -309,7 +292,7 @@ gem 'premailer-rails', '~> 1.9.7' # I18n gem 'ruby_parser', '~> 3.8', require: false -gem 'rails-i18n', gem_versions['rails-i18n'] +gem 'rails-i18n', '~> 5.1' gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.2.2', require: false, group: :development @@ -319,7 +302,7 @@ gem 'batch-loader', '~> 1.2.2' # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' -gem 'peek-mysql2', '~> 1.1.0', group: :mysql +gem 'peek-mysql2', '~> 1.2.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' @@ -352,13 +335,13 @@ end group :development, :test do gem 'bootsnap', '~> 1.3' gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] - gem 'pry-byebug', '~> 3.4.1', platform: :mri + gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.4' gem 'awesome_print', require: false gem 'fuubar', '~> 2.2.0' - gem 'database_cleaner', '~> 1.5.0' + gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 4.8.2' gem 'rspec-rails', '~> 3.7.0' gem 'rspec-retry', '~> 0.4.5' @@ -367,13 +350,13 @@ group :development, :test do gem 'rspec-parameterized', require: false # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.7.0' + gem 'minitest', '~> 5.11.0' # Generate Fake data gem 'ffaker', '~> 2.10' - gem 'capybara', '~> 2.15' - gem 'capybara-screenshot', '~> 1.0.0' + gem 'capybara', '~> 2.16.1' + gem 'capybara-screenshot', '~> 1.0.18' gem 'selenium-webdriver', '~> 3.12' gem 'spring', '~> 2.0.0' @@ -394,7 +377,7 @@ group :development, :test do gem 'license_finder', '~> 5.4', require: false gem 'knapsack', '~> 1.17' - gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] + gem 'activerecord_sane_schema_dumper', '1.0' gem 'stackprof', '~> 0.2.10', require: false @@ -408,8 +391,7 @@ group :test do gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' gem 'webmock', '~> 2.3.2' - gem 'rails-controller-testing' if rails5? # Rails5 only gem. - gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0. + gem 'rails-controller-testing' gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 0.2.5' @@ -450,7 +432,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.3.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly' gem 'grpc', '~> 1.15.0' gem 'google-protobuf', '~> 3.6' @@ -465,3 +447,6 @@ gem 'flipper-active_support_cache_store', '~> 0.13.0' # Structured logging gem 'lograge', '~> 0.5' gem 'grape_logging', '~> 1.7' + +# DNS Lookup +gem 'net-dns', '~> 0.9.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index d7c27460c604..8d07afb59bf1 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -4,41 +4,41 @@ GEM RedCloth (4.3.2) abstract_type (0.0.7) ace-rails-ap (4.1.2) - actioncable (5.0.7) - actionpack (= 5.0.7) + actioncable (5.0.7.1) + actionpack (= 5.0.7.1) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) + actionmailer (5.0.7.1) + actionpack (= 5.0.7.1) + actionview (= 5.0.7.1) + activejob (= 5.0.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7) - actionview (= 5.0.7) - activesupport (= 5.0.7) + actionpack (5.0.7.1) + actionview (= 5.0.7.1) + activesupport (= 5.0.7.1) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7) - activesupport (= 5.0.7) + actionview (5.0.7.1) + activesupport (= 5.0.7.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.7) - activesupport (= 5.0.7) + activejob (5.0.7.1) + activesupport (= 5.0.7.1) globalid (>= 0.3.6) - activemodel (5.0.7) - activesupport (= 5.0.7) - activerecord (5.0.7) - activemodel (= 5.0.7) - activesupport (= 5.0.7) + activemodel (5.0.7.1) + activesupport (= 5.0.7.1) + activerecord (5.0.7.1) + activemodel (= 5.0.7.1) + activesupport (= 5.0.7.1) arel (~> 7.0) activerecord_sane_schema_dumper (1.0) rails (>= 5, < 6) - activesupport (5.0.7) + activesupport (5.0.7.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -105,18 +105,18 @@ GEM bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (9.0.6) - capybara (2.15.1) + byebug (9.1.0) + capybara (2.16.1) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.14) - capybara (>= 1.0, < 3) + capybara-screenshot (1.0.22) + capybara (>= 1.0, < 4) launchy - carrierwave (1.2.3) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) @@ -148,7 +148,7 @@ GEM css_parser (1.5.0) addressable daemons (1.2.6) - database_cleaner (1.5.3) + database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) deckar01-task_list (2.0.0) @@ -298,7 +298,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.3.0) + gitaly-proto (1.5.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -408,7 +408,7 @@ GEM json (~> 1.8) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.1.1) + i18n (1.2.0) concurrent-ruby (~> 1.0) icalendar (2.4.1) ice_nine (0.11.2) @@ -431,7 +431,7 @@ GEM bindata json-schema (2.8.0) addressable (>= 2.4) - jwt (1.5.6) + jwt (2.1.0) kaminari (1.0.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.0.1) @@ -477,7 +477,7 @@ GEM loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) mail_room (0.9.1) memoist (0.16.0) @@ -491,7 +491,7 @@ GEM mini_magick (4.8.0) mini_mime (1.0.1) mini_portile2 (2.3.0) - minitest (5.7.0) + minitest (5.11.3) msgpack (1.2.4) multi_json (1.13.1) multi_xml (0.6.0) @@ -501,6 +501,7 @@ GEM mustermann (~> 1.0.0) mysql2 (0.4.10) nakayoshi_fork (0.0.4) + net-dns (0.9.0) net-ldap (0.16.0) net-ntp (2.1.3) net-ssh (5.0.1) @@ -512,24 +513,24 @@ GEM nokogiri numerizer (0.1.1) oauth (0.5.4) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + oauth2 (1.4.1) + faraday (>= 0.8, < 0.16.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) octokit (4.9.0) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.8.1) - hashie (>= 3.4.6, < 3.6.0) + omniauth (1.9.0) + hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) omniauth-auth0 (2.0.0) omniauth-oauth2 (~> 1.4) omniauth-authentiq (0.3.3) jwt (>= 1.5) omniauth-oauth2 (>= 1.5) - omniauth-azure-oauth2 (0.0.9) - jwt (~> 1.0) + omniauth-azure-oauth2 (0.0.10) + jwt (>= 1.0, < 3.0) omniauth (~> 1.0) omniauth-oauth2 (~> 1.4) omniauth-cas3 (1.1.4) @@ -544,8 +545,8 @@ GEM omniauth-gitlab (1.0.3) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.5.3) - jwt (>= 1.5) + omniauth-google-oauth2 (0.6.0) + jwt (>= 2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) omniauth-kerberos (0.3.0) @@ -556,9 +557,9 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.5.0) + omniauth-oauth2 (1.6.0) oauth2 (~> 1.1) - omniauth (~> 1.2) + omniauth (~> 1.9) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) omniauth-saml (1.10.0) @@ -587,8 +588,9 @@ GEM railties (>= 4.0.0) peek-gc (0.0.2) peek - peek-mysql2 (1.1.0) - atomic (>= 1.0.0) + peek-mysql2 (1.2.0) + concurrent-ruby + concurrent-ruby-ext mysql2 peek peek-pg (1.3.0) @@ -623,8 +625,8 @@ GEM pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.4.3) - byebug (>= 9.0, < 9.1) + pry-byebug (3.5.1) + byebug (~> 9.1) pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) @@ -652,17 +654,17 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (5.0.7) - actioncable (= 5.0.7) - actionmailer (= 5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) - activemodel (= 5.0.7) - activerecord (= 5.0.7) - activesupport (= 5.0.7) + rails (5.0.7.1) + actioncable (= 5.0.7.1) + actionmailer (= 5.0.7.1) + actionpack (= 5.0.7.1) + actionview (= 5.0.7.1) + activejob (= 5.0.7.1) + activemodel (= 5.0.7.1) + activerecord (= 5.0.7.1) + activesupport (= 5.0.7.1) bundler (>= 1.3.0) - railties (= 5.0.7) + railties (= 5.0.7.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -678,15 +680,15 @@ GEM rails-i18n (5.1.1) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.0.7) - actionpack (= 5.0.7) - activesupport (= 5.0.7) + railties (5.0.7.1) + actionpack (= 5.0.7.1) + activesupport (= 5.0.7.1) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) raindrops (0.18.0) - rake (12.3.1) + rake (12.3.2) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -992,9 +994,9 @@ DEPENDENCIES browser (~> 2.5) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) - capybara (~> 2.15) - capybara-screenshot (~> 1.0.0) - carrierwave (= 1.2.3) + capybara (~> 2.16.1) + capybara-screenshot (~> 1.0.18) + carrierwave (~> 1.3) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) @@ -1002,7 +1004,7 @@ DEPENDENCIES concurrent-ruby (~> 1.1) connection_pool (~> 2.0) creole (~> 0.5.0) - database_cleaner (~> 1.5.0) + database_cleaner (~> 1.7.0) deckar01-task_list (= 2.0.0) device_detector devise (~> 4.4) @@ -1041,7 +1043,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.3.0) + gitaly-proto (~> 1.5.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-license (~> 1.0) @@ -1076,7 +1078,7 @@ DEPENDENCIES jquery-atwho-rails (~> 1.3.2) js_regex (~> 2.2.1) json-schema (~> 2.8.0) - jwt (~> 1.5.6) + jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) kubeclient (~> 4.0.0) @@ -1089,13 +1091,14 @@ DEPENDENCIES method_source (~> 0.8) mimemagic (~> 0.3.2) mini_magick - minitest (~> 5.7.0) + minitest (~> 5.11.0) mysql2 (~> 0.4.10) nakayoshi_fork (~> 0.0.4) + net-dns (~> 0.9.0) net-ldap net-ntp net-ssh (~> 5.0) - nokogiri (~> 1.8.2) + nokogiri (~> 1.8.5) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1106,7 +1109,7 @@ DEPENDENCIES omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.3) omniauth-gitlab (~> 1.0.2) - omniauth-google-oauth2 (~> 0.5.3) + omniauth-google-oauth2 (~> 0.6.0) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) omniauth-saml (~> 1.10) @@ -1116,14 +1119,14 @@ DEPENDENCIES org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) - peek-mysql2 (~> 1.1.0) + peek-mysql2 (~> 1.2.0) peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) - pry-byebug (~> 3.4.1) + pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) puma (~> 3.12) puma_worker_killer @@ -1132,7 +1135,7 @@ DEPENDENCIES rack-cors (~> 1.0.0) rack-oauth2 (~> 1.2.1) rack-proxy (~> 0.6.0) - rails (= 5.0.7) + rails (= 5.0.7.1) rails-controller-testing rails-deprecated_sanitizer (~> 1.0.3) rails-i18n (~> 5.1) @@ -1163,9 +1166,11 @@ DEPENDENCIES ruby-prof (~> 0.17.0) ruby-progressbar ruby_parser (~> 3.8) + rubyzip (~> 1.2.2) rufus-scheduler (~> 3.4) rugged (~> 0.27) sanitize (~> 4.6) + sass (~> 3.5) sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) @@ -1206,4 +1211,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index bd6c9d29a0aa..03f885f2f9e5 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -19,64 +19,64 @@ dependencies = ["actionpack" "nio4r" "websocket-driver"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2znw81zf11f7kqyks80ha4sb4aiqrs1mia0jnf3xfn5zgx28y0"; + sha256 = "1443cal16yzc94hfxcx9ljagdbs5xs54bmr55wzmg84wx28bgvrb"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d9f3kwk1z3p6sa9d8vl7yqa689ihm24cy7lp4h6v478dbr156sz"; + sha256 = "077g5yg8l10rcs8r63pmmikakma1nr2bvxa1ifly1vbry8lajmhm"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nin3f817dpkjlw94sh4rsvayqy4z6ij7fak82wqdqv5mcd9q08"; + sha256 = "1zn3gw1naz1l6kcb4h5all24kisdv8fk733vm1niiaq2zmwbvlrw"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12vvq439jjj4byhkvckrk7ap4krrfsbpw54n5xxfwh7fr5y0087b"; + sha256 = "053z1r9lbyqb7a8mvi7ppwgphqg1pn9ynhklwxavq65cym8qn9a1"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mdqdgwmcx28jznc5mfmqzz42y03mx6i6fs6m4nka0ic61rmp8g8"; + sha256 = "0w9rspq9y5a99kyljzam7k0cpvkxpzhfmlvs1j6a4flxn14qy7lv"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activemodel = { dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11ycnzi32cd92ylxhqwqfchqk3m7y9z7sfiyf8b7830lzfxv2dgy"; + sha256 = "1i808lgn542x0lyk2dlnziiqcf1nmxhxqf6125dq6brr08yxgr0c"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ri32lhmmd4waphpynwj53ysy9xlhx743lnlsnp8l499kvarqd66"; + sha256 = "1qva7vdv9arliza0155k0xh5w1q6rzdajj3rmj7hv0f86ybd674c"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; activerecord_sane_schema_dumper = { dependencies = ["rails"]; @@ -91,10 +91,10 @@ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yx73l984y3ri5ndj37l1dfarcdvbhra7vhz9fcww4za24is95d5"; + sha256 = "02dnmcmkvzijbzm5nlmrd55s5586b78s087kvpvkada3791b9agb"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -402,37 +402,37 @@ byebug = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kbfcn65rgdhi72n8x9l393b89rvi5z542459k7d1ggchpb0idb0"; + sha256 = "1vv7s88w8jb1qg4qz3jrs3x3y5d9jfyyl7wfiz78b5x95ydvx41q"; type = "gem"; }; - version = "9.0.6"; + version = "9.1.0"; }; capybara = { dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bahhwrd1rpfhci1x57yz0df9plziipljbw3p4k6mlash4wq6w92"; + sha256 = "0hkl6p07gf29952biv07fy88vjz46ng2h37wwx5ks0mk9kn8vvvf"; type = "gem"; }; - version = "2.15.1"; + version = "2.16.1"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xy79lf3rwn3602r4hqm9s8a03bhlf6hzwdi6345dzrkmhwwj2ij"; + sha256 = "1x90lh7nf3zi54arjf430s9xdxr3c12xjq1l28izgxqdk8s40q7q"; type = "gem"; }; - version = "1.0.14"; + version = "1.0.22"; }; carrierwave = { dependencies = ["activemodel" "activesupport" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9kla5ncygm97vn33lsrs7ch5zy4qqhhvc8m3khm986yaqh75qs"; + sha256 = "10rz94kajilffp83sb767lr62b5f8l4jzqq80cr92wqxdgbszdks"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.1"; }; cause = { source = { @@ -597,10 +597,10 @@ database_cleaner = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0fx6zmqznklmkbjl6f713jyl11d4g9q220rcl86m2jp82r8kfwjj"; + sha256 = "05i0nf2aj70m61y3fspypdkc6d1qgibf5kav05a71b5gjz0k7y5x"; type = "gem"; }; - version = "1.5.3"; + version = "1.7.0"; }; debug_inspector = { source = { @@ -1173,10 +1173,10 @@ dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17fg29j089k94ssim9hfzpd5lycvhimbpvz12d73ywrbwz7a7680"; + sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0"; type = "gem"; }; - version = "1.3.0"; + version = "1.5.0"; }; github-markup = { source = { @@ -1532,10 +1532,10 @@ dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7"; + sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.0"; }; icalendar = { source = { @@ -1633,10 +1633,10 @@ jwt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; + sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky"; type = "gem"; }; - version = "1.5.6"; + version = "2.1.0"; }; kaminari = { dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; @@ -1774,10 +1774,10 @@ dependencies = ["mini_mime"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz"; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; mail_room = { source = { @@ -1864,10 +1864,10 @@ minitest = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0rxqfakp629mp3vwda7zpgb57lcns5znkskikbfd0kriwv8i1vq8"; + sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; type = "gem"; }; - version = "5.7.0"; + version = "5.11.3"; }; msgpack = { source = { @@ -1934,6 +1934,14 @@ }; version = "0.0.4"; }; + net-dns = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18d97xjphw21naaqfhgxp95ikr1d79rx708b2df3xm01j6isqy1d"; + type = "gem"; + }; + version = "0.9.0"; + }; net-ldap = { source = { remotes = ["https://rubygems.org"]; @@ -2012,10 +2020,10 @@ dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "094hmmfms8vpm6nwglpl7jmlv85nlfzl0kik4fizgx1rg70a6mr5"; + sha256 = "0av6nlb5y2sm6m8fx669ywrqa9858yqaqfqzny75nqp3anag89qh"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; octokit = { dependencies = ["sawyer"]; @@ -2030,10 +2038,10 @@ dependencies = ["hashie" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1msqr4qq7mfdvl3rg89529isrv595hvjpj2gi0say4b8nwqfggmg"; + sha256 = "1p16h1rp8by05k8gfw17xjhgwp60dk8qmj1xalv1n23kmxfsxb1x"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; omniauth-auth0 = { dependencies = ["omniauth-oauth2"]; @@ -2057,10 +2065,10 @@ dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck5616fjik0dw89xvak1mi8ijcv10lsh6n9h4107l5dys2g3jfx"; + sha256 = "1a3iqy63l1jd6na4y0bj4a8mlp7gcn3a0awnz9g79fa8n4v2g8n4"; type = "gem"; }; - version = "0.0.9"; + version = "0.0.10"; }; omniauth-cas3 = { dependencies = ["addressable" "nokogiri" "omniauth"]; @@ -2102,10 +2110,10 @@ dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rvdac08vgrxcblq8w2hqj080v2cwv3cigxdzs11gz4d538zjnym"; + sha256 = "03v2gqpsbdhkqaxhvzr83za885awm6pgskv3mkyfvang7mr321df"; type = "gem"; }; - version = "0.5.3"; + version = "0.6.0"; }; omniauth-kerberos = { dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; @@ -2138,10 +2146,10 @@ dependencies = ["oauth2" "omniauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kscjf1y0lnggsl4z3w5bwllqshqjlsl5kmcya5haydajdnzvdjr"; + sha256 = "11mi36l9d97r77q99jnafdc1yaa0a9wahhpp7dj7ank8q52g7g79"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; omniauth-oauth2-generic = { dependencies = ["omniauth-oauth2"]; @@ -2257,13 +2265,13 @@ version = "0.0.2"; }; peek-mysql2 = { - dependencies = ["atomic" "mysql2" "peek"]; + dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "mysql2" "peek"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fzx3dwj7k6sc87jwhjk8vzp8dskv49j141xx15vvkg603j8k"; + sha256 = "0avmwm3yw0kx0z8gh4cpqj79jb5aicd0h3yzrcdfpzwks56h1k9z"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; peek-pg = { dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"]; @@ -2373,10 +2381,10 @@ dependencies = ["byebug" "pry"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g820bqmlq8vvh78895zgrzgmj3g6n63px7cba11s02lpz56630n"; + sha256 = "1f9kj1qp14qb8crg2rdzf22pr6ngxvy4n6ipymla8q1yjr842625"; type = "gem"; }; - version = "3.4.3"; + version = "3.5.1"; }; pry-rails = { dependencies = ["pry"]; @@ -2494,10 +2502,10 @@ dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "117z277m78cw6bm43dyzxhjmx8awpidmqcjjx99kpj4rgqm5m0bn"; + sha256 = "0blacnfcn2944cml69wji2ywp9c13qjiciavnfsa9vpimk8ixq9w"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2548,10 +2556,10 @@ dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j6v5ylwgqmxs4pllgip5yxdsivdqs1w00cs8jfqyw5v7pn9b2z0"; + sha256 = "1cfh2ijfalxj8hhf0rfw8bqhazsq6km7barsxczsvyl2a9islanr"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.1"; }; rainbow = { source = { @@ -2572,10 +2580,10 @@ rake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg"; + sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; type = "gem"; }; - version = "12.3.1"; + version = "12.3.2"; }; rb-fsevent = { source = { From 81531046e84d1159be0eebfd5fb18e7ea174495f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 5 Feb 2019 20:45:10 -0500 Subject: [PATCH 179/193] qt511: add patch for macOS sdk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unfortunately we don’t have access to NSWindowStyleMask. These patches should go away once we switch to a newer SDK. --- .../libraries/qt-5/5.11/default.nix | 1 + .../5.11/qtbase-darwin-revert-69221.patch | 73 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patch diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index c6cc393624e6..59dab2beabd0 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -56,6 +56,7 @@ let ./qtbase-fixguicmake.patch ] ++ optionals stdenv.isDarwin [ ./qtbase-darwin-nseventtype.patch + ./qtbase-darwin-revert-69221.patch ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patch new file mode 100644 index 000000000000..73eea435f847 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patch @@ -0,0 +1,73 @@ +diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm +index 00c3f7c22c..94d35f59d6 100644 +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -1355,15 +1355,6 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel) + { + QMacAutoReleasePool pool; + +- Qt::WindowType type = window()->type(); +- Qt::WindowFlags flags = window()->flags(); +- +- // Note: The macOS window manager has a bug, where if a screen is rotated, it will not allow +- // a window to be created within the area of the screen that has a Y coordinate (I quadrant) +- // higher than the height of the screen in its non-rotated state, unless the window is +- // created with the NSWindowStyleMaskBorderless style mask. +- NSWindowStyleMask styleMask = windowStyleMask(flags); +- + QRect rect = geometry(); + + QScreen *targetScreen = nullptr; +@@ -1375,22 +1366,26 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel) + } + + if (!targetScreen) { +- qCWarning(lcQpaCocoaWindow) << "Window position" << rect << "outside any known screen, using primary screen"; ++ qCWarning(lcQpaCocoaWindow) << "Window position outside any known screen, using primary screen"; + targetScreen = QGuiApplication::primaryScreen(); +- // AppKit will only reposition a window that's outside the target screen area if +- // the window has a title bar. If left out, the window ends up with no screen. +- // The style mask will be corrected to the original style mask in setWindowFlags. +- styleMask |= NSWindowStyleMaskTitled; + } + + rect.translate(-targetScreen->geometry().topLeft()); + QCocoaScreen *cocoaScreen = static_cast(targetScreen->handle()); + NSRect frame = QCocoaScreen::mapToNative(rect, cocoaScreen); + ++ // Note: The macOS window manager has a bug, where if a screen is rotated, it will not allow ++ // a window to be created within the area of the screen that has a Y coordinate (I quadrant) ++ // higher than the height of the screen in its non-rotated state, unless the window is ++ // created with the NSWindowStyleMaskBorderless style mask. ++ ++ Qt::WindowType type = window()->type(); ++ Qt::WindowFlags flags = window()->flags(); ++ + // Create NSWindow + Class windowClass = shouldBePanel ? [QNSPanel class] : [QNSWindow class]; + QCocoaNSWindow *nsWindow = [[windowClass alloc] initWithContentRect:frame +- styleMask:styleMask ++ styleMask:windowStyleMask(flags) + // Deferring window creation breaks OpenGL (the GL context is + // set up before the window is shown and needs a proper window) + backing:NSBackingStoreBuffered defer:NO +@@ -1399,9 +1394,6 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel) + Q_ASSERT_X(nsWindow.screen == cocoaScreen->nativeScreen(), "QCocoaWindow", + "Resulting NSScreen should match the requested NSScreen"); + +- if (targetScreen != window()->screen()) +- QWindowSystemInterface::handleWindowScreenChanged(window(), targetScreen); +- + nsWindow.delegate = [[QNSWindowDelegate alloc] initWithQCocoaWindow:this]; + + // Prevent Cocoa from releasing the window on close. Qt +@@ -1421,6 +1413,9 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel) + }); + } + ++ if (targetScreen != window()->screen()) ++ QWindowSystemInterface::handleWindowScreenChanged(window(), targetScreen); ++ + nsWindow.restorable = NO; + nsWindow.level = windowLevel(flags); + From 013c7fa4ba46882427e0973aa17d63ea2c918ec6 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 5 Feb 2019 21:33:37 -0500 Subject: [PATCH 180/193] efi-image_eltorito: make reproducible './*' produces arguments ordered by inode. efiDir produces, reliably, ./EFI, so just make all the directories known explicitly. --- nixos/modules/installer/cd-dvd/iso-image.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 9475da23b1ff..e78e290e7438 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -339,11 +339,11 @@ let # dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i) '' mkdir ./contents && cd ./contents - cp -rp "${efiDir}"/* . + cp -rp "${efiDir}"/EFI . mkdir ./boot cp -p "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}" \ "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}" ./boot/ - touch --date=@0 ./* + touch --date=@0 ./EFI ./boot usage_size=$(du -sb --apparent-size . | tr -cd '[:digit:]') # Make the image 110% as big as the files need to make up for FAT overhead @@ -355,7 +355,7 @@ let echo "Image size: $image_size" truncate --size=$image_size "$out" ${pkgs.libfaketime}/bin/faketime "2000-01-01 00:00:00" ${pkgs.dosfstools}/sbin/mkfs.vfat -i 12345678 -n EFIBOOT "$out" - mcopy -psvm -i "$out" ./* :: + mcopy -psvm -i "$out" ./EFI ./boot :: # Verify the FAT partition. ${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out" ''; # */ From 89c2bf50694c330b3d2727e7afeca0068172d391 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Tue, 5 Feb 2019 18:45:07 -0800 Subject: [PATCH 181/193] amass: 2.8.5 -> 2.9.1 (#55252) --- pkgs/tools/networking/amass/default.nix | 4 +- pkgs/tools/networking/amass/deps.nix | 284 ++++++++++++++++++++++-- 2 files changed, 265 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 16e87d2a5c97..f031cf09884c 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { name = "amass-${version}"; - version = "2.8.5"; + version = "2.9.1"; goPackagePath = "github.com/OWASP/Amass"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "OWASP"; repo = "Amass"; rev = version; - sha256 = "1nsqg1p7hcv369d53n13xps3ks6fgzkkp6v9q87l04yj32nbr5qy"; + sha256 = "07vs741vmhi735ba26wscldwdx0i2yamr2g8bq7jr3sjik8ncd29"; }; outputs = [ "bin" "out" "wordlists" ]; diff --git a/pkgs/tools/networking/amass/deps.nix b/pkgs/tools/networking/amass/deps.nix index e9b5acf618e2..c81a603e39ce 100644 --- a/pkgs/tools/networking/amass/deps.nix +++ b/pkgs/tools/networking/amass/deps.nix @@ -1,101 +1,343 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ + + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "v0.34.0"; + sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; + }; + } + { goPackagePath = "github.com/PuerkitoBio/fetchbot"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/fetchbot"; - rev = "1f502d610659b899a007858812b601e715f531eb"; - sha256 = "0yzv0xh3cwq87jv9whs5rmhaj8b2nqdm76vwppzn8mm34fg41n8s"; + rev = "v1.1.2"; + sha256 = "1xw8jszjmhf8wsyc02wfplyvvcaq3wjwbzr131afcsvc4i4nlrqq"; }; } + { goPackagePath = "github.com/PuerkitoBio/goquery"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/goquery"; - rev = "2d2796f41742ece03e8086188fa4db16a3a0b458"; - sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; + rev = "v1.4.1"; + sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; }; } + { goPackagePath = "github.com/andybalholm/cascadia"; fetch = { type = "git"; url = "https://github.com/andybalholm/cascadia"; - rev = "680b6a57bda4f657485ad44bdea42342ead737bc"; - sha256 = "0v95plagirbjlc4p00y9brhpvv4nm8q0gr63gcfs3shyh1a8xwbm"; + rev = "v1.0.0"; + sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; }; } + { goPackagePath = "github.com/asaskevich/EventBus"; fetch = { type = "git"; url = "https://github.com/asaskevich/EventBus"; - rev = "d46933a94f05c6657d7b923fcf5ac563ee37ec79"; + rev = "d46933a94f05"; sha256 = "130mjlsc6jf17zdx8ymhxis70a13l2zbjmjzgvjdr6pb0jzxsqha"; }; } + + { + goPackagePath = "github.com/caffix/cloudflare-roundtripper"; + fetch = { + type = "git"; + url = "https://github.com/caffix/cloudflare-roundtripper"; + rev = "4c29d231c9cb"; + sha256 = "0i8z9p8wfvjphsgj88jcgpbyyb10hq24a72df4kdw7xl6189chra"; + }; + } + + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "v2.1.1"; + sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; + }; + } + + { + goPackagePath = "github.com/dghubble/go-twitter"; + fetch = { + type = "git"; + url = "https://github.com/dghubble/go-twitter"; + rev = "7fd79e2bcc65"; + sha256 = "0vk66ndhwvqq23v5xfla9npcrrxgphp318n7hn8vaw7zayznmfy7"; + }; + } + + { + goPackagePath = "github.com/dghubble/sling"; + fetch = { + type = "git"; + url = "https://github.com/dghubble/sling"; + rev = "v1.2.0"; + sha256 = "0ns17xy7xig3zdcjqkxn33nzar1ybqpw2arc016i5vv09b1yypj6"; + }; + } + { goPackagePath = "github.com/fatih/color"; fetch = { type = "git"; url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; }; } + + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "v1.41.0"; + sha256 = "1pm4s8j5azafvminc7ll0ncvfznwn9cvq2zhmxri5waffwr1sdxg"; + }; + } + + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.0"; + sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; + }; + } + + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "v1.4.0"; + sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; + }; + } + { goPackagePath = "github.com/irfansharif/cfilter"; fetch = { type = "git"; url = "https://github.com/irfansharif/cfilter"; - rev = "d07d951ff29d52840ca5e798a17e80db4de8c820"; - sha256 = "11gicb8jbpnsc7wylv7qs9dgc91qc3rld6ahsylb491knxr78yb2"; + rev = "v0.1.1"; + sha256 = "0hfxp57m37wygqy3y72fm9ydvfymkmqnif48spssc3zqaqvhcgkz"; }; } + { goPackagePath = "github.com/johnnadratowski/golang-neo4j-bolt-driver"; fetch = { type = "git"; url = "https://github.com/johnnadratowski/golang-neo4j-bolt-driver"; - rev = "6b24c0085aaeaf3b2844acd18066864e24b57387"; - sha256 = "0dmfgy0ci0k0s4hxp9v5j4j0mab5x1nsc83icgq9ldb2446mn0fk"; + rev = "c68f22031e42"; + sha256 = "0v9cxzmj5r0zkh8p61rbknrw17zbciy3fvmg9d6srg1hb7wizp5c"; }; } + + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.0"; + sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; + }; + } + + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { goPackagePath = "github.com/miekg/dns"; fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "1c9c9bf4c93ee029810272d3e5b8a126aee5bf1f"; - sha256 = "002z8l5crsipdn2zkavjkjzxrj6c4132yqgbg1zk7w7gkv40q7wr"; + rev = "v1.0.8"; + sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx"; }; } + + { + goPackagePath = "github.com/qasaur/gremgo"; + fetch = { + type = "git"; + url = "https://github.com/qasaur/gremgo"; + rev = "fa23ada7c5da"; + sha256 = "1cqz1zqwvcgnq3dfv9zcyjgmla8d9vbh0s31x8iv2r8jdzfgqik4"; + }; + } + + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "15f95af6e78d"; + sha256 = "07j7l340lmqwpfscwyb8llk3k37flvs20a4a8vzc85f16xyd9npf"; + }; + } + + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "v1.2.0"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + + { + goPackagePath = "github.com/temoto/robotstxt"; + fetch = { + type = "git"; + url = "https://github.com/temoto/robotstxt"; + rev = "9e4646fa7053"; + sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0"; + }; + } + { goPackagePath = "github.com/temoto/robotstxt-go"; fetch = { type = "git"; url = "https://github.com/temoto/robotstxt-go"; - rev = "97ee4a9ee6ea01ed0bbf0325dd789f74cac6cb94"; - sha256 = "1nfnwz5lm9dgicsjh99gs4gh4gbrxdl16srz505f04mab51kd51r"; + rev = "9e4646fa7053"; + sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0"; }; } + + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c126467f60eb"; + sha256 = "0xvvzwxqi1dbrnsvq00klx4bnjalf90haf1slnxzrdmbadyp992q"; + }; + } + { goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "adae6a3d119ae4890b46832a2e88a95adc62b8e7"; - sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; + rev = "1e06a53dbb7e"; + sha256 = "0lpqqvdccby48nixihvmn8ig1z48b950m1bxfqxn78air308qc3j"; }; } + + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "99b60b757ec1"; + sha256 = "119py9nia7957kf51gg9qvh34d18jb1a293zwfgvdf5inl1ja6y6"; + }; + } + + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "37e7f081c4d4"; + sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + }; + } + { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "ec83556a53fe16b65c452a104ea9d1e86a671852"; - sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f"; + rev = "e072cadbbdc8"; + sha256 = "17l1diq0526zpdpwfmjs7w9w8sg6prv6sjnvmg869yrj26b1xdcc"; + }; + } + + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "4d8a0ac9f66c"; + sha256 = "12cyxcijjsdg4wxl8hvxfbwdkqapvl1f7994963i6rf0qvh41qym"; + }; + } + + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.4.0"; + sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; + }; + } + + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/sourcemap.v1"; + rev = "v1.0.5"; + sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; }; } ] From da628f0cbda0d6115648411aff07236293363177 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 20:06:55 -0800 Subject: [PATCH 182/193] igv: 2.4.16 -> 2.4.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/igv/versions --- pkgs/applications/science/biology/igv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 1804f854c48c..19ba508d758e 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.4.16"; + version = "2.4.17"; src = fetchurl { url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; - sha256 = "0bsl20zw7sgw16xadh1hmlg6d6ijyb1dhpnyvf4kxk3nk0abrmn1"; + sha256 = "02zl0r1yhyllh000cad6pjk0ic0xm6l05jzkglsf8wdz17nh15nr"; }; buildInputs = [ unzip jre ]; From a1360faba7f3add8b4ca16cb331ffdd2c509c233 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 20:33:46 -0800 Subject: [PATCH 183/193] jmol: 14.29.29 -> 14.29.31 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jmol/versions --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index b748d26bb2a1..a57b2357d27a 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.29"; + version = "14.29.31"; pname = "jmol"; name = "${pname}-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "0j3075lwagfvwzyh0mas9pj2fm8zdqn5ak0w0byz8s57azsrc3w4"; + sha256 = "15mxifm1h145bhyrm9rvmipvg048q8rgwg1sn6jmfgrimy0cjraj"; }; patchPhase = '' From ce8878fdeb600c408cc6a75273ec0c38f074f8f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 Feb 2019 18:03:33 -0200 Subject: [PATCH 184/193] materia-theme: 20181125 -> 20190201 --- pkgs/data/themes/materia-theme/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index f081078d3afd..efafdb5d3bb7 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }: stdenv.mkDerivation rec { - name = "materia-theme-${version}"; - version = "20181125"; + pname = "materia-theme"; + version = "20190201"; src = fetchFromGitHub { owner = "nana-4"; - repo = "materia-theme"; + repo = pname; rev = "v${version}"; - sha256 = "17gsgll2m534lwvpffqisdmhhmn0da419wnpq39wv5cjnmk0q3by"; + sha256 = "0al6d1ijrdzhia1nflyy178r1jszh82splv81cjpj8cyrq579r32"; }; nativeBuildInputs = [ gnome3.glib libxml2 bc ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Material Design theme for GNOME/GTK+ based desktop environments"; + description = "Material Design theme for GNOME/GTK+ based desktop environments"; homepage = https://github.com/nana-4/materia-theme; license = licenses.gpl2; platforms = platforms.all; From a33b64c83582485824ce278830ea75c5bd803b52 Mon Sep 17 00:00:00 2001 From: Edward Amsden Date: Wed, 2 Jan 2019 21:45:04 -0500 Subject: [PATCH 185/193] maintainers: add eamsden (Edward Amsden) --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 69cdb0b47ccd..b005a1b9c127 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1275,6 +1275,11 @@ github = "eadwu"; name = "Edmund Wu"; }; + eamsden = { + email = "edward@blackriversoft.com"; + github = "eamsden"; + name = "Edward Amsden"; + }; earldouglas = { email = "james@earldouglas.com"; github = "earldouglas"; From 42bdc36a84c6a6cadd70c963d172d322e48c1db0 Mon Sep 17 00:00:00 2001 From: Edward Amsden Date: Wed, 2 Jan 2019 21:45:51 -0500 Subject: [PATCH 186/193] ledger-autosync: init at 1.0.0 --- .../office/ledger-autosync/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/office/ledger-autosync/default.nix diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix new file mode 100644 index 000000000000..4c126fc2f919 --- /dev/null +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -0,0 +1,51 @@ +{ stdenv, python3Packages, fetchFromGitHub, ledger, hledger, useLedger ? true, useHledger ? true }: + +python3Packages.buildPythonApplication rec { + pname = "ledger-autosync"; + version = "1.0.0"; + +# no tests included in PyPI tarball + src = fetchFromGitHub { + owner = "egh"; + repo = "ledger-autosync"; + rev = "v${version}"; + sha256 = "1fn32c02idccdmf9906pxn248qc9basjy2kr2g600806k3qvw84a"; + }; + + propagatedBuildInputs = with python3Packages; [ + asn1crypto + beautifulsoup4 + cffi + cryptography + entrypoints + fuzzywuzzy + idna + jeepney + keyring + lxml + mock + nose + ofxclient + ofxhome + ofxparse + pbr + pycparser + secretstorage + six + ] ++ stdenv.lib.optional useLedger ledger + ++ stdenv.lib.optional useHledger hledger; + + # Checks require ledger as a python package, + # ledger does not support python3 while ledger-autosync requires it. + checkInputs = with python3Packages; [ ledger hledger nose mock ]; + checkPhase = '' + nosetests -a generic -a ledger -a hledger + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/egh/ledger-autosync; + description = "OFX/CSV autosync for ledger and hledger"; + license = licenses.gpl3; + maintainers = with maintainers; [ eamsden ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1adb32cded1..7b61ad101db0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18044,6 +18044,9 @@ in boost = boost15x; }; ledger = ledger3; + + ledger-autosync = callPackage ../applications/office/ledger-autosync { }; + ledger-web = callPackage ../applications/office/ledger-web { }; lighthouse = callPackage ../applications/misc/lighthouse { }; From 08a54aac01c677fee66df0c625ad3fbacc6d840c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 Feb 2019 23:52:43 -0800 Subject: [PATCH 187/193] guvcview: 2.0.5 -> 2.0.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/guvcview/versions --- pkgs/os-specific/linux/guvcview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 4b9c37686c1c..1afd1078c03e 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -5,12 +5,12 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { - version = "2.0.5"; + version = "2.0.6"; name = "guvcview-${version}"; src = fetchurl { url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.gz"; - sha256 = "a86beb5993a8449ed3cbcc6ec2a238ef0b90138b6cbe2afab4456d37f44c41a0"; + sha256 = "11byyfpkcik7wvf2qic77zjamfr2rhji97dpj1gy2fg1bvpiqf4m"; }; buildInputs = From a382c2969a3176b1a3f2cda0381da47b2eb5c7f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 00:27:19 -0800 Subject: [PATCH 188/193] flacon: 5.0.0 -> 5.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/flacon/versions --- pkgs/applications/audio/flacon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index cec20743abdd..1c5eaba78b27 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "flacon-${version}"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "0pglqm2z7mp5igqmfnmvrgjhfbfrj8q5jvd0a0g2dzv3rqwfw4vc"; + sha256 = "18m077z1hqjg10chy5rgajd9q1wnrcxhiidivgjcdchc9q5d4b08"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; From 4f621ca1d4ebf7d596119de11c1010e87aafece1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 01:01:03 -0800 Subject: [PATCH 189/193] folly: 2018.10.29.00 -> 2019.01.28.00 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/folly/versions --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 1598dafaad05..7381c240c8c8 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.10.29.00"; + version = "2019.01.28.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0bbp4w8wbawh3ilgkl7rwvbqkdczpvfn92f9lcvxj8sili0nldab"; + sha256 = "0ll7ivf59s4xpc6wkyxnl1hami3s2a0kq8njr57lxiqy938clh4g"; }; nativeBuildInputs = [ cmake ]; From ac098c2e6292eabf1d0375856d71e8328e347c0b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 6 Feb 2019 17:28:30 +0800 Subject: [PATCH 190/193] home-assistant: missing dependencies (#55294) --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 73595c1d67bc..7e5eb47953ec 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -592,7 +592,7 @@ "light.lifx" = ps: with ps; [ ]; "light.lifx_legacy" = ps: with ps; [ ]; "light.lightwave" = ps: with ps; [ ]; - "light.limitlessled" = ps: with ps; [ ]; + "light.limitlessled" = ps: with ps; [ limitlessled ]; "light.litejet" = ps: with ps; [ ]; "light.lutron" = ps: with ps; [ ]; "light.lutron_caseta" = ps: with ps; [ ]; @@ -799,7 +799,7 @@ "notify.clicksend_tts" = ps: with ps; [ ]; "notify.command_line" = ps: with ps; [ ]; "notify.demo" = ps: with ps; [ ]; - "notify.discord" = ps: with ps; [ ]; + "notify.discord" = ps: with ps; [ discordpy ]; "notify.ecobee" = ps: with ps; [ ]; "notify.facebook" = ps: with ps; [ ]; "notify.file" = ps: with ps; [ ]; From 56c7ac2fba5bf3d68860fd70d45ed4ffc300f7e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 Feb 2019 20:55:33 -0800 Subject: [PATCH 191/193] rabbitmq-server: 3.7.10 -> 3.7.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rabbitmq-server/versions --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index b13c2cbee85d..5f8358a45d64 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.7.10"; + version = "3.7.11"; src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; - sha256 = "03g9912640xxwwm078idrxqg8jwn3xc45lkyq5ixjqs0vhc7aw4v"; + sha256 = "04m9ikm7ywx63y68lf3rxds97nr9czdzg82c1m1f823m89kmpgi0"; }; buildInputs = From 4cd3944a1bd05e141b111dae6d21fa41a3061302 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Feb 2019 03:02:31 -0800 Subject: [PATCH 192/193] google-compute-engine: 20181206 -> 20190124 (#55312) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/google-compute-engine/versions --- pkgs/tools/virtualization/google-compute-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 8f50b1d38a2c..0db43ccfcfdd 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -12,14 +12,14 @@ buildPythonApplication rec { name = "google-compute-engine-${version}"; - version = "20181206"; + version = "20190124"; namePrefix = ""; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "compute-image-packages"; rev = version; - sha256 = "090gbkfk3jh403jzs133isxk8263i16vnj5021l7pxbjgj1zzzwf"; + sha256 = "08cy0jd463kng6hwbd3nfldsp4dpd2lknlvdm88cq795wy0kh4wp"; }; postPatch = '' From 64e9f2ad654d5c13d24f5618baf4cbe71923f00c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 6 Feb 2019 12:25:25 +0100 Subject: [PATCH 193/193] jmol: remove redundant name attribute version and pname are alrady present --- pkgs/applications/science/chemistry/jmol/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index a57b2357d27a..7f5eb7b76e8c 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -19,9 +19,8 @@ in stdenv.mkDerivation rec { version = "14.29.31"; pname = "jmol"; - name = "${pname}-${version}"; - src = let + src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";