From 679d5e8bd5089b6c824a8d0d3d541c3a142460f7 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 11 Jun 2018 16:44:54 +0300 Subject: [PATCH 001/139] samba: fix autostart service --- nixos/modules/services/network-filesystems/samba.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index b23266e8d43..7dcd3e2e410 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -45,6 +45,7 @@ let daemonService = appName: args: { description = "Samba Service Daemon ${appName}"; + after = [ "network.target" ]; requiredBy = [ "samba.target" ]; partOf = [ "samba.target" ]; From 30360cb0455ffd9bf5da5bd474afce9374fbb9e3 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Mon, 12 Aug 2019 21:34:33 +1000 Subject: [PATCH 002/139] qtstyleplugin-kvantum: use wrapQtAppsHook Shouldn't be needed for the style engine itself to work, but it is needed for `kvantummanager` and `kvantumpreview`. --- .../libraries/qtstyleplugin-kvantum/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index dc11cb56091..46cf8668b22 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem, libX11, libXext, qttools }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem +, libX11, libXext, qttools, wrapQtAppsHook +}: stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; @@ -11,8 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g"; }; - nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase qtsvg qtx11extras kwindowsystem libX11 libXext ]; + nativeBuildInputs = [ + qmake qttools wrapQtAppsHook + ]; + buildInputs = [ + qtbase qtsvg qtx11extras kwindowsystem libX11 libXext + ]; sourceRoot = "source/Kvantum"; From e89f861ec565feb7cd10f261b23884c73208e1e7 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Mon, 26 Aug 2019 10:56:03 +1000 Subject: [PATCH 003/139] qtstyleplugin-kvantum{,-qt4}: 0.11.0 -> 0.11.2 --- .../libraries/qtstyleplugin-kvantum-qt4/default.nix | 4 ++-- pkgs/development/libraries/qtstyleplugin-kvantum/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 88330712dcd..7c2a99804c4 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g"; + sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc"; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 46cf8668b22..71ca8e720a4 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g"; + sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc"; }; nativeBuildInputs = [ From b172c449a9a9d348fecb3a39fbbbc233de722873 Mon Sep 17 00:00:00 2001 From: kayhide Date: Thu, 15 Aug 2019 23:18:56 +0900 Subject: [PATCH 004/139] add kayhide to maintainers list. --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7298ed804bb..d0eaab889b8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3223,6 +3223,12 @@ email = "info+nix@chmist.com"; name = "karolchmist"; }; + kayhide = { + email = "kayhide@gmail.com"; + github = "kayhide"; + githubId = 1730718; + name = "Hideaki Kawai"; + }; kazcw = { email = "kaz@lambdaverse.org"; github = "kazcw"; From 2e68d1e54d58e1cd3fed65ebcdbba7395ab7df8d Mon Sep 17 00:00:00 2001 From: kayhide Date: Thu, 15 Aug 2019 23:19:45 +0900 Subject: [PATCH 005/139] lv: init at 4.51 --- pkgs/tools/text/lv/default.nix | 33 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/text/lv/default.nix diff --git a/pkgs/tools/text/lv/default.nix b/pkgs/tools/text/lv/default.nix new file mode 100644 index 00000000000..3e96858f9c9 --- /dev/null +++ b/pkgs/tools/text/lv/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + pname = "lv"; + version = "4.51"; + + src = fetchurl { + url = "mirror://debian/pool/main/l/${pname}/${pname}_${version}.orig.tar.gz"; + sha256 = "0yf3idz1qspyff1if41xjpqqcaqa8q8icslqlnz0p9dj36gmm5l3"; + }; + + makeFlags = [ "prefix=${placeholder "out"}" ]; + + buildInputs = [ ncurses ]; + + configurePhase = '' + mkdir -p build + cd build + ../src/configure + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with stdenv.lib; { + description = "Powerful multi-lingual file viewer / grep"; + homepage = "https://web.archive.org/web/20160310122517/www.ff.iij4u.or.jp/~nrt/lv/"; + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ kayhide ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d58cd634f46..2fbe1bd5e93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4628,6 +4628,8 @@ in ltris = callPackage ../games/ltris { }; + lv = callPackage ../tools/text/lv { }; + lxc = callPackage ../os-specific/linux/lxc { }; lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd { }; From c99f686a9317c7c628e3ec12e4fc70105d7b0714 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 10 Sep 2019 17:44:57 -0500 Subject: [PATCH 006/139] bdf2psf: fix /usr/share -> /share, and don't install env-vars (instead install what we want directly) --- pkgs/tools/misc/bdf2psf/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 2f326a1d6ac..6309587fd52 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { unpackPhase = "dpkg-deb -x $src ."; installPhase = " substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl ${perl}/bin/perl - mv usr/bin . - cp -r . $out + mv usr $out "; meta = with stdenv.lib; { From 7ebb3f58189fe303f8a1a54476a398dd1f9fa655 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sun, 22 Sep 2019 16:15:06 +0200 Subject: [PATCH 007/139] shiori: init at 1.5.0 --- pkgs/servers/web-apps/shiori/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/servers/web-apps/shiori/default.nix diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix new file mode 100644 index 00000000000..5cf54ff14ba --- /dev/null +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "shiori"; + version = "1.5.0"; + + modSha256 = "142raxqh6mipw0dyhzgc8ha6vn74wdin25qrl1nkd68mpcvsbblg"; + + src = fetchFromGitHub { + owner = "go-shiori"; + repo = pname; + rev = "v${version}"; + sha256 = "13and7gh2882khqppwz3wwq44p7az4bfdfjvlnqcpqyi8xa28pmq"; + }; + + meta = with stdenv.lib; { + description = "Simple bookmark manager built with Go"; + homepage = "https://github.com/go-shiori/shiori"; + license = licenses.mit; + maintainers = with maintainers; [ minijackson ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2fbc80a9c6..a63498e1fd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15240,6 +15240,8 @@ in shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; + shiori = callPackage ../servers/web-apps/shiori { }; + matomo = callPackage ../servers/web-apps/matomo { }; axis2 = callPackage ../servers/http/tomcat/axis2 { }; From 367cd2c7f8c7801f94ad4750f3f3389526643fcc Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sun, 22 Sep 2019 17:54:16 +0200 Subject: [PATCH 008/139] nixos/shiori: init with test --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/shiori.nix | 50 ++++++++++++++++++++++ nixos/tests/shiori.nix | 17 ++++++++ 3 files changed, 68 insertions(+) create mode 100644 nixos/modules/services/web-apps/shiori.nix create mode 100644 nixos/tests/shiori.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 775cc05aa0a..14d673a6fb5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -805,6 +805,7 @@ ./services/web-apps/restya-board.nix ./services/web-apps/tt-rss.nix ./services/web-apps/selfoss.nix + ./services/web-apps/shiori.nix ./services/web-apps/virtlyst.nix ./services/web-apps/wordpress.nix ./services/web-apps/youtrack.nix diff --git a/nixos/modules/services/web-apps/shiori.nix b/nixos/modules/services/web-apps/shiori.nix new file mode 100644 index 00000000000..1817a203935 --- /dev/null +++ b/nixos/modules/services/web-apps/shiori.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.shiori; +in { + options = { + services.shiori = { + enable = mkEnableOption "Shiori simple bookmarks manager"; + + package = mkOption { + type = types.package; + default = pkgs.shiori; + defaultText = "pkgs.shiori"; + description = "The Shiori package to use."; + }; + + address = mkOption { + type = types.str; + default = ""; + description = '' + The IP address on which Shiori will listen. + If empty, listens on all interfaces. + ''; + }; + + port = mkOption { + type = types.port; + default = 8080; + description = "The port of the Shiori web application"; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.shiori = with cfg; { + description = "Shiori simple bookmarks manager"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = "${package}/bin/shiori serve --address '${address}' --port '${toString port}'"; + DynamicUser = true; + Environment = "SHIORI_DIR=/var/lib/shiori"; + StateDirectory = "shiori"; + }; + }; + }; + + meta.maintainers = with maintainers; [ minijackson ]; +} diff --git a/nixos/tests/shiori.nix b/nixos/tests/shiori.nix new file mode 100644 index 00000000000..0022a7220fe --- /dev/null +++ b/nixos/tests/shiori.nix @@ -0,0 +1,17 @@ +import ./make-test.nix ({ lib, ...}: + +{ + name = "shiori"; + meta.maintainers = with lib.maintainers; [ minijackson ]; + + machine = + { ... }: + { services.shiori.enable = true; }; + + testScript = '' + $machine->waitForUnit('shiori.service'); + $machine->waitForOpenPort('8080'); + $machine->succeed("curl --fail http://localhost:8080/"); + $machine->succeed("curl --fail --location http://localhost:8080/ | grep -qi shiori"); + ''; +}) From 7058b0ad124279cce4ff28e627c59afac87f0dec Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Wed, 25 Sep 2019 18:27:19 +0200 Subject: [PATCH 009/139] nixos/systemd: Make machinectl work with NixOS Images generated with nixos-install will be supported by machinectl problem is that systemd-nspawn's private usersns feature clashes with DynamicUser and RuntimeDirectory features, which causes NixOS images to not boot. There is an upstream issue for this https://github.com/systemd/systemd/issues/13622 --- nixos/modules/system/boot/systemd-nspawn.nix | 22 ++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix index db6e06b4107..3ddd45b1348 100644 --- a/nixos/modules/system/boot/systemd-nspawn.nix +++ b/nixos/modules/system/boot/systemd-nspawn.nix @@ -113,11 +113,21 @@ in { config = let units = mapAttrs' (n: v: let nspawnFile = "${n}.nspawn"; in nameValuePair nspawnFile (instanceToUnit nspawnFile v)) cfg; - in mkIf (cfg != {}) { - - environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] []; - - systemd.targets.multi-user.wants = [ "machines.target" ]; - }; + in + mkMerge [ + (mkIf (cfg != {}) { + environment.etc."systemd/nspawn".source = mkIf (cfg != {}) (generateUnits "nspawn" units [] []); + }) + { + systemd.targets.multi-user.wants = [ "machines.target" ]; + # Workaround for https://github.com/NixOS/nixpkgs/pull/67232#issuecomment-531315437 and https://github.com/systemd/systemd/issues/13622 + # Once systemd fixes this upstream, we can re-enable -U + systemd.services."systemd-nspawn@".serviceConfig.ExecStart = [ + "" # deliberately empty. signals systemd to override the ExecStart + # Only difference between upstream is that we do not pass the -U flag + "${pkgs.systemd}/bin/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%i" + ]; + } + ]; } From c9f7f8718cb48fb4ba50b1f1a2009b1e9cceb172 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Sep 2019 22:18:02 -0700 Subject: [PATCH 010/139] caf: 0.17.0 -> 0.17.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/actor-framework/versions --- pkgs/development/libraries/caf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 3ebc0b36679..4a4cba31735 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "10dcpmdsfq6r7hpvg413pqi1q3rjvgn7f87c17ghyz30x6rjhaic"; + sha256 = "1xbq591m3v6pkz4z3dg2lsxr6bxv1lpz4yhdci3vi55y6x9pwyfw"; }; nativeBuildInputs = [ cmake ]; From e45a6e8381b3a4e9f1142295013f574041b4aff1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Sep 2019 23:30:11 -0700 Subject: [PATCH 011/139] amtk: 5.0.0 -> 5.0.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/amtk/versions --- pkgs/development/libraries/amtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index e8ecd0c0f1e..177bf324b7a 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, gtk3 , pkgconfig, gnome3, dbus, xvfb_run }: let - version = "5.0.0"; + version = "5.0.1"; pname = "amtk"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zriix7bdwcg0868mfc7jy6zbwjwdmjwbh0ah6dbddrhiabrda8j"; + sha256 = "09yy95w1s83c43mh9vha1jbb780yighf5pd2j0ygjmc68sjg871d"; }; nativeBuildInputs = [ From 3e777edc3e7f1f6747f204896928bba2fbcab216 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Sep 2019 23:32:59 -0700 Subject: [PATCH 012/139] axel: 2.17.5 -> 2.17.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/axel/versions --- pkgs/tools/networking/axel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index afa6cef1524..1fa43e5849e 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "axel"; - version = "2.17.5"; + version = "2.17.6"; src = fetchFromGitHub { owner = "axel-download-accelerator"; repo = pname; rev = "v${version}"; - sha256 = "0kwfbwh9g2227icgykgwa057vll5rkgac3df0pby530bivqzzzlw"; + sha256 = "011cpkf6hpia5b5wfhy84fxfqpishdkvrg0kpbfprymq9bxjp0yl"; }; nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ]; From 40fadcb5c6b28922ede7119ff00056b95820c722 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 00:13:11 -0700 Subject: [PATCH 013/139] libsForQt5.alkimia: 8.0.1 -> 8.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/alkimia/versions --- pkgs/development/libraries/alkimia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index 407aa557ea2..d7d8c268928 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -5,11 +5,11 @@ mkDerivation rec { pname = "alkimia"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz"; - sha256 = "059i6vn36sdq5zn2vqzh4asvvgdgs7n478nk9phvb5gdys01fq7m"; + sha256 = "0al5k9irmg9gsjc234qxjsqfzgzsavl18pspqk78mkp8zlv7fvv1"; }; nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; From 8e867bd4a62362afe72efe367f6ba14bacd40469 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 00:17:46 -0700 Subject: [PATCH 014/139] bfs: 1.5 -> 1.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/bfs/versions --- pkgs/tools/system/bfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 8443314cf71..a304fce352f 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "1.5"; + version = "1.5.1"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "0lyrxbmfr4ckz4hx5dgz8xbq479l5rlyrqf205v6c82cap4zyv4x"; + sha256 = "1yp8zaj2rqd1df20wxym1x7q5d3lxqwalazbvmfnwqn5y4m368y3"; }; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; From d09d30a4cb05eba31ae98c88e9abe928d07920f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 00:48:59 -0700 Subject: [PATCH 015/139] cherrytree: 0.38.8 -> 0.38.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cherrytree/versions --- pkgs/applications/misc/cherrytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 856853e3b1c..4e734aa849f 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.38.8"; + version = "0.38.9"; src = fetchurl { url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz"; - sha256 = "1ns87xl2sgrf3nha4xkhp0xcxlycqszlp6xdrn95lg6vzm0fa8dg"; + sha256 = "0xal09ijgxbzvp003s40xbrfnpq3ald1fw8nnpqq3yg7h6g6c5pw"; }; buildInputs = with pythonPackages; From c41d8db5af9076246e03b89e48e14cf464e45007 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 01:20:31 -0700 Subject: [PATCH 016/139] credstash: 1.15.0 -> 1.16.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/credstash/versions --- pkgs/development/python-modules/credstash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index e761792bb99..495311c0972 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "credstash"; - version = "1.15.0"; + version = "1.16.1"; src = fetchPypi { inherit pname version; - sha256 = "814560f99ae2409e2c6d906d878f9dadada5d1d0a950aafb6b2c0d535291bdfb"; + sha256 = "019wviz3hx0pkh3mgqr3prg55njyhzvhjqcpndgrfmkykjkcj435"; }; # The install phase puts an executable and a copy of the library it imports in From 7653ff45cb21c2624b8ce7ba5193e81fff90a21a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 01:49:26 -0700 Subject: [PATCH 017/139] clp: 1.17.2 -> 1.17.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/clp/versions --- pkgs/applications/science/math/clp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index 0eb57c75692..f91b091439f 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - version = "1.17.2"; + version = "1.17.3"; pname = "clp"; src = fetchurl { url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; - sha256 = "1fkmgpn0zaraymi6s3isrrscgjxggcs2yjrx7jfy4hb1jacx71zz"; + sha256 = "0ws515f73vq2p4nzyq0fbnm4zp9a7mjg54szdzvkql5dj51gafx1"; }; propagatedBuildInputs = [ zlib ]; From da5af7b52bb6740c7b9becc7d4961569e58bd1fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 02:24:30 -0700 Subject: [PATCH 018/139] chirp: 20190718 -> 20190905 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chirp-daily/versions --- pkgs/applications/radio/chirp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index aeadf49f898..1a9328bb455 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "chirp-daily"; - version = "20190718"; + version = "20190905"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "1zngdqqqrlm8qpv8dzinamhwq6rr8zcq7db3vb284wrq0jcvrry5"; + sha256 = "01xglzzl94wzkd2d8zmyv6s1xqsfc7biph15k0ap8rlf98874rlf"; }; nativeBuildInputs = [ makeWrapper ]; From a6a073d70143f1020fd133ac20198d8904977aea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 05:10:24 -0700 Subject: [PATCH 019/139] drumstick: 1.1.2 -> 1.1.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/drumstick/versions --- pkgs/development/libraries/drumstick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 756a03503b3..92c97436d7a 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "drumstick"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0kljqyqj7s1i2z52i24x7ail1bywn6dcxxfbad5c59drm8wv94bp"; + sha256 = "1n9wvg79yvkygrkc8xd8pgrd3d7hqmr7gh24dccf0px23lla9b3m"; }; outputs = [ "out" "dev" "man" ]; From 24db075c5c4815312397d88a24c596dab6f0963a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 05:34:41 -0700 Subject: [PATCH 020/139] eagle: 9.4.2 -> 9.5.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/eagle/versions --- pkgs/applications/science/electronics/eagle/eagle.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 2b28f2c06db..7789f4cf8ba 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "eagle"; - version = "9.4.2"; + version = "9.5.0"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "0lrwrvqcb91mcggmicvwjrngccsdy0f06l7a8nfgp9ckn4d9vmg2"; + sha256 = "0wakaja98mkdgcxp18d7499i0254ns1xhnx4bag2lqi7j8qn8rqy"; }; desktopItem = makeDesktopItem { From 50f334ca4994eda7fc7c1c8e825f82f3733fc6ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 18:30:41 -0700 Subject: [PATCH 021/139] krusader: 2.7.1 -> 2.7.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/krusader/versions --- pkgs/applications/misc/krusader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index cf81d572c61..15979def34b 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -6,14 +6,14 @@ let pname = "krusader"; - version = "2.7.1"; + version = "2.7.2"; in mkDerivation rec { pname = "krusader"; inherit version; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm"; + sha256 = "02b1jz5a7cjr13v6c7fczrhs1xmg1krnva5fxk8x2bf4nd1rm8s1"; }; meta = with lib; { From 50a34183ea027817d53ced9cfbd9f82a30ff84da Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 19:03:25 -0700 Subject: [PATCH 022/139] libdsk: 1.5.10 -> 1.5.12 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libdsk/versions --- pkgs/misc/emulators/libdsk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix index edb70ba7264..cb64c30be49 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/misc/emulators/libdsk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdsk"; - version = "1.5.10"; + version = "1.5.12"; src = fetchurl { url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz"; - sha256 = "0ndkwyf8dp252v4yhqphvi32gmz9m5kkdqwv0aw92cz7mfbnp36g"; + sha256 = "0s2k9vkrf95pf4ydc6vazb29ysrnhdpcfjnf17lpk4nmlv1j3vyv"; }; meta = with stdenv.lib; { From ba22b6ec31d5053ab70d14cd5d5f911f22d2cdb6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Sep 2019 19:25:36 -0700 Subject: [PATCH 023/139] link-grammar: 5.6.2 -> 5.7.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/link-grammar/versions --- pkgs/tools/text/link-grammar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index bca0a5e3857..ce9b0bfa883 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }: stdenv.mkDerivation rec { - version = "5.6.2"; + version = "5.7.0"; pname = "link-grammar"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "1jc6j5kxdv3y4mm82q0rrjvlak8p26fqh92dzw5bkwxnvjmjjg1k"; + sha256 = "0ak1v469k56v3511kxxkxvx1nw6zcxcl0f1kcvc82ffacqbr4y96"; }; nativeBuildInputs = [ pkgconfig python3 ]; From 53132f6dce3be738cbba967beb9c5041e099ce41 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Sep 2019 07:50:18 -0700 Subject: [PATCH 024/139] libsvm: 3.23 -> 3.24 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libsvm/versions --- pkgs/development/libraries/libsvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index fcd010b46cc..99eccc3436f 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libsvm"; - version = "3.23"; + version = "3.24"; src = fetchurl { url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; - sha256 = "0jpaq0rr92x38p4nk3gjan79ip67m6p80anb28z1d8601miysyi5"; + sha256 = "15l69y23fxslrap415dvqb383x5fxvbffp9giszjfqjf38h1m26m"; }; buildPhase = '' From 95b19025797c98dfe180fe8fcf1ef9164f2573e3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Sep 2019 07:53:00 -0700 Subject: [PATCH 025/139] libite: 2.0.2 -> 2.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/libite/versions --- pkgs/development/libraries/libite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 73801102ba3..34ca7406d69 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libite"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "0qk7231c1xwvjhkc9w7hasvafvgns10cx9kdhfdbc4r1hsh6d1ca"; + sha256 = "0fi3j3y37id24cgy3868pyvxkd6mvbbraalvpm99f5dhrxdlv961"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From bd78aa0d9f8ccc58771646f3358e8bfaf35f3680 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 24 Sep 2019 10:28:37 +0200 Subject: [PATCH 026/139] tor-browser-bundle-bin: use hardened allocator --- .../browsers/tor-browser-bundle-bin/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 563c0e751c8..5dfda424acf 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -44,6 +44,10 @@ , shared-mime-info , gsettings-desktop-schemas +# Hardening +, graphene-hardened-malloc +, useHardenedMalloc ? graphene-hardened-malloc != null && builtins.elem stdenv.system graphene-hardened-malloc.meta.platforms + # Whether to disable multiprocess support to work around crashing tabs # TODO: fix the underlying problem instead of this terrible work-around , disableContentSandbox ? true @@ -245,6 +249,9 @@ stdenv.mkDerivation rec { GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6 EOF + WRAPPER_LD_PRELOAD=${optionalString useHardenedMalloc + "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} + WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ gnome3.adwaita-icon-theme shared-mime-info @@ -327,6 +334,8 @@ stdenv.mkDerivation rec { # # XDG_DATA_DIRS is set to prevent searching system dirs (looking for .desktop & icons) exec env -i \ + LD_PRELOAD=$WRAPPER_LD_PRELOAD \ + \ TZ=":" \ TZDIR="\''${TZDIR:-}" \ LOCALE_ARCHIVE="\$LOCALE_ARCHIVE" \ From ed633cb994cb28c346e528f4892fd812ca977aab Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Sat, 5 Oct 2019 15:42:04 +0200 Subject: [PATCH 027/139] runc: v1.0.0-rc8 -> v1.0.0-rc9 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/runc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 6357f9fadff..c850a18c867 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -5,13 +5,13 @@ with lib; buildGoPackage rec { pname = "runc"; - version = "1.0.0-rc8"; + version = "1.0.0-rc9"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; + sha256 = "1ss5b46cbbckyqlwgj8dbd5l59c5y0kp679hcpc0ybaj53pmwxj7"; }; goPackagePath = "github.com/opencontainers/runc"; @@ -53,7 +53,7 @@ buildGoPackage rec { homepage = https://runc.io/; description = "A CLI tool for spawning and running containers according to the OCI specification"; license = licenses.asl20; - maintainers = with maintainers; [ offline vdemeester ]; + maintainers = with maintainers; [ offline vdemeester saschagrunert ]; platforms = platforms.linux; }; } From 1137ac77858d55a8bf0ff5f378b53b6d7080e3f9 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 6 Oct 2019 11:34:54 +0900 Subject: [PATCH 028/139] nixos/steam-hardware: add uinput to boot.kernelModules uinput needs to be added to boot.kernelModules in order for the udev rules defined by steam to be run and set permissions correctly on /dev/uinput. See https://github.com/NixOS/nixpkgs/issues/70471. --- nixos/modules/hardware/steam-hardware.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/hardware/steam-hardware.nix b/nixos/modules/hardware/steam-hardware.nix index 378aeffe71b..6218c9ffbb9 100644 --- a/nixos/modules/hardware/steam-hardware.nix +++ b/nixos/modules/hardware/steam-hardware.nix @@ -21,5 +21,12 @@ in services.udev.packages = [ pkgs.steamPackages.steam ]; + + # The uinput module needs to be loaded in order to trigger the udev rules + # defined in the steam package for setting permissions on /dev/uinput. + # + # If the udev rules are not triggered, some controllers won't work with + # steam. + boot.kernelModules = [ "uinput" ]; }; } From 2a1f30259c91b08edb867c3f67467d982d8bd454 Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 7 Oct 2019 01:16:08 +0200 Subject: [PATCH 029/139] {v8, v8_6_x}: fix log output exceeded w. GCC8 This reduces the log size to ~1MB. --- pkgs/development/libraries/v8/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index fa2a0f4f594..4e9336172ad 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -97,6 +97,10 @@ stdenv.mkDerivation rec { ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' ] ++ stdenv.lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; + # with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit + # to be exceeded + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-class-memaccess"; + nativeBuildInputs = [ gn ninja pkgconfig python ] ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; buildInputs = [ glib icu ]; From d73f96ff80cf291d7eba8ceb05f578027561e19b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 7 Oct 2019 13:52:45 -0400 Subject: [PATCH 030/139] gtkd: 3.8.5 -> 3.9.0 --- pkgs/development/libraries/gtkd/default.nix | 138 ++++++++++++-------- pkgs/development/libraries/gtkd/paths.d | 8 +- 2 files changed, 89 insertions(+), 57 deletions(-) diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 31a3242cdef..0b2df597be5 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,69 +1,75 @@ -{ stdenv, fetchzip, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg -, glib, gtk3, gtksourceview, libgda, libpeas, pango, pkgconfig, which, vte }: +{ stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg +, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkgconfig, which, vte }: let - inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; in stdenv.mkDerivation rec { pname = "gtkd"; - version = "3.8.5"; + version = "3.9.0"; src = fetchzip { url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; - sha256 = "12n2njsaplra7x15nqwrj2hrf8a27pfjj2mck4mkzxv03qk6mqky"; + sha256 = "12kc4s5gp6gn456d8pzhww1ggi9qbxldmcpp6855297g2x8xxy5p"; stripRoot = false; }; nativeBuildInputs = [ dmd pkgconfig which ]; propagatedBuildInputs = [ - atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview + atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4 libgda libpeas librsvg pango vte ]; + patches = [ + # Fix makefile not installing .pc's + (fetchpatch { + url = "https://github.com/gtkd-developers/GtkD/commit/a9db09117ab27127ca4c3b8d2f308fae483a9199.patch"; + sha256 = "0ngyqifw1kandc1vk01kms3z65pcisfd75q7z09rml96glhfzjd6"; + }) + ]; + prePatch = '' substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d - substituteInPlace src/cairo/c/functions-compiletime.d \ - --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ - --replace libcairo.dylib ${cairo}/lib/libcairo.dylib - substituteInPlace src/cairo/c/functions-runtime.d \ - --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ - --replace libcairo.dylib ${cairo}/lib/libcairo.dylib - substituteInPlace generated/gtkd/gdkpixbuf/c/functions.d \ - --replace libgdk_pixbuf-2.0.so.0 ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \ - --replace libgdk_pixbuf-2.0.0.dylib ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib - substituteInPlace generated/gtkd/atk/c/functions.d \ - --replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \ - --replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib - substituteInPlace generated/gtkd/pango/c/functions.d \ - --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \ - --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ - --replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \ - --replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib - substituteInPlace generated/gtkd/gobject/c/functions.d \ - --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ - --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib - substituteInPlace generated/gtkd/rsvg/c/functions.d \ - --replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \ - --replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib - substituteInPlace generated/gtkd/cairo/c/functions.d \ - --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ - --replace libcairo.dylib ${cairo}/lib/libcairo.dylib - substituteInPlace generated/gtkd/gdk/c/functions.d \ - --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \ - --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib - substituteInPlace generated/peas/peas/c/functions.d \ - --replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \ - --replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \ - --replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \ - --replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib - substituteInPlace generated/vte/vte/c/functions.d \ - --replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \ - --replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib + + substituteInPlace generated/gstreamer/gst/app/c/functions.d \ + --replace libgstapp-1.0.so.0 ${gst-plugins-base}/lib/libgstapp-1.0.so.0 \ + --replace libgstapp-1.0.0.dylib ${gst-plugins-base}/lib/libgstapp-1.0.0.dylib + + substituteInPlace generated/gstreamer/gst/base/c/functions.d \ + --replace libgstbase-1.0.so.0 ${gstreamer.out}/lib/libgstbase-1.0.so.0 \ + --replace libgstbase-1.0.0.dylib ${gstreamer.out}/lib/libgstbase-1.0.0.dylib + + substituteInPlace generated/gstreamer/gst/mpegts/c/functions.d \ + --replace libgstmpegts-1.0.so.0 ${gst-plugins-bad.out}/lib/libgstmpegts-1.0.so.0 \ + --replace libgstmpegts-1.0.0.dylib ${gst-plugins-bad.out}/lib/libgstmpegts-1.0.0.dylib + substituteInPlace generated/gstreamer/gstinterfaces/c/functions.d \ --replace libgstvideo-1.0.so.0 ${gst-plugins-base}/lib/libgstvideo-1.0.so.0 \ --replace libgstvideo-1.0.0.dylib ${gst-plugins-base}/lib/libgstvideo-1.0.0.dylib - substituteInPlace generated/sourceview/gsv/c/functions.d \ - --replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \ - --replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib + + substituteInPlace generated/gstreamer/gstreamer/c/functions.d \ + --replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \ + --replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib + + substituteInPlace generated/gtkd/atk/c/functions.d \ + --replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \ + --replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib + + substituteInPlace generated/gtkd/cairo/c/functions.d \ + --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ + --replace libcairo.dylib ${cairo}/lib/libcairo.dylib + + substituteInPlace generated/gtkd/gdk/c/functions.d \ + --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \ + --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib + + substituteInPlace generated/gtkd/gdkpixbuf/c/functions.d \ + --replace libgdk_pixbuf-2.0.so.0 ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \ + --replace libgdk_pixbuf-2.0.0.dylib ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib + + substituteInPlace generated/gtkd/gio/c/functions.d \ + --replace libgio-2.0.so.0 ${glib.out}/lib/libgio-2.0.so.0 \ + --replace libgio-2.0.0.dylib ${glib.out}/lib/libgio-2.0.0.dylib + substituteInPlace generated/gtkd/glib/c/functions.d \ --replace libglib-2.0.so.0 ${glib.out}/lib/libglib-2.0.so.0 \ --replace libgmodule-2.0.so.0 ${glib.out}/lib/libgmodule-2.0.so.0 \ @@ -71,20 +77,46 @@ in stdenv.mkDerivation rec { --replace libglib-2.0.0.dylib ${glib.out}/lib/libglib-2.0.0.dylib \ --replace libgmodule-2.0.0.dylib ${glib.out}/lib/libgmodule-2.0.0.dylib \ --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib - substituteInPlace generated/gtkd/gio/c/functions.d \ - --replace libgio-2.0.so.0 ${glib.out}/lib/libgio-2.0.so.0 \ - --replace libgio-2.0.0.dylib ${glib.out}/lib/libgio-2.0.0.dylib - substituteInPlace generated/gstreamer/gstreamer/c/functions.d \ - --replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \ - --replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib + + substituteInPlace generated/gtkd/gobject/c/functions.d \ + --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ + --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib + substituteInPlace generated/gtkd/gtk/c/functions.d \ --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \ --replace libgtk-3.so.0 ${gtk3}/lib/libgtk-3.so.0 \ --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib \ --replace libgtk-3.0.dylib ${gtk3}/lib/libgtk-3.0.dylib + + substituteInPlace generated/gtkd/pango/c/functions.d \ + --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \ + --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ + --replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \ + --replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib + + substituteInPlace generated/gtkd/rsvg/c/functions.d \ + --replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \ + --replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib + + substituteInPlace generated/peas/peas/c/functions.d \ + --replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \ + --replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \ + --replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \ + --replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib + + substituteInPlace generated/sourceview/gsv/c/functions.d \ + --replace libgtksourceview-4.so.0 ${gtksourceview4}/lib/libgtksourceview-4.so.0 \ + --replace libgtksourceview-4.0.dylib ${gtksourceview4}/lib/libgtksourceview-4.0.dylib + + substituteInPlace generated/vte/vte/c/functions.d \ + --replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \ + --replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib ''; - installFlags = "prefix=$(out)"; + makeFlags = [ + "prefix=${placeholder "out"}" + "PKG_CONFIG=${pkgconfig}/bin/pkg-config" + ]; meta = with stdenv.lib; { description = "D binding and OO wrapper for GTK"; diff --git a/pkgs/development/libraries/gtkd/paths.d b/pkgs/development/libraries/gtkd/paths.d index 0f857136499..8793da44069 100644 --- a/pkgs/development/libraries/gtkd/paths.d +++ b/pkgs/development/libraries/gtkd/paths.d @@ -103,8 +103,8 @@ else version(darwin) LIBRARY.GLGDK: "libgdkglext-3.0.dylib", LIBRARY.GLGTK: "libgtkglext-3.0.dylib", LIBRARY.GDA: "@libgda@/lib/libgda-2.dylib", - LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.dylib", - LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.dylib", + LIBRARY.GSV: "@gtksourceview4@/lib/libgtksourceview-4.0.dylib", + LIBRARY.GSV1: "@gtksourceview4@/lib/libgtksourceview-4.0.dylib", LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.dylib", LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.dylib", LIBRARY.VTE: "@vte@/lib/libvte-2.91.dylib", @@ -131,8 +131,8 @@ else LIBRARY.GLGDK: "libgdkglext-3.0.so.0", LIBRARY.GLGTK: "libgtkglext-3.0.so.0", LIBRARY.GDA: "@libgda@/lib/libgda-4.0.so.4", - LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.so.0", - LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.so.1", + LIBRARY.GSV: "@gtksourceview4@/lib/libgtksourceview-4.so.0", + LIBRARY.GSV1: "@gtksourceview4@/lib/libgtksourceview-4.so.0", LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.so.0", LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.so.0", LIBRARY.VTE: "@vte@/lib/libvte-2.91.so.0", From b4cd4b98d04327fa2be14b5c4ab5e579465c6e5a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 7 Oct 2019 14:33:49 -0400 Subject: [PATCH 031/139] tilix: 2019-08-03 -> 2019-10-02 --- pkgs/applications/misc/tilix/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index aae17905cb7..326b24cc672 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation { pname = "tilix"; - version = "unstable-2019-08-03"; + version = "unstable-2019-10-02"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; - rev = "09ec4e8e113703ca795946d8d2a83091e7b741e4"; - sha256 = "1vvp6l25xygzhbhscg8scik8y59nl8a92ri024ijk0c0lclga05m"; + rev = "ffcd31e3c0e1a560ce89468152d8726065e8fb1f"; + sha256 = "1bzv7xiqhyblz1rw8ln4zpspmml49vnshn1zsv9di5q7kfgpqrgq"; }; # Default upstream else LDC fails to link @@ -56,15 +56,6 @@ stdenv.mkDerivation { libunwind ]; - patches = [ - # Depends on libsecret optionally - # https://github.com/gnunn1/tilix/pull/1745 - (fetchpatch { - url = "https://github.com/gnunn1/tilix/commit/e38dd182bfb92419d70434926ef9c0530189aab8.patch"; - sha256 = "1ws4iyzi67crzlp9p7cw8jr752b3phcg5ymx5aj0bh6321g38kfk"; - }) - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py From 6661c367df39df623208a8d8cc39d4c79ee7836a Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2019 10:26:55 +0200 Subject: [PATCH 032/139] fonts/gohufont: update for outputs change in bdf2psf --- pkgs/data/fonts/gohufont/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index 1f861afcf83..29b4241be92 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # convert bdf to psf fonts build=$(pwd) mkdir psf - cd ${bdf2psf}/usr/share/bdf2psf + cd ${bdf2psf}/share/bdf2psf for i in $bdf/*.bdf; do bdf2psf \ --fb "$i" standard.equivalents \ From 0192972ab09104c94d50da9357119b0ec2d636e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 8 Oct 2019 00:15:35 -0700 Subject: [PATCH 033/139] python37Packages.ed25519: 1.4 -> 1.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/python3.7-ed25519/versions --- pkgs/development/python-modules/ed25519/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index b1026e8d446..cd3c98e9cce 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ed25519"; - version = "1.4"; + version = "1.5"; src = fetchPypi { inherit pname version; - sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499"; + sha256 = "0n1k83ww0pr4q6z0h7p8hvy21hcgb96jvgllfbwhvvyf37h3w182"; }; meta = with stdenv.lib; { From 0b549a7a1e3736cef27e275f7de0cf43de1960d5 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Tue, 8 Oct 2019 12:58:26 +0200 Subject: [PATCH 034/139] grafana: 6.4.1 -> 6.4.2 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 04ddde00458..658c7ad816e 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.4.1"; + version = "6.4.2"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0z615a885vh92kv9jm6ixhj0i1w0k44wl4rczvp6mcmasbvfb5fb"; + sha256 = "12j0lksryggn7lg003ma2cnblclgzdw6b8rhz1wbq8d68m1mq5wv"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "08y2h7c2zavxwmxlajg2qzfd0lhkj00i2azz5ydm184m38b98kk7"; + sha256 = "0ch35h681yq5w7cpys0iiv3kva9hiqxzgk2gp0vcnadzmincwj7c"; }; postPatch = '' From 0ad35ab3ad1d97f6f0c4a8e7dab4e1c770ad8d67 Mon Sep 17 00:00:00 2001 From: Dima Date: Wed, 9 Oct 2019 22:23:59 +0200 Subject: [PATCH 035/139] aws-sdk-cpp: fixing hydra build Removing debug info to fix hydra build. The debug symbols alone are around ~1.8GB in size, which makes the closure combined with the other two outputs too large. --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 6bfb80d3a17..037fd198fef 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { # FIXME: might be nice to put different APIs in different outputs # (e.g. libaws-cpp-sdk-s3.so in output "s3"). outputs = [ "out" "dev" ]; - separateDebugInfo = stdenv.isLinux; nativeBuildInputs = [ cmake curl ]; From a2c9fc430ca60e1edcd2f429ce3129f0802d16cd Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Thu, 10 Oct 2019 19:54:46 +0800 Subject: [PATCH 036/139] go-ethereum: 1.9.5 -> 1.9.6 --- pkgs/applications/blockchains/go-ethereum.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 3754c9a087c..a59cffb4b1d 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "go-ethereum"; - version = "1.9.5"; + version = "1.9.6"; goPackagePath = "github.com/ethereum/go-ethereum"; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "1h1c02dgazlcgp9lrm0zsig80nfj0c9553jy9nsvjyzf95ym1542"; + sha256 = "08k6p7mbszlg8mq8k3vi5xrfnhfbxlh2ynd0nr0j64qdhmhcdnq6"; }; meta = with stdenv.lib; { From bd023200a94d6243a59c040dccb1aebd42f74646 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Wed, 4 Sep 2019 14:46:45 +0200 Subject: [PATCH 037/139] go_1_13: init at 1.13.1 --- pkgs/development/compilers/go/1.13.nix | 239 ++++++++++++++++++ .../compilers/go/remove-test-pie-1.13.patch | 34 +++ .../compilers/go/ssl-cert-file-1.13.patch | 64 +++++ pkgs/top-level/all-packages.nix | 4 + 4 files changed, 341 insertions(+) create mode 100644 pkgs/development/compilers/go/1.13.nix create mode 100644 pkgs/development/compilers/go/remove-test-pie-1.13.patch create mode 100644 pkgs/development/compilers/go/ssl-cert-file-1.13.patch diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix new file mode 100644 index 00000000000..2ff10d528d8 --- /dev/null +++ b/pkgs/development/compilers/go/1.13.nix @@ -0,0 +1,239 @@ +{ stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, mailcap, runtimeShell +, buildPackages, pkgsTargetTarget +}: + +let + + inherit (stdenv.lib) optionals optionalString; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${buildPackages.go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + +in + +stdenv.mkDerivation rec { + pname = "go"; + version = "1.13.1"; + + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "0n4k42bbrj5g9b1kczkfsih049v43vqzaps7n69gmfa4jpk59wc1"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + + propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + substituteInPlace src/mime/type_unix.go \ + --replace '/etc/mime.types' '${mailcap}/etc/mime.types' + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go + '' + optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.13.patch + ./remove-test-pie-1.13.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./skip-external-network-tests.patch + ./skip-nohup-tests.patch + # breaks under load: https://github.com/golang/go/issues/25628 + ./skip-test-extra-files-on-386.patch + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" + else + null; + + GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + # Independent from host/target, CC should produce code for the building system. + export CC=${buildPackages.stdenv.cc}/bin/cc + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/obj + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + setupHook = ./setup-hook.sh; + + disallowedReferences = [ goBootstrap ]; + + meta = with stdenv.lib; { + branch = "1.13"; + homepage = http://golang.org/; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/remove-test-pie-1.13.patch b/pkgs/development/compilers/go/remove-test-pie-1.13.patch new file mode 100644 index 00000000000..05f18b813f9 --- /dev/null +++ b/pkgs/development/compilers/go/remove-test-pie-1.13.patch @@ -0,0 +1,34 @@ +diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go +index f63c94697c..f02eff7064 100644 +--- a/src/cmd/dist/test.go ++++ b/src/cmd/dist/test.go +@@ -574,29 +574,6 @@ func (t *tester) registerTests() { + }) + } + +- // Test internal linking of PIE binaries where it is supported. +- if goos == "linux" && (goarch == "amd64" || goarch == "arm64") { +- t.tests = append(t.tests, distTest{ +- name: "pie_internal", +- heading: "internal linking of -buildmode=pie", +- fn: func(dt *distTest) error { +- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) +- return nil +- }, +- }) +- // Also test a cgo package. +- if t.cgoEnabled { +- t.tests = append(t.tests, distTest{ +- name: "pie_internal_cgo", +- heading: "internal linking of -buildmode=pie", +- fn: func(dt *distTest) error { +- t.addCmd(dt, "src", t.goTest(), "os/user", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) +- return nil +- }, +- }) +- } +- } +- + // sync tests + if goos != "js" { // js doesn't support -cpu=10 + t.tests = append(t.tests, distTest{ diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.13.patch b/pkgs/development/compilers/go/ssl-cert-file-1.13.patch new file mode 100644 index 00000000000..02a50d9c72f --- /dev/null +++ b/pkgs/development/compilers/go/ssl-cert-file-1.13.patch @@ -0,0 +1,64 @@ +diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go +index 255a8d3525..a467255a54 100644 +--- a/src/crypto/x509/root_cgo_darwin.go ++++ b/src/crypto/x509/root_cgo_darwin.go +@@ -280,6 +280,8 @@ int CopyPEMRoots(CFDataRef *pemRoots, CFDataRef *untrustedPemRoots, bool debugDa + import "C" + import ( + "errors" ++ "io/ioutil" ++ "os" + "unsafe" + ) + +@@ -295,6 +297,13 @@ func loadSystemRoots() (*CertPool, error) { + buf := C.GoBytes(unsafe.Pointer(C.CFDataGetBytePtr(data)), C.int(C.CFDataGetLength(data))) + roots := NewCertPool() + roots.AppendCertsFromPEM(buf) ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + if C.CFDataGetLength(untrustedData) == 0 { + return roots, nil +diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go +index 2f6a8b8d60..b81889fe69 100644 +--- a/src/crypto/x509/root_darwin.go ++++ b/src/crypto/x509/root_darwin.go +@@ -92,6 +92,14 @@ func execSecurityRoots() (*CertPool, error) { + verifyCh = make(chan rootCandidate) + ) + ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } ++ + // Using 4 goroutines to pipe into verify-cert seems to be + // about the best we can do. The verify-cert binary seems to + // just RPC to another server with coarse locking anyway, so +diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +index 48de50b4ea..750e12c6b4 100644 +--- a/src/crypto/x509/root_unix.go ++++ b/src/crypto/x509/root_unix.go +@@ -38,6 +38,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + files := certFiles + if f := os.Getenv(certFileEnv); f != "" { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7612c39f2e4..5ce994da2df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7955,6 +7955,10 @@ in inherit (darwin.apple_sdk.frameworks) Security Foundation; }; + go_1_13 = callPackage ../development/compilers/go/1.13.nix { + inherit (darwin.apple_sdk.frameworks) Security Foundation; + }; + go = go_1_12; go-repo-root = callPackage ../development/tools/go-repo-root { }; From bdd503323a3d8b17bb23cc20c46db022ebb81c46 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Wed, 4 Sep 2019 14:46:59 +0200 Subject: [PATCH 038/139] go: default to go_1_13 --- pkgs/top-level/all-packages.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ce994da2df..d72b57af7e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7959,7 +7959,7 @@ in inherit (darwin.apple_sdk.frameworks) Security Foundation; }; - go = go_1_12; + go = go_1_13; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -14433,14 +14433,21 @@ in buildGo112Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_12; }; + buildGo113Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_13; + }; - buildGoPackage = buildGo112Package; + buildGoPackage = buildGo113Package; buildGo112Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_12; }; - buildGoModule = buildGo112Module; + buildGo113Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_13; + }; + + buildGoModule = buildGo113Module; go2nix = callPackage ../development/tools/go2nix { }; From 4ef3de864573891748b7b24e2ca35c21dc6fe1b9 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 10 Sep 2019 21:23:53 +0200 Subject: [PATCH 039/139] ctop: ensure go 1.13 compatibility --- pkgs/tools/system/ctop/default.nix | 6 ++ pkgs/tools/system/ctop/go-1.13-deps.patch | 90 +++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 pkgs/tools/system/ctop/go-1.13-deps.patch diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index effc879e478..8d8b710750c 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -11,6 +11,12 @@ buildGoModule rec { sha256 = "0mm6hl5qklfv0yffj6cgypsgcrk4fq6p60djycfgj20yhz9cmf9x"; }; + patches = [ + # Version 0.7.2 does not build with go 1.13. + # TODO: Remove once(and if) https://github.com/bcicen/ctop/pull/178 is merged and lands in a release. + ./go-1.13-deps.patch + ]; + modSha256 = "0ad1gvamckg94r7f68cnjdbq9nyz6c3hh339hy4hghxd3rd1qskn"; meta = with lib; { diff --git a/pkgs/tools/system/ctop/go-1.13-deps.patch b/pkgs/tools/system/ctop/go-1.13-deps.patch new file mode 100644 index 00000000000..153c0f36f81 --- /dev/null +++ b/pkgs/tools/system/ctop/go-1.13-deps.patch @@ -0,0 +1,90 @@ +diff --git a/go.mod b/go.mod +index 4921cba..cbb4028 100644 +--- a/go.mod ++++ b/go.mod +@@ -18,9 +18,6 @@ require ( + github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 // indirect + github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7 // indirect + github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c +- github.com/kr/pretty v0.1.0 // indirect +- github.com/maruel/panicparse v0.0.0-20170227222818-25bcac0d793c // indirect +- github.com/maruel/ut v1.0.0 // indirect + github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c // indirect + github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect + github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884 +@@ -39,3 +36,5 @@ require ( + ) + + replace github.com/gizak/termui => github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5 ++ ++go 1.13 +diff --git a/go.sum b/go.sum +new file mode 100644 +index 0000000..5ca7d55 +--- /dev/null ++++ b/go.sum +@@ -0,0 +1,64 @@ ++github.com/Azure/go-ansiterm v0.0.0-20160622173216-fa152c58bc15 h1:VtP6TygBMvrR+SMMPHj3z3jvnj4vcafMRLIw4at7xww= ++github.com/Azure/go-ansiterm v0.0.0-20160622173216-fa152c58bc15/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= ++github.com/BurntSushi/toml v0.3.0 h1:e1/Ivsx3Z0FVTV0NSOv/aVgbUWyQuzj7DDnFblkRvsY= ++github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= ++github.com/Microsoft/go-winio v0.3.8 h1:dvxbxtpTIjdAbx2OtL26p4eq0iEvys/U5yrsTJb3NZI= ++github.com/Microsoft/go-winio v0.3.8/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= ++github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= ++github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= ++github.com/Sirupsen/logrus v0.0.0-20150423025312-26709e271410 h1:RxP6uUzJlS1Qa3+HYls3u+nQMKlnqC3RhL7wWC4Y4+E= ++github.com/Sirupsen/logrus v0.0.0-20150423025312-26709e271410/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U= ++github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5 h1:2pI3ZsoefWIi++8EqmANoC7Px/v2lRwnleVUcCuFgLg= ++github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5/go.mod h1:yIA9ITWZD1p4/DvCQ44xvhyVb9XEUlVnY1rzGSHwbiM= ++github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd h1:xqaBnULC8wEnQpRDXAsDgXkU/STqoluz1REOoegSfNU= ++github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd/go.mod h1:uEyr4WpAH4hio6LFriaPkL938XnrvLpNPmQHBdrmbIE= ++github.com/coreos/go-systemd v0.0.0-20151104194251-b4a58d95188d h1:MJ4ge3i0lehw+gE3JcGUUp8TmWjsLAlQlhmdASs/9wk= ++github.com/coreos/go-systemd v0.0.0-20151104194251-b4a58d95188d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= ++github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= ++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/docker/docker v0.0.0-20170502054910-90d35abf7b35 h1:ly3dRUfvdP5i/t9iqVHd2VQQIDtO3tpfFWPah7g4CFw= ++github.com/docker/docker v0.0.0-20170502054910-90d35abf7b35/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= ++github.com/docker/go-connections v0.0.0-20170301234100-a2afab980204 h1:JYhQLEn7v7EtrpA9ByRz51gwlk8qt12EGP9XlbX/qw4= ++github.com/docker/go-connections v0.0.0-20170301234100-a2afab980204/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= ++github.com/docker/go-units v0.3.2 h1:Kjm80apys7gTtfVmCvVY8gwu10uofaFSrmAKOVrtueE= ++github.com/docker/go-units v0.3.2/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= ++github.com/fsouza/go-dockerclient v0.0.0-20170307141636-318513eb1ab2 h1:JuVaWSoRMBrstn2l8cxKXjK8l/qurk5qyJ9dq7EIQmU= ++github.com/fsouza/go-dockerclient v0.0.0-20170307141636-318513eb1ab2/go.mod h1:KpcjM623fQYE9MZiTGzKhjfxXAV9wbyX2C1cyRHfhl0= ++github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 h1:oIgNYSrSUbNH5DJh6DMhU1PiOKOYIHNxrV3djLsLpEI= ++github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= ++github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 h1:ulJ2cj/xlDlrwLCvWH4UeV9vJ/jXP6wEGgTSF7EOnmQ= ++github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7 h1:67fHcS+inUoiIqWCKIqeDuq2AlPHNHPiTqp97LdQ+bc= ++github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= ++github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c h1:/hc+TxW4Q1v6aqNPHE5jiaNF2xEK0CzWTgo25RQhQ+U= ++github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c/go.mod h1:FJRkXmPrkHw0WDjB/LXMUhjWJ112Y6JUYnIVBOy8oH8= ++github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c h1:eFzthqtg3W6Pihj3DMTXLAF4f+ge5r5Ie5g6HLIZAF0= ++github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= ++github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= ++github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= ++github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884 h1:fcs71SMqqDhUD+PbpIv9xf3EH9F9s6HfiLwr6jKm1VA= ++github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= ++github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= ++github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= ++github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473 h1:J1QZwDXgZ4dJD2s19iqR9+U00OWM2kDzbf1O/fmvCWg= ++github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= ++github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y= ++github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= ++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= ++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= ++github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e h1:HJbgNpzYMeTLPpkMwbPNTPlhNd9r4xQtqcZG6qoIGgs= ++github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= ++github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= ++github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= ++github.com/syndtr/gocapability v0.0.0-20150716010906-2c00daeb6c3b h1:UzwAjzrPQVJoxLfb26YI2WRrhD3g09ZHt9vAQckWiPY= ++github.com/syndtr/gocapability v0.0.0-20150716010906-2c00daeb6c3b/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= ++github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc h1:0HAHLwEY4k1VqaO1SzBi4XxT0KA06Cv+QW2LXknBk9g= ++github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= ++github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4= ++github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= ++golang.org/x/net v0.0.0-20170308210134-a6577fac2d73 h1:5kGFsglTK4KqaHYb/WCmYmj+Gm1+dzbilbtzruHj6dw= ++golang.org/x/net v0.0.0-20170308210134-a6577fac2d73/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= ++golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sys v0.0.0-20170308153327-99f16d856c98 h1:U3NsAsR1IG0Aet3Z+IToBDWbPoJ7hjwgDpqqch4APkU= ++golang.org/x/sys v0.0.0-20170308153327-99f16d856c98/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= From ea0b765208720e94acc6d555f51ed2b8df2d87ec Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 10 Sep 2019 18:19:06 +0200 Subject: [PATCH 040/139] all-packages: use go 1.12 for consul --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d72b57af7e2..1a32bfc78d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1373,7 +1373,11 @@ in compactor = callPackage ../applications/networking/compactor { }; - consul = callPackage ../servers/consul { }; + consul = callPackage ../servers/consul { + # Version 1.6.0 fails to build with go 1.13 due to broken dependency: + # go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go:11:2: code in directory /build/go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/protoc-gen-validate/validate expects import "github.com/lyft/protoc-gen-validate/validate" + buildGoPackage = buildGo112Package; + }; consul-alerts = callPackage ../servers/monitoring/consul-alerts { }; From 2d7e8e1b0fce31e1a8437027f20a96491e09cfa6 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 10 Sep 2019 18:50:07 +0200 Subject: [PATCH 041/139] all-packages: use go 1.12 for perkeep --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a32bfc78d8..3bd4047f9d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17699,7 +17699,11 @@ in poppler = poppler_0_61; }; - perkeep = callPackage ../applications/misc/perkeep { }; + perkeep = callPackage ../applications/misc/perkeep { + # Revision c9f78d02adf9740f3b8d403a1418554293cc9f41 fails to build with go 1.13 due to a dependency: + # go: bazil.org/fuse@v0.0.0-20160811212531-371fbbdaa898: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:36526->[::1]:53: read: connection refused + buildGoPackage = buildGo112Package; + }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; From 9e5f063058bb4e9652281916e0ecbef65665b844 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 22:36:48 +0200 Subject: [PATCH 042/139] all-packages: use go 1.12 for wtf --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bd4047f9d3..39811184105 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24915,7 +24915,9 @@ in zimg = callPackage ../development/libraries/zimg { }; - wtf = callPackage ../applications/misc/wtf { }; + wtf = callPackage ../applications/misc/wtf { + buildGoModule = buildGo112Module; + }; zk-shell = callPackage ../applications/misc/zk-shell { }; From 01721f144968b898af74228dd1bcc52462d6e464 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 22:43:58 +0200 Subject: [PATCH 043/139] all-packages: use go 1.12 for bazel-watcher --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39811184105..24b607fdaa9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9283,7 +9283,9 @@ in bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = callPackage ../development/tools/bazel-watcher { }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { + go = go_1_12; + }; bazelisk = callPackage ../development/tools/bazelisk { }; From 2f20deb2024bdcc051317f61263b865cd8d70954 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 22:46:07 +0200 Subject: [PATCH 044/139] all-packages: use go 1.12 for cri-o --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24b607fdaa9..fde4b59260b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22051,7 +22051,9 @@ in crispyDoom = callPackage ../games/crispy-doom { }; - cri-o = callPackage ../applications/virtualization/cri-o {}; + cri-o = callPackage ../applications/virtualization/cri-o { + buildGoPackage = buildGo112Package; + }; ckan = callPackage ../games/ckan { }; From db6cb37aa72b16d2f0f9b459129e1e1ff6811a81 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 22:51:15 +0200 Subject: [PATCH 045/139] all-packages: use go 1.12 for curlie --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fde4b59260b..adf51146fb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2527,7 +2527,11 @@ in curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; - curlie = callPackage ../tools/networking/curlie { }; + curlie = callPackage ../tools/networking/curlie { + # Version 1.2.0 fails to build with go 1.13 due to: + # verifying golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: Get https://sum.golang.org/lookup/golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:49088->[::1]:53: read: connection refused + buildGoModule = buildGo112Module; + }; cunit = callPackage ../tools/misc/cunit { }; bcunit = callPackage ../tools/misc/bcunit { }; From ee2c8ece9e3960669775d7947ae11f1d33829578 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 22:53:12 +0200 Subject: [PATCH 046/139] all-packages: use go 1.12 for gotestsum --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adf51146fb7..4f45a15f0c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16346,7 +16346,11 @@ in gotests = callPackage ../development/tools/gotests { }; - gotestsum = callPackage ../development/tools/gotestsum { }; + gotestsum = callPackage ../development/tools/gotestsum { + # Version 0.3.5 fails to build with go 1.13: + # build ./testjson/internal/badmain: cannot find module for path ./testjson/internal/badmain + buildGoModule = buildGo112Module; + }; impl = callPackage ../development/tools/impl { }; From 745b2994035fc62af5963e6ba182337385ef89fd Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 22:58:43 +0200 Subject: [PATCH 047/139] all-packages: use go 1.12 for grpcui --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f45a15f0c7..39cf77f8044 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3618,7 +3618,9 @@ in grpcurl = callPackage ../tools/networking/grpcurl { }; - grpcui = callPackage ../tools/networking/grpcui { }; + grpcui = callPackage ../tools/networking/grpcui { + buildGoModule = buildGo112Module; + }; grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; From 7ddd2a206984bc2b2a5a98e5d19bb5a62b3d57e3 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 23:16:31 +0200 Subject: [PATCH 048/139] all-packages: use go 1.12 for lnd --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39cf77f8044..897223b47a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21912,7 +21912,9 @@ in }; litecoind = litecoin.override { withGui = false; }; - lnd = callPackage ../applications/blockchains/lnd.nix { }; + lnd = callPackage ../applications/blockchains/lnd.nix { + buildGoModule = buildGo112Module; + }; monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; From 72a6ab4d5fb08943720bddffba9ad9a862983e95 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 23:36:02 +0200 Subject: [PATCH 049/139] all-packages: use go 1.12 for scaleway-cli --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 897223b47a6..c4a080248e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22523,7 +22523,9 @@ in sauerbraten = callPackage ../games/sauerbraten {}; - scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; + scaleway-cli = callPackage ../tools/admin/scaleway-cli { + buildGoPackage = buildGo112Package; + }; scid = callPackage ../games/scid { tcl = tcl-8_5; From b63b95f1414f2fa05bd5e26a54444f71fe20b9f1 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 23:39:25 +0200 Subject: [PATCH 050/139] all-packages: use go 1.12 for tendermint --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4a080248e2..a7283934e19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20946,7 +20946,9 @@ in telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; - tendermint = callPackage ../tools/networking/tendermint {}; + tendermint = callPackage ../tools/networking/tendermint { + buildGoModule = buildGo112Module; + }; termdown = (newScope pythonPackages) ../applications/misc/termdown { }; From a3341e8499994498dc371ce3da23caac333e2dc8 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 23:46:42 +0200 Subject: [PATCH 051/139] all-packages: use go 1.12 for restic --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7283934e19..46d5d133e09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15198,7 +15198,11 @@ in redstore = callPackage ../servers/http/redstore { }; - restic = callPackage ../tools/backup/restic { }; + restic = callPackage ../tools/backup/restic { + # Version 0.9.5 fails to build with go 1.13 due to dependency: + # go: bazil.org/fuse@v0.0.0-20180421153158-65cc252bf669: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:56450->[::1]:53: read: connection refused + buildGoPackage = buildGo112Package; + }; restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { }; From cf6e2776f2be8c2ebd810ab756ab1a9a224971c8 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 17 Sep 2019 00:25:43 +0200 Subject: [PATCH 052/139] all-packages: use go 1.12 for packr --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46d5d133e09..5f3a7c52656 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -260,7 +260,11 @@ in packer = callPackage ../development/tools/packer { }; - packr = callPackage ../development/libraries/packr { }; + packr = callPackage ../development/libraries/packr { + # Version 2.6.0 fails to build with go 1.13 due to nested modules: + # go: directory v2/packr2 is outside main module + buildGoModule = buildGo112Module; + }; pet = callPackage ../development/tools/pet { }; From fcdc280d7f8460603db116dea3964b9ef20d22e9 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 17 Sep 2019 00:29:15 +0200 Subject: [PATCH 053/139] all-packages: use go 1.12 for terraform-lsp --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f3a7c52656..4beb5a92d7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10191,7 +10191,11 @@ in terracognita = callPackage ../development/tools/misc/terracognita { }; - terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; + terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { + # Version 0.0.5 fails to build with go 1.13 due to dependency: + # build github.com/juliosueiras/terraform-lsp: cannot load github.com/googleapis/gax-go/v2: github.com/googleapis/gax-go@v2.0.0+incompatible: reading file:///nix/store/ihiyd3mqa5gvfm2k2716hpl16knak798-terraform-lsp-0.0.5-go-modules/github.com/googleapis/gax-go/@v/v2.0.0+incompatible.zip: Not Found + buildGoModule = buildGo112Module; + }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; From 8c33df9d65750410c64ce8ad26125a1a5bc936c4 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 17 Sep 2019 00:47:28 +0200 Subject: [PATCH 054/139] all-packages: use go 1.12 for terraform-providers.elasticsearch --- .../networking/cluster/terraform-providers/default.nix | 10 ++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index fc6b7131385..83157c90a48 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -2,6 +2,7 @@ , buildGoPackage , fetchFromGitHub , callPackage +, buildGo112Module }: let list = import ./data.nix; @@ -16,7 +17,7 @@ let inherit owner repo sha256; rev = "v${version}"; }; - + # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. @@ -24,7 +25,12 @@ let }; in { - elasticsearch = callPackage ./elasticsearch {}; + elasticsearch = callPackage ./elasticsearch { + # Version 0.7.0 fails to build with go 1.13 due to dependencies: + # verifying git.apache.org/thrift.git@v0.12.0/go.mod: git.apache.org/thrift.git@v0.12.0/go.mod: Get https://sum.golang.org/lookup/git.apache.org/thrift.git@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused + # verifying github.com/hashicorp/terraform@v0.12.0/go.mod: github.com/hashicorp/terraform@v0.12.0/go.mod: Get https://sum.golang.org/lookup/github.com/hashicorp/terraform@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused + buildGoModule = buildGo112Module; + }; gandi = callPackage ./gandi {}; ibm = callPackage ./ibm {}; libvirt = callPackage ./libvirt {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4beb5a92d7f..d5377f2020b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24607,7 +24607,9 @@ in terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( - callPackage ../applications/networking/cluster/terraform-providers {} + callPackage ../applications/networking/cluster/terraform-providers { + inherit buildGo112Module; + } ); terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; From e45055c3289c9bf7c5c4e00066e88ac8871f1f67 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 17 Sep 2019 00:48:30 +0200 Subject: [PATCH 055/139] all-packages: use go 1.12 for prow --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5377f2020b..17226d2c0bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24593,7 +24593,11 @@ in jx = callPackage ../applications/networking/cluster/jx {}; - prow = callPackage ../applications/networking/cluster/prow {}; + prow = callPackage ../applications/networking/cluster/prow { + # Version 2019-08-14 fails to build with go 1.13 due to dependencies: + # go: golang.org/x/lint@v0.0.0-20190301231843-5614ed5bae6f used for two different module paths (github.com/golang/lint and golang.org/x/lint) + buildGoModule = buildGo112Module; + }; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_11 From eec1a1345f94b2a512dbe666729b090e60eddc2f Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 18 Sep 2019 23:28:57 +0200 Subject: [PATCH 056/139] all-packages: use go 1.12 for cockroachdb --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17226d2c0bb..5f4f7dc34ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15561,7 +15561,9 @@ in cpustat = callPackage ../os-specific/linux/cpustat { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { }; + cockroachdb = callPackage ../servers/sql/cockroachdb { + buildGoPackage = buildGo112Package; + }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; From 6e031f1244ec5b32ae90ee8a240fd37741200817 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Tue, 17 Sep 2019 22:53:59 -0400 Subject: [PATCH 057/139] all-packages: use go 1.12 for grafana --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f4f7dc34ad..622a3d06112 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14766,7 +14766,9 @@ in gofish = callPackage ../servers/gopher/gofish { }; - grafana = callPackage ../servers/monitoring/grafana { }; + grafana = callPackage ../servers/monitoring/grafana { + buildGoPackage = buildGo112Package; + }; grafana-loki = callPackage ../servers/monitoring/loki { }; From 7c6e98721c7551298b80a4751ccb614c81eea50c Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Tue, 17 Sep 2019 22:58:26 -0400 Subject: [PATCH 058/139] all-packages: use go 1.12 for magnetico Co-authored-by: Roman Volosatovs --- 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 622a3d06112..2bc8c94c779 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19497,7 +19497,10 @@ in marp = callPackage ../applications/office/marp { }; - magnetico = callPackage ../applications/networking/p2p/magnetico { }; + magnetico = callPackage ../applications/networking/p2p/magnetico { + # Version 2019-08-14 fails to build with go 1.13 due to missing go.sum + buildGoModule = buildGo112Module; + }; matchbox = callPackage ../applications/window-managers/matchbox { }; From 057b547fd4e73af8398d282f0b137dccb26cd4f1 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Tue, 17 Sep 2019 23:00:27 -0400 Subject: [PATCH 059/139] all-packages: use go 1.12 for openshift --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bc8c94c779..e8a1d70cd9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19780,7 +19780,9 @@ in notion = callPackage ../applications/window-managers/notion { }; - openshift = callPackage ../applications/networking/cluster/openshift { }; + openshift = callPackage ../applications/networking/cluster/openshift { + buildGoPackage = buildGo112Package; + }; oroborus = callPackage ../applications/window-managers/oroborus {}; From e9a9b553e7a827ee71b3478280cb0b4731b905e2 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Tue, 17 Sep 2019 23:43:25 -0400 Subject: [PATCH 060/139] all-packages: use go 1.12 for kubernetes --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8a1d70cd9a..1381ee9ecac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19265,7 +19265,9 @@ in kubeval = callPackage ../applications/networking/cluster/kubeval { }; - kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { + go = buildPackages.go_1_12; + }; kubectl = callPackage ../applications/networking/cluster/kubectl { }; From 88ffdabc0e57d743518824a57b89ef2b8a3ee311 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 22 Sep 2019 19:14:48 -0500 Subject: [PATCH 061/139] documize-community: disable go module build --- pkgs/servers/documize-community/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 7339bcc6584..af969c9e929 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { runHook preBuild pushd go/src/github.com/documize/community - go build -gcflags="all=-trimpath=$GOPATH" -o bin/documize ./edition/community.go + GO111MODULE=off go build -gcflags="all=-trimpath=$GOPATH" -o bin/documize ./edition/community.go popd runHook postBuild From fc5026b4ec9e999b6049e2362d9f497cd2eaf9c2 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Fri, 20 Sep 2019 00:14:08 -0400 Subject: [PATCH 062/139] all-packages: use go 1.12 for prometheus and prometheus-varnish-exporter These both fail to work with go1.13 due to test issues, downgrading to 1.12 --- pkgs/top-level/all-packages.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1381ee9ecac..0cf0991f70b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15134,7 +15134,11 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { }; + prometheus = callPackage ../servers/monitoring/prometheus { + # Version 2.12.0 fails to build with go 1.13 due to an incorrect module file + # compilation error :go: cloud.google.com/go@v0.44.1: Get https://proxy.golang.org/cloud.google.com/go/@v/v0.44.1.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:58980->[::1]:53: read: connection refused + buildGoPackage = buildGo112Package; + }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; @@ -15166,7 +15170,11 @@ in prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; - prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; + prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { + # Version 1.5.1 fails to build with go 1.13 due to test failure + # FAIL github.com/jonnenauha/prometheus_varnish_exporter 0.041s + buildGoModule = buildGo112Module; + }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; From d32980ca1edb934e6756770b288806dbda388113 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 25 Sep 2019 22:44:49 -0400 Subject: [PATCH 063/139] all-packages: use go 1.12 for circleci-cli --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cf0991f70b..1924bdf6d1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2243,7 +2243,11 @@ in ciopfs = callPackage ../tools/filesystems/ciopfs { }; - circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { + # Version 0.1.5879 fails to build with go 1.13 due to: + # build github.com/CircleCI-Public/circleci-cli: cannot load github.com/gobuffalo/packr/v2: github.com/gobuffalo/packr@v1.21.0: reading file:///nix/store/hh9hrfdg3gbqz37sa3hx44mkzkxpkkyw-circleci-cli-0.1.5879-go-modules/github.com/gobuffalo/packr/@v/v1.21.0.zip: Not Found + buildGoModule = buildGo112Module; + }; # Cleanup before 20.03: citrix_receiver = throw "citrix_receiver has been discontinued by Citrix (https://docs.citrix.com/en-us/citrix-workspace-app.html). Please use citrix_workspace."; From 52d057f575456660f6f8e83a9d5eef6e46091e74 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 25 Sep 2019 22:49:13 -0400 Subject: [PATCH 064/139] all-packages: use go 1.12 for git-lfs --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1924bdf6d1f..a995a1306cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3390,7 +3390,11 @@ in git-crecord = callPackage ../applications/version-management/git-crecord { }; - git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { }); + git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { + # Version 2.8.0 fails with go1.13 + # go: github.com/alexbrainman/sspi@v0.0.0-20180125232955-4729b3d4d858: Get https://proxy.golang.org/github.com/alexbrainman/sspi/@v/v0.0.0-20180125232955-4729b3d4d858.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:32932->[::1]:53: read: connection refused + buildGoPackage = buildGo112Package; + }); git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { }; From f93ea5abe1d23f6f12661333f510201fb48b533e Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sat, 5 Oct 2019 10:36:53 +0200 Subject: [PATCH 065/139] go_1_13: add kalbasit to maintainers --- pkgs/development/compilers/go/1.13.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index 2ff10d528d8..d0aeac13522 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -233,7 +233,7 @@ stdenv.mkDerivation rec { homepage = http://golang.org/; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs ]; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; } From 88f65fca79f806042e54908a0a71b085c2d5c135 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 18 Sep 2019 23:59:36 +0200 Subject: [PATCH 066/139] conftest: 0.12.0 -> 0.14.0, disable go sum db. The go sum db is a hosted service that appears to be generating a new inclusion proof each time this build is run (rather than using the one from the previous run). Since this ends up the module directory + thus hash, it's breaking deterministic builds. Co-authored-by: Roman Volosatovs --- pkgs/development/tools/conftest/default.nix | 21 ++-- .../tools/conftest/go-1.13-deps.patch | 99 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 14 insertions(+), 108 deletions(-) delete mode 100644 pkgs/development/tools/conftest/go-1.13-deps.patch diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 4c8792cc6aa..a4a6a7998b0 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,27 +2,32 @@ buildGoModule rec { pname = "conftest"; - version = "0.12.0"; + version = "0.14.0"; + + # Something subtle in the go sum db is causing every download to + # get a new sum (and thus breaking the hash). This disables the + # fetching of the sum from the go sum database. + modBuildPhase = '' + runHook preBuild + GONOSUMDB=* go mod download + runHook postBuild + ''; src = fetchFromGitHub { owner = "instrumenta"; repo = "conftest"; rev = "v${version}"; - sha256 = "0blrbbnvnnxyw0idhglqdz16i7g6g86a6kw2iw707bg0yfdl1ncq"; + sha256 = "0fjz6ad8rnznlp1kiyb3c6anhjs6v6acgziw4hmyz0xva4jnspsh"; }; - patches = [ - # Version 0.12.0 does not build with go 1.13. See https://github.com/instrumenta/conftest/pull/85. - # TODO: Remove once https://github.com/instrumenta/conftest/pull/85 is merged and lands in a release. - ./go-1.13-deps.patch - ]; + modSha256 = "1xwqlqx5794hsi14h5gqg69gjcqcma24ha0fxn0vffqgqs2cz1d1"; buildFlagsArray = '' -ldflags= -X main.version=${version} ''; - modSha256 = "11999ywy73ng45gl1qypky8342jvishcp11bdxbigvqhwl2zbpav"; + subPackages = [ "cmd" ]; meta = with lib; { description = "Write tests against structured configuration data"; diff --git a/pkgs/development/tools/conftest/go-1.13-deps.patch b/pkgs/development/tools/conftest/go-1.13-deps.patch deleted file mode 100644 index d03d4ed742a..00000000000 --- a/pkgs/development/tools/conftest/go-1.13-deps.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/go.mod b/go.mod -index a552a6b..a39703d 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,6 @@ - module github.com/instrumenta/conftest - --go 1.12 -+go 1.13 - - require ( - cloud.google.com/go v0.39.0 // indirect -@@ -43,12 +43,16 @@ require ( - golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect - golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0 // indirect - golang.org/x/sys v0.0.0-20190526052359-791d8a0f4d09 // indirect -+ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect - google.golang.org/appengine v1.6.0 // indirect - google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601 // indirect - ) - - replace ( -+ git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 - github.com/containerd/containerd => github.com/containerd/containerd v1.2.6 - github.com/docker/docker => github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd - github.com/golang/lint => golang.org/x/lint v0.0.0-20190409202823-959b441ac422 -+ github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e => github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e -+ golang.org/x/crypto v0.0.0-20190129210102-0709b304e793 => golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 - ) -diff --git a/go.sum b/go.sum -index 2441c4e..212ac69 100644 ---- a/go.sum -+++ b/go.sum -@@ -10,7 +10,6 @@ dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl - dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= - dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= - dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= --git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= - github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= - github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= - github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -@@ -43,6 +42,7 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU - github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= - github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod h1:LzD22aAzDP8/dyiCKFp31He4m2GPjl0AFyzDtZzUu9M= - github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -+github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= - github.com/apparentlymart/go-cidr v1.0.0 h1:lGDvXx8Lv9QHjrAVP7jyzleG4F9+FkRhJcEsDFxeb8w= - github.com/apparentlymart/go-cidr v1.0.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= - github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= -@@ -132,13 +132,8 @@ github.com/docker/cli v0.0.0-20190511004558-53fc257292ad/go.mod h1:JLrzqnKDaYBop - github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= - github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= - github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= --github.com/docker/docker v0.0.0-20180531152204-71cd53e4a197/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= - github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd h1:h98Vus5/NAC3I4k243/B/KgCdpjCUK4lfxNEw2p/HAc= - github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= --github.com/docker/docker v1.14.0-0.20190131205458-8a43b7bb99cd h1:adRHD5aU4yFK0L4yZwjY3SyWapVmPdq1h19eJdgYUfs= --github.com/docker/docker v1.14.0-0.20190131205458-8a43b7bb99cd/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= --github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c h1:rZ+3jNsgjvYgdZ0Nrd4Udrv8rneDbWBohAPuXsTsvGU= --github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= - github.com/docker/docker-credential-helpers v0.6.0/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= - github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= - github.com/docker/docker-credential-helpers v0.6.2 h1:CrW9H1VMf3a4GrtyAi7IUJjkJVpwBBpX0+mvkvYJaus= -@@ -214,6 +209,7 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPg - github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= - github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= - github.com/google/shlex v0.0.0-20150127133951-6f45313302b9/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE= -+github.com/googleapis/gax-go v2.0.0+incompatible h1:j0GKcs05QVmm7yesiZq2+9cxHkNK9YM6zKx4D2qucQU= - github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= - github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= - github.com/googleapis/gax-go/v2 v2.0.4 h1:hU4mGcQI4DaAYW+IbTun+2qEZVFxK0ySjQLTbS0VQKc= -@@ -407,8 +403,8 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM - github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y= - github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= - github.com/opencontainers/runc v1.0.0-rc6/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= --github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e h1:+uPGJuuDl61O9GKN/rLHkUCf597mpxmJI06RqMQX81A= --github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -+github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e h1:9wcty7nGPPNkY8/VsiZkjmMB8x7SydrklJE+vCr4uDg= -+github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= - github.com/opencontainers/runtime-spec v0.0.0-20180909173843-eba862dc2470/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= - github.com/opentracing-contrib/go-stdlib v0.0.0-20171029140428-b1a47cfbdd75/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= - github.com/opentracing/opentracing-go v0.0.0-20171003133519-1361b9cd60be/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -@@ -587,7 +583,6 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf - golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= --golang.org/x/crypto v0.0.0-20190129210102-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20190129210102-ccddf3741a0c/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -@@ -679,6 +674,8 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262 h1:qsl9y/CJx34tuA7QCPNp86J - golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= - golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 h1:PPwnA7z1Pjf7XYaBP9GL1VAMZmcIWyFz7QCMSIIa3Bg= - golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= -+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= - google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= - google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a995a1306cf..954d450bad4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -159,7 +159,7 @@ in cm256cc = callPackage ../development/libraries/cm256cc { }; - conftest = callPackage ../development/tools/conftest {}; + conftest = callPackage ../development/tools/conftest { }; corgi = callPackage ../development/tools/corgi { }; From 8ff186585574067b8a316aaace041167e6d07fb0 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Thu, 10 Oct 2019 21:39:28 -0400 Subject: [PATCH 067/139] gcsfuse: add go.mod and go.sum files. It looks like go1.12 silently created the module, but go1.13 does not. --- pkgs/tools/filesystems/gcsfuse/default.nix | 5 +++ pkgs/tools/filesystems/gcsfuse/go.mod.patch | 28 +++++++++++++++ pkgs/tools/filesystems/gcsfuse/go.sum.patch | 38 +++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 pkgs/tools/filesystems/gcsfuse/go.mod.patch create mode 100644 pkgs/tools/filesystems/gcsfuse/go.sum.patch diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 8ce87375b26..af3e9250985 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -13,6 +13,11 @@ buildGoModule rec { modSha256 = "0i86xs3lq2mj22yv7jmhmb34k7lz348bakqz020xpyccllkkszy4"; + patches = [ + ./go.mod.patch + ./go.sum.patch + ]; + meta = with lib;{ description = "A user-space file system for interacting with Google Cloud Storage"; homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; diff --git a/pkgs/tools/filesystems/gcsfuse/go.mod.patch b/pkgs/tools/filesystems/gcsfuse/go.mod.patch new file mode 100644 index 00000000000..fbda63432d7 --- /dev/null +++ b/pkgs/tools/filesystems/gcsfuse/go.mod.patch @@ -0,0 +1,28 @@ +--- a/go.mod 2019-10-09 22:35:05.777065057 -0400 ++++ b/go.mod 2019-10-10 21:34:15.809681738 -0400 +@@ -0,0 +1,25 @@ ++module github.com/googlecloudplatform/gcsfuse ++ ++go 1.12 ++ ++require ( ++ cloud.google.com/go v0.0.0-20170807235027-9be7f826df5c ++ github.com/codegangsta/cli v0.0.0-20170804093415-b99aa811b4c1 ++ github.com/golang/protobuf v0.0.0-20170902000452-17ce1425424a ++ github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f ++ github.com/jacobsa/fuse v0.0.0-20170513050233-fe7f3a55dcaa ++ github.com/jacobsa/gcloud v0.0.0-20180124212516-9291bd1e8308 ++ github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd ++ github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff ++ github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 ++ github.com/jacobsa/ratelimit v0.0.0-20150904001804-f5e47030f3b0 ++ github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb ++ github.com/jacobsa/syncutil v0.0.0-20150827001642-c39ef5c1aa0b ++ github.com/jacobsa/timeutil v0.0.0-20170205232429-577e5acbbcf6 ++ github.com/jacobsa/util v0.0.0-20150810040848-976a6f4de67e ++ github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 ++ golang.org/x/net v0.0.0-20170809000501-1c05540f6879 ++ golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95 ++ google.golang.org/api v0.0.0-20170807210121-5c4ffd5985e2 ++ google.golang.org/appengine v0.0.0-20170801183137-c5a90ac045b7 ++) diff --git a/pkgs/tools/filesystems/gcsfuse/go.sum.patch b/pkgs/tools/filesystems/gcsfuse/go.sum.patch new file mode 100644 index 00000000000..d537266e3c1 --- /dev/null +++ b/pkgs/tools/filesystems/gcsfuse/go.sum.patch @@ -0,0 +1,38 @@ +--- a/go.sum 2019-10-09 22:35:05.777065057 -0400 ++++ b/go.sum 2019-10-10 21:34:15.809681738 -0400 +@@ -0,0 +1,35 @@ ++cloud.google.com/go v0.0.0-20170807235027-9be7f826df5c h1:pTb3uxaVLke7AQ/KUVTHWZmzKrKYrip7FimNb3ecAbo= ++cloud.google.com/go v0.0.0-20170807235027-9be7f826df5c/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= ++github.com/codegangsta/cli v0.0.0-20170804093415-b99aa811b4c1 h1:PTPzzngHWcTI0ph/9I92RhVtRkdOCi37wySw/ojR5Eg= ++github.com/codegangsta/cli v0.0.0-20170804093415-b99aa811b4c1/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA= ++github.com/golang/protobuf v0.0.0-20170902000452-17ce1425424a/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f h1:X+tnaqoCcBgAwSTJtoYW6p0qKiuPyMfofEHEFUf2kdU= ++github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f/go.mod h1:Ip4fOwzCrnDVuluHBd7FXIMb7SHOKfkt9/UDrYSZvqI= ++github.com/jacobsa/fuse v0.0.0-20170513050233-fe7f3a55dcaa h1:3420E523ahKsI3tlbO0zeLvgzuTFdJoy6JoAVuShs8U= ++github.com/jacobsa/fuse v0.0.0-20170513050233-fe7f3a55dcaa/go.mod h1:9Aml1MG17JVeXrN4D2mtJvYHtHklJH5bESjCKNzVjFU= ++github.com/jacobsa/gcloud v0.0.0-20180124212516-9291bd1e8308 h1:sfc1gTCrsJQJMySgDstAhwzogqQIrTxkwwScG4p2kbM= ++github.com/jacobsa/gcloud v0.0.0-20180124212516-9291bd1e8308/go.mod h1:3fF6sEraNZSToePaj5q+f9KSaMpuZcwccqAQmOKDv/k= ++github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd h1:9GCSedGjMcLZCrusBZuo4tyKLpKUPenUUqi34AkuFmA= ++github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M= ++github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff h1:2xRHTvkpJ5zJmglXLRqHiZQNjUoOkhUyhTAhEQvPAWw= ++github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff/go.mod h1:gJWba/XXGl0UoOmBQKRWCJdHrr3nE0T65t6ioaj3mLI= ++github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11/go.mod h1:+DBdDyfoO2McrOyDemRBq0q9CMEByef7sYl7JH5Q3BI= ++github.com/jacobsa/ratelimit v0.0.0-20150904001804-f5e47030f3b0 h1:6GaIakaFrxn738iBykUc6fyS5sIAKRg/wafwzrzRX30= ++github.com/jacobsa/ratelimit v0.0.0-20150904001804-f5e47030f3b0/go.mod h1:5/sdn6lSZE5l3rXMkJGO7Y3MHJImklO43rZx9ouOWYQ= ++github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb h1:uSWBjJdMf47kQlXMwWEfmc864bA1wAC+Kl3ApryuG9Y= ++github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb/go.mod h1:ivcmUvxXWjb27NsPEaiYK7AidlZXS7oQ5PowUS9z3I4= ++github.com/jacobsa/syncutil v0.0.0-20150827001642-c39ef5c1aa0b h1:HMNP0njxow/ahg3AFKzu8HnyOUSRiVqWXm+i4VefV+Y= ++github.com/jacobsa/syncutil v0.0.0-20150827001642-c39ef5c1aa0b/go.mod h1:mPvulh9VKXvo+yOlrD4VYOOYuLdZJ36wa/5QIrtXvWs= ++github.com/jacobsa/timeutil v0.0.0-20170205232429-577e5acbbcf6 h1:XKHJmHcgU9glxk3eLPiRZT5VFSHJitVTnMj/EgIoXC4= ++github.com/jacobsa/timeutil v0.0.0-20170205232429-577e5acbbcf6/go.mod h1:JEWKD6V8xETMW+DEv+IQVz++f8Cn8O/X0HPeDY3qNis= ++github.com/jacobsa/util v0.0.0-20150810040848-976a6f4de67e h1:BegecLAVSx5IW1bOImB8Lt6+4yiWP4t+PUeckWYzIeg= ++github.com/jacobsa/util v0.0.0-20150810040848-976a6f4de67e/go.mod h1:q0HiLetNeSPHjs8ddOw9U6xahog8xR7WPp6PhzJ6wmk= ++github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro= ++github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= ++golang.org/x/net v0.0.0-20170809000501-1c05540f6879 h1:0rFa7EaCGdQPmZVbo9F7MNF65b8dyzS6EUnXjs9Cllk= ++golang.org/x/net v0.0.0-20170809000501-1c05540f6879/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95 h1:RS+wSrhdVci7CsPwJaMN8exaP3UTuQU0qB34R/E/JD0= ++golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= ++google.golang.org/api v0.0.0-20170807210121-5c4ffd5985e2 h1:wF/9eBxkxh3/00HWCFpF3583KFXGapuZ3EVpZIuLd4Q= ++google.golang.org/api v0.0.0-20170807210121-5c4ffd5985e2/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= ++google.golang.org/appengine v0.0.0-20170801183137-c5a90ac045b7/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= From df946258ddbda9f6df40b3f002c8139e5fb8e67a Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 11 Oct 2019 14:02:12 +0200 Subject: [PATCH 068/139] riot-web: 1.4.1 -> 1.4.2 --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 1b9b34ed4aa..05c5059a51f 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "16lgxyqxs6vpjcfdr4j7gnn7h8gyi6b5520b8nq8hxynh24iyhcq"; + sha256 = "0bbal3y4clgp7j703f3ll5zwhbpjz6zpw3qslwza6lik4g4k0vaj"; }; installPhase = let From 28853bc838da1793d41fa5a3e6a34bf29e1b3c91 Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 11 Oct 2019 14:02:23 +0200 Subject: [PATCH 069/139] riot-desktop: 1.4.1 -> 1.4.2 --- .../instant-messengers/riot/riot-desktop-package.json | 2 +- .../networking/instant-messengers/riot/riot-desktop.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index d305fade038..f7a70bce61a 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.4.1", + "version": "1.4.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 7b5bb1e04f3..f03849a9cd6 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.4.1"; + version = "1.4.2"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "0w4w39smak6hp65vam5rrz6l48rb4yzszzyn1yjhr1m8w8j9bvfl"; + sha256 = "1s1m2jbcax92pql9yzw3kxdmn97a2xnas49rw3n1vldkla2wx4zx"; }; in yarn2nix-moretea.mkYarnPackage rec { From e2771bfac397c4e1abacbd8b88130a0c677383df Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 11 Oct 2019 08:27:44 -0400 Subject: [PATCH 070/139] vivaldi: fix build on latest snapshot --- pkgs/applications/networking/browsers/vivaldi/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 51a9cc9aec0..c95a996abeb 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -82,8 +82,7 @@ in stdenv.mkDerivation rec { --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ ${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} '' + stdenv.lib.optionalString enableWidevine '' - rm $out/opt/${vivaldiName}/libwidevinecdm.so - ln -s ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/${vivaldiName}/libwidevinecdm.so + ln -sf ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/${vivaldiName}/libwidevinecdm.so ''; meta = with stdenv.lib; { From 340b252d4b67572ccece3641e09235bd4fa1a374 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 11 Oct 2019 08:33:03 -0400 Subject: [PATCH 071/139] vscodium: 1.38.1 -> 1.39.1 --- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 3024ea10799..0f7c10558bd 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "15m7mfb8gmx3pwydc37blj0rxwgmkrnqfj6y79rpqlr2dg92gwlb"; - x86_64-darwin = "080k4fnfa5ylmmya6zprgci3gld9mrbqsfnk53hgcny91ykl5xj5"; + x86_64-linux = "1vhrfz36ay67laa5159jcnxyl4prgm8v1mp6anv1s7bppazigg2n"; + x86_64-darwin = "0cxsl0qpk223khndfwwgxl8az4rz4ap657yrkvws9bh8k4vv473h"; }.${system}; sourceRoot = { @@ -23,7 +23,7 @@ in callPackage ./generic.nix rec { inherit sourceRoot; - version = "1.38.1"; + version = "1.39.1"; pname = "vscodium"; executableName = "codium"; From 134f666279dc3b05940425c8dee9966d3260f04e Mon Sep 17 00:00:00 2001 From: Koki Yasuno Date: Fri, 11 Oct 2019 22:27:09 +0900 Subject: [PATCH 072/139] station: 1.51.1 -> 1.52.2 --- pkgs/applications/networking/station/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix index 6b241ddb959..afc89fe7802 100644 --- a/pkgs/applications/networking/station/default.nix +++ b/pkgs/applications/networking/station/default.nix @@ -2,13 +2,13 @@ let pname = "station"; - version = "1.51.1"; + version = "1.52.2"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/getstation/desktop-app-releases/releases/download/${version}/Station-${version}.AppImage"; - sha256 = "1vfis2q7zf1sabdlxzmbxh135jk25ylhavrgfc30k5nad9cacw8k"; + url = "https://github.com/getstation/desktop-app-releases/releases/download/${version}/Station-${version}-x86_64.AppImage"; + sha256 = "0lhiwvnf94is9klvzrqv2wri53gj8nms9lg2678bs4y58pvjxwid"; }; profile = '' From 847c5f077f3efd2766b3feaabee9e70ebedd661a Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Fri, 11 Oct 2019 05:33:16 -0500 Subject: [PATCH 073/139] elmPackages.*: update to latest versions elm-verify-examples: 4.0.1 -> 4.0.2 elm-live: 4.0.0 -> 4.0.1 downstream dependencies for most packages --- .../compilers/elm/packages/node-packages.nix | 292 ++++++++++-------- 1 file changed, 161 insertions(+), 131 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 45fb96ed693..91e027990d6 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -13,31 +13,31 @@ let sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA=="; }; }; - "@nodelib/fs.scandir-2.1.2" = { + "@nodelib/fs.scandir-2.1.3" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.2.tgz"; - sha512 = "wrIBsjA5pl13f0RN4Zx4FNWmU71lv03meGKnqRUoCyan17s4V3WL92f3w3AIuWbNnpcrQyFBU5qMavJoB8d27w=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; + sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="; }; }; - "@nodelib/fs.stat-2.0.2" = { + "@nodelib/fs.stat-2.0.3" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.2.tgz"; - sha512 = "z8+wGWV2dgUhLqrtRYa03yDx4HWMvXKi1z8g3m2JyxAx8F7xk74asqPk5LAETjqDSGLFML/6CDl0+yFunSYicw=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; + sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="; }; }; - "@nodelib/fs.walk-1.2.3" = { + "@nodelib/fs.walk-1.2.4" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.3.tgz"; - sha512 = "l6t8xEhfK9Sa4YO5mIRdau7XSOADfmh3jCr0evNHdY+HNkW6xuQhgMH7D73VV6WpZOagrW0UludvMTiifiwTfA=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; + sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; }; }; "@sindresorhus/is-0.7.0" = { @@ -76,13 +76,13 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-12.7.5" = { + "@types/node-12.7.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.7.5"; + version = "12.7.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz"; - sha512 = "9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.7.12.tgz"; + sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; "accepts-1.3.7" = { @@ -148,13 +148,13 @@ let sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; }; }; - "anymatch-3.1.0" = { + "anymatch-3.1.1" = { name = "anymatch"; packageName = "anymatch"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.0.tgz"; - sha512 = "Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA=="; + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; + sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; }; }; "arr-diff-4.0.0" = { @@ -382,13 +382,13 @@ let sha512 = "Y+Wvypk3JhH5GPZAvlwJAWOVH/OsOhQMSj37vySuWHwQivoALplPxfBA8b973rFJI7OS+O+1YmmYXIiEXVMAcw=="; }; }; - "bluebird-3.5.5" = { + "bluebird-3.7.0" = { name = "bluebird"; packageName = "bluebird"; - version = "3.5.5"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz"; - sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz"; + sha512 = "aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg=="; }; }; "body-parser-1.18.2" = { @@ -598,13 +598,13 @@ let sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; - "chownr-1.1.2" = { + "chownr-1.1.3" = { name = "chownr"; packageName = "chownr"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz"; - sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz"; + sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="; }; }; "class-utils-0.3.6" = { @@ -679,13 +679,13 @@ let sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; }; }; - "commander-3.0.1" = { + "commander-3.0.2" = { name = "commander"; packageName = "commander"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-3.0.1.tgz"; - sha512 = "UNgvDd+csKdc9GD4zjtkHKQbT8Aspt2jCBqNSPp53vAS0L1tS9sXB2TCEOPHJ7kt9bN/niWkYj8T3RQSoMXdSQ=="; + url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz"; + sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; }; }; "component-emitter-1.3.0" = { @@ -859,6 +859,15 @@ let sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; + "cross-spawn-7.0.1" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz"; + sha512 = "u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg=="; + }; + }; "crypt-0.0.2" = { name = "crypt"; packageName = "crypt"; @@ -1103,22 +1112,22 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "end-of-stream-1.4.1" = { + "end-of-stream-1.4.4" = { name = "end-of-stream"; packageName = "end-of-stream"; - version = "1.4.1"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; - sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "es-abstract-1.14.2" = { + "es-abstract-1.15.0" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.14.2"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz"; - sha512 = "DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.15.0.tgz"; + sha512 = "bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ=="; }; }; "es-to-primitive-1.2.0" = { @@ -1193,13 +1202,13 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-2.0.4" = { + "execa-2.1.0" = { name = "execa"; packageName = "execa"; - version = "2.0.4"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-2.0.4.tgz"; - sha512 = "VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ=="; + url = "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz"; + sha512 = "Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw=="; }; }; "expand-brackets-2.1.4" = { @@ -1310,13 +1319,13 @@ let sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; - "fast-glob-3.0.4" = { + "fast-glob-3.1.0" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.0.4.tgz"; - sha512 = "wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.0.tgz"; + sha512 = "TrUz3THiq2Vy3bjfQUB2wNyPdGBeGmdjbzzBLhfHN4YFurYptCKwGq/TfiRavbGywFRzY6U2CdmQ1zmsY5yYaw=="; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -1553,13 +1562,13 @@ let sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="; }; }; - "fs-minipass-1.2.6" = { + "fs-minipass-1.2.7" = { name = "fs-minipass"; packageName = "fs-minipass"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz"; - sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ=="; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; + sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; }; }; "fs.realpath-1.0.0" = { @@ -1589,13 +1598,13 @@ let sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw=="; }; }; - "fsevents-2.0.7" = { + "fsevents-2.1.0" = { name = "fsevents"; packageName = "fsevents"; - version = "2.0.7"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz"; - sha512 = "a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.0.tgz"; + sha512 = "+iXhW3LuDQsno8dOIrCIT/CBjeBWuP7PXe8w9shnj9Lebny/Gx1ZjVBYwexLz36Ri2jKuXMNpV6CYNh8lHHgrQ=="; }; }; "function-bind-1.1.1" = { @@ -1697,13 +1706,13 @@ let sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; - "glob-parent-5.0.0" = { + "glob-parent-5.1.0" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz"; - sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg=="; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz"; + sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw=="; }; }; "globby-10.0.1" = { @@ -2750,22 +2759,22 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "minipass-2.5.1" = { + "minipass-2.9.0" = { name = "minipass"; packageName = "minipass"; - version = "2.5.1"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.5.1.tgz"; - sha512 = "dmpSnLJtNQioZFI5HfQ55Ad0DzzsMAb+HfokwRTNXwEQjepbTkl5mtIlSVxGIkOkxlpX7wIn5ET/oAd9fZ/Y/Q=="; + url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; + sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; }; }; - "minizlib-1.2.2" = { + "minizlib-1.3.3" = { name = "minizlib"; packageName = "minizlib"; - version = "1.2.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz"; - sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ=="; + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; + sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; "mixin-deep-1.3.2" = { @@ -3515,13 +3524,13 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; - "readdirp-3.1.2" = { + "readdirp-3.1.3" = { name = "readdirp"; packageName = "readdirp"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.2.tgz"; - sha512 = "8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.3.tgz"; + sha512 = "ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q=="; }; }; "regenerator-runtime-0.9.6" = { @@ -3911,6 +3920,15 @@ let sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; }; }; + "shebang-command-2.0.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; + }; + }; "shebang-regex-1.0.0" = { name = "shebang-regex"; packageName = "shebang-regex"; @@ -3920,6 +3938,15 @@ let sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; }; }; + "shebang-regex-3.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; + }; + }; "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; @@ -4208,13 +4235,13 @@ let sha512 = "tPYCsLGWTDRlET7cen2iAwbmO+lSwfIdKoLkUPC41t/54UhqbzpwXL4RhODu5fQnmZdQZlEFKeD0W/BysU5WEg=="; }; }; - "tar-4.4.10" = { + "tar-4.4.13" = { name = "tar"; packageName = "tar"; - version = "4.4.10"; + version = "4.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz"; - sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; + sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; }; }; "temp-0.8.3" = { @@ -4676,6 +4703,15 @@ let sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; }; + "which-2.0.1" = { + name = "which"; + packageName = "which"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-2.0.1.tgz"; + sha512 = "N7GBZOTswtB9lkQBZA4+zAXrjEIWAUOB93AvzUiudRzRxhUdLURQ7D/gAIMY1gatT/LTbmbcv8SiYazy3eYB7w=="; + }; + }; "which-module-2.0.0" = { name = "which-module"; packageName = "which-module"; @@ -4793,13 +4829,13 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; - "yallist-3.0.3" = { + "yallist-3.1.1" = { name = "yallist"; packageName = "yallist"; - version = "3.0.3"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz"; - sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="; + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; }; }; "yargs-13.3.0" = { @@ -4870,7 +4906,7 @@ in sources."binary-0.3.0" sources."binary-extensions-1.13.1" sources."binwrap-0.2.2" - sources."bluebird-3.5.5" + sources."bluebird-3.7.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -4888,7 +4924,7 @@ in sources."fsevents-1.2.9" ]; }) - sources."chownr-1.1.2" + sources."chownr-1.1.3" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -4972,7 +5008,7 @@ in sources."form-data-2.3.3" sources."fragment-cache-0.2.1" sources."fs-extra-0.30.0" - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."fsevents-1.2.4" sources."get-value-2.0.6" @@ -5033,12 +5069,12 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.5.1" // { + (sources."minipass-2.9.0" // { dependencies = [ - sources."yallist-3.0.3" + sources."yallist-3.1.1" ]; }) - sources."minizlib-1.2.2" + sources."minizlib-1.3.3" sources."mixin-deep-1.3.2" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -5160,9 +5196,9 @@ in sources."stealthy-require-1.1.1" sources."string_decoder-1.1.1" sources."supports-color-4.2.0" - (sources."tar-4.4.10" // { + (sources."tar-4.4.13" // { dependencies = [ - sources."yallist-3.0.3" + sources."yallist-3.1.1" ]; }) (sources."temp-0.8.3" // { @@ -5227,10 +5263,10 @@ in elm-verify-examples = nodeEnv.buildNodePackage { name = "elm-verify-examples"; packageName = "elm-verify-examples"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-4.0.1.tgz"; - sha512 = "YlkOLWIDnlgkKG8gnxQkKKJHkkx4MqyIXqjmYqvGPwatrPmLo46BJ2drOPHNIh43T7mh7c1K8vxrzV4seQtFUA=="; + url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-4.0.2.tgz"; + sha512 = "zvQ1SvfXyMCb9TwiC74+QyFsl/4Hjpr1lb37QRKWrSCu+hOhbxM2MkJ6+KP1izGK36kzRr97y81Z1of0/EX3cg=="; }; dependencies = [ sources."ajv-6.10.2" @@ -5263,7 +5299,7 @@ in sources."binary-0.3.0" sources."binary-extensions-1.13.1" sources."binwrap-0.2.2" - sources."bluebird-3.5.5" + sources."bluebird-3.7.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -5282,7 +5318,7 @@ in sources."fsevents-1.2.9" ]; }) - sources."chownr-1.1.2" + sources."chownr-1.1.3" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -5382,7 +5418,7 @@ in sources."jsonfile-4.0.0" ]; }) - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."fsevents-1.2.4" sources."get-caller-file-2.0.5" @@ -5446,12 +5482,12 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.5.1" // { + (sources."minipass-2.9.0" // { dependencies = [ - sources."yallist-3.0.3" + sources."yallist-3.1.1" ]; }) - sources."minizlib-1.2.2" + sources."minizlib-1.3.3" sources."mixin-deep-1.3.2" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -5582,9 +5618,9 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" - (sources."tar-4.4.10" // { + (sources."tar-4.4.13" // { dependencies = [ - sources."yallist-3.0.3" + sources."yallist-3.1.1" ]; }) (sources."temp-0.8.3" // { @@ -5718,7 +5754,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-3.0.1" + sources."commander-3.0.2" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."content-disposition-0.5.3" @@ -5740,8 +5776,8 @@ in sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.1" - sources."es-abstract-1.14.2" + sources."end-of-stream-1.4.4" + sources."es-abstract-1.15.0" sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -6306,15 +6342,15 @@ in elm-live = nodeEnv.buildNodePackage { name = "elm-live"; packageName = "elm-live"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.0.tgz"; - sha512 = "Yf6afXvBnghRZkefxgXCf/KjCm3DlwT6lfTrjLSc5v0I0VXE2Rc5T9iqXihjg3alh9t8NwDVLL+/py8PkkdC9Q=="; + url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.1.tgz"; + sha512 = "IlonaC1pO/QoXlOrwwrJaxyvpJAT8QDSfzenkChbhU1PC1fJetkj2TwZfki+y1ZxpSMTnMSomMraOdWA6DO3VQ=="; }; dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."anymatch-3.1.0" + sources."anymatch-3.1.1" sources."async-limiter-1.0.1" sources."binary-extensions-2.0.0" sources."braces-3.0.2" @@ -6332,7 +6368,7 @@ in sources."ee-first-1.1.1" sources."elm-hot-1.1.1" sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.1" + sources."end-of-stream-1.4.4" sources."es6-promisify-6.0.2" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -6352,9 +6388,9 @@ in ]; }) sources."fresh-0.5.2" - sources."fsevents-2.0.7" + sources."fsevents-2.1.0" sources."get-stream-4.1.0" - sources."glob-parent-5.0.0" + sources."glob-parent-5.1.0" sources."has-ansi-2.0.0" sources."http-errors-1.7.3" sources."http-proxy-1.17.0" @@ -6389,7 +6425,7 @@ in sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."range-parser-1.2.1" - sources."readdirp-3.1.2" + sources."readdirp-3.1.3" sources."requires-port-1.0.0" sources."semver-5.7.1" (sources."send-0.17.1" // { @@ -6434,7 +6470,7 @@ in sha512 = "9AjXLkznJBVLHHO+KErcgFMKeXe3tcudjj3PYIH6gWXG6W3PT+HF+t2zCflvgFPlhJO5H/wQCCo4rfCApltBzg=="; }; dependencies = [ - sources."bluebird-3.5.5" + sources."bluebird-3.7.0" sources."core-util-is-1.0.2" sources."fs-extra-6.0.1" sources."graceful-fs-4.2.2" @@ -6474,13 +6510,13 @@ in sha512 = "gzN/ee5JfQmg/+2xFq49zRN62ZFeMTu5A0unwQpOf3qLZa8Rz7no6OIaCnl6nEkNsaoAjvZxv1aFJOd2TtNtFw=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.2" - sources."@nodelib/fs.stat-2.0.2" - sources."@nodelib/fs.walk-1.2.3" + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.7.5" + sources."@types/node-12.7.12" sources."accepts-1.3.7" sources."ajv-6.10.2" sources."array-flatten-1.1.1" @@ -6508,7 +6544,7 @@ in sources."cookie-signature-1.0.6" sources."core-js-2.6.9" sources."core-util-is-1.0.2" - sources."cross-spawn-6.0.5" + sources."cross-spawn-7.0.1" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" @@ -6524,10 +6560,10 @@ in ]; }) sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.1" + sources."end-of-stream-1.4.4" sources."escape-html-1.0.3" sources."etag-1.8.1" - (sources."execa-2.0.4" // { + (sources."execa-2.1.0" // { dependencies = [ sources."is-stream-2.0.0" ]; @@ -6542,7 +6578,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-diff-1.2.0" - sources."fast-glob-3.0.4" + sources."fast-glob-3.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fastq-1.6.0" sources."fill-range-7.0.1" @@ -6557,7 +6593,7 @@ in sources."get-stream-5.1.0" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."glob-parent-5.0.0" + sources."glob-parent-5.1.0" sources."globby-10.0.1" sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" @@ -6599,13 +6635,8 @@ in sources."minimist-1.2.0" sources."ms-2.0.0" sources."negotiator-0.6.2" - sources."nice-try-1.0.5" sources."node-watch-0.5.5" - (sources."npm-run-path-3.1.0" // { - dependencies = [ - sources."path-key-3.1.0" - ]; - }) + sources."npm-run-path-3.1.0" sources."oauth-sign-0.9.0" sources."on-finished-2.3.0" sources."once-1.4.0" @@ -6617,7 +6648,7 @@ in sources."p-finally-2.0.1" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" + sources."path-key-3.1.0" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."performance-now-2.1.0" @@ -6649,12 +6680,11 @@ in sources."rxjs-6.5.3" sources."safe-buffer-5.1.1" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" sources."send-0.16.2" sources."serve-static-1.13.2" sources."setprototypeof-1.1.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.2" sources."slash-3.0.0" sources."sshpk-1.16.1" @@ -6694,7 +6724,7 @@ in sources."vscode-languageserver-types-3.14.0" sources."vscode-uri-2.0.3" sources."web-tree-sitter-0.15.9" - sources."which-1.3.1" + sources."which-2.0.1" sources."wrappy-1.0.2" sources."ws-7.1.2" sources."xtend-4.0.2" From 9eb00acbbee63d20a6ac7c124005089a8bebcfba Mon Sep 17 00:00:00 2001 From: wucke13 Date: Tue, 1 Oct 2019 00:28:23 +0200 Subject: [PATCH 074/139] utsushi: 3.57.0 -> 3.59.2 + building from gitlab source + reorderd dependencies to be in logical/alphabetical order + replaced patches with substituteInPlace, as patches broke the installChecks and substituteInPlace may be more robust than making new patches for each release. Also the compiled source is now closer to upstream than before. + added installChecks + added all supported devices as listed on epson.net --- pkgs/misc/drivers/utsushi/default.nix | 205 ++++++++---------- .../patches/absolute-path-to-convert.patch | 166 -------------- .../patches/absolute_path_for_tesseract.patch | 56 ----- .../utsushi/patches/print-errors.patch | 15 -- pkgs/misc/drivers/utsushi/patches/series | 3 - 5 files changed, 96 insertions(+), 349 deletions(-) delete mode 100644 pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch delete mode 100644 pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch delete mode 100644 pkgs/misc/drivers/utsushi/patches/print-errors.patch delete mode 100644 pkgs/misc/drivers/utsushi/patches/series diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index 5972773d1ad..8a8556b63df 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -1,64 +1,62 @@ -{ stdenv, fetchurl, autoreconfHook, boost, gtkmm2 -, pkg-config, libtool, udev, libjpeg, file, texlive -, libusb, libtiff, imagemagick, sane-backends, tesseract }: - -/* -Alternatively, this package could use the "community source" at -https://gitlab.com/utsushi/utsushi/ -Epson provides proprietary plugins for networking, ocr and some more -scanner models. Those are not (yet ?) packaged here. -*/ +{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, boost, gtkmm2 +, imagemagick, sane-backends, tesseract4, udev, libusb}: stdenv.mkDerivation rec { pname = "utsushi"; - version = "3.57.0"; + version = "3.59.2"; - src = fetchurl { - url = "http://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${version}.orig.tar.gz"; - sha256 = "0qy6n6nbisbvy0q3idj7hpmj9i85cd0a18klfd8nsqsa2nkg57ny"; + src = fetchFromGitLab{ + owner = pname; + repo = "imagescan"; + rev = version; + sha256 = "06gp97dfnf43l6kb988scmm66q9n5rc7ndwv3rykrdpyhy8rbi05"; }; nativeBuildInputs = [ - pkg-config autoreconfHook - libtool + pkg-config ]; buildInputs = [ - boost - libusb - libtiff - libjpeg - udev + boost.dev + gtkmm2.dev imagemagick sane-backends - gtkmm2 - file - tesseract + udev.dev + libusb.dev ]; - patches = [ - ./patches/absolute-path-to-convert.patch - ./patches/print-errors.patch - ./patches/absolute_path_for_tesseract.patch + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + "-Wno-error=parentheses" + "-Wno-error=unused-variable" ]; postPatch = '' # remove vendored dependencies rm -r upstream/boost + # create fake udev and sane config mkdir -p $out/etc/{sane.d,udev/rules.d} touch $out/etc/sane.d/dll.conf + + # absolute paths to conver & tesseract + substituteInPlace filters/magick.cpp \ + --replace '"convert' '"${imagemagick}/bin/convert' + substituteInPlace filters/reorient.cpp \ + --replace '"tesseract' '"${tesseract4}/bin/tesseract' + substituteInPlace filters/get-text-orientation \ + --replace '=tesseract' '=${tesseract4}/bin/tesseract' ''; configureFlags = [ "--with-boost-libdir=${boost}/lib" "--with-sane-confdir=${placeholder "out"}/etc/sane.d" "--with-udev-confdir=${placeholder "out"}/etc/udev" - "--with-sane" "--with-gtkmm" "--with-jpeg" "--with-magick" + "--with-magick-pp" "--with-sane" "--with-tiff" ]; @@ -67,89 +65,78 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + doInstallCheck = true; + + meta = with stdenv.lib; { description = "SANE utsushi backend for some Epson scanners"; longDescription = '' - ImageScanV3 (aka utsushi) scanner driver. - Non-free plugins are not included so no network support. - To use the SANE backend, in /etc/nixos/configuration.nix: + ImageScanV3 (aka utsushi) scanner driver. Non-free plugins are not + included, so no network support. To use the SANE backend, in + /etc/nixos/configuration.nix: - hardware.sane = { - enable = true; - extraBackends = [ pkgs.utsushi ]; - }; - services.udev.packages = [ pkgs.utsushi ]; + + hardware.sane = { + enable = true; + extraBackends = [ pkgs.utsushi ]; + }; + services.udev.packages = [ pkgs.utsushi ]; + - Supported hardware: - - DS-40 - - DS-70 - - DS-80W - - DS-410 - - DS-510 - - DS-520 - - DS-530 - - DS-535 - - DS-535H - - DS-560 - - DS-575W - - DS-760 - - DS-775 - - DS-780N - - DS-860 - - DS-1630 - - DS-5500 - - DS-6500 - - DS-7500 - - DS-50000 - - DS-60000 - - DS-70000 - - EP-10VA Series - - EP-808A Series - - EP-978A3 Series - - ES-50 - - ES-55R - - ES-60W - - ES-65WR - - ES-300WR - - ES-400 - - ES-500WR - - ES-8500 - - ET-2500 Series - - ET-2550 Series - - ET-4500 Series - - ET-4550 Series - - Expression 1640XL - - FF-680W - - L220/L360 Series - - L365/L366 Series - - L380 Series - - L455 Series - - L565/L566 Series - - L655 Series - - PX-M840FX - - PX-M860F - - PX-M884F - - PX-M7050 Series - - PX-M7050FX Series - - WF-4720 - - WF-6530 Series - - WF-6590 Series - - WF-8510/8590 Series - - WF-R8590 Series - - XP-220 Series - - XP-230 Series - - XP-235 Series - - XP-332 335 Series - - XP-430 Series - - XP-432 435 Series - - XP-530 Series - - XP-540 - - XP-630 Series - - XP-640 - - XP-830 Series - - XP-960 Series - ''; - license = stdenv.lib.licenses.gpl3Plus; - broken = true; + Supported hardware: + DS-1610, DS-1630, DS-1660W, DS-310, DS-320, DS-360W, DS-40, DS-410, + DS-50000, DS-510, DS-520, DS-530, DS-535, DS-535H, DS-5500, DS-560, + DS-570W, DS-575W, DS-60000, DS-6500, DS-70, DS-70000, DS-7500, DS-760, + DS-770, DS-775, DS-780N, DS-80W, DS-860, EC-4020 Series, EC-4030 Series, + EC-4040 Series, EP-10VA Series, EP-30VA Series, EP-708A Series, EP-709A + Series, EP-710A Series, EP-711A Series, EP-712A Series, EP-808A Series, + EP-810A Series, EP-811A Series, EP-812A Series, EP-879A Series, EP-880A + Series, EP-881A Series, EP-882A Series, EP-978A3 Series, EP-979A3 Series, + EP-982A3 Series, EP-M570T Series, ES-200, ES-300W, ES-300WR, ES-400, + ES-50, ES-50, ES-500W, ES-500WR, ES-55R, ES-60W, ES-60WB, ES-60WW, + ES-65WR, ET-16500 Series, ET-2500 Series, ET-2550 Series, ET-2600 Series, + ET-2610 Series, ET-2650 Series, ET-2700 Series, ET-2710 Series, ET-2720 + Series, ET-2750 Series, ET-2760 Series, ET-3600 Series, ET-3700 Series, + ET-3710 Series, ET-3750 Series, ET-3760 Series, ET-4500 Series, ET-4550 + Series, ET-4700 Series, ET-4750 Series, ET-4760 Series, ET-7700 Series, + ET-7750 Series, ET-8700 Series, ET-M2140 Series, ET-M2170 Series, + ET-M3140 Series, ET-M3170 Series, ET-M3180 Series, EW-052A Series, + EW-452A Series, EW-M5071FT Series, EW-M571T Series, EW-M630T Series, + EW-M660FT Series, EW-M670FT Series, EW-M770T Series, EW-M970A3T Series, + FF-640, FF-680W, GT-S650, L1455 Series, L220 Series, L222 Series, L3050 + Series, L3060 Series, L3070 Series, L3100 Series, L3110 Series, L3150 + Series, L3160 Series, L360 Series, L362 Series, L364 Series, L365 Series, + L366 Series, L375 Series, L380 Series, L382 Series, L385 Series, L386 + Series, L395 Series, L396 Series, L405 Series, L4150 Series, L4160 + Series, L455 Series, L475 Series, L485 Series, L486 Series, L495 Series, + L5190 Series, L565 Series, L566 Series, L575 Series, L605 Series, L6160 + Series, L6170 Series, L6190 Series, L655 Series, L7160 Series, L7180 + Series, LX-10000F, LX-10000FK, LX-10010MF, LX-7000F, M2140 Series, M2170 + Series, M3140 Series, M3170 Series, M3180 Series, PX-048A Series, PX-049A + Series, PX-M160T Series, PX-M270FT Series, PX-M270T Series, PX-M380F, + PX-M381FL, PX-M5080F Series, PX-M5081F Series, PX-M680F Series, PX-M7050 + Series, PX-M7050FP, PX-M7050FX, PX-M7070FX, PX-M7110F, PX-M7110FP, + PX-M780F Series, PX-M781F Series, PX-M840FX, PX-M860F, PX-M880FX, + PX-M884F, PX-M885F, PX-M886FL, Perfection V19, Perfection V39, ST-2000 + Series, ST-3000 Series, ST-4000 Series, ST-M3000 Series, WF-2750 Series, + WF-2760 Series, WF-2810 Series, WF-2830 Series, WF-2850 Series, WF-2860 + Series, WF-3720 Series, WF-3730 Series, WF-4720 Series, WF-4730 Series, + WF-4740 Series, WF-6530 Series, WF-6590 Series, WF-7710 Series, WF-7720 + Series, WF-8510 Series, WF-8590 Series, WF-C17590 Series, WF-C20590 + Series, WF-C5710 Series, WF-C5790 Series, WF-C5790BA, WF-C579R Series, + WF-C579RB, WF-C8610 Series, WF-C8690 Series, WF-C8690B, WF-C869R Series, + WF-M20590 Series, WF-M5799 Series, WF-R8590 Series, XP-2100 Series, + XP-220 Series, XP-230 Series, XP-235 Series, XP-240 Series, XP-243 245 + 247 Series, XP-255 257 Series, XP-3100 Series, XP-332 335 Series, XP-340 + Series, XP-342 343 345 Series, XP-352 355 Series, XP-4100 Series, XP-430 + Series, XP-432 435 Series, XP-440 Series, XP-442 445 Series, XP-452 455 + Series, XP-5100 Series, XP-530 Series, XP-540 Series, XP-6000 Series, + XP-6100 Series, XP-630 Series, XP-640 Series, XP-7100 Series, XP-830 + Series, XP-8500 Series, XP-8600 Series, XP-900 Series, XP-960 Series, + XP-970 Series + ''; + homepage = "https://gitlab.com/utsushi/imagescan"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch b/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch deleted file mode 100644 index 2bc9422b061..00000000000 --- a/pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch +++ /dev/null @@ -1,166 +0,0 @@ -Index: utsushi-0.57.0/configure.ac -=================================================================== ---- utsushi-0.57.0.orig/configure.ac -+++ utsushi-0.57.0/configure.ac -@@ -221,6 +221,9 @@ AS_IF([test xno != x$enable_code_coverag - [AC_MSG_ERROR([code coverage support requires a GNU C/C++ compiler])]) - ]) - AM_PROG_AR -+AC_PATH_PROG([AWK],[awk]) -+AC_DEFINE_UNQUOTED([AWK], ["$AWK"], -+ [Path to awk.]) - - PKG_PROG_PKG_CONFIG - -@@ -379,27 +382,31 @@ AM_CONDITIONAL([have_libmagick_pp], [tes - AS_IF([test xno != "x$with_magick"], - AS_CASE("x$with_magick", - [xGraphicsMagick], -- [AC_CHECK_PROGS([MAGICK_CONVERT], [gm]) -- AS_IF([test xgm != x$MAGICK_CONVERT], -+ [[AC_PATH_PROG(MAGICK_CONVERT, gm)] -+ AS_IF([test x == x$MAGICK_CONVERT], - [AC_MSG_ERROR([$with_magick requested but not found])]) - AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1]) -- MAGICK_CONVERT="gm convert" -+ HAVE_MAGICK=1 -+ MAGICK_CONVERT="$MAGICK_CONVERT convert" - ], - [xImageMagick], -- [AC_CHECK_PROGS([MAGICK_CONVERT], [convert]) -- AS_IF([test xconvert != x$MAGICK_CONVERT], -+ [[AC_PATH_PROG(MAGICK_CONVERT, convert)] -+ AS_IF([test x == x$MAGICK_CONVERT], - [AC_MSG_ERROR([$with_magick requested but not found])]) - AC_DEFINE([HAVE_IMAGE_MAGICK], [1]) -+ HAVE_MAGICK=1 - ], - [xyes|xcheck], -- [AC_CHECK_PROGS([MAGICK_CONVERT], [gm convert]) -+ [[AC_PATH_PROGS([MAGICK_CONVERT], [gm convert])] - AS_CASE(x$MAGICK_CONVERT, -- [xgm], -+ [x*gm], - [AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1]) -- MAGICK_CONVERT="gm convert" -+ HAVE_MAGICK=1 -+ MAGICK_CONVERT="$MAGICK_CONVERT convert" - ], -- [xconvert], -+ [x*convert], - [AC_DEFINE([HAVE_IMAGE_MAGICK], [1]) -+ HAVE_MAGICK=1 - ], - [dnl default case - AS_IF([test xcheck != "x$with_magick"], -@@ -410,7 +417,7 @@ AS_IF([test xno != "x$with_magick"], - AC_MSG_ERROR([unknown value: --with-magick=$with_magick]) - ])) - AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"]) --AM_CONDITIONAL([have_magick], [test x != "x$MAGICK_CONVERT"]) -+AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"]) - - AS_IF([test xno != "x$with_gtkmm"], - [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20], -Index: utsushi-0.57.0/filters/magick.cpp -=================================================================== ---- utsushi-0.57.0.orig/filters/magick.cpp -+++ utsushi-0.57.0/filters/magick.cpp -@@ -81,19 +81,18 @@ chomp (char *str) - } - - bool --magick_version_before_(const char *magick, const char *cutoff) -+magick_version_before_(const char *cutoff) - { - FILE *fp = NULL; - int errc = 0; - -- if (0 == strcmp ("GraphicsMagick", magick)) -- fp = popen ("gm convert -version" -- "| awk '/^GraphicsMagick/{print $2}'", "r"); -- if (fp) errc = errno; -- -- if (0 == strcmp ("ImageMagick", magick)) -- fp = popen ("convert -version" -- "| awk '/^Version:/{print $3}'", "r"); -+#if HAVE_GRAPHICS_MAGICK -+ fp = popen (MAGICK_CONVERT " -version" -+ "| " AWK " '/^GraphicsMagick/{print $2}'", "r"); -+#elif HAVE_IMAGE_MAGICK -+ fp = popen (MAGICK_CONVERT " -version" -+ "| " AWK " '/^Version:/{print $3}'", "r"); -+#endif - if (fp) errc = errno; - - if (fp) -@@ -106,42 +105,32 @@ magick_version_before_(const char *magic - - if (version) - { -- log::debug ("found %1%-%2%") % magick % version; -+ log::debug ("found " MAGICK_CONVERT "version %1%") % version; - return (0 > strverscmp (version, cutoff)); - } - } - - if (errc) -- log::alert ("failure checking %1% version: %2%") -- % magick -+ log::alert ("failure checking " MAGICK_CONVERT " version: %1%") - % strerror (errc); - - return false; - } - - bool --graphics_magick_version_before_(const char *cutoff) --{ -- return magick_version_before_("GraphicsMagick", cutoff); --} -- --bool --image_magick_version_before_(const char *cutoff) --{ -- return magick_version_before_("ImageMagick", cutoff); --} -- --bool - auto_orient_is_usable () - { - static int usable = -1; - - if (-1 == usable) - { -- if (HAVE_GRAPHICS_MAGICK) // version -auto-orient was added -- usable = !graphics_magick_version_before_("1.3.18"); -- if (HAVE_IMAGE_MAGICK) // version known to work -- usable = !image_magick_version_before_("6.7.8-9"); -+#if HAVE_GRAPHICS_MAGICK -+ // version -auto-orient was added -+ usable = !magick_version_before_("1.3.18"); -+#elif HAVE_IMAGE_MAGICK -+ // version known to work -+ usable = !magick_version_before_("6.7.8-9"); -+#endif - if (-1 == usable) - usable = false; - usable = (usable ? 1 : 0); -@@ -392,7 +381,7 @@ magick::arguments (const context& ctx) - if (color_correction_) - { - if (HAVE_IMAGE_MAGICK -- && !image_magick_version_before_("6.6.1-0")) -+ && !magick_version_before_("6.6.1-0")) - argv += " -color-matrix"; - else - argv += " -recolor"; -@@ -416,7 +405,7 @@ magick::arguments (const context& ctx) - size_t mat_size = ((HAVE_IMAGE_MAGICK) ? 6 : 5); - - if (HAVE_IMAGE_MAGICK -- && !image_magick_version_before_("6.6.1-0")) -+ && !magick_version_before_("6.6.1-0")) - argv += " -color-matrix"; - else - argv += " -recolor"; diff --git a/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch b/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch deleted file mode 100644 index d4d44497921..00000000000 --- a/pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: utsushi-0.57.0/filters/reorient.cpp -=================================================================== ---- utsushi-0.57.0.orig/filters/reorient.cpp -+++ utsushi-0.57.0/filters/reorient.cpp -@@ -96,8 +96,8 @@ chomp (char *str) - bool - tesseract_version_before_(const char *cutoff) - { -- FILE *fp = popen ("tesseract --version 2>&1" -- "| awk '/^tesseract/{ print $2 }'", "r"); -+ FILE *fp = popen (TESSERACT " --version 2>&1" -+ "| " AWK " '/^tesseract/{ print $2 }'", "r"); - int errc = errno; - - if (fp) -@@ -126,7 +126,7 @@ tesseract_version_before_(const char *cu - bool - have_tesseract_language_pack_(const char *lang) - { -- std::string cmd("tesseract --list-langs 2>&1" -+ std::string cmd(TESSERACT " --list-langs 2>&1" - "| sed -n '/^"); - cmd += lang; - cmd += "$/p'"; -@@ -291,7 +291,7 @@ reorient::reorient () - - if (found) - { -- if (have_tesseract_()) engine_ = "tesseract"; -+ if (have_tesseract_()) engine_ = TESSERACT; - if (have_ocr_engine_()) engine_ = abs_path_name; - } - freeze_options (); // initializes option tracking member variables -Index: utsushi-0.57.0/configure.ac -=================================================================== ---- utsushi-0.57.0.orig/configure.ac -+++ utsushi-0.57.0/configure.ac -@@ -196,6 +196,8 @@ AC_DEFINE([HAVE_IMAGE_MAGICK_PP], - [0], [Define to 1 if ImageMagick's C++ API is usable]) - AC_DEFINE([MAGICK_CONVERT], - [], [Define to an appropriate command-line invocation for convert]) -+AC_DEFINE([TESSERACT], -+ [], [Define to an appropriate command-line invocation for tesseract]) - AC_DEFINE([WITH_INCLUDED_BOOST], - [0], [Define to 1 if using the included Boost sources]) - -@@ -419,6 +421,9 @@ AS_IF([test xno != "x$with_magick"], - AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"]) - AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"]) - -+AC_PATH_PROG([TESSERACT], [tesseract], [tesseract]) -+AC_DEFINE_UNQUOTED([TESSERACT], ["$TESSERACT"]) -+ - AS_IF([test xno != "x$with_gtkmm"], - [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20], - [AC_DEFINE([HAVE_LIBGTKMM], [1])], diff --git a/pkgs/misc/drivers/utsushi/patches/print-errors.patch b/pkgs/misc/drivers/utsushi/patches/print-errors.patch deleted file mode 100644 index 06660ebde98..00000000000 --- a/pkgs/misc/drivers/utsushi/patches/print-errors.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: utsushi-0.57.0/lib/log.cpp -=================================================================== ---- utsushi-0.57.0.orig/lib/log.cpp -+++ utsushi-0.57.0/lib/log.cpp -@@ -26,8 +26,8 @@ - - namespace utsushi { - --log::priority log::threshold = log::FATAL; --log::category log::matching = log::NOTHING; -+log::priority log::threshold = log::ERROR; -+log::category log::matching = log::ALL; - - template<> - std::basic_ostream< char >& diff --git a/pkgs/misc/drivers/utsushi/patches/series b/pkgs/misc/drivers/utsushi/patches/series deleted file mode 100644 index de0964c758b..00000000000 --- a/pkgs/misc/drivers/utsushi/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -absolute-path-to-convert.patch -print-errors.patch -absolute_path_for_tesseract.patch From 32113451b7ae79307da0dd6b0103ca9dedb3b008 Mon Sep 17 00:00:00 2001 From: John Mercier Date: Tue, 1 Oct 2019 06:35:42 -0400 Subject: [PATCH 075/139] spring-boot: init at 2.1.9 --- .../development/tools/spring-boot/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/tools/spring-boot/default.nix diff --git a/pkgs/development/tools/spring-boot/default.nix b/pkgs/development/tools/spring-boot/default.nix new file mode 100644 index 00000000000..9e0e2b5dee4 --- /dev/null +++ b/pkgs/development/tools/spring-boot/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles }: + +stdenv.mkDerivation rec { + pname = "spring-boot"; + version = "2.1.9"; + + src = fetchzip { + url = "https://repo.spring.io/release/org/springframework/boot/${pname}-cli/${version}.RELEASE/${pname}-cli-${version}.RELEASE-bin.zip"; + sha256 = "03iphh5l9w9sizksidkv217qnqx3nh1zpw6kdjnn40j3mlabfb7j"; + }; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + installPhase = '' + runHook preInstall + rm bin/spring.bat + installShellCompletion --bash shell-completion/bash/spring + installShellCompletion --zsh shell-completion/zsh/_spring + rm -r shell-completion + cp -r . $out + wrapProgram $out/bin/spring \ + --prefix JAVA_HOME : ${jdk} + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = '' + CLI which makes it easy to create spring-based applications + ''; + longDescription = '' + Spring Boot makes it easy to create stand-alone, production-grade + Spring-based Applications that you can run. We take an opinionated view + of the Spring platform and third-party libraries, so that you can get + started with minimum fuss. Most Spring Boot applications need very + little Spring configuration. + + You can use Spring Boot to create Java applications that can be started + by using java -jar or more traditional war deployments. We also provide + a command line tool that runs “spring scripts”. + ''; + homepage = https://spring.io/projects/spring-boot; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ moaxcp ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7308fff8ac..36998c5fd54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15255,6 +15255,8 @@ in spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; + spring-boot = callPackage ../development/tools/spring-boot { }; + squid = callPackage ../servers/squid { }; sslh = callPackage ../servers/sslh { }; From 0811095d845a6689389b0b4e3d7b7f558c3a8884 Mon Sep 17 00:00:00 2001 From: John Mercier Date: Fri, 11 Oct 2019 20:13:45 -0400 Subject: [PATCH 076/139] visualvm update homepage --- pkgs/development/tools/java/visualvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 3d0ff33d5b5..4dd6c1efc90 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { capability of monitoring and performance analysis for the Java SE platform. ''; - homepage = https://visualvm.java.net/; + homepage = "https://visualvm.github.io"; license = licenses.gpl2ClasspathPlus; platforms = platforms.all; maintainers = with maintainers; [ michalrus moaxcp ]; From 361b5f7f6533c2b597057805b16bdf229d675d15 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 11 Oct 2019 20:02:25 -0400 Subject: [PATCH 077/139] nixos/pulseaudio: don't autospawn ever This is long been superseded by socket activation. Additonally using autospawn nudges some unpleasant GDM related issues. --- nixos/modules/config/pulseaudio.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 5c3e3930258..b3bc4a451aa 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -51,8 +51,7 @@ let # that we can disable the autospawn feature in programs that # are built with PulseAudio support (like KDE). clientConf = writeText "client.conf" '' - autospawn=${if nonSystemWide then "yes" else "no"} - ${optionalString nonSystemWide "daemon-binary=${binary}"} + autospawn=no ${cfg.extraClientConf} ''; From 1658beb6a13cbcc8ff40245fad4a3936fb9b0fbd Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Thu, 10 Oct 2019 18:59:37 +0800 Subject: [PATCH 078/139] cargo-bloat: 0.8.3 -> 0.9.0 --- pkgs/development/tools/rust/cargo-bloat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index b5c6f19ddc3..0c1af58221b 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "088px2kdcfjdb8zfmk7g409h7ij9dngywz336hj2ny82lrdjzazc"; + sha256 = "03pzp5d9kzbx62jpjzgww0x3qv9f08blvl8f4yg5hrlyaaa06xsd"; }; - cargoSha256 = "11q8j8y7m59gc8047qhz6pp2825qjcpg9xwgj09l8a5aijf25avb"; + cargoSha256 = "1jc1lx0yk8galkyc4a67d39ywsfrgc2sjjsz08p47gpz7228d64w"; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; From 632f69857d0a0bdaad7b1b77c85ce9050289f428 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 5 Oct 2019 07:36:46 +0000 Subject: [PATCH 079/139] ocamlPackages.ocaml-monadic: init at 0.4.1 --- .../ocaml-modules/ocaml-monadic/default.nix | 25 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ocaml-monadic/default.nix diff --git a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix new file mode 100644 index 00000000000..0420e95b12b --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildDunePackage +, ocaml-migrate-parsetree, ppx_tools_versioned +}: + +buildDunePackage rec { + pname = "ocaml-monadic"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "zepalmer"; + repo = pname; + rev = version; + sha256 = "1zcwydypk5vwfn1g7srnl5076scwwq5a5y8xwcjl70pc4cpzszll"; + }; + + buildInputs = [ ppx_tools_versioned ]; + propagatedBuildInputs = [ ocaml-migrate-parsetree ]; + + meta = { + inherit (src.meta) homepage; + description = "A PPX extension to provide an OCaml-friendly monadic syntax"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 95c16e55a8d..81db86cbb1e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -519,6 +519,8 @@ let ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; + ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { }; + ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { }; From d0ec32c4fd12ac8f91cf6c196cf5a2b46f0d376e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 12 Oct 2019 08:31:19 +0200 Subject: [PATCH 080/139] Partially revert "busybox: fix musl builds" Original commit 5ba8c04ae5 destroyed the meaning of the *overridable* flag, and incidentally we were relying on it in channel-critical stuff: https://hydra.nixos.org/build/102298542 --- pkgs/os-specific/linux/busybox/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 087209a9d29..40b44514f1b 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,6 +1,8 @@ { stdenv, lib, buildPackages, fetchurl , enableStatic ? false , enableMinimal ? false +# Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping: +# nix build -f pkgs/top-level/release.nix stdenvBootstrapTools.x86_64-linux.dist , useMusl ? stdenv.hostPlatform.libc == "musl", musl , extraConfig ? "" }: @@ -88,6 +90,10 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + postConfigure = lib.optionalString (useMusl && stdenv.hostPlatform.libc != "musl") '' + makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib") + ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ]; From a9435c8db818b69ad2607e12bb774536d8ca0298 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 6 Oct 2019 07:37:47 +0000 Subject: [PATCH 081/139] =?UTF-8?q?ocamlPackages.labltk:=20init=20at=208.0?= =?UTF-8?q?6.7=20for=20OCaml=20=E2=89=A5=204.08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/labltk/default.nix | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index d92cf543f80..0677202fab9 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -1,26 +1,43 @@ -{ stdenv, fetchurl, ocaml, findlib, tcl, tk }: +{ stdenv, fetchurl, fetchzip, ocaml, findlib, tcl, tk }: -if !stdenv.lib.versionAtLeast ocaml.version "4.04" +let OCamlVersionAtLeast = stdenv.lib.versionAtLeast ocaml.version; in + +if !OCamlVersionAtLeast "4.04" then throw "labltk is not available for OCaml ${ocaml.version}" else -let param = { - "4.04" = { +let param = +if OCamlVersionAtLeast "4.08" then rec { + version = "8.06.7"; + src = fetchzip { + url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz"; + sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h"; + }; +} else + let mkOldParam = { version, key, sha256 }: { + src = fetchurl { + url = "https://forge.ocamlcore.org/frs/download.php/${key}/labltk-${version}.tar.gz"; + inherit sha256; + }; + inherit version; + }; in + { + "4.04" = mkOldParam { version = "8.06.2"; key = "1628"; sha256 = "1p97j9s33axkb4yyl0byhmhlyczqarb886ajpyggizy2br3a0bmk"; }; - "4.05" = { + "4.05" = mkOldParam { version = "8.06.3"; key = "1701"; sha256 = "1rka9jpg3kxqn7dmgfsa7pmsdwm16x7cn4sh15ijyyrad9phgdxn"; }; - "4.06" = { + "4.06" = mkOldParam { version = "8.06.4"; key = "1727"; sha256 = "0j3rz0zz4r993wa3ssnk5s416b1jhj58l6z2jk8238a86y7xqcii"; }; - "4.07" = { + "4.07" = mkOldParam { version = "8.06.5"; key = "1764"; sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj"; @@ -29,14 +46,9 @@ let param = { in stdenv.mkDerivation rec { - inherit (param) version; + inherit (param) version src; name = "ocaml${ocaml.version}-labltk-${version}"; - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/${param.key}/labltk-${param.version}.tar.gz"; - inherit (param) sha256; - }; - buildInputs = [ ocaml findlib tcl tk ]; configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; From 8ae02b57c6c78c77ee9dfb6d0ddedc90093b947a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 12 Oct 2019 09:45:54 +0200 Subject: [PATCH 082/139] scylladb: don't build on Hydra; /cc PR #70576 --- pkgs/servers/scylladb/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index 2304a72882b..a2671e17cb7 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -96,6 +96,7 @@ gcc8Stdenv.mkDerivation { homepage = "https://scylladb.com"; license = licenses.agpl3; platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; # It's huge ATM, about 18 GB. maintainers = [ stdenv.lib.maintainers.farlion ]; }; } From e9cd8a2d60f0fb1a55b997a3f10aefdd1f1b1e52 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sat, 12 Oct 2019 11:13:35 +0200 Subject: [PATCH 083/139] pivx: 3.2.0 -> 3.4.0 * pivx: 3.2.0 -> 3.2.2 * altcoins.pivx: 3.2.2 -> 3.3.0 Furthermore, this fixes 2542928 * pivx: 3.3.0 -> 3.4.0 Added `test_pivx` as test ran by nixpkgs * Update pkgs/applications/blockchains/pivx.nix Thanks to @lassulus for fixing this typo! Co-Authored-By: Lassulus --- pkgs/applications/blockchains/pivx.nix | 27 ++++++++++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index c0833de7dbf..22fdc7f51c5 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -1,5 +1,5 @@ -{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook -, openssl, db48, boost, zlib, miniupnpc, gmp +{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null +, openssl_1_0_2, db48, boost, zlib, miniupnpc, gmp , qrencode, glib, protobuf, yasm, libevent , utillinux, qtbase ? null, qttools ? null , enableUpnp ? false @@ -9,18 +9,18 @@ with stdenv.lib; stdenv.mkDerivation rec { - pname = "pivx"; - version = "3.2.0"; + name = "pivx-${version}"; + version = "3.4.0"; src = fetchFromGitHub { owner = "PIVX-Project"; repo= "PIVX"; rev = "v${version}"; - sha256 = "1sym6254vhq8qqpxq9qhy10m5167v7x93kqaj1gixc1vwwbxyazy"; + sha256 = "1fqccdqhbwyvix0ihhbgg2w048i6bhfmazr36h2cn4j65n1fgmi2"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf utillinux ] + nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; + buildInputs = [ glib gmp openssl_1_0_2 db48 yasm boost zlib libevent miniupnpc protobuf utillinux ] ++ optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { ++ optional disableWallet "--disable-wallet" ++ optional disableDaemon "--disable-daemon" ++ optionals withGui [ "--with-gui=yes" + "--with-unsupported-ssl" # TODO remove this ASAP "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -39,6 +40,11 @@ stdenv.mkDerivation rec { cp share/pixmaps/*128.png $out/share/icons/ ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/test_pivx + ''; + meta = with stdenv.lib; { description = "An open source crypto-currency focused on fast private transactions"; longDescription = '' @@ -50,12 +56,9 @@ stdenv.mkDerivation rec { homepage = https://www.dash.org; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.unix; - + # TODO # upstream doesn't support newer openssl versions # https://github.com/PIVX-Project/PIVX/issues/748 - # "Your system is most probably using openssl 1.1 which is not the - # officialy supported version. Either use 1.0.1 or run again configure - # with the given option." - broken = true; + # openssl_1_0_2 should be replaced with openssl ASAP }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f805f58c6dc..cd923f79457 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21980,7 +21980,7 @@ in namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; - pivx = libsForQt59.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; + pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; ethabi = callPackage ../applications/blockchains/ethabi.nix { }; From 7cd3396ab75323321a5a2c9214af39dba14c5cfa Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 12 Oct 2019 04:20:00 -0500 Subject: [PATCH 084/139] netdata: 1.17.1 -> 1.18.0 Changelog: https://github.com/netdata/netdata/releases/tag/v1.18.0 --- pkgs/tools/system/netdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 7526a55d7ef..b04bc905ec0 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -12,12 +12,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.17.1"; + version = "1.18.0"; pname = "netdata"; src = fetchurl { url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz"; - sha256 = "0k49ms295b9icccvknyqyqlsy911h06c7h7aql5havcx5m5jxq7w"; + sha256 = "1ay22x3ydmfh7649scampr0xvgzb32rvbs6fk57xx64sav8vx607"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From fbb14b289f7b0caf2efede1259dfc22fe2ff1311 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 12 Oct 2019 11:43:52 +0200 Subject: [PATCH 085/139] python: misaka: update homepage url it redirected --- pkgs/development/python-modules/misaka/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/misaka/default.nix b/pkgs/development/python-modules/misaka/default.nix index 85511d3ad25..07f251f75b5 100644 --- a/pkgs/development/python-modules/misaka/default.nix +++ b/pkgs/development/python-modules/misaka/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "A CFFI binding for Hoedown, a markdown parsing library"; - homepage = "http://misaka.61924.nl/"; + homepage = "https://misaka.61924.nl"; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; }; From 348fac7b529e17f20340ded5ac77ad473e568735 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Wed, 25 Sep 2019 16:56:45 +0200 Subject: [PATCH 086/139] solo-python: init at 0.0.15 Support for solokeys U2F tokens --- .../python-modules/solo-python/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/solo-python/default.nix diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix new file mode 100644 index 00000000000..7b2b578eed8 --- /dev/null +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, click, ecdsa, fido2, intelhex, pyserial, pyusb, requests}: + + buildPythonPackage rec { + pname = "solo-python"; + version = "0.0.15"; + format = "flit"; + + src = fetchFromGitHub { + owner = "solokeys"; + repo = pname; + rev = version; + sha256 = "14na9s65hxzx141bdv0j7rx1wi3cv85jzpdivsq1rwp6hdhiazr1"; + }; + + # TODO: remove ASAP + patchPhase = '' + substituteInPlace pyproject.toml --replace "fido2 == 0.7.0" "fido2 >= 0.7.0" + ''; + + propagatedBuildInputs = [ + click + ecdsa + fido2 + intelhex + pyserial + pyusb + requests + ]; + + meta = with lib; { + description = "Python tool and library for SoloKeys"; + homepage = "https://github.com/solokeys/solo-python"; + maintainers = with maintainers; [ wucke13 ]; + license = with licenses; [ asl20 mit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f0a597d22b..4478b4e39db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6036,6 +6036,8 @@ in { yarl = callPackage ../development/python-modules/yarl { }; + solo-python = disabledIf (! pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); + suseapi = callPackage ../development/python-modules/suseapi { }; typed-ast = callPackage ../development/python-modules/typed-ast { }; From 5bea2997fe9b08f76de5ae41dc2e300598bc9556 Mon Sep 17 00:00:00 2001 From: Joachim F Date: Sat, 12 Oct 2019 10:08:44 +0000 Subject: [PATCH 087/139] nixos/hardened: blacklist old filesystems (#70482) The rationale for this is that old filesystems have recieved little scrutiny wrt. security relevant bugs. Lifted from OpenSUSE[1]. [1]: https://github.com/openSUSE/suse-module-tools/pull/5/commits/8cb42fb6658f210cb8c955d584a65f7b041c0575 Co-Authored-By: Renaud --- nixos/modules/profiles/hardened.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 626d8b1d2bd..f7b2f5c7fc1 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -52,6 +52,27 @@ with lib; "ax25" "netrom" "rose" + + # Old or rare or insufficiently audited filesystems + "adfs" + "affs" + "bfs" + "befs" + "cramfs" + "efs" + "erofs" + "exofs" + "freevxfs" + "f2fs" + "hfs" + "hpfs" + "jfs" + "minix" + "nilfs2" + "qnx4" + "qnx6" + "sysv" + "ufs" ]; # Restrict ptrace() usage to processes with a pre-defined relationship From 2a1797ae9b46249bed1034021f5b0f5e59b73c50 Mon Sep 17 00:00:00 2001 From: Marcus Boyd Date: Sat, 12 Oct 2019 20:43:12 +1030 Subject: [PATCH 088/139] pythonPackages.bokeh: added packaging dependency --- pkgs/development/python-modules/bokeh/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index d5337122120..c92f299f919 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -8,6 +8,7 @@ , mock , numpy , nodejs +, packaging , pillow , pytest , python @@ -48,6 +49,7 @@ buildPythonPackage rec { pyyaml tornado numpy + packaging ] ++ lib.optionals ( !isPy3k ) [ futures ]; From cc768f7d1fc2a38e264cb023f997a532dbf6677a Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 12 Oct 2019 18:25:47 +0800 Subject: [PATCH 089/139] vimPlugins.lessspace.vim: init at 2019-09-12 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index c3387f30175..61727c548d5 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1497,6 +1497,17 @@ let }; }; + lessspace-vim = buildVimPluginFrom2Nix { + pname = "lessspace-vim"; + version = "2019-09-12"; + src = fetchFromGitHub { + owner = "thirtythreeforty"; + repo = "lessspace.vim"; + rev = "dc05cf6c3b67e3f8c87da2e565c5524872526316"; + sha256 = "154x6i2ncmcbc3snkzdcggq5m5zvlbjyry5lvr6n4qcvf65z5z44"; + }; + }; + lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; version = "2019-05-23"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0a32fff23fe..25c8451ff90 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -214,13 +214,13 @@ MarcWeber/vim-addon-sql MarcWeber/vim-addon-syntax-checker MarcWeber/vim-addon-toggle-buffer MarcWeber/vim-addon-xdebug -MaxMEllon/vim-jsx-pretty markonm/traces.vim martinda/Jenkinsfile-vim-syntax mattn/emmet-vim mattn/gist-vim mattn/webapi-vim maximbaz/lightline-ale +MaxMEllon/vim-jsx-pretty mbbill/undotree megaannum/forms megaannum/self @@ -346,8 +346,8 @@ scrooloose/syntastic sebastianmarkow/deoplete-rust sheerun/vim-polyglot Shougo/context_filetype.vim -Shougo/denite.nvim Shougo/defx.nvim +Shougo/denite.nvim Shougo/deol.nvim Shougo/deoplete-lsp Shougo/deoplete.nvim @@ -386,6 +386,7 @@ thinca/vim-quickrun thinca/vim-scouter thinca/vim-themis thinca/vim-visualstar +thirtythreeforty/lessspace.vim thosakwe/vim-flutter tikhomirov/vim-glsl tmux-plugins/vim-tmux From 1b42193d42326dace1b546a5b50e42ca9fd25ee3 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 12 Oct 2019 18:26:13 +0800 Subject: [PATCH 090/139] vimPlugins.neovim-fuzzy: init at 2018-11-15 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 61727c548d5..ee55abe64f1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1827,6 +1827,17 @@ let }; }; + neovim-fuzzy = buildVimPluginFrom2Nix { + pname = "neovim-fuzzy"; + version = "2018-11-15"; + src = fetchFromGitHub { + owner = "cloudhead"; + repo = "neovim-fuzzy"; + rev = "c177209678477d091ee4576e231c5b80b44514d0"; + sha256 = "069phpy1p8dindi6whddsb9x5zyw1adzsnv7br7q955hf6x9bxxj"; + }; + }; + neovim-sensible = buildVimPluginFrom2Nix { pname = "neovim-sensible"; version = "2017-09-20"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 25c8451ff90..248afa14253 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -43,6 +43,7 @@ chrisgeo/sparkup chriskempson/base16-vim christoomey/vim-sort-motion christoomey/vim-tmux-navigator +cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail cocopon/iceberg.vim ctjhoa/spacevim From 7ba023cf6049208737f0453f591ec285bba48d86 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 12 Oct 2019 18:26:37 +0800 Subject: [PATCH 091/139] vimPlugins.open-browser-github.vim: init at 2018-03-14 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ee55abe64f1..6f53be4c503 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1981,6 +1981,17 @@ let }; }; + open-browser-github-vim = buildVimPluginFrom2Nix { + pname = "open-browser-github-vim"; + version = "2018-03-14"; + src = fetchFromGitHub { + owner = "tyru"; + repo = "open-browser-github.vim"; + rev = "6f63e9c8b9482858af12c2dc60f6df2854e57f28"; + sha256 = "06wvj6sqqzf52ng0k0p9g8wnlrljnia6h4d65681plqyxakbvi2w"; + }; + }; + open-browser-vim = buildVimPluginFrom2Nix { pname = "open-browser-vim"; version = "2018-11-29"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 248afa14253..273ea722fe4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -426,6 +426,7 @@ twerth/ir_black twinside/vim-haskellconceal Twinside/vim-hoogle tyru/caw.vim +tyru/open-browser-github.vim tyru/open-browser.vim ujihisa/neco-look valloric/youcompleteme From 035f28e3982402b3821b85d32686744c357715a1 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 12 Oct 2019 18:26:59 +0800 Subject: [PATCH 092/139] vimPlugins.prev_indent: init at 2014-03-08 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 6f53be4c503..a27d3bb9332 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2069,6 +2069,17 @@ let }; }; + prev_indent = buildVimPluginFrom2Nix { + pname = "prev_indent"; + version = "2014-03-08"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "prev_indent"; + rev = "79e9b1b9a6895bfd15463c45595ca599987a4b23"; + sha256 = "03xqdwfkc7a84742ldsggi7ix99c7dhpmg6j13gkasyfk487ryh6"; + }; + }; + psc-ide-vim = buildVimPluginFrom2Nix { pname = "psc-ide-vim"; version = "2019-09-17"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 273ea722fe4..aebeaaaf6ca 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -453,6 +453,7 @@ vim-scripts/jdaddy.vim vim-scripts/matchit.zip vim-scripts/mayansmoke vim-scripts/PreserveNoEOL +vim-scripts/prev_indent vim-scripts/random.vim vim-scripts/Rename vim-scripts/ReplaceWithRegister From 8e4961701d601265d86a7e97d0d8487710b34791 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 12 Oct 2019 18:27:24 +0800 Subject: [PATCH 093/139] vimPlugins.vim-diminactive: init at 2017-08-27 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index a27d3bb9332..b39284a398a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3247,6 +3247,17 @@ let }; }; + vim-diminactive = buildVimPluginFrom2Nix { + pname = "vim-diminactive"; + version = "2017-08-27"; + src = fetchFromGitHub { + owner = "blueyed"; + repo = "vim-diminactive"; + rev = "6f2e14e6ff6a038285937c378ec3685e6ff7ee36"; + sha256 = "14jf5hh3v2f5wb10v09ygx15pxbwziv20pwv0fqkakxwf0vqwd50"; + }; + }; + vim-dirdiff = buildVimPluginFrom2Nix { pname = "vim-dirdiff"; version = "2019-05-14"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index aebeaaaf6ca..37e118d88e8 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -23,6 +23,7 @@ bhurlow/vim-parinfer bitc/vim-hdevtools bkad/camelcasemotion bling/vim-bufferline +blueyed/vim-diminactive bogado/file-line brennanfee/vim-gui-position bronson/vim-trailing-whitespace From d6bafe828642de8baab990686a0a513935c9f114 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 12 Oct 2019 18:27:49 +0800 Subject: [PATCH 094/139] vimPlugins.vim-textobj-haskell: init at 2014-10-27 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b39284a398a..4ae58490ab5 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4854,6 +4854,17 @@ let }; }; + vim-textobj-haskell = buildVimPluginFrom2Nix { + pname = "vim-textobj-haskell"; + version = "2014-10-27"; + src = fetchFromGitHub { + owner = "gibiansky"; + repo = "vim-textobj-haskell"; + rev = "ca656e98ea31e201f5bc543909398a6c8bb5d537"; + sha256 = "096pjjl3ngw0hsh59j2x6pdrpqvp657rcxfyl9kw13ndqyd867xs"; + }; + }; + vim-textobj-multiblock = buildVimPluginFrom2Nix { pname = "vim-textobj-multiblock"; version = "2014-06-02"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 37e118d88e8..2c512103bd9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -91,6 +91,7 @@ freitass/todo.txt-vim frigoeu/psc-ide-vim fsharp/vim-fsharp garbas/vim-snipmate +gibiansky/vim-textobj-haskell glts/vim-textobj-comment gmarik/vundle godlygeek/csapprox From 651a2342b4418138c67a6bf0ead0b398d2781873 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 12 Oct 2019 18:28:14 +0800 Subject: [PATCH 095/139] vimPlugins.vim-tmux-focus-events: init at 2019-04-19 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4ae58490ab5..4a3d8946b06 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4920,6 +4920,17 @@ let }; }; + vim-tmux-focus-events = buildVimPluginFrom2Nix { + pname = "vim-tmux-focus-events"; + version = "2019-04-19"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "vim-tmux-focus-events"; + rev = "0f89b1ada151e22882a5a47a1ee2b6d6135bc5c1"; + sha256 = "0rx1615wlsl62y62l217vgjd5vjfzf3zjwq43fflpc6bixikqc6j"; + }; + }; + vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; version = "2019-01-29"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 2c512103bd9..bab77bda4c5 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -393,6 +393,7 @@ thirtythreeforty/lessspace.vim thosakwe/vim-flutter tikhomirov/vim-glsl tmux-plugins/vim-tmux +tmux-plugins/vim-tmux-focus-events tomasr/molokai tomlion/vim-solidity tommcdo/vim-exchange From e5a558a748810a22a30542e6f6e27bb321d0871a Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 12 Oct 2019 18:28:39 +0800 Subject: [PATCH 096/139] vimPlugins.vim-togglelist: init at 2013-04-07 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4a3d8946b06..4bfba9ff303 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4942,6 +4942,17 @@ let }; }; + vim-togglelist = buildVimPluginFrom2Nix { + pname = "vim-togglelist"; + version = "2013-04-07"; + src = fetchFromGitHub { + owner = "milkypostman"; + repo = "vim-togglelist"; + rev = "cafedc49860950200f28f2e1d95ab6a87b79d113"; + sha256 = "17y4ply2irz81gjv5hb51dy7wzv3l3sq6qaska31lswd5dgh1ifg"; + }; + }; + vim-toml = buildVimPluginFrom2Nix { pname = "vim-toml"; version = "2019-08-28"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index bab77bda4c5..3b807aa649d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -236,6 +236,7 @@ mhinz/vim-signify mhinz/vim-startify michaeljsmith/vim-indent-object mileszs/ack.vim +milkypostman/vim-togglelist mindriot101/vim-yapf mk12/vim-lean mkasa/lushtags From f74b035ca7d0c7d95dc383f78c98637ceacb6d63 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 12 Oct 2019 18:29:02 +0800 Subject: [PATCH 097/139] vimPlugins.vim-visual-increment: init at 2015-07-02 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4bfba9ff303..71fce6ec4e0 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5019,6 +5019,17 @@ let }; }; + vim-visual-increment = buildVimPluginFrom2Nix { + pname = "vim-visual-increment"; + version = "2015-07-02"; + src = fetchFromGitHub { + owner = "triglav"; + repo = "vim-visual-increment"; + rev = "e50e8f7c062cec759f665278eb58535df1611a23"; + sha256 = "1gd6mxp9y80wf7nxcm02104l54gqz5k3dgv1h98jl9a7q9swb8y6"; + }; + }; + vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; version = "2019-09-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3b807aa649d..d7efe2eea94 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -425,6 +425,7 @@ tpope/vim-tbone tpope/vim-unimpaired tpope/vim-vinegar travitch/hasksyn +triglav/vim-visual-increment troydm/zoomwintab.vim twerth/ir_black twinside/vim-haskellconceal From 750757dba437bc296087cd88c5a5c9d32caeca93 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 12 Oct 2019 18:29:27 +0800 Subject: [PATCH 098/139] vimPlugins.vim-yaml: init at 2019-01-07 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 71fce6ec4e0..688db5b5308 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5118,6 +5118,17 @@ let }; }; + vim-yaml = buildVimPluginFrom2Nix { + pname = "vim-yaml"; + version = "2019-01-07"; + src = fetchFromGitHub { + owner = "stephpy"; + repo = "vim-yaml"; + rev = "0da1975ec394154349db744c1996fe2ef8fa5ed0"; + sha256 = "0kvsy6k4snwykpxk49x06jizxqrjjmbhhdcwiyiqy0029n05322l"; + }; + }; + vim-yapf = buildVimPluginFrom2Nix { pname = "vim-yapf"; version = "2018-10-04"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d7efe2eea94..37c9e3edca9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -377,6 +377,7 @@ sk1418/last256 slashmili/alchemist.vim sonph/onehalf stefandtw/quickfix-reflector.vim +stephpy/vim-yaml t9md/vim-choosewin t9md/vim-smalls takac/vim-hardtime From 4a702c9d1cd180c9f99fd88cd63f67231614e823 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 12 Oct 2019 18:37:46 +0800 Subject: [PATCH 099/139] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 240 ++++++++++++++-------------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 688db5b5308..a6b8c6dadc1 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-09-25"; + version = "2019-10-09"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "41ff80dc9ec2cc834cc8c4aaa753e308223d48b8"; - sha256 = "1bfylcp9490cd2yz00nq6ky1w55dkvldrdjxip36ahci4cpfn0xw"; + rev = "3fe2223a48465c58c48a5a6a30ecf13ab92f7b97"; + sha256 = "1nzh34n1kix1fzfz3vnk5pajajj10k449m6wn3458d5mpyp7lrsh"; }; }; @@ -270,12 +270,12 @@ let coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2019-01-26"; + version = "2019-10-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "ec7dfd56612664c20bb0f6a19c524100cd2047ed"; - sha256 = "0fc03ndq7ys4lvqgfbh314fsvbcjf3nm4spfklsmz2c587qbvv1l"; + rev = "7da99cf5eb5cbf9f7eb6c6b8450764afbb9c20f1"; + sha256 = "1qj4xr9vy2s3hr5hqjfdq46x5lszqsp4z1dggfk6gpzwln4k5ql0"; }; }; @@ -303,12 +303,12 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2019-09-29"; + version = "2019-10-05"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "50508a69a02e3598ad1208d4f2f7be9df555892b"; - sha256 = "18id9gbpx15acyrg695434cjk5ni543y265xjp0jc3jwayl3rwfq"; + rev = "fea9b887936590e58f179d38e88005454e150673"; + sha256 = "19vhlhrzzijxkxn1c6azp8s2khdckxgp0vk4rdlhjhc6j14110p5"; }; }; @@ -391,12 +391,12 @@ let coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2019-10-02"; + version = "2019-10-04"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "5711bf2eedb7de2757b1650603736886a810388d"; - sha256 = "0k0lgdvxlpv6hg09xhwkim9654sgzw2ivhp1saiab1dy0klp4iqv"; + rev = "3c117046b54130157006f8ddf048304507499260"; + sha256 = "1wv3ryih2f3hdcb78yy0r20wzlpqf4jv3j4mllb9vay0lcgyx90b"; }; }; @@ -424,12 +424,12 @@ let coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2019-10-01"; + version = "2019-10-06"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "dbe8d23a4397daba8211192c57117ea0f900fbf6"; - sha256 = "1p7ypmy5x7d1skrfqgl52vrx0y5z8q66fk9zyj4y349n4kgx9i85"; + rev = "198fff4227cbc2742ed6167c1f097826e867d66d"; + sha256 = "1ylwcr8l3bhgxb2zkqskkq97757di6vq7acxw6dd1hb5hk5a17kc"; }; }; @@ -545,23 +545,23 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-10-02"; + version = "2019-10-06"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "d64d956388d85b53dceca6eb526b032c96912672"; - sha256 = "137bfdnywx44vl8b50vxbi7k8g622yhpsavvlqxc8cllmjamp96f"; + rev = "a22270bede3ebab2f51c9a4bfd91305c5d5b7fcb"; + sha256 = "1nd2hk0zdgys7gzmfzkyzsxdcc2dbw573g7wxwxsa9fsk733fydf"; }; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2019-08-22"; + version = "2019-10-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "444c297e2a418d816b6094446b57f2333ef9047a"; - sha256 = "01d51z6iyl2p5lhkr86a3gri0d8g7ydb8qvlp0xqrr2fy97xdx9v"; + rev = "b26cda8472205bf28522f06f16a39166a0b78d2a"; + sha256 = "0d8x4l5jk1na0a08xxq65drhcisxm5s8llsymiv9mgnqv3w43yyj"; }; }; @@ -777,12 +777,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2019-09-29"; + version = "2019-10-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "9423625ec729fceed640337012a8a64264f47654"; - sha256 = "11gwdqyayi9pznkw75z27k7r42bl5dh9l3d79ashfv70z578sp1j"; + rev = "442fda4ab39a340052c173e414e03e10eb0c8244"; + sha256 = "1h8h97hvj5bjdwh5ixj6cpdc1xjnvnrwnykfpz460vqzn2wkcfj9"; }; }; @@ -821,12 +821,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-09-28"; + version = "2019-10-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "2de8a3dfd7a104ce6e661c672d58f90ffa90dc35"; - sha256 = "1bnlr0lrkl8djhji0vaplx73vw4yq82nx90lzd9jch1fm4d5mdq0"; + rev = "7e15b1ffed251ef68ec3796676fe37ee57c786ca"; + sha256 = "08c0m8jkdi21r2wxqqkar411ydvmfpwqdmnklpzzs4hznxfqxpf3"; }; }; @@ -945,12 +945,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-09-26"; + version = "2019-10-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "503c42d17deb812ee5363e271cca0e68856a289d"; - sha256 = "1b4hd4g3s96gbq3bi4jbry02jhbzvhx09jss574krhp771mrkzl2"; + rev = "70a11ee67f3c4353e48aad69812c34b5c8489f07"; + sha256 = "1zwhsk30nq5p82px2z4gri8pxgkri26x488fi20pdkpabgg5dh8g"; }; }; @@ -1023,12 +1023,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2019-08-27"; + version = "2019-10-08"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "10b3746ecb52064d44bbcb1fdf6b21cca551f30c"; - sha256 = "1crm0qj8wwizgvzn4jlwbpnjbddp08fs9i46nr56q38hc6mgir4x"; + rev = "5f559fae12a8babf414376906197dbd751e11380"; + sha256 = "0z9lny12hckc635zafh1mdh58pikz5k19kkhxj1m77h15rwwms7f"; fetchSubmodules = true; }; }; @@ -1179,12 +1179,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2019-10-02"; + version = "2019-10-04"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "840d9a7f4c707b3369f2a4b6aac89dcbc45950dc"; - sha256 = "19bncad9k4mc2zsiw3r6qrf1mscjzimivzpq4d1yp4ciswvmqx4a"; + rev = "8b7ee2a596aa33dec51246a4670eb20e337caaa2"; + sha256 = "19magq7d0yi2jklm9zn7da2xk1lm21hlcscl1x3i0ma6all5y06s"; }; }; @@ -1488,12 +1488,12 @@ let lean-vim = buildVimPluginFrom2Nix { pname = "lean-vim"; - version = "2017-05-03"; + version = "2019-10-04"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean.vim"; - rev = "2ebb71d95c072f8604385dab58398b2107337e63"; - sha256 = "0rvvicw8ldaskwar5219aag93xa3qp3nqld5ddb70c6hq3bmwrnz"; + rev = "2ace010eb32603a65af7921954a0594a02523c6b"; + sha256 = "0wq2lw4xx2qhz1xii9g7i6wz0y43b2icqrm6ypr9jmaac1rhiq7c"; }; }; @@ -1741,12 +1741,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-09-26"; + version = "2019-10-07"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "6b66c20fadd489460422104a62279a0cd8b35eda"; - sha256 = "1kfhirlxq90vbqzg0wwa69aya0k89icxbw8qdinfrsfng1f3yliq"; + rev = "ec512eb8d8d66fa15bb7f5df2f500d117aa3ee0d"; + sha256 = "0v2i0wwiyc5x9s3ff7qpddicf9i18hhmzffgkm0hfmnspln04vml"; }; }; @@ -1763,12 +1763,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-09-19"; + version = "2019-10-09"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "ba38b8786ce68c36fc3cd2139a7820b25bea378a"; - sha256 = "187zj4ircbbhn7gp3gabzrcnld3mz5g76ibp4wbcxngml60hhk9r"; + rev = "eefad2c87845b141a269e0ed64c23eeb64319506"; + sha256 = "0b74ga7wvd3fs2hrdjjal3ihacl81fyld01jn8chm255px1kajkv"; }; }; @@ -1862,23 +1862,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-09-26"; + version = "2019-10-05"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "a4b7c046b3d3e170c6f62a6209abfa0760d6694a"; - sha256 = "0qz5b00rv59b3ng8wzf69lgbabqxfwzxbcj2595hmyf6pi0k0swz"; + rev = "92082862364cf5ec3eec79a025bbc7bc5165e05f"; + sha256 = "0aqjc26l1m62jgj34difkkbbd0kam1sa6ldfwf2fbkxs3f5y63q8"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-10-01"; + version = "2019-10-11"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "2d639b70e73ecf3f62884a578fe5e5937e6d8a92"; - sha256 = "0ahfdbg26yn4phwkbkx29m8z8dabx5qa7zahsab0pd3pvgipjxzj"; + rev = "926ff0ec038d2be0bf4ff3412d3c7144b5f82498"; + sha256 = "12znr5q2p41yq4av27a49ciisdlv3ajh9qrfgbkvc581l2pbq0yz"; }; }; @@ -1961,12 +1961,12 @@ let nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev-nvim"; - version = "2019-09-27"; + version = "2019-10-09"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "c405a548d489e3bb93784ecf5f6fa25109305ac1"; - sha256 = "17n9adnhhc6hnvrw98i54f8jb1510bfzgciwf436l5xgcjgvqvk0"; + rev = "994ff5daf571ad02cc96436002411b4fb235c91f"; + sha256 = "07dx6qkxqpakl1hrqwhfjgdzcnl4j3j9qih0l20qn8p6askj3b2j"; }; }; @@ -2038,12 +2038,12 @@ let plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2019-07-18"; + version = "2019-10-12"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "0024021f01c349c2828aeb50a1e131997adea066"; - sha256 = "1abqpbgz0d0ik4w5frha62i0s3f2w5xsgfa34c0jbwzzq0fkvkk7"; + rev = "ea0d44c725b3bed5dc37ab88d62279c6066add06"; + sha256 = "1f5dljfqk69f77r94kxaz8pi35n7hc53h5gfcs3ba0jsjz19mpnv"; }; }; @@ -2137,12 +2137,12 @@ let rainbow = buildVimPluginFrom2Nix { pname = "rainbow"; - version = "2019-05-08"; + version = "2019-10-09"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "04b7723b810f24152865af656c46e8513489b77a"; - sha256 = "08qzcy06kr96dj91cdqzp5yn3zjpfcv9miywa6zxvir8vbfkv21d"; + rev = "c876f4bc6e737241d53669415f88cb5f2afd8ad9"; + sha256 = "1kmgm91q507qv9bvg37dn0lddzb8gwkmslajampnfjyfhbs0shgz"; }; }; @@ -2258,12 +2258,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-10-01"; + version = "2019-10-08"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "0dabf6a2ecfe671e0cab945ba980ad19bbcfa8ca"; - sha256 = "193z9np3gbjbrgsak60bxq8sga74l3g7bfbcsqmjbw888bmaipm6"; + rev = "7959279612914eeaa584f5ce719fc71cd967e384"; + sha256 = "0glmnj3ra4m9hi0qrvdi8g2h29vzjw9biwq1l2sjx4hmv6smnri5"; }; }; @@ -2346,12 +2346,12 @@ let SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2019-10-02"; + version = "2019-10-09"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "52f9db92514ee2d2b9907bff31e8b16267cc9a91"; - sha256 = "066z9zypgmcs9jzxfqhh4m7ppjcgw36bmhs799198qj740whlqd9"; + rev = "ed1e2b20a6c2c4945b529799f2cdb0409f6a10d2"; + sha256 = "0yl82pp23nfg4ckrq33a3flisp7all6gs3aza7z9swv966y1qhwx"; }; }; @@ -2600,12 +2600,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2019-09-30"; + version = "2019-10-09"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "47a9452038d6aba1b653de21bc6e6bc303f1ae5f"; - sha256 = "129rism5mj91nmrsrmh2qksw74byfm346d5hizz4c40g87gs72x0"; + rev = "6863fcdce850673b4468c43244d189ade3f99a8f"; + sha256 = "0sq5cmsng2lid3dlfhcyagpzsjw1abp43wl3clm3bc5f3944lx5r"; }; }; @@ -2710,12 +2710,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-07-10"; + version = "2019-10-06"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "86712dc2de083e91a78bddddbb7fe7defe818c79"; - sha256 = "171fyxv09nikb5w2bmy3j5fmhb7mmqgsmjp9v3mc03hdxbf68kfk"; + rev = "f6dd7c17f71d2b6a1fad1e84e6cb28861af0e978"; + sha256 = "1407gl1rki5nj7rwiab61j579cih6shkgl02z4cmrvyb0dcq0vq8"; }; }; @@ -2941,12 +2941,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-10-02"; + version = "2019-10-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "62f2dc02f01da7cfa16e45a9f8ce7036a03c3420"; - sha256 = "13ngk5riqjacn6k9l7bn4llsdld3235bda1cl3ambmv8qbwn5mk5"; + rev = "297ca3d00406064004be5f2a9923fe8c2406e6e9"; + sha256 = "1fmd0rjgrhsngpml885lybzibrpsszcc80iwm6qvydddhcp35jdi"; }; }; @@ -3007,12 +3007,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2019-10-01"; + version = "2019-10-09"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "7d8d3979182eaee65299690b971f785fa0e1f422"; - sha256 = "1z60mvj93krhp5cdn8ip26v3qkc9nmv5a8jf5kwkscfsfxsriqvr"; + rev = "a350538f8a5a8f08cf64a520d456282080c3968f"; + sha256 = "0abz5asjgawz7zx5gy7q5nnrkmzijwpn0ay93913l78dnsal0408"; }; }; @@ -3502,12 +3502,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-10-02"; + version = "2019-10-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "80aa8a9aea72f2054fb2ad8582461f60b0db9757"; - sha256 = "0pbrx477hg5kwb6smja6lijkavrfz5jjxj843pa6vv2lf8xvrddf"; + rev = "06e34204af04643d96d30132de6ba9066368de15"; + sha256 = "1322pr6zv2yv1y9gvwb8d7an4iyvi4yxbbivy1y8hl9pcy8ni989"; }; }; @@ -3579,12 +3579,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-10-02"; + version = "2019-10-11"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "1df81617fbda56bf3cb2dfc289fe1f3713bdfddb"; - sha256 = "0w6mi2fph6c1skqz4j7q30k130p30nqyylbphzjaqa32xxsq2psd"; + rev = "51940d350f87611d6128e641766dcab73003a6fa"; + sha256 = "0ajzb64z12c51c7k8zbj34i2mali289q0gyj2qpmi4ganfq4zdg8"; }; }; @@ -3601,12 +3601,12 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2019-10-01"; + version = "2019-10-09"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "e550eadf37ed7529fbc103c6153ceaa0ab1e5a62"; - sha256 = "0zp3q1qd2zwlr0x7ij5gyfpg7kkyws090pamv60ni0ij2y7xjl8n"; + rev = "8b783474b64fa01b813f9c4a24f240c7c3378726"; + sha256 = "1mrqdg0hq4gvzng959dk6hbgh19sxzgg959i6k39c7phdd1f1fm9"; }; }; @@ -4009,12 +4009,12 @@ let vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2019-07-03"; + version = "2019-10-08"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "3d76cee270b1a9583d535737ac2e63166335d45c"; - sha256 = "1kjbw98gvjsx4mydndkv0hjsczafq8sgb38j0bb0jbynqbbplsv9"; + rev = "4a8ee53029afa755f76b9e953ce3ca6beabdb63f"; + sha256 = "0vjk2knvpx79qa27k9zgc5s9pw3r96ylydhimsf9wxsgz7ihfr4r"; }; }; @@ -4119,12 +4119,12 @@ let vim-monokai-pro = buildVimPluginFrom2Nix { pname = "vim-monokai-pro"; - version = "2018-12-27"; + version = "2019-10-12"; src = fetchFromGitHub { owner = "phanviet"; repo = "vim-monokai-pro"; - rev = "39fcf3b418fc3a01e604cbb5f9c08d79d7d957c0"; - sha256 = "1k0n9chmilppsiyxhz1ig0ywimbnl4qpzib6ris1cy6kjnl4mdyq"; + rev = "d99c93733f3461466773b52b26392cf9b35717c0"; + sha256 = "05vk9hgdldgmijawblslf4sly67lqxljx1y9qs4dl2cbvz8gw882"; }; }; @@ -4251,12 +4251,12 @@ let vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2019-10-03"; + version = "2019-10-12"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "5012b8ffaaf18803d2e52e8ba4609a3ed1828653"; - sha256 = "1liw4ixljkzbkzmjz4n0cygv8wylrw0bxiv98z9lindbm3pa0n9l"; + rev = "5099025d0b632a5e56fa457f826153cd37c48d3c"; + sha256 = "145x60yxzxga92ix4pp0rac5r9r61jgqr8s0l991zz30jxcv1qy2"; }; }; @@ -4306,12 +4306,12 @@ let vim-parinfer = buildVimPluginFrom2Nix { pname = "vim-parinfer"; - version = "2019-09-19"; + version = "2019-10-06"; src = fetchFromGitHub { owner = "bhurlow"; repo = "vim-parinfer"; - rev = "eba349553e2438dcc9d37f3a6aff2807af731c3f"; - sha256 = "07cppsywz60ss0af86z4ia9kbixnwf9bl437fxq7hwhx6wig0njq"; + rev = "ceb429049458d168a56ca9c6e30a3f3f305dee75"; + sha256 = "0a667ph1xlf7fblk2c54ff2pvsc3zfxzz85g778jrq0569zvm3fd"; }; }; @@ -4361,12 +4361,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-09-29"; + version = "2019-10-04"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "ff97806e50196d56b2858cd56bada9d48cada2aa"; - sha256 = "0n1j35h09hbwinfbk3a276vjv0bv9f73q8prckkpxdnzzcyrs0yl"; + rev = "849b76be90a2c5a13fd9943b2b76d77a9b6ebc0f"; + sha256 = "16s6fcb9cx6lib0vh30whbrqs9j6j2wjc0cykd80vjdhi4rv1r55"; }; }; @@ -4592,12 +4592,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-10-02"; + version = "2019-10-07"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "ab60166512f7ea2d361243fbf8b1593721a043a2"; - sha256 = "037nhry4k6cmjvdmvmbfh48y56kvpygvqs714j05mijfkprj802y"; + rev = "80f64eace5694413f9dfd8e70e4a7018b56c42b6"; + sha256 = "1v8zhs240d4z87sryn14dn29i9a2aigwz197c5ag8l4zg4b466z0"; }; }; @@ -4658,12 +4658,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-10-02"; + version = "2019-10-12"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "eb76bee6e7b610298dfccb9653b1e6dbb571b0c8"; - sha256 = "0r136z0arw36gbjkxhn7fajyf91fv4qlz8zf17npbks8x7zgcszx"; + rev = "5ee6d319bb895bb6672f253798263f53a93c2a06"; + sha256 = "1id8vghf09ahpv0kkvvg9v498i4xvv499z0b3ynjjqgpda44fh2i"; }; }; @@ -4713,12 +4713,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-10-01"; + version = "2019-10-06"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "af03e075a3c0dfe5ca17fd49c59a3f4c30a4b342"; - sha256 = "1dd2vhszck76mpxz2m9qlmyvsravx9xslh4j68y8ygap97y2ykzi"; + rev = "520f27769573582db9b40ae14ae86ac1f6a60c97"; + sha256 = "11w28f038cw937wp5p3cykvab4xyhksvf158r2hgqd1i11qvq8ks"; }; }; @@ -4812,23 +4812,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-09-26"; + version = "2019-10-07"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "a9925ccef810d01e3a21295d4dba97532d14f2ee"; - sha256 = "0il49wyidin463x16b2lcf7cb5rqidqqwv56vxv9znrg6wqn94wp"; + rev = "ffdf2dc17aaef733164a7079f95dd74f6cda9241"; + sha256 = "1y4v2hn44rjyfh18ninzyb37xxc47fl20wzhnvs5gnnhjfsyfbqj"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-09-27"; + version = "2019-10-12"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "3c2cc7c87882c4034f4ce0a9b71980b127a680a3"; - sha256 = "0jac3cf7cidwqf0lvlkdkg6m2r0xng3xyzsh0iyn1dw6qg3wzi2y"; + rev = "7e0269621f8e408a75a548171445a5612a7a2094"; + sha256 = "1w7b9dp6a3h2iqlxp12bfyq6q4hximagcgllq7j06h2wnp7jbkw2"; }; }; @@ -5197,12 +5197,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-10-01"; + version = "2019-10-10"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "e323c55e9669c1adb205295b06ec4463bae5b637"; - sha256 = "0wcpdmblb38ym08b7k4iy1l279zcvmpnzygp5m946sija6nc34v9"; + rev = "7fc7a1b37514716bf9ae685024fa5009085f8d17"; + sha256 = "1z6js7przlncfdriyds89am3hk4yc0bmj6qg7cn89kfgh85zg6vs"; }; }; From 65d7bf58f11a2e116087ddbfcd71db4218e45125 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 Oct 2019 03:57:05 -0700 Subject: [PATCH 100/139] ne: 3.1.2 -> 3.2.1 (#70663) * ne: 3.1.2 -> 3.2.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/ne/versions * ne: revamp --- pkgs/applications/editors/ne/default.nix | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index 96687ab81d6..3c96ba91165 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -1,36 +1,36 @@ { stdenv, fetchFromGitHub, ncurses, texinfo, texlive, perl, ghostscript }: - stdenv.mkDerivation rec { pname = "ne"; - version = "3.1.2"; + version = "3.2.1"; + src = fetchFromGitHub { owner = "vigna"; - repo = "ne"; + repo = pname; rev = version; - sha256 = "154grh9gdzydnqn9xxj7zpia9cc5x6a7y1g73vwizr9bkg92l5cc"; + sha256 = "0h6d08cnwrk96ss83i9bragwwanph6x54sm3ak1z81146dsqsiif"; }; - buildInputs = [ ncurses texlive.combined.scheme-medium texinfo perl ghostscript ]; - dontBuild = true; - installPhase = '' - substituteInPlace src/makefile --replace "CC=c99" "cc=gcc" - substituteInPlace src/makefile --replace "-lcurses" "-lncurses" + + postPatch = '' substituteInPlace makefile --replace "./version.pl" "perl version.pl" - cd doc && make && cd .. - cd src && make && cd .. - make PREFIX=$out install + substituteInPlace src/makefile --replace "-lcurses" "-lncurses" ''; - meta = { + nativeBuildInputs = [ texlive.combined.scheme-medium texinfo perl ghostscript ]; + buildInputs = [ ncurses ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { description = "The nice editor"; - homepage = https://github.com/vigna/ne; + homepage = "http://ne.di.unimi.it/"; longDescription = '' ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any UN*X machine. ne is easy to use for the beginner, but powerful and fully configurable for the wizard, and most sparing in its resource usage. See the manual for some highlights of ne's features. ''; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl3; + platforms = platforms.unix; }; } From 04b2c195f03c875b6dc43c3f3e0e822902e3dabd Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 12 Oct 2019 12:00:00 +0000 Subject: [PATCH 101/139] nix-du: 0.3.0 -> 0.3.1 --- pkgs/tools/package-management/nix-du/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 870e6ce67b9..74543cef83b 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }: rustPlatform.buildRustPackage rec { pname = "nix-du"; - version = "unstable-2019-07-15"; + version = "0.3.1"; src = fetchFromGitHub { owner = "symphorien"; repo = "nix-du"; - rev = "e6e927c15e75f7c2e63f7f3c181dc6b257f6fd9e"; - sha256 = "08jyp078h9jpb9qfqg5mdbq29rl8a006n94hqk3yk6gv1s57cfic"; + rev = "v${version}"; + sha256 = "149d60mid29s5alv5m3d7jrhyzc6cj7b6hpiq399gsdwzgxr00wq"; }; - cargoSha256 = "071gbhxbvnwi7n3zpy7bmlprzir0sl0f0pb191xg2ynw678prd7v"; + cargoSha256 = "18kb4car5nzch3vpl6z1499silhs3fyn8c6xj3rzk94mm2m9srg4"; + verifyCargoDeps = true; doCheck = true; checkInputs = [ graphviz ]; From 7f8befd4e10952cfea858b4bb22939dfe71cee0b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 Oct 2019 05:01:55 -0700 Subject: [PATCH 102/139] copyq: 3.9.0 -> 3.9.2 (#69490) * copyq: 3.9.0 -> 3.9.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/copyq/versions * copyq: use mkDerivation from Qt --- pkgs/applications/misc/copyq/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 2aad4d352c9..825053483a4 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst -, qtx11extras, git +{ lib, mkDerivation, fetchFromGitHub, cmake +, qtbase, qtscript, qtwebkit, libXfixes, libXtst, qtx11extras, git , webkitSupport ? true }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "CopyQ"; - version = "3.9.0"; + version = "3.9.2"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "1l9f0hg2ggy944sjlyiyglln5mjm9fvgmvwp3pnvmmc6mfbmslq3"; + sha256 = "02zs444i7hnqishs1i6vp8ffjxlxk3xkrw935pdwnwppv9s9v202"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ git qtbase qtscript libXfixes libXtst qtx11extras - ] ++ stdenv.lib.optional webkitSupport qtwebkit; + ] ++ lib.optional webkitSupport qtwebkit; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://hluk.github.io/CopyQ; description = "Clipboard Manager with Advanced Features"; license = licenses.gpl3; From 9377142fe1104a8c44bcb2db8c76bd30a6afecd7 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 12 Oct 2019 14:44:52 +0200 Subject: [PATCH 103/139] tinycc: fixup perms for generated .pc file --- pkgs/development/compilers/tinycc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 7c81f9ba163..03e8be7053a 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { Libs: -L$out/lib -Wl,--rpath $out/lib -ltcc -ldl Cflags: -I$out/include EOF - install -Dt $out/lib/pkgconfig libtcc.pc + install -Dt $out/lib/pkgconfig libtcc.pc -m 444 ''; doCheck = true; From e810171ef6968fdf3bbe88e46518e4b6453ed1e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrkan=20G=C3=BCr?= Date: Sat, 12 Oct 2019 14:47:43 +0200 Subject: [PATCH 104/139] gitAndTools.gita: 0.9.2 -> 0.9.9 --- .../version-management/git-and-tools/gita/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix index 6ecf81779f2..22bd0e66c15 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -2,23 +2,23 @@ , buildPythonApplication , fetchPypi , pyyaml +, setuptools }: buildPythonApplication rec { - version = "0.9.2"; + version = "0.9.9"; pname = "gita"; src = fetchPypi { inherit pname version; - sha256 = "1aycqq4crsa57ghpv7xc497rf4y8x43fcfd0v9prd2kn6h1793r0"; + sha256 = "1si2f9nyisbrvv8cvrjxj8r4cbrgc97ic0wdlbf34gvp020dsmgv"; }; propagatedBuildInputs = [ pyyaml + setuptools ]; - doCheck = false; # Releases don't include tests - meta = with lib; { description = "A command-line tool to manage multiple git repos"; homepage = https://github.com/nosarthur/gita; From 4fb5cdd4133eed92cb1c50dd0f7b3f74db21cb6e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Oct 2019 14:51:00 +0200 Subject: [PATCH 105/139] treewide: update some homepage URLs Updated dead or redirecting URLs on packages maintained by me. --- pkgs/applications/misc/qlcplus/default.nix | 2 +- pkgs/applications/misc/zathura/wrapper.nix | 2 +- pkgs/os-specific/linux/zfs/default.nix | 2 +- pkgs/tools/graphics/scrot/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index e928b0d597e..c0b844d121a 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -40,6 +40,6 @@ mkDerivation rec { maintainers = [ maintainers.globin ]; license = licenses.asl20; platforms = platforms.all; - homepage = "http://www.qlcplus.org/"; + homepage = "https://www.qlcplus.org/"; }; } diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 88e4a904393..6c8ad97d355 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -17,7 +17,7 @@ in symlinkJoin { ''; meta = with lib; { - homepage = https://pwmt.org/projects/zathura/; + homepage = https://git.pwmt.org/pwmt/zathura/; description = "A highly customizable and functional PDF viewer"; longDescription = '' Zathura is a highly customizable and functional PDF viewer based on the diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 899e5f05509..985faa51951 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -140,7 +140,7 @@ let Copy-On-Write filesystem with data integrity detection and repair, snapshotting, cloning, block devices, deduplication, and more. ''; - homepage = http://zfsonlinux.org/; + homepage = https://zfsonlinux.org/; license = licenses.cddl; platforms = platforms.linux; maintainers = with maintainers; [ jcumming wizeman fpletz globin ]; diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 2f4862b0645..413bc8c52f1 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ giblib xlibsWrapper libXfixes libXcursor ]; meta = with stdenv.lib; { - homepage = http://linuxbrit.co.uk/scrot/; + homepage = https://github.com/resurrecting-open-source-projects/scrot; description = "A command-line screen capture utility"; platforms = platforms.linux; maintainers = with maintainers; [ globin ]; From c7788ab7b6dd9531540554add5ae0bbf22b8f81b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 8 Oct 2019 00:59:11 +0200 Subject: [PATCH 106/139] atlassian-confluence: 6.15.8 -> 7.0.2 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index c9dcba28382..d7fb5b55468 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "atlassian-confluence"; - version = "6.15.8"; + version = "7.0.2"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "17pcgjv6rj2jxzmwx82941zhrrmprkchjhnnadnxq4709zsyb4q3"; + sha256 = "00ma2l6gknlpaf2k26md9fskgzcllky3vv89sb1izsrxl8la1dhq"; }; buildPhase = '' From 92bd7a76506fe133fe185de42cf58ca5436d4114 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 8 Oct 2019 00:59:40 +0200 Subject: [PATCH 107/139] atlassian-jira: 8.4.1 -> 8.4.2 --- pkgs/servers/atlassian/jira.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index f73a4df2c4d..18c838a0b21 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,15 +5,13 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.4.1"; + version = "8.4.2"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0dkilp5wvda29rin2wj9zs2vgwyfning7cz6dyk0kyg45dl07wky"; + sha256 = "0f0l9ss8jv06iidg8jw7yk5z42r1m0cbmlgj1wgli9a21ssp65sh"; }; - phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; - buildPhase = '' mv conf/server.xml conf/server.xml.dist ln -sf /run/atlassian-jira/server.xml conf/server.xml From 39b7c7e6887c6408a4483967a0f5868d01aed097 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 12 Oct 2019 13:21:59 +0200 Subject: [PATCH 108/139] wine: unstable 4.16 -> 4.17 also mono 4.9.2 -> 4.9.3 --- pkgs/misc/emulators/wine/sources.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 7b26bf44cdc..af71e8fdc73 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -31,24 +31,24 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.9.2"; + version = "4.9.3"; url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "0x7z0216j21bzc9v1q283qlsvbfzn92yiaf26ilh6bd7zib4c7xr"; + sha256 = "0va7nbhvfb52g78s9k3zc6xxwsn5whfyn333s6fdxycp8rkvgxkw"; }; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "4.16"; + version = "4.17"; url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz"; - sha256 = "17qxbddv23ibbayw1ai984m0dlq63cgplms2jhsc09incjhafywd"; + sha256 = "1bmj4l84q29h4km5ab5zzypns3mpf7pizybcpab6jj47cr1s303l"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "0zkvwl6rxr6xcqk4a3h43cak67w6bcyqqnajz6azif07ir3z1c61"; + sha256 = "0cb0w6jwqs70854g1ixfj8r53raln0spyy1l96qv72ymbhzc353h"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 2718c41712692b1dd37491d41158392177932ab9 Mon Sep 17 00:00:00 2001 From: marius851000 Date: Mon, 7 Oct 2019 12:22:33 +0200 Subject: [PATCH 109/139] faudio, wine, vkd3d: add faudio 19.10 and vkd3d 1.1 to wine fixes https://github.com/NixOS/nixpkgs/pull/68952 --- pkgs/development/libraries/faudio/default.nix | 27 +++++++++++++++++++ pkgs/misc/emulators/wine/base.nix | 9 +++++-- pkgs/misc/emulators/wine/default.nix | 5 +++- pkgs/misc/emulators/wine/vkd3d.nix | 26 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/wine-packages.nix | 2 ++ 6 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/faudio/default.nix create mode 100644 pkgs/misc/emulators/wine/vkd3d.nix diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix new file mode 100644 index 00000000000..b0818d79dfa --- /dev/null +++ b/pkgs/development/libraries/faudio/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, SDL2}: + +#TODO: tests + +stdenv.mkDerivation rec { + pname = "faudio"; + version = "19.10"; + + src = fetchFromGitHub { + owner = "FNA-XNA"; + repo = "FAudio"; + rev = version; + sha256 = "1z7j803nxhgvjwpxr1m5d490yji727v7pn0ghhipbrfxlwzkw1sz"; + }; + + nativeBuildInputs = [cmake]; + + buildInputs = [ SDL2 ]; + + meta = with stdenv.lib; { + description = "XAudio reimplementation focusing to develop a fully accurate DirectX audio library"; + homepage = "https://github.com/FNA-XNA/FAudio"; + license = licenses.zlib; + platforms = platforms.linux; + maintainers = [ maintainers.marius851000 ]; + }; +} diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 01d09659915..8252c96282d 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgArches, +{ stdenv, lib, pkgArches, callPackage, name, version, src, monos, geckos, platforms, pkgconfig, fontforge, makeWrapper, flex, bison, supportFlags, @@ -7,6 +7,9 @@ with import ./util.nix { inherit lib; }; +let + vkd3d = callPackage ./vkd3d.nix {}; +in stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { builder = buildScript; }) // rec { @@ -46,8 +49,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional udevSupport pkgs.udev ++ lib.optional vulkanSupport pkgs.vulkan-loader ++ lib.optional sdlSupport pkgs.SDL2 + ++ lib.optional faudioSupport pkgs.faudio + ++ lib.optional vkd3dSupport vkd3d ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; - [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav + [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav (gst-plugins-bad.override { enableZbar = false; }) ]) ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 6ecca6c2503..727eb270067 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -43,6 +43,8 @@ xmlSupport ? false, vulkanSupport ? false, sdlSupport ? false, + faudioSupport ? false, + vkd3dSupport ? false, }: let wine-build = build: release: @@ -54,7 +56,8 @@ let wine-build = build: release: netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport - openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport; + openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport + vkd3dSupport; }; }); diff --git a/pkgs/misc/emulators/wine/vkd3d.nix b/pkgs/misc/emulators/wine/vkd3d.nix new file mode 100644 index 00000000000..082eb0b90c6 --- /dev/null +++ b/pkgs/misc/emulators/wine/vkd3d.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, vulkan-headers, spirv-headers, vulkan-loader }: + +#TODO: MoltenVK +#TODO: unstable + +stdenv.mkDerivation rec { + pname = "vkd3d"; + version = "1.1"; + + src = fetchurl { + url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"; + sha256 = "1dkayp95g1691w7n2yn1q9y7klq5xa921dgmn9a5vil0rihxqnj9"; + }; + + buildInputs = [ vulkan-headers spirv-headers vulkan-loader ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A 3d library build on top on Vulkan with a similar api to DirectX 12"; + homepage = "https://source.winehq.org/git/vkd3d.git"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [ maintainers.marius851000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7be0e132341..26bec15f568 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1629,6 +1629,8 @@ in fast-cli = nodePackages.fast-cli; + faudio = callPackage ../development/libraries/faudio { }; + fd = callPackage ../tools/misc/fd { }; fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { }; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 2c47a362c9a..88ea6a00f8c 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -44,6 +44,8 @@ rec { gsmSupport = true; gphoto2Support = true; ldapSupport = true; + faudioSupport = true; + vkd3dSupport = true; }; stable = base.override { wineRelease = "stable"; }; From f3366d27f5f87634cb4672d0ce7db676da4b6e13 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 12 Oct 2019 14:45:28 +0200 Subject: [PATCH 110/139] sauerbraten: 5000 -> 5492 fixes https://github.com/NixOS/nixpkgs/issues/45088 cc @raskin --- pkgs/games/sauerbraten/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 3a9635f6712..c4119ee4363 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchsvn, libGLU_combined, SDL, SDL_image, SDL_mixer -, libpng, zlib, libjpeg, imagemagick, libX11, runtimeShell +{ stdenv, fetchsvn, SDL2, SDL2_image, SDL2_mixer +, zlib, runtimeShell }: stdenv.mkDerivation rec { name = "sauerbraten-r${version}"; - version = "5000"; + version = "5492"; src = fetchsvn { url = "https://svn.code.sf.net/p/sauerbraten/code"; - sha256 = "17libj7dslprlwppdk3vyxdcigbsa4czln8gdyz9j264m11z1cbh"; + sha256 = "0pin7ggy84fadjvran18db5v0l81qfv42faknpfaxx47xqz00l5s"; rev = version; }; buildInputs = [ - libGLU_combined SDL SDL_image SDL_mixer libpng zlib libjpeg imagemagick - libX11 + SDL2 SDL2_mixer SDL2_image + zlib ]; preBuild = '' From 2c410e25de148e7ed19be3682f4512cac81072af Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 10 Aug 2019 01:44:54 +0200 Subject: [PATCH 111/139] atinout: init 0.9.2-alpha --- pkgs/tools/networking/atinout/default.nix | 28 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/networking/atinout/default.nix diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix new file mode 100644 index 00000000000..175ba3960ee --- /dev/null +++ b/pkgs/tools/networking/atinout/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, ronn, mount }: + +stdenv.mkDerivation rec { + name = "atinout-${version}"; + version = "0.9.2-alpha"; + + NIX_CFLAGS_COMPILE = [ "-Werror=implicit-fallthrough=0" ]; + LANG = "C.UTF-8"; + nativeBuildInputs = [ ronn mount ]; + + src = fetchgit { + url = "git://git.code.sf.net/p/atinout/code"; + rev = "4976a6cb5237373b7e23cd02d7cd5517f306e3f6"; + sha256 = "0bninv2bklz7ly140cxx8iyaqjlq809jjx6xqpimn34ghwsaxbpv"; + }; + + installPhase = '' + make PREFIX=$out install + ''; + + meta = with stdenv.lib; { + homepage = http://atinout.sourceforge.net; + description = "Tool for talking to modems"; + platforms = platforms.unix; + license = licenses.gpl3; + maintainers = with maintainers; [ bendlas ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26bec15f568..14596a6dd5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -660,6 +660,8 @@ in gsl = gsl_1; }; + atinout = callPackage ../tools/networking/atinout { }; + atomicparsley = callPackage ../tools/video/atomicparsley { inherit (darwin.apple_sdk.frameworks) Cocoa; }; From 6c7029e7ce4e41816a12fe9bb9d87107fb38c258 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 10 Aug 2019 01:45:19 +0200 Subject: [PATCH 112/139] libui: 3.1a -> 4.1a --- pkgs/development/libraries/libui/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index e333e73de3f..57385d1b410 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchgit, cmake, pkgconfig, gtk3, Cocoa }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, Cocoa }: let shortName = "libui"; - version = "3.1a"; + version = "4.1a"; backend = if stdenv.isDarwin then "darwin" else "unix"; in stdenv.mkDerivation { name = "${shortName}-${version}"; - src = fetchgit { - url = "https://github.com/andlabs/libui.git"; - rev = "6ebdc96b93273c3cedf81159e7843025caa83058"; - sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn"; + src = fetchFromGitHub { + owner = "andlabs"; + repo = "libui"; + rev = "alpha4.1"; + sha256 = "0bm6xvqk4drg2kw6d304x6mlfal7gh8mbl5a9f0509smmdzgdkwm"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = stdenv.lib.optional stdenv.isLinux gtk3 + propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux gtk3 ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' From 1c165f5d4a6faf552c084b364d3e33b9c5e54ecd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 12 Oct 2019 01:30:33 +0200 Subject: [PATCH 113/139] maintainers: add hexa --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 142d36fe761..82be9e7e415 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2637,6 +2637,11 @@ githubId = 1401179; name = "Guanpeng Xu"; }; + hexa = { + github = "mweinelt"; + githubId = 131599; + name = "Martin Weinelt"; + }; hhm = { email = "heehooman+nixpkgs@gmail.com"; github = "hhm0"; From 97d29590286349570d87df0bd0dfd0775c0dc349 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 12 Oct 2019 01:30:55 +0200 Subject: [PATCH 114/139] nixos/tests: add babeld --- nixos/tests/all-tests.nix | 1 + nixos/tests/babeld.nix | 148 +++++++++++++++++++++++ pkgs/tools/networking/babeld/default.nix | 4 +- 3 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/babeld.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 04323317a99..914b32f97c3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -25,6 +25,7 @@ in atd = handleTest ./atd.nix {}; automysqlbackup = handleTest ./automysqlbackup.nix {}; avahi = handleTest ./avahi.nix {}; + babeld = handleTest ./babeld.nix {}; bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64 beanstalkd = handleTest ./beanstalkd.nix {}; beegfs = handleTestOn ["x86_64-linux"] ./beegfs.nix {}; # beegfs is unsupported on aarch64 diff --git a/nixos/tests/babeld.nix b/nixos/tests/babeld.nix new file mode 100644 index 00000000000..5242cf395d7 --- /dev/null +++ b/nixos/tests/babeld.nix @@ -0,0 +1,148 @@ + +import ./make-test.nix ({ pkgs, lib, ...} : { + name = "babeld"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ hexa ]; + }; + + nodes = + { client = { pkgs, lib, ... }: + { + virtualisation.vlans = [ 10 ]; + + networking = { + useDHCP = false; + interfaces."eth1" = { + ipv4.addresses = lib.mkForce [ { address = "192.168.10.2"; prefixLength = 24; } ]; + ipv4.routes = lib.mkForce [ { address = "0.0.0.0"; prefixLength = 0; via = "192.168.10.1"; } ]; + ipv6.addresses = lib.mkForce [ { address = "2001:db8:10::2"; prefixLength = 64; } ]; + ipv6.routes = lib.mkForce [ { address = "::"; prefixLength = 0; via = "2001:db8:10::1"; } ]; + }; + }; + }; + + localRouter = { pkgs, lib, ... }: + { + virtualisation.vlans = [ 10 20 ]; + + boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1; + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; + + networking = { + useDHCP = false; + firewall.enable = false; + + interfaces."eth1" = { + ipv4.addresses = lib.mkForce [ { address = "192.168.10.1"; prefixLength = 24; } ]; + ipv6.addresses = lib.mkForce [ { address = "2001:db8:10::1"; prefixLength = 64; } ]; + }; + + interfaces."eth2" = { + ipv4.addresses = lib.mkForce [ { address = "192.168.20.1"; prefixLength = 24; } ]; + ipv6.addresses = lib.mkForce [ { address = "2001:db8:20::1"; prefixLength = 64; } ]; + }; + }; + + services.babeld = { + enable = true; + interfaces.eth2 = { + hello-interval = 1; + type = "wired"; + }; + extraConfig = '' + local-port-readwrite 33123 + + import-table 254 # main + export-table 254 # main + + in ip 192.168.10.0/24 deny + in ip 192.168.20.0/24 deny + in ip 2001:db8:10::/64 deny + in ip 2001:db8:20::/64 deny + + in ip 192.168.30.0/24 allow + in ip 2001:db8:30::/64 allow + + in deny + + redistribute local proto 2 + redistribute local deny + ''; + }; + }; + remoteRouter = { pkgs, lib, ... }: + { + virtualisation.vlans = [ 20 30 ]; + + boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1; + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; + + networking = { + useDHCP = false; + firewall.enable = false; + + interfaces."eth1" = { + ipv4.addresses = lib.mkForce [ { address = "192.168.20.2"; prefixLength = 24; } ]; + ipv6.addresses = lib.mkForce [ { address = "2001:db8:20::2"; prefixLength = 64; } ]; + }; + + interfaces."eth2" = { + ipv4.addresses = lib.mkForce [ { address = "192.168.30.1"; prefixLength = 24; } ]; + ipv6.addresses = lib.mkForce [ { address = "2001:db8:30::1"; prefixLength = 64; } ]; + }; + }; + + services.babeld = { + enable = true; + interfaces.eth1 = { + hello-interval = 1; + type = "wired"; + }; + extraConfig = '' + local-port-readwrite 33123 + + import-table 254 # main + export-table 254 # main + + in ip 192.168.20.0/24 deny + in ip 192.168.30.0/24 deny + in ip 2001:db8:20::/64 deny + in ip 2001:db8:30::/64 deny + + in ip 192.168.10.0/24 allow + in ip 2001:db8:10::/64 allow + + in deny + + redistribute local proto 2 + redistribute local deny + ''; + }; + + }; + }; + + testScript = + '' + startAll; + + $client->waitForUnit("network-online.target"); + $localRouter->waitForUnit("network-online.target"); + $remoteRouter->waitForUnit("network-online.target"); + + $localRouter->waitForUnit("babeld.service"); + $remoteRouter->waitForUnit("babeld.service"); + + $localRouter->waitUntilSucceeds("ip route get 192.168.30.1"); + $localRouter->waitUntilSucceeds("ip route get 2001:db8:30::1"); + + $remoteRouter->waitUntilSucceeds("ip route get 192.168.10.1"); + $remoteRouter->waitUntilSucceeds("ip route get 2001:db8:10::1"); + + $client->succeed("ping -c1 192.168.30.1"); + $client->succeed("ping -c1 2001:db8:30::1"); + + $remoteRouter->succeed("ping -c1 192.168.10.2"); + $remoteRouter->succeed("ping -c1 2001:db8:10::2"); + ''; +}) diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 12d2d169a23..2ff127f3e68 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, nixosTests }: stdenv.mkDerivation rec { pname = "babeld"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { makeFlags="PREFIX=$out ETCDIR=$out/etc" ''; + passthru.tests.babeld = nixosTests.babeld; + meta = { homepage = http://www.pps.univ-paris-diderot.fr/~jch/software/babel/; description = "Loop-avoiding distance-vector routing protocol"; From 817d23d7e0a3e0b2917625c0d7c9f0ddd01c6fa3 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 7 Oct 2019 15:49:31 +0200 Subject: [PATCH 115/139] cinelerra: use github source fixes build error due to discontinued repository --- pkgs/applications/video/cinelerra/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index eb3946b9ed0..d567622000e 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, libtool +{ stdenv, fetchFromGitHub, autoconf, automake, libtool , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr @@ -9,8 +9,9 @@ stdenv.mkDerivation { name = "cinelerra-unstable-2016-01-12"; - src = fetchgit { - url = "git://git.cinelerra-cv.org/j6t/cinelerra.git"; + src = fetchFromGitHub { + owner = "ratopi"; + repo = "CinelerraCV"; rev = "454be60e201c18c1fc3f1f253a6d2184fcfc94c4"; sha256 = "1n4kshqhgnr7aivsi8dgx48phyd2nzvv4szbc82mndklvs9jfb7r"; }; From e5782ca77c8706c1c5ccdc22fb3ad593282cac6f Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 12 Oct 2019 15:20:19 +0200 Subject: [PATCH 116/139] cinelerra: 2016-01-12 -> 2018-05-16 fixes SEGV on startup --- pkgs/applications/video/cinelerra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index d567622000e..42d3b387320 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -7,13 +7,13 @@ , fontconfig, intltool }: stdenv.mkDerivation { - name = "cinelerra-unstable-2016-01-12"; + name = "cinelerra-unstable-2018-05-16"; src = fetchFromGitHub { owner = "ratopi"; repo = "CinelerraCV"; - rev = "454be60e201c18c1fc3f1f253a6d2184fcfc94c4"; - sha256 = "1n4kshqhgnr7aivsi8dgx48phyd2nzvv4szbc82mndklvs9jfb7r"; + rev = "d9c0dbf4393717f0a42f4b91c3e1ed5b16f955dc"; + sha256 = "0a8kfm1v96sv6jh4568crg6nkr6n3579i9xksfj8w199s6yxzsbk"; }; # touch config.rpath: work around bug in automake 1.10 ? From f452b45052af4feddc958a503883ab23f802c11c Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 12 Oct 2019 15:43:33 +0200 Subject: [PATCH 117/139] cinelerra: streamline build --- pkgs/applications/video/cinelerra/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 42d3b387320..36ad39bd37c 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -7,7 +7,7 @@ , fontconfig, intltool }: stdenv.mkDerivation { - name = "cinelerra-unstable-2018-05-16"; + name = "cinelerra-cv-2018-05-16"; src = fetchFromGitHub { owner = "ratopi"; @@ -16,14 +16,18 @@ stdenv.mkDerivation { sha256 = "0a8kfm1v96sv6jh4568crg6nkr6n3579i9xksfj8w199s6yxzsbk"; }; - # touch config.rpath: work around bug in automake 1.10 ? preConfigure = '' find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@${perl}/bin/perl@" -i - touch config.rpath ./autogen.sh sed -i -e "s@/usr/bin/file@${file}/bin/file@" ./configure ''; + ## fix bug with parallel building + preBuild = '' + make -C cinelerra versioninfo.h + ''; + enableParallelBuilding = true; + buildInputs = [ automake autoconf libtool pkgconfig file @@ -38,10 +42,6 @@ stdenv.mkDerivation { fontconfig intltool ]; - # $ make -C cinelerra edl.o - # edl.C:50:25: fatal error: versioninfo.h: No such file or directory - enableParallelBuilding = false; - meta = { description = "Video Editor"; homepage = http://www.cinelerra.org; From 57f698434a850fa03cbe86bab51262f2138bc627 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 Oct 2019 06:58:46 -0700 Subject: [PATCH 118/139] crispyDoom: 5.6 -> 5.6.3 (#69496) * crispyDoom: 5.6 -> 5.6.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/crispy-doom/versions * crispy-doom: 5.6.2 -> 5.6.3 --- pkgs/games/crispy-doom/default.nix | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index 3897f29c657..4fb4f301cfb 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -1,23 +1,31 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchurl }: +{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "crispy-doom-5.6"; - src = fetchurl { - url = "https://github.com/fabiangreffrath/crispy-doom/archive/${name}.tar.gz"; - sha256 = "1icz3ivd7v3mvwlslwwd7s3bpjzr54x4lslihyjg1ckq23sl830j"; + pname = "crispy-doom"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "fabiangreffrath"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0f319979wqfgm4pvsa6y5clg30p55l441kmrr8db0p5smyv3x2s4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; - patchPhase = '' + + postPatch = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ''; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; enableParallelBuilding = true; meta = { - homepage = http://fabiangreffrath.github.io/crispy-doom; + homepage = "http://fabiangreffrath.github.io/crispy-doom"; description = "A limit-removing enhanced-resolution Doom source port based on Chocolate Doom"; - longDescription = "Crispy Doom is a limit-removing enhanced-resolution Doom source port based on Chocolate Doom. Its name means that 640x400 looks \"crisp\" and is also a slight reference to its origin."; + longDescription = '' + Crispy Doom is a limit-removing enhanced-resolution Doom source port based on Chocolate Doom. + Its name means that 640x400 looks \"crisp\" and is also a slight reference to its origin. + ''; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ neonfuz ]; From 66d8b9aa3c491bc85ede97dd11705ceda811c6ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 Oct 2019 07:14:38 -0700 Subject: [PATCH 119/139] calamares: 3.2.11 -> 3.2.15 (#69510) * calamares: 3.2.11 -> 3.2.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/calamares/versions * calamares: 3.2.13 -> 3.2.15 --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 2c48f995ca2..3a6585514ab 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "calamares"; - version = "3.2.11"; + version = "3.2.15"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1djrc8p6kll8szycyj86v02jphiw2xwfhn563siykphfqr0jknlw"; + sha256 = "0m2z34vgcqaf1yfa2919v3mz9b0q43mihz6di5kg62h6swaaanxd"; }; buildInputs = [ From 6ed5bf160c1ce9bc49b921dfe2bffcbe54fcb45a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 12 Oct 2019 11:03:46 -0400 Subject: [PATCH 120/139] linux: 4.14.148 -> 4.14.149 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5c07f84ca82..289f7cc3915 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.148"; + version = "4.14.149"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1b8ggknvaidsvqnzpgbcmz3ybys9a8jm8iq6aqcnqfp10d0bglhj"; + sha256 = "15pjngy3j5vnisv462ll7wsg78qv7q2cz86da0bcwh446v9ap7g6"; }; } // (args.argsOverride or {})) From 83162506c6b86e515a3526c0b08df55835619602 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 12 Oct 2019 11:04:27 -0400 Subject: [PATCH 121/139] linux: 4.19.78 -> 4.19.79 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index b12127d349b..decfab4382a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.78"; + version = "4.19.79"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jah57k3q7b674dr544cniwhya667d8h7x9k5886d1g2qrvylqyz"; + sha256 = "0d2bcg0krahia2ylgqaxdppyr9idq2pi6y1si6h8n9sg6rj3a57i"; }; } // (args.argsOverride or {})) From 198eb547e2043f8a9aef5927a6df9efbd9327417 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 12 Oct 2019 11:05:09 -0400 Subject: [PATCH 122/139] linux: 5.2.20 -> 5.2.21 --- pkgs/os-specific/linux/kernel/linux-5.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index 6db0c8471df..d3794616d8c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.20"; + version = "5.2.21"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0sddasxka08c1qjhbd9w4z7rzprfly2i67q4iwppbldngi4y48di"; + sha256 = "0f1mick15d0m7yhhhdwai03wmczvkm9cg38w2ivgmgysfpzy73ls"; }; } // (args.argsOverride or {})) From b2db28464b838f99b8ed910729237afa544dab09 Mon Sep 17 00:00:00 2001 From: Jeroen Wijenbergh Date: Sat, 12 Oct 2019 15:22:04 +0200 Subject: [PATCH 123/139] spotify-tui: init at 0.5.0 --- maintainers/maintainer-list.nix | 6 +++++ .../audio/spotify-tui/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/applications/audio/spotify-tui/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 142d36fe761..46863c9102d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3271,6 +3271,12 @@ githubId = 8460; name = "John Wiegley"; }; + jwijenbergh = { + email = "jeroenwijenbergh@protonmail.com"; + github = "jwijenbergh"; + githubId = 46386452; + name = "Jeroen Wijenbergh"; + }; jwilberding = { email = "jwilberding@afiniate.com"; name = "Jordan Wilberding"; diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix new file mode 100644 index 00000000000..441d0efcb52 --- /dev/null +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "spotify-tui"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "Rigellute"; + repo = "spotify-tui"; + rev = "v${version}"; + sha256 = "1spnr67fb2wjjf9sfkk3vps6q45w0zrk47an79bhv4imziy4dbs3"; + }; + + cargoSha256 = "029g80mcqvmckszpbzm4hxs5w63n41ah4rc1b93i9c1nzvncd811"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ]; + + meta = with stdenv.lib; { + description = "Spotify for the terminal written in Rust"; + homepage = https://github.com/Rigellute/spotify-tui; + license = licenses.mit; + maintainers = with maintainers; [ jwijenbergh ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14596a6dd5f..788bb62169f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20676,6 +20676,8 @@ in split2flac = callPackage ../applications/audio/split2flac { }; + spotify-tui = callPackage ../applications/audio/spotify-tui { }; + squishyball = callPackage ../applications/audio/squishyball { ncurses = ncurses5; }; From 50c36c4df149b15c32207dab5cf63410cfbd0a17 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 12 Oct 2019 11:05:45 -0400 Subject: [PATCH 124/139] linux: 5.3.5 -> 5.3.6 --- pkgs/os-specific/linux/kernel/linux-5.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix index 5d5624af2da..9311cad10a0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.3.5"; + version = "5.3.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1w2k3q6q9cf3r27z084c9nsxh49bq4cvky39pp6dp3r9zif8rvc0"; + sha256 = "07zcfpj6ras7mmazny5xjwf8v6l5hwdgnla21sqpppl48ylj2h78"; }; } // (args.argsOverride or {})) From 91295f93fbf8d737339742ec6a3ac605c8c315d9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 12 Oct 2019 11:12:54 -0400 Subject: [PATCH 125/139] zoom-us: 3.0.301026.0930 -> 3.0.303290.1010 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 5a84f9be96d..9c06a737598 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.0.301026.0930"; + version = "3.0.303290.1010"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0y3c7345y2wibz6p7d6p89wraaqb51651p176z4v7lcjv3gr8dar"; + sha256 = "0rs18csmwb8r5n0fc1ka1zjz3f0rydm6fxiy1pa1c2k5bmya56f9"; }; }; From 950ae44ea9d03acc42acc4bf486764b7cc351d21 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 12 Oct 2019 11:17:24 -0400 Subject: [PATCH 126/139] oh-my-zsh: 2019-10-09 -> 2019-10-10 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 450ce647125..176d7dfafeb 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-10-09"; + version = "2019-10-10"; pname = "oh-my-zsh"; - rev = "710a3d5a1e2888a4dfb1769f8f1edd8a590eee22"; + rev = "52f58785645c18aa88ea515d070a42bcfe97508d"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "0yckzrinlggyr40qc0cib3nw631vgy8nryiazyjw1mlx8iq1dskd"; + sha256 = "0sxj077g8jh9v0n3zzrkihmgx7v5dyv4h6nrpk1c5ijjk9j7x9d5"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 6fc744bc84d4973586e3c8c9a92e04e637f109f1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 12 Oct 2019 17:19:16 +0200 Subject: [PATCH 127/139] python37Packages.glances: 3.1.2 -> 3.1.3 --- pkgs/development/python-modules/glances/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix index 0f4bb4ce9c4..f248dffb4ff 100644 --- a/pkgs/development/python-modules/glances/default.nix +++ b/pkgs/development/python-modules/glances/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchFromGitHub, isPyPy, lib +{ buildPythonPackage, fetchFromGitHub, fetchpatch, isPyPy, lib , psutil, setuptools, bottle, batinfo, pysnmp , hddtemp, future # Optional dependencies: @@ -9,18 +9,23 @@ buildPythonPackage rec { pname = "glances"; - version = "3.1.2"; + version = "3.1.3"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "1z9sq0chhm8m4gq98yfknxj408cj017h7j375blngjk2zvhw39qd"; + sha256 = "15yz8sbw3k3n0729g2zcwsxc5iyhkyrhqza6fnipxxpsskwgqbwp"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): - patches = lib.optional doCheck ./skip-failing-tests.patch; + patches = lib.optional doCheck ./skip-failing-tests.patch + ++ [ (fetchpatch { + # Correct unitest + url = "https://github.com/nicolargo/glances/commit/abf64ffde31113f5f46ef286703ff061fc57395f.patch"; + sha256 = "00krahqq89jvbgrqx2359cndmvq5maffhpj163z10s1n7q80kxp1"; + }) ]; doCheck = true; checkInputs = [ unittest2 ]; From c880884656ef8ae550217269f717a73e1a9a67d4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 12 Oct 2019 18:28:15 +0200 Subject: [PATCH 128/139] spotify-tui: fix darwin build --- pkgs/applications/audio/spotify-tui/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 441d0efcb52..14c9a88d4e4 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "spotify-tui"; @@ -12,9 +12,10 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "029g80mcqvmckszpbzm4hxs5w63n41ah4rc1b93i9c1nzvncd811"; - + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { description = "Spotify for the terminal written in Rust"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 788bb62169f..770fba7b7ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20676,7 +20676,9 @@ in split2flac = callPackage ../applications/audio/split2flac { }; - spotify-tui = callPackage ../applications/audio/spotify-tui { }; + spotify-tui = callPackage ../applications/audio/spotify-tui { + inherit (darwin.apple_sdk.frameworks) Security; + }; squishyball = callPackage ../applications/audio/squishyball { ncurses = ncurses5; From 0877ebd6d2e238f708bcf9dbfd2b013f641e0ace Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 Oct 2019 10:33:32 -0700 Subject: [PATCH 129/139] catch2: 2.8.0 -> 2.9.2 (#63993) * catch2: 2.8.0 -> 2.9.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/catch2/versions * catch2: 2.9.1 -> 2.9.2 --- pkgs/development/libraries/catch2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index d7876affe2f..f8097599f4f 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.8.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="1i7nz29gcsy9cnljb0sb1fw8fg9p1gdh2pdhrgj3kcrsnxgbyhrq"; + sha256="0wn0vm9mdl4iv3scihdwfbg40appnllzbq4ik3jpr1jdf6ik7par"; }; nativeBuildInputs = [ cmake ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; - homepage = http://catch-lib.net; + homepage = "http://catch-lib.net"; license = licenses.boost; maintainers = with maintainers; [ edwtjo knedlsepp ]; platforms = with platforms; unix; From 89b78283178728f83a4541865a23f254b1361ca9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 Oct 2019 13:02:27 -0700 Subject: [PATCH 130/139] dmtcp: 2.5.2 -> 2.6.0 (#69521) * dmtcp: 2.5.2 -> 2.6.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/dmtcp/versions * dmtcp: disable on ARM and Darwin --- pkgs/os-specific/linux/dmtcp/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index 1d67b16a492..0f7f2f9817a 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dmtcp"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { - owner = "dmtcp"; - repo = "dmtcp"; + owner = pname; + repo = pname; rev = version; - sha256 = "1sq38in4wk855yhfnzbs9xpnps97fhja93w08xjmx7szzm33g5a8"; + sha256 = "01skyhr573w1dygvkwz66lvir2jsq443fjwkysglwxvmrdfz9kwd"; }; dontDisableStatic = true; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --replace "os.getenv('USER')" "\"nixbld1\"" ''; - meta = { + meta = with stdenv.lib; { description = "Distributed MultiThreaded Checkpointing"; longDescription = '' DMTCP (Distributed MultiThreaded Checkpointing) is a tool to @@ -41,7 +41,8 @@ stdenv.mkDerivation rec { programs spread across many machines and connected by sockets. It does not modify the user's program or the operating system. ''; - homepage = http://dmtcp.sourceforge.net/; - license = stdenv.lib.licenses.lgpl3Plus; # most files seem this or LGPL-2.1+ + homepage = "http://dmtcp.sourceforge.net/"; + license = licenses.lgpl3Plus; # most files seem this or LGPL-2.1+ + platforms = intersectLists platforms.linux platforms.x86; # broken on ARM and Darwin }; } From 6e46d3bcbd983cf40ae55f215fd539958319a576 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 Oct 2019 13:10:04 -0700 Subject: [PATCH 131/139] groonga: 9.0.6 -> 9.0.7 (#69581) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/groonga/versions --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 9fd49e96fa2..669901d7625 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "9.0.6"; + version = "9.0.7"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "0d1p8v7qd97h3znp84a1w40hbg834n3wxp6gaa8mbnff16s18kl7"; + sha256 = "1j308p6l6q716qlk3azqk9v11a93cxhcppj7qh5wm2aqsngw9rfq"; }; buildInputs = with stdenv.lib; From 2d0056b1493680084196fb547932d7ac0cb27f0c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 12 Oct 2019 16:29:27 -0400 Subject: [PATCH 132/139] aliases.nix: update jikes message --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 97c3f1df458..b81f1a79c71 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -162,7 +162,7 @@ mapAliases ({ infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; jbuilder = dune; # added 2018-09-09 - jikes = throw "deprecated in 2019-10-07: abandoned by upstream"; + jikes = throw "deprecated in 2019-10-07: jikes was abandoned by upstream"; joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdiff3-qt5 = kdiff3; # added 2017-02-18 From 5075996b5921b70a4b509536d40d3a89fb5b7cac Mon Sep 17 00:00:00 2001 From: kjuvi Date: Tue, 8 Oct 2019 19:05:08 +0200 Subject: [PATCH 133/139] envelope: init at 0.0.4 Co-authored-by: worldofpeace --- pkgs/applications/office/envelope/default.nix | 74 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/applications/office/envelope/default.nix diff --git a/pkgs/applications/office/envelope/default.nix b/pkgs/applications/office/envelope/default.nix new file mode 100644 index 00000000000..9142fff9a2c --- /dev/null +++ b/pkgs/applications/office/envelope/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkgconfig +, pantheon +, python3 +, vala +, appstream-glib +, desktop-file-utils +, gettext +, glib +, gtk3 +, libgee +, sqlite +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "envelope"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "cjfloss"; + repo = pname; + rev = version; + sha256 = "111lq1gijcm7qwpac09q11ymwiw2x3m12a28ki52f28fb1amvffc"; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + meson + ninja + vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libgee + pantheon.granite + sqlite + ]; + + doCheck = true; + + patches = [ + # Fix AppData Validation. + # https://github.com/cjfloss/envelope/pull/59 + (fetchpatch { + url = "https://github.com/cjfloss/envelope/commit/b6a28eced89b8f944479fcc695aebfb9aae0c691.patch"; + sha256 = "11znc8z52kl893n3gmmdpnp3y4vpzmb263m5gp0qxbl3xykq2wzr"; + }) + ]; + + postPatch = '' + chmod +x data/post_install.py + patchShebangs data/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Personal finance manager for elementary OS"; + homepage = "https://github.com/cjfloss/envelope"; + maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + platforms = platforms.linux; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34dc13fcdab..13639320579 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18222,6 +18222,8 @@ in enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; + envelope = callPackage ../applications/office/envelope { }; + eolie = callPackage ../applications/networking/browsers/eolie { }; epdfview = callPackage ../applications/misc/epdfview { }; From fb60d59a5143e59c291a6dd8f9fa153287d08990 Mon Sep 17 00:00:00 2001 From: paumr Date: Sun, 13 Oct 2019 00:35:28 +0200 Subject: [PATCH 134/139] newsboat - unmark as broken newsboat builds fine on master/19.09 thus this commit should also be backported https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.newsboat.x86_64-linux#tabs-status --- pkgs/applications/networking/feedreaders/newsboat/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 4273545a8e5..f7a9521c993 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -53,6 +53,5 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ dotlambda nicknovitski ]; license = licenses.mit; platforms = platforms.unix; - broken = true; }; } From 5078eba3aa90f2ea87dc84ccc96991bc3f386d97 Mon Sep 17 00:00:00 2001 From: Greg Roodt Date: Sun, 13 Oct 2019 11:12:59 +1100 Subject: [PATCH 135/139] argo: 2.2.1 -> 2.4.1 (#70672) --- .../networking/cluster/argo/default.nix | 5 +- .../networking/cluster/argo/deps.nix | 530 ++++++++++++------ 2 files changed, 376 insertions(+), 159 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 92db34417f4..2c0d039721f 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -2,17 +2,18 @@ buildGoPackage rec { pname = "argo"; - version = "2.2.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "0x3aizwbqkg2712021wcq4chmwjhw2df702wbr6zd2a2cdypwb67"; + sha256 = "1f9l9d4r0qfhpr2fn17faczcwmwmdz8f56f27cmmnhxz4r7qcm48"; }; goDeps = ./deps.nix; goPackagePath = "github.com/argoproj/argo"; + subPackages = [ "cmd/argo" ]; meta = with lib; { description = "Container native workflow engine for Kubernetes"; diff --git a/pkgs/applications/networking/cluster/argo/deps.nix b/pkgs/applications/networking/cluster/argo/deps.nix index ace7ecd21b3..b275cd21cf4 100644 --- a/pkgs/applications/networking/cluster/argo/deps.nix +++ b/pkgs/applications/networking/cluster/argo/deps.nix @@ -5,8 +5,26 @@ fetch = { type = "git"; url = "https://code.googlesource.com/gocloud"; - rev = "64a2037ec6be8a4b0c1d1f706ed35b428b989239"; - sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; + rev = "ceeb313ad77b789a7fa5287b36a1d127b69b7093"; + sha256 = "0z5z3qag9g4fc7g6di7ijxzz0s3c7al1rx0sxxkbqbpwlgk4iwf2"; + }; + } + { + goPackagePath = "contrib.go.opencensus.io/exporter/ocagent"; + fetch = { + type = "git"; + url = "https://github.com/census-ecosystem/opencensus-go-exporter-ocagent"; + rev = "f9129169651c35ecbdc1186c3ba4aa876ee62e1e"; + sha256 = "09n7w31668f6f55qw6qkw85mp6mhkmxs2x5hk4vr0p5qiqap576h"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "880eb0e2aca291c40538ddef66e5914fb1cc1d7f"; + sha256 = "0v6d6la29n3kkgn7r3b63pf96cpj5kf88rddkm2x2vqb9x2gmi0p"; }; } { @@ -23,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/purell"; - rev = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"; - sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; + rev = "44968752391892e1b0d0b821ee79e9a85fa13049"; + sha256 = "0c525frsxmalrn55hzzsxy17ng8avkd40ga0wxfw9haxsdjgqdqy"; }; } { @@ -41,8 +59,17 @@ fetch = { type = "git"; url = "https://github.com/argoproj/pkg"; - rev = "1aa3e0c55668da17703adba5c534fff6930db589"; - sha256 = "0lr1dimm443qq3zzcrpialvxq9bl8pb3317zn34gmf1sycqh4iii"; + rev = "5616f48963eebf7cca912632230032b263bb62bc"; + sha256 = "1m50mpmgdv4hjdpl994xdkdbjfwv7dagn6mhix17cb5mf61ixs6z"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "d57c8d96f72d9475194ccf18d2ba70ac294b0cb3"; + sha256 = "09bv2ay7vnv15vj83ysqs98v0hcjg0nziwnp7qjdr0iasrhl4r21"; }; } { @@ -50,8 +77,26 @@ fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + rev = "37c8de3658fcb183f997c4e13e8337516ab753e6"; + sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; + }; + } + { + goPackagePath = "github.com/census-instrumentation/opencensus-proto"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-proto"; + rev = "d89fa54de508111353cb0b06403c00569be780d8"; + sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; + }; + } + { + goPackagePath = "github.com/colinmarc/hdfs"; + fetch = { + type = "git"; + url = "https://github.com/colinmarc/hdfs"; + rev = "9746310a4d311e21ce43b2a645c5a1e64c5e8efa"; + sha256 = "0r5dyadjck22i7fyci67r00ajbcqgx52z13rhriy0sw68j510r1r"; }; } { @@ -59,8 +104,17 @@ fetch = { type = "git"; url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; }; } { @@ -68,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/docker/spdystream"; - rev = "bc6354cbbc295e925e4c611ffe90c1f287ee54db"; - sha256 = "08746a15snvmax6cnzn2qy7cvsspxbsx97vdbjpdadir3pypjxya"; + rev = "6480d4af844c189cf5dd913db24ddd339d3a4f85"; + sha256 = "19glzj20vvy19igsl5bji9xrxi9m0ixhk4zs98dg15mh8ah36zak"; }; } { @@ -86,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/emicklei/go-restful"; - rev = "3eb9738c1697594ea6e71a7156a9bb32ed216cf0"; - sha256 = "1zqcjhg4q7788hyrkhwg4b6r1vc4qnzbw8c5j994mr18x42brxzg"; + rev = "6ac3b8eb89d325e5c750d77f344a6870464d03c3"; + sha256 = "0dgjld5240xhz45rj929ffm452n931qfw3fx8x99vhlnii9qrwz2"; }; } { @@ -95,8 +149,8 @@ fetch = { type = "git"; url = "https://github.com/emirpasic/gods"; - rev = "f6c17b524822278a87e3b3bd809fec33b51f5b46"; - sha256 = "1zhkppqzy149fp561pif8d5d92jd9chl3l9z4yi5f8n60ibdmmjf"; + rev = "1615341f118ae12f353cc8a983f35b584342c9b3"; + sha256 = "0i5qqq7ajvw3mikr95zl9rsnfsjanzwpqqs6kzzplsfgsifybar1"; }; } { @@ -104,17 +158,8 @@ fetch = { type = "git"; url = "https://github.com/evanphx/json-patch"; - rev = "afac545df32f2287a079e2dfb7ba2745a643747e"; - sha256 = "1d90prf8wfvndqjn6nr0k405ykia5vb70sjw4ywd49s9p3wcdyn8"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + rev = "026c730a0dcc5d11f93f1cf1cc65b01247ea7b6f"; + sha256 = "144mk2v9q37l1qjf8498nff4hhz96mlkl7ls7ihixbmrji4lmch4"; }; } { @@ -122,17 +167,8 @@ fetch = { type = "git"; url = "https://github.com/ghodss/yaml"; - rev = "c7ce16629ff4cd059ed96ed06419dd3856fd3577"; - sha256 = "10cyv1gy3zwwkr04kk8cvhifb7xddakyvnk5s13yfcqj9hcjz8d1"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "358ee7663966325963d4e8b2e1fbd570c5195153"; - sha256 = "1zr51xaka7px1pmfndm12fvg6a3cr24kg77j28zczbfcc6h339gy"; + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; }; } { @@ -140,8 +176,8 @@ fetch = { type = "git"; url = "https://github.com/go-openapi/jsonpointer"; - rev = "3a0015ad55fa9873f41605d3e8f28cd279c32ab2"; - sha256 = "02an755ashhckqwxyq2avgn8mm4qq3hxda2jsj1a3bix2gkb45v7"; + rev = "a105a905c5e6ad147f08504784917f3e178e0ba5"; + sha256 = "1s3cqf4svrbygvvpvi7hf122szsgihas52vqh0bba3avf4w03g9n"; }; } { @@ -149,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/go-openapi/jsonreference"; - rev = "3fb327e6747da3043567ee86abd02bb6376b6be2"; - sha256 = "0zwsrmqqcihm0lj2pc18cpm7wnn1dzwr4kvrlyrxf0lnn7dsdsbm"; + rev = "2903bfd4bfbaf188694f1edf731f2725a8fa344f"; + sha256 = "0v933yvcwyzzlpdxwb9204ki7lls2rwfd96ww2i901ndvz37kdf8"; }; } { @@ -158,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/go-openapi/spec"; - rev = "bce47c9386f9ecd6b86f450478a80103c3fe1402"; - sha256 = "0agys8v5rkfyinvmjd8hzgwvb20hnqninwkxwqkwbbsnakhi8shk"; + rev = "bdfd7e07daecc404d77868a88b2364d0aed0ee5a"; + sha256 = "1r2my46qc85fp1j4lbddmd6c1n0am9bq1wyqsnw7x8raiznqxp5l"; }; } { @@ -167,8 +203,17 @@ fetch = { type = "git"; url = "https://github.com/go-openapi/swag"; - rev = "2b0bd4f193d011c203529df626a65d63cb8a79e8"; - sha256 = "14c998wkycmy69jhjqkrah8acrr9xfam1dxbzl0lf4s2ghwn7bdn"; + rev = "c3d0f7896d589f3babb99eea24bbc7de98108e72"; + sha256 = "1z34vqc5yz6rzvarrvlhkimxx33p74iaxb28l1mv716njvlsmjhg"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "72cd26f257d44c1114970e19afddcd812016007e"; + sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; }; } { @@ -176,17 +221,8 @@ fetch = { type = "git"; url = "https://github.com/gogo/protobuf"; - rev = "636bf0302bc95575d69441b25a2603156ffdddf1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + rev = "0ca988a254f991240804bf9821f3450d87ccbb1b"; + sha256 = "0slfyrmbpdcppf0z3waar90bpszdhi2gv705ys1b0zx5x6ax8f1a"; }; } { @@ -194,8 +230,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; }; } { @@ -203,8 +239,8 @@ fetch = { type = "git"; url = "https://github.com/google/gofuzz"; - rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; + rev = "f140a6486e521aad38f5917de355cbf147cc0496"; + sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; }; } { @@ -212,8 +248,8 @@ fetch = { type = "git"; url = "https://github.com/googleapis/gnostic"; - rev = "7c663266750e7d82587642f65e60bc4083f1f84e"; - sha256 = "0yh3ckd7m0r9h50wmxxvba837d0wb1k5yd439zq4p1kpp4390z12"; + rev = "ab0dd09aa10e2952b28e12ecd35681b20463ebab"; + sha256 = "1f4bs71hrqkwg8fdhsxh25s12xnkxly13cnmp6m4qj6vc6k6zr2n"; }; } { @@ -221,8 +257,26 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; - sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; + rev = "c3e18be99d19e6b3e8f1559eea2c161a665c4b6b"; + sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/grpc-gateway"; + rev = "471f45a5a99a578de7a8638dc7ed29e245bde097"; + sha256 = "1jbr14p1dh6jpq3q6b4nq97ryh56h17ali0nckicpxhdrvxgi81c"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-uuid"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-uuid"; + rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"; + sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; }; } { @@ -230,17 +284,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/golang-lru"; - rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"; - sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2"; - }; - } - { - goPackagePath = "github.com/howeyc/gopass"; - fetch = { - type = "git"; - url = "https://github.com/howeyc/gopass"; - rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; - sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + rev = "7f827b33c0f158ec5dfbba01bb0b14a4541fd81d"; + sha256 = "1p2igd58xkm8yaj2c2wxiplkf2hj6kxwrg6ss7mx61s5rd71v5xb"; }; } { @@ -248,8 +293,8 @@ fetch = { type = "git"; url = "https://github.com/imdario/mergo"; - rev = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4"; - sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; + rev = "7c29201646fa3de8506f701213473dd407f19646"; + sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8"; }; } { @@ -270,13 +315,31 @@ sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl"; }; } + { + goPackagePath = "github.com/jcmturner/gofork"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/gofork"; + rev = "dc7c13fece037a4a36e2b3c69db4991498d30692"; + sha256 = "0xzsnjqv3d59w9pgqzf6550wdwaqnac7zcdgqfd25w65yhcffzhr"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "c2b33e84"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; + }; + } { goPackagePath = "github.com/json-iterator/go"; fetch = { type = "git"; url = "https://github.com/json-iterator/go"; - rev = "1624edc4454b8682399def8740d46db5e4362ba4"; - sha256 = "11wn4hpmrs8bmpvd93wqk49jfbbgylakhi35f9k5qd7jd479ci4s"; + rev = "27518f6661eba504be5a7a9a9f6d9460d892ade3"; + sha256 = "0n79p4s67zl5zprxv7diayw3vavnmmfqkmd6snz0i9bxp825dsyz"; }; } { @@ -284,8 +347,26 @@ fetch = { type = "git"; url = "https://github.com/kevinburke/ssh_config"; - rev = "9fc7bb800b555d63157c65a904c86a2cc7b4e795"; - sha256 = "102icrla92zmr5zngipc8c9yfbqhf73zs2w2jq6s7p0gdjifigc8"; + rev = "6cfae18c12b8934b1afba3ce8159476fdef666ba"; + sha256 = "05jvz5r58a057zxvic9dyr9v2wilha8l6366npwkqgxmnmk9sh5f"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "3427c32cb71afc948325f299f040e53c1dd78979"; + sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz"; }; } { @@ -293,8 +374,8 @@ fetch = { type = "git"; url = "https://github.com/mailru/easyjson"; - rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; - sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; + rev = "b2ccc519800e761ac8000b95e5d57c80a897ff9e"; + sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk"; }; } { @@ -311,8 +392,8 @@ fetch = { type = "git"; url = "https://github.com/minio/minio-go"; - rev = "70799fe8dae6ecfb6c7d7e9e048fce27f23a1992"; - sha256 = "0xvvnny59v4p1y2kbvz90ga5xvc5sq1gc4wv6cym82rdbvgzb2ax"; + rev = "c6c2912aa5522e5f5a505e6cba30e95f0d8456fa"; + sha256 = "0f5av1da4xbcy34j6dfy7c90na4a1capmsyac9qswq4xzq2zky10"; }; } { @@ -320,8 +401,17 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/go-homedir"; - rev = "58046073cbffe2f25d425fe1331102f55cf719de"; - sha256 = "0kwflrwsjdsy8vbhyzicc4c2vdi7lhdvn4rarfr18x1qsrb7n1bx"; + rev = "af06845cf3004701891bf4fdb884bfe4920b3727"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-ps"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-ps"; + rev = "621e5597135b1d14a7d9c2bfc7bc312e7c58463c"; + sha256 = "0sjkz24kqz5nzgncnvdlzhlyba4jwmf6cxj8c4p8mb44679gkphh"; }; } { @@ -342,22 +432,13 @@ sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; }; } - { - goPackagePath = "github.com/pelletier/go-buffruneio"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-buffruneio"; - rev = "c37440a7cf42ac63b919c752ca73a85067e05992"; - sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; - }; - } { goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; }; } { @@ -383,8 +464,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; + rev = "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016"; + sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; }; } { @@ -392,8 +473,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "c7de2306084e37d54b8be01f3541a8464345e9a5"; - sha256 = "11dqfm2d0m4sjjgyrnayman96g59x2apmvvqby9qmww2qj2k83ig"; + rev = "31bed53e4047fd6c510e43a941f90cb31be0972a"; + sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; }; } { @@ -401,8 +482,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "05ee40e3a273f7245e8777337fc7b46e533a9a92"; - sha256 = "0f6fnczxa42b9rys2h3l0m8fy3x5hrhaq707vq0lbx5fcylw8lis"; + rev = "00ec24a6a2d86e7074629c8384715dbb05adccd8"; + sha256 = "1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544"; }; } { @@ -419,8 +500,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "3e01752db0189b9157070a0e1668a620f9a85da2"; - sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c"; + rev = "839c75faf7f98a33d445d181f3018b5c3409a45e"; + sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; }; } { @@ -428,8 +509,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "7c4570c3ebeb8129a1f7456d0908a8b676b6f9f1"; - sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7"; + rev = "fe5e611709b0c57fa4a89136deaa8e1d4004d053"; + sha256 = "1pn7g9jmhqc9yg6x02dgp4phiggnnxz8a11pv5y4vxhrvkjm6h71"; }; } { @@ -437,8 +518,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + rev = "298182f68c66c05229eb03ac171abe6e309ee79a"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; }; } { @@ -446,8 +527,8 @@ fetch = { type = "git"; url = "https://github.com/src-d/gcfg"; - rev = "f187355171c936ac84a82793659ebb4936bc1c23"; - sha256 = "1hrdxlha4kkcpyydmjqd929rmwn5a9xq7arvwhryxppxq7502axk"; + rev = "1ac3a1ac202429a54835fe8408a92880156b489d"; + sha256 = "044j95skmyrwjw5fwjk6ka32rjgsg0ar0mfp9np19sh1acwv4x4r"; }; } { @@ -464,8 +545,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + rev = "221dbe5ed46703ee255b1da0dec05086f5035f62"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; }; } { @@ -473,8 +554,8 @@ fetch = { type = "git"; url = "https://github.com/tidwall/gjson"; - rev = "1e3f6aeaa5bad08d777ea7807b279a07885dd8b2"; - sha256 = "0b0kvpzq0xxk2fq4diy3ab238yjx022s56h5jv1lc9hglds80lnn"; + rev = "c5e72cdf74dff23857243dd662c465b810891c21"; + sha256 = "0cg23va26ga6d0gckp5i3ramc98cbz6ij9gn9dqqyc8igvcx9cb3"; }; } { @@ -482,8 +563,17 @@ fetch = { type = "git"; url = "https://github.com/tidwall/match"; - rev = "1731857f09b1f38450e2c12409748407822dc6be"; - sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578"; + rev = "33827db735fff6510490d69a8622612558a557ed"; + sha256 = "1ip5nkjvmzzzsypyzdd9nsnzbhwssprlx8qs5llqh16fl7kcvi3n"; + }; + } + { + goPackagePath = "github.com/tidwall/pretty"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/pretty"; + rev = "1166b9ac2b65e46a43d8618d30d1554f4652d49b"; + sha256 = "1jwpj5903lh8hsj9apm2gwd70809zq0gjgmivkxaq4iq29wnv0n9"; }; } { @@ -500,8 +590,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/fasttemplate"; - rev = "dcecefd839c4193db0d35b88ec65b4c12d360ab0"; - sha256 = "0kkxn0ad5a36533djh50n9l6wsylmnykridkm91dqlqbjirn7216"; + rev = "8b5e4e491ab636663841c42ea3c5a9adebabaf36"; + sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq"; }; } { @@ -509,8 +599,17 @@ fetch = { type = "git"; url = "https://github.com/xanzy/ssh-agent"; - rev = "640f0ab560aeb89d523bb6ac322b1244d5c3796c"; - sha256 = "069nlriymqswg52ggiwi60qhwrin9nzhd2g65a7h59z2qbcvk2hy"; + rev = "6a3e2ff9e7c564f36873c2e36413f634534f1c44"; + sha256 = "1chjlnv5d6svpymxgsr62d992m2xi6jb5lybjc5zn1h3hv1m01av"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "aab39bd6a98b853ab66c8a564f5d6cfcad59ce8a"; + sha256 = "1x1ysvpyak1hcmfgvy0mk30g1ammbsmw19c9s0brz5h9wn7m4vva"; }; } { @@ -518,8 +617,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "f027049dab0ad238e394a753dba2d14753473a04"; - sha256 = "026475grqvylk9n2ld4ygaxmzck6v97j48sc2x58jjsmqflnhzld"; + rev = "9756ffdc24725223350eb3266ffb92590d28f278"; + sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; }; } { @@ -527,8 +626,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f9ce57c11b242f0f1599cf25c89d8cb02c45295a"; - sha256 = "1m507gyjd9246cr3inpn6lgv3vnc3i11x4fgz0k0hdxv3cn9dyx2"; + rev = "ba9fcec4b297b415637633c5a6e8fa592e4a16c3"; + sha256 = "1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx"; }; } { @@ -536,8 +635,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "3d292e4d0cdc3a0113e6d207bb137145ef1de42f"; - sha256 = "0jvivlvx7snacd6abd1prqxa7h1z6b7s6mqahn8lpqlag3asryrl"; + rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33"; + sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c580c3556b8cee6403af37a4fc5f28c"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; }; } { @@ -545,8 +653,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "904bdc257025c7b3f43c19360ad3ab85783fad78"; - sha256 = "1pmj9axkj898bk4i4lny03b3l0zbkpvxj03gyjckliabqimqz0az"; + rev = "9109b7679e13aa34a54834cfb4949cac4b96e576"; + sha256 = "169sg6fyjkykiylrgxr0pynv2zc3frkgssbsk5w2lqyl8mb319hl"; }; } { @@ -554,8 +662,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; }; } { @@ -563,8 +671,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/time"; - rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; - sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; + rev = "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef"; + sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; }; } { @@ -572,8 +680,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "ca6481ae56504398949d597084558e50ad07117a"; - sha256 = "0pza1pd0wy9r0pf9b9hham9ldr2byyg1slqf8p56dhf8b6j9jw9v"; + rev = "be0da057c5e3c2df569a2c25cd280149b7d7e7d0"; + sha256 = "19i9sjvbk79sgzyzjzrnmf575rnwj2bjsj4r1fmp7827dq97kqks"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "feb0267beb8644f5088a03be4d5ec3f8c7020152"; + sha256 = "1lzdzkd2i41v6amxs9jah1q44qbvf1yvm8906jpfjiq6c3ffhqss"; }; } { @@ -581,8 +698,26 @@ fetch = { type = "git"; url = "https://github.com/golang/appengine"; - rev = "b1f26356af11148e710935ed1ac8a7f5702c7612"; - sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + rev = "5f2a59506353b8d5ba8cbbcd9f3c1f41f1eaf079"; + sha256 = "1gwcwh8w5b1l15pjm8pqs3bbymvjcak3wva37zi5z9ilzr8c5wnx"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "24fa4b261c55da65468f2abfdae2b024eef27dfb"; + sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "6eaf6f47437a6b4e2153a190160ef39a92c7eceb"; + sha256 = "1cn33r2gclmq2v1ndpf1n5bmhf2qs8mms7ii5cnl6f9ch4r2c4k3"; }; } { @@ -594,13 +729,58 @@ sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; }; } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "d4cae42d398bc0095297fc3315669590d29166ea"; + sha256 = "1z7531wz62305hwg9y2f04d819am8x3ys96ssy6qndlzmw60yjsr"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/aescts.v1"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/aescts"; + rev = "f6abebb3171c4c1b1fea279cb7c7325020a26290"; + sha256 = "0rbq4zf3db48xa2gqdp2swws7wizmbwagigqkr1zxzd1ramps6rv"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/dnsutils.v1"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/dnsutils"; + rev = "13eeb8d49ffb74d7a75784c35e4d900607a3943c"; + sha256 = "0l543c64pyzbnrc00jspg21672l3a0kjjw9pbdxwna93w8d8m927"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/gokrb5.v5"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/gokrb5"; + rev = "32ba44ca5b42f17a4a9f33ff4305e70665a1bc0f"; + sha256 = "0jynpkncifdd2ib2pc9qhh0r8q7ab7yw0ygzpzgisdzv8ars1diq"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/rpc.v0"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/rpc"; + rev = "4480c480c9cd343b54b0acb5b62261cbd33d7adf"; + sha256 = "0hivgq52gwxsqs5x1my2047k7nqh7wx3yi0llsj3lc3h2mjy4yhd"; + }; + } { goPackagePath = "gopkg.in/src-d/go-billy.v4"; fetch = { type = "git"; url = "https://github.com/src-d/go-billy"; - rev = "83cf655d40b15b427014d7875d10850f96edba14"; - sha256 = "18fghcyk69g460px8rvmhmqldkbhw17dpnhg45qwdvaq90b0bkx9"; + rev = "780403cfc1bc95ff4d07e7b26db40a6186c5326e"; + sha256 = "0jcyi4ink2njgflp3f2mbl5b86p2w0rh945k5xplcl158i5wkrc6"; }; } { @@ -608,8 +788,8 @@ fetch = { type = "git"; url = "https://github.com/src-d/go-git"; - rev = "3bd5e82b2512d85becae9677fa06b5a973fd4cfb"; - sha256 = "1krg24ncckwalmhzs2vlp8rwyk4rfnhfydwg8iw7gaywww2c1wfc"; + rev = "0d1a009cbb604db18be960db5f1525b99a55d727"; + sha256 = "0n4x7r69qrmpss51b3wd3vj4b9jmip4archz3fbqk6q1yyd1pxjb"; }; } { @@ -626,8 +806,8 @@ fetch = { type = "git"; url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } { @@ -635,8 +815,8 @@ fetch = { type = "git"; url = "https://github.com/kubernetes/api"; - rev = "0f11257a8a25954878633ebdc9841c67d8f83bdb"; - sha256 = "1y8k0b03ibr8ga9dr91dc2imq2cbmy702a1xqggb97h8lmb6jqni"; + rev = "e3a6b8045b0b303430f6d0c261fd9e35be50800e"; + sha256 = "1c1nrcy0j7aj93l2xgdw0asyvxa4h8pzz004drf7pvh9pvsg0vqq"; }; } { @@ -644,8 +824,8 @@ fetch = { type = "git"; url = "https://github.com/kubernetes/apimachinery"; - rev = "e386b2658ed20923da8cc9250e552f082899a1ee"; - sha256 = "0lgwpsvx0gpnrdnkqc9m96xwkifdq50l7cj9rvh03njws4rbd8jz"; + rev = "8f6ac2502e5143406f4eaedc4ca4262854d877ce"; + sha256 = "0v8cb63nvry4b0ls1h185hb3llp6rk0b4n92f76jcjsv1b7sspbi"; }; } { @@ -653,8 +833,8 @@ fetch = { type = "git"; url = "https://github.com/kubernetes/client-go"; - rev = "a312bfe35c401f70e5ea0add48b50da283031dc3"; - sha256 = "0z360np4iv7jdgacw576gdxbzl8ss810kbqwyrjk39by589rfkl9"; + rev = "6d55c1b1f1ca8ad83d572bbc3ca55ba5526d9d71"; + sha256 = "1j8m0pqn9c6lwr7h5aq7zrpdd73bwbwnhy4mbc0654ylmc3lnq8q"; }; } { @@ -662,8 +842,8 @@ fetch = { type = "git"; url = "https://github.com/kubernetes/code-generator"; - rev = "9de8e796a74d16d2a285165727d04c185ebca6dc"; - sha256 = "09858ykfrd3cyzkkpafzhqs6h7bk3n90s3p52x3axn4f7ikjh7k4"; + rev = "6c2a4329ac290d921e8616cad41635c87dbb1518"; + sha256 = "18kx2wcqb5cvivbl61q7vyic5rp0fica9n6xgrjfsxczjbihlq70"; }; } { @@ -671,8 +851,17 @@ fetch = { type = "git"; url = "https://github.com/kubernetes/gengo"; - rev = "c42f3cdacc394f43077ff17e327d1b351c0304e4"; - sha256 = "05vbrqfa96izm5j2q9f4yiyrbyx23nrkj5yv4fhfc7pvwb35iy04"; + rev = "a874a240740c2ae854082ec73d46c5efcedd2149"; + sha256 = "0z8gay4bj6l8cv7gzi55l2c3jx94caq28sk0x6p3s6wxqxmnqp92"; + }; + } + { + goPackagePath = "k8s.io/klog"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/klog"; + rev = "3ca30a56d8a775276f9cdae009ba326fdc05af7f"; + sha256 = "0a7kn145q4cbsd2cfpv7sz09prjrxl6aaqzdcgq7p7jxc23a7zps"; }; } { @@ -680,8 +869,35 @@ fetch = { type = "git"; url = "https://github.com/kubernetes/kube-openapi"; - rev = "e3762e86a74c878ffed47484592986685639c2cd"; - sha256 = "1n9j08dwnj77iflzj047hrk0zg6nh1m4a5pljjdsvvf3xgka54pz"; + rev = "5e22f3d471e6f24ca20becfdffdc6206c7cecac8"; + sha256 = "08drikf269fhlnrhc29v7rhxl1950d94rl5x8l11n0qf2v2ffwib"; + }; + } + { + goPackagePath = "k8s.io/utils"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/utils"; + rev = "3a4a5477acf81b48e20870a3b9dc743f63c66730"; + sha256 = "1f01ck7nvm9rmw1fkylbnr1cdd9byiagl9ni40j9p9gfy5v5nxk8"; + }; + } + { + goPackagePath = "sigs.k8s.io/yaml"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/yaml"; + rev = "fd68e9863619f6ec2fdd8625fe1f02e7c877e480"; + sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; + }; + } + { + goPackagePath = "upper.io/db.v3"; + fetch = { + type = "git"; + url = "https://upper.io/db.v3"; + rev = "fad80cdab4f761cb26416675df120f5d8c3f0db7"; + sha256 = "1bddpi278bzp39470llrgnsnnfyqqmzym5hmd8dxmczmzhhkirfv"; }; } ] \ No newline at end of file From 710e28bdd8a137c29eb4c4d6b12207ee17cf52a9 Mon Sep 17 00:00:00 2001 From: Red Davies Date: Fri, 11 Oct 2019 23:22:41 -0400 Subject: [PATCH 136/139] ponyc: 0.31.0 -> 0.32.0 --- 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 6c9c9c77e6d..f20a32acedd 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { pname = "ponyc"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "0cchikwga59b3p7ip9d6kxz50w5yvk1dh1dcmbix4fwfwc3zdm75"; + sha256 = "07ai5lr0zdrcdmfjxsypp33fpj8lnak7y5177s7qd19163z0ia20"; }; buildInputs = [ llvm makeWrapper which ]; From e1b9556f87ba339b2cee43905286ab559e5fc402 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 30 Sep 2019 19:57:19 +0000 Subject: [PATCH 137/139] =?UTF-8?q?ocamlPackages.ocsigen=5Fserver:=202.11.?= =?UTF-8?q?0=20=E2=86=92=202.15.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.ssl: 0.5.5 → 0.5.9 --- .../ocaml-modules/ocsigen-server/default.nix | 4 +-- .../development/ocaml-modules/ssl/default.nix | 26 ++++++++----------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index df484b230c2..426fecf3915 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -13,14 +13,14 @@ let mkpath = p: n: in stdenv.mkDerivation rec { - version = "2.11.0"; + version = "2.15.0"; pname = "ocsigenserver"; src = fetchFromGitHub { owner = "ocsigen"; repo = "ocsigenserver"; rev = version; - sha256 = "0y1ngki7w9s10ip7nj9qb7254bd5sp01xxz16sxyj7l7qz603hy2"; + sha256 = "15qdkxcbl9c1bbn0fh9awjw0hjn7r6awcn288a9vyxln7icdbifw"; }; buildInputs = [ which makeWrapper ocaml findlib diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index b24d799cf28..5ee77425a2f 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -1,29 +1,25 @@ -{ stdenv, fetchzip, which, openssl, ocaml, findlib }: +{ lib, buildDunePackage, fetchFromGitHub, pkg-config, openssl }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ssl-${version}"; - version = "0.5.5"; +buildDunePackage rec { + pname = "ssl"; + version = "0.5.9"; - src = fetchzip { - url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz"; - sha256 = "0j5zvsx51dg5r7sli7bakv7gfd29z890h0xzi876pg9vywwz9w7l"; + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-ssl"; + rev = version; + sha256 = "04h02rvzrwp886n5hsx84rnc9b150iggy38g5v1x1rwz3pkdnmf0"; }; - buildInputs = [which ocaml findlib]; - + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [openssl]; - dontAddPrefix = true; - - createFindlibDestdir = true; - meta = { homepage = http://savonet.rastageeks.org/; description = "OCaml bindings for libssl "; license = "LGPL+link exception"; - platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.z77z + lib.maintainers.z77z ]; }; } From d15e5b02fec04532bfcdcbc1c3ab13996ca04638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 13 Oct 2019 10:03:54 +0200 Subject: [PATCH 138/139] nixos/lightdm: do not conflict with plymouth (#71061) Having `display-manager` conflict with `plymouth-quit` causes this lock up: - `plymouth-quit-wait` starts up, waiting for plymouth-quit to run - `lightdm` starts up - `plymouth-quit` can't start, it conflicts with lightdm - `plymouth-quit-wait` keeps waiting on plymouth-quit to kill plymouthd The idea is having LightDM control when plymouth quits, but communication with plymouth was broken: https://github.com/NixOS/nixpkgs/pull/71064 Unfortunately having the conflict breaks switching to configurations with plymouth enabled. So we still need to remove the conflict. fixes #71034 --- nixos/modules/services/x11/display-managers/lightdm.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index aeee48de701..cf4c05acbcc 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -220,10 +220,11 @@ in exec ${lightdm}/sbin/lightdm ''; - # Replaces getty and plymouth quit since it quits plymouth on it's own. + # Replaces getty systemd.services.display-manager.conflicts = [ "getty@tty7.service" - "plymouth-quit.service" + # TODO: Add "plymouth-quit.service" so LightDM can control when plymouth + # quits. Currently this breaks switching to configurations with plymouth. ]; # Pull in dependencies of services we replace. From 3cb1576815b910a54afefcadfc86e7dd85c3d5f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 13 Oct 2019 10:14:13 +0200 Subject: [PATCH 139/139] poetry: remove "broken" mark Apparently it was marked by mistake in 5aa4b1994629; it seems fine both locally and on Hydra's three platforms. --- pkgs/development/python-modules/poetry/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 62b7f97695e..52be2c3bafc 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -87,6 +87,5 @@ in buildPythonPackage rec { description = "Python dependency management and packaging made easy"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; - broken = true; }; }