From d2adb05aa6a20cc9e32baca7014b87acacc27ff4 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 24 Jun 2019 00:58:53 +0200
Subject: [PATCH 01/23] i3-layout-manager: init at unstable-2019-06-19
Simple script which is a wrapper for i3's layout persist functionality[1] that
automates the manual editing of the exported layout JSON.
[1] https://i3wm.org/docs/layout-saving.html
---
.../window-managers/i3/layout-manager.nix | 39 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +
2 files changed, 41 insertions(+)
create mode 100644 pkgs/applications/window-managers/i3/layout-manager.nix
diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix
new file mode 100644
index 000000000000..afa14b48451a
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/layout-manager.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, vim, makeWrapper, jq, rofi, xrandr, xdotool, i3, gawk, libnotify }:
+
+let
+ path = stdenv.lib.makeBinPath [ vim jq rofi xrandr xdotool i3 gawk libnotify ];
+in
+
+stdenv.mkDerivation rec {
+ pname = "i3-layout-manager";
+ version = "unstable-2019-06-19";
+
+ src = fetchFromGitHub {
+ owner = "klaxalk";
+ repo = pname;
+ rev = "80ade872bfd70d9c6039024097ceb8c852a2816a";
+ sha256 = "02xhyd737qwni628mjzr9i5v2kga5cq4k8m77bxm1p6kkj84nlmg";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ install -D layout_manager.sh $out/bin/layout_manager
+ wrapProgram $out/bin/layout_manager \
+ --prefix PATH : "${path}"
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/klaxalk/i3-layout-manager;
+ description = "Saving, loading and managing layouts for i3wm.";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ ma27 ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f90aa516e563..4344decb6328 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18430,6 +18430,8 @@ in
i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { };
+ i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { };
+
i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };
i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { };
From 02e8a36df1c33253822a945ab6290960edf7d082 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 29 Jun 2019 12:14:42 +0200
Subject: [PATCH 02/23] zsh-you-should-use: init at 1.1.0
Simple zsh plugin that reminds you to use existing aliases. With
`oh-my-zsh` it can be installed like this:
```
{
programs.zsh.ohMyZsh = {
customPkgs = [ pkgs.zsh-you-should-use ];
plugins = [ "you-should-use" ];
};
}
```
---
.../shells/zsh/zsh-you-should-use/default.nix | 26 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 28 insertions(+)
create mode 100644 pkgs/shells/zsh/zsh-you-should-use/default.nix
diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix
new file mode 100644
index 000000000000..c44483d3744f
--- /dev/null
+++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "zsh-you-should-use";
+ version = "1.1.0";
+
+ src = fetchFromGitHub {
+ owner = "MichaelAquilina";
+ repo = pname;
+ rev = version;
+ sha256 = "0fig5ralagi5jajk7gdm52jvwql17qk9cd6j98qsndvckb26a753";
+ };
+
+ dontBuild = true;
+
+ installPhase = ''
+ install -D you-should-use.plugin.zsh $out/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/MichaelAquilina/zsh-you-should-use;
+ license = licenses.gpl3;
+ description = "ZSH plugin that reminds you to use existing aliases for commands you just typed";
+ maintainers = with maintainers; [ ma27 ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54f2cab11d48..379a30e66ea4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6987,6 +6987,8 @@ in
zsh-command-time = callPackage ../shells/zsh/zsh-command-time { };
+ zsh-you-should-use = callPackage ../shells/zsh/zsh-you-should-use { };
+
zssh = callPackage ../tools/networking/zssh { };
zstd = callPackage ../tools/compression/zstd { };
From f88bb6c2b2bec0ca3d6ad9da5d1348fd779c22e5 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 30 Jun 2019 12:05:55 +0200
Subject: [PATCH 03/23] mautrix-appservice: 0.3.10.dev1 -> 0.3.11
---
.../development/python-modules/mautrix-appservice/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/mautrix-appservice/default.nix b/pkgs/development/python-modules/mautrix-appservice/default.nix
index 8f59d7ce7b5e..ba96e7d734be 100644
--- a/pkgs/development/python-modules/mautrix-appservice/default.nix
+++ b/pkgs/development/python-modules/mautrix-appservice/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "mautrix-appservice";
- version = "0.3.10.dev1";
+ version = "0.3.11";
src = fetchPypi {
inherit pname version;
- sha256 = "ed827ff2a50b43f8125268145991d51b4a32ea4fbdd95b589ea15019b72a0bc3";
+ sha256 = "60192920cff75afdd096eea3a43276e33ec15f4f00bd04d2d1dda616c84f22a5";
};
propagatedBuildInputs = [
From 91e311d1b060cf0891f82e16dd89d830c3600df2 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 30 Jun 2019 12:06:17 +0200
Subject: [PATCH 04/23] telethon: 1.6.2 -> 1.8.0
---
pkgs/development/python-modules/telethon/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix
index 09d944c80883..ec1c01df7c77 100644
--- a/pkgs/development/python-modules/telethon/default.nix
+++ b/pkgs/development/python-modules/telethon/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "telethon";
- version = "1.6.2";
+ version = "1.8.0";
src = fetchPypi {
inherit version;
pname = "Telethon";
- sha256 = "074h5gj0c330rb1nxzpqm31fp1vw7calh1cdkapbjx90j769iz18";
+ sha256 = "6e8f55cbe26a031d427f2c3e23d391b8c2272d1540bcb36fe4df65d928ca2b25";
};
propagatedBuildInputs = [
From f2a499549f10e7a5e47e6c066f8081d6dac03881 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Mon, 1 Jul 2019 15:19:15 -0400
Subject: [PATCH 05/23] nixos/httpd: drop mercurial httpd subservice
---
nixos/doc/manual/release-notes/rl-1909.xml | 5 ++
.../web-servers/apache-httpd/mercurial.nix | 75 -------------------
2 files changed, 5 insertions(+), 75 deletions(-)
delete mode 100644 nixos/modules/services/web-servers/apache-httpd/mercurial.nix
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 3c0699b4b539..0b3d2d0c4fd8 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -297,6 +297,11 @@
<literal>phd</literal> service have been removed from nixpkgs due to lack of maintainer.
</para>
</listitem>
+ <listitem>
+ <para>
+ The <literal>mercurial</literal> <literal>httpd.extraSubservice</literal> has been removed from nixpkgs due to lack of maintainer.
+ </para>
+ </listitem>
</itemizedlist>
</section>
</section>
diff --git a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
deleted file mode 100644
index 4b8ee2b17ea7..000000000000
--- a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
- inherit (pkgs) mercurial;
- inherit (lib) mkOption;
-
- urlPrefix = config.urlPrefix;
-
- cgi = pkgs.stdenv.mkDerivation {
- name = "mercurial-cgi";
- buildCommand = ''
- mkdir -p $out
- cp -v ${mercurial}/share/cgi-bin/hgweb.cgi $out
- sed -i "s|/path/to/repo/or/config|$out/hgweb.config|" $out/hgweb.cgi
- echo "
- [collections]
- ${config.dataDir} = ${config.dataDir}
- [web]
- style = gitweb
- allow_push = *
- " > $out/hgweb.config
- '';
- };
-
-in {
-
- extraConfig = ''
- RewriteEngine on
- RewriteRule /(.*) ${cgi}/hgweb.cgi/$1
-
- <Location "${urlPrefix}">
- AuthType Basic
- AuthName "Mercurial repositories"
- AuthUserFile ${config.dataDir}/hgusers
- <LimitExcept GET>
- Require valid-user
- </LimitExcept>
- </Location>
- <Directory "${cgi}">
- Order allow,deny
- Allow from all
- AllowOverride All
- Options ExecCGI
- AddHandler cgi-script .cgi
- PassEnv PYTHONPATH
- </Directory>
- '';
-
- robotsEntries = ''
- User-agent: *
- Disallow: ${urlPrefix}
- '';
-
- extraServerPath = [ pkgs.python ];
-
- globalEnvVars = [ { name = "PYTHONPATH"; value = "${mercurial}/lib/${pkgs.python.libPrefix}/site-packages"; } ];
-
- options = {
- urlPrefix = mkOption {
- default = "/hg";
- description = "
- The URL prefix under which the Mercurial service appears.
- Use the empty string to have it appear in the server root.
- ";
- };
-
- dataDir = mkOption {
- example = "/data/mercurial";
- description = "
- Path to the directory that holds the repositories.
- ";
- };
- };
-
-}
From 00ba557856d6217121e50ea69c251e9458d9dc08 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 8 Jul 2019 12:31:11 -0400
Subject: [PATCH 06/23] systems/doubles.nix: add Apple doubles
These are used in cross-compilation to iOS devices and simulators.
Fallout from #60349.
---
lib/systems/doubles.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 09e9089aa6fd..39018d045b32 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -13,9 +13,11 @@ let
"i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd"
- "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux"
+ "x86_64-cygwin" "x86_64-freebsd" "x86_64-linux"
"x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
+ "x86_64-darwin" "aarch64-ios" "armv7a-ios" "x86_64-ios" "i686-ios"
+
"x86_64-windows" "i686-windows"
"wasm64-wasi" "wasm32-wasi"
From 520f8464b0331d3c2f3c588d2c411dfab93ef2bf Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 3 Jul 2019 15:03:21 -0500
Subject: [PATCH 07/23] jsoncpp: 1.8.4 -> 1.9.0
---
pkgs/development/libraries/jsoncpp/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index b543d47a050d..fa2b45ae948e 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jsoncpp";
- version = "1.8.4";
+ version = "1.9.0";
src = fetchFromGitHub {
owner = "open-source-parsers";
repo = "jsoncpp";
rev = version;
- sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm";
+ sha256 = "10wnwlq92gp32f5p55kjcc12jfsl0yq6f2y4abb0si6wym12krw9";
};
/* During darwin bootstrap, we have a cp that doesn't understand the
From 9921afa53feea9c4f6f8a02b2577dafceb6a2a4b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 3 Jul 2019 15:00:30 -0500
Subject: [PATCH 08/23] trilium: (0.32.4,0.33.5) -> 0.33.6
---
pkgs/applications/office/trilium/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
index 788f2ccf3d1f..c1e2fdcc7dfa 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@@ -13,11 +13,11 @@ let
in stdenv.mkDerivation rec {
name = "trilium-${version}";
- version = "0.32.4";
+ version = "0.33.6";
src = fetchurl {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
- sha256 = "05h5k5n63pmf6mmyfpw41xf6lzfd8dwdhy7r5fmhdxy2gpl3a817";
+ sha256 = "1sg6iqhpgyr8zr6w6dgs0ha0indb9vyp8vh2clj2fds5ahhlvf91";
};
# Fetch from source repo, no longer included in release.
From fcd6773c4c2c6c4f126159bfa763a27c8e448b42 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 3 Jul 2019 14:44:50 -0500
Subject: [PATCH 09/23] electrum: 3.3.6 -> 3.3.7
---
pkgs/applications/misc/electrum/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 2f8b98f3a446..0de055df5698 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -14,14 +14,14 @@
}:
let
- version = "3.3.6";
+ version = "3.3.7";
# Not provided in official source releases, which are what upstream signs.
tests = fetchFromGitHub {
owner = "spesmilo";
repo = "electrum";
rev = version;
- sha256 = "0s8i6fn1jwk80d036n4c7csv4qnx2k15f6347kr4mllglcpa9hb3";
+ sha256 = "1g2kbbsi6k105q6s0la20h12gz8dzka5kdcjbdhs12jqsjfx3lr0";
extraPostFetch = ''
mv $out ./all
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "0am5ki3z0yvhrz16vp2jjy5fkxxqph0mj9qqpbw3kpql65shykwz";
+ sha256 = "13ahc4zqpgzmck2r663sqqgz86xsd83r5qqi26mh2vazy1i6pykz";
};
postUnpack = ''
From e7c08055e4a787a8116a9d113c99560bdd6dc5e1 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 9 Jul 2019 15:15:02 +0300
Subject: [PATCH 10/23] netdata: 1.15.0 -> 1.16.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 a749595b4154..5455728a10c2 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.15.0";
+ version = "1.16.0";
name = "netdata-${version}";
src = fetchurl {
url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz";
- sha256 = "04frfy08k6m70y3s8j3gvnfnqqd9d5mwj3j6krk9dsh34332abvx";
+ sha256 = "0kwbrkv7g9m7l580myd2r8bpxqn6fxmx5vd6xh7x94wygfffhann";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
From 91f523c38ee5b7f48c639077c63088c165b63bcc Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Tue, 9 Jul 2019 21:17:19 +0800
Subject: [PATCH 11/23] pax-utils: 1.2.2 -> 1.2.4
---
pkgs/os-specific/linux/pax-utils/default.nix | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 5de0081a411c..917652ca6f79 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl }:
+{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
- name = "pax-utils-${version}";
- version = "1.2.2";
+ pname = "pax-utils";
+ version = "1.2.4";
src = fetchurl {
- url = "https://dev.gentoo.org/~vapier/dist/${name}.tar.xz";
- sha512 = "26f7lqr1s2iywj8qfbf24sm18bl6f7cwsf77nxwwvgij1z88gvh6yx3gp65zap92l0xjdp8kwq9y96xld39p86zd9dmkm447czykbvb";
+ url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz";
+ sha256 = "01kr6l2c3bhbgdrmwgzh6jk0jjkw3pi9xrzzl9cpn0ibyf68p1aj";
};
makeFlags = [ "PREFIX=$(out)" ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "ELF utils that can check files for security relevant properties";
longDescription = ''
A suite of ELF tools to aid auditing systems. Contains
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
for displaying PaX and security info on a large groups of
binary files.
'';
- homepage = https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities;
+ homepage = "https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice joachifm ];
From 99f0083ea51039917e45dec58f139aea54796317 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 6 Jul 2019 21:14:48 +0200
Subject: [PATCH 12/23] pythonPackages.telethon: 1.8.0 -> 1.9.0
---
pkgs/development/python-modules/telethon/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix
index ec1c01df7c77..334163114a18 100644
--- a/pkgs/development/python-modules/telethon/default.nix
+++ b/pkgs/development/python-modules/telethon/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "telethon";
- version = "1.8.0";
+ version = "1.9.0";
src = fetchPypi {
inherit version;
pname = "Telethon";
- sha256 = "6e8f55cbe26a031d427f2c3e23d391b8c2272d1540bcb36fe4df65d928ca2b25";
+ sha256 = "a8797ad5bfee2b350cfc9b73cbb30fc19c8f73c0db42471e0df1371b1a269edc";
};
propagatedBuildInputs = [
From baddb2ac8907844888a4387c04393ae930ecc8d2 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 30 Jun 2019 12:06:39 +0200
Subject: [PATCH 13/23] mautrix-telegram: 0.5.2 -> 0.6.0
---
pkgs/servers/mautrix-telegram/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index 496b8c493904..7499f203136c 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -4,11 +4,11 @@ with python3.pkgs;
buildPythonPackage rec {
pname = "mautrix-telegram";
- version = "0.5.2";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "03dbd389e05aa08c52ef36ca362fcc9aa103f6c6173bb093ed03a96e05e8d43d";
+ sha256 = "fbed41838e1ef7e43f6e47ff38f9906cb311cfc5b3b6bc6f704babd7c83b193d";
};
postPatch = ''
From 0bc362c4851e2cd34b34ce7afcad9d8cdfb4c586 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 9 Jul 2019 20:32:51 +0300
Subject: [PATCH 14/23] dotnet-sdk: fix debugging
Without this attempt to run debugger fails with "Unknown error
0x80131c3c". Underlying problem is that libmscordbi.so cannot
find libmscordaccore.so.
---
pkgs/development/compilers/dotnet/sdk/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index b4f35b1c4c01..6c1fa37e81a4 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -28,7 +28,7 @@ in
runHook preBuild
patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ./dotnet
patchelf --set-rpath "${rpath}" ./dotnet
- find -type f -name "*.so" -exec patchelf --set-rpath "${rpath}" {} \;
+ find -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \;
echo -n "dotnet-sdk version: "
./dotnet --version
runHook postBuild
From a52e70e10e47a22238d81d8a52e547f5925ca73c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 27 Jun 2019 18:54:27 -0500
Subject: [PATCH 15/23] pahole: 1.12 -> 1.15
---
pkgs/development/tools/misc/pahole/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix
index 3864ad945835..5b17f111b45a 100644
--- a/pkgs/development/tools/misc/pahole/default.nix
+++ b/pkgs/development/tools/misc/pahole/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchgit, cmake, elfutils, zlib }:
stdenv.mkDerivation rec {
- name = "pahole-${version}";
- version = "1.12";
+ pname = "pahole";
+ version = "1.15";
src = fetchgit {
url = https://git.kernel.org/pub/scm/devel/pahole/pahole.git;
- sha256 = "1a8xfwqdc2j3ydh9bk2pkvsaf3lrkbxj66vj991c7knc31ix8kpw";
rev = "v${version}";
+ sha256 = "10af9mh3qxbx0hgjcmh0vjbg22bgxzhbpd9395ymasyw4npg6l9x";
};
nativeBuildInputs = [ cmake ];
From fc15a97b7b319f56dbcc1d286d13b0f709ed41d0 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Tue, 9 Jul 2019 09:17:06 -0400
Subject: [PATCH 16/23] eclipses: 2018-12 -> 2019-06
---
pkgs/applications/editors/eclipse/default.nix | 18 +++++++++---------
pkgs/applications/editors/eclipse/plugins.nix | 12 ++++++------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 3fa46fc4d927..972a9daded41 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -13,10 +13,10 @@ assert stdenv ? glibc;
let
platform_major = "4";
- platform_minor = "10";
- year = "2018";
- month = "12";
- timestamp = "201812060815";
+ platform_minor = "12";
+ year = "2019";
+ month = "06";
+ timestamp = "201906051800";
in rec {
@@ -34,7 +34,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "1f5yr7cydz4iw8c14yn713d44f1g1wkiqiwmb4ikdfx4l70rc5xxsdxv9b4mhm89b02cqnxdh9p5hivkssmnzg0km3ab5bx9mvzgzx7";
+ sha512 = "3mfljabrwbwq256vvsp9qjb96hzlbpwgnb3wz806pbyh0ibfq6s1hn8kh5aaa2da5821v0ykcxa12jagj7naqp4g91jqxp1wb1ygz2q";
};
};
@@ -46,7 +46,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "18psh1lgqg21dmndyc0yr6rz7piqyk861j9mlhgv9xaq8nz11fb6lil594sk64yyv0qbgi98vp03f1p06zvhgs37k9rjkfjmzl7n97k";
+ sha512 = "18p6xz6rq4w6j39b2k9kjpz8s1nljfq44g2cmvxqjgjfkq8lk4ij73ssyv1raly4wkm7r22ixacswdjmyj942k5vpv9y11i91hp1scv";
};
};
@@ -58,7 +58,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
- sha512 = "2zdvbjk05a00lbcad9v30rcr93j03d2pycdhpwrvrakr8z4yrxs6svamq9s294ry1w3lw04pgsnqklw6zjx6iil1kp51f374lkfpxn7";
+ sha512 = "0qiyk95qhdqcfgg5hgc7pcpbpjy9jnx7l3vb7s4cgijdz2xz0n5psh11lpj3whk2amh4iwkyx7kn8fxdq7lm03rlgx67cbk7p8my16m";
};
};
@@ -88,7 +88,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
- sha512 = "1kq14vhzcngfhl8kjs722rshny81gxv6wcgln46x7lnpg2274sb9dprhns62fpq97l0355cmg8mnny6fsd1nqibrw09xq932v86cfm8";
+ sha512 = "3bbc8d66ms7nhg6f8gb0bnzjqz26wixpipn4n9qf0azcplrv2j91z8hjw1fx39dx4pqnsf442bkgab4qqhkpks7qq54110l01q6gvy9";
};
};
@@ -100,7 +100,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "2xd5q7kg3aly7jnz2fijn06ljmnnd7ggwwzmndfhqwfzxpyjg1lnlln76pcd6chx7gnwdrl7khg0fs566ddabfjv17c46dj5fpw9y6j";
+ sha512 = "20qs1aagh4drsycvar3x42zy422zl34yg1p3vhxbqfbf7v3z1d3cxs9ah61x4bdxx9bkfwchasqp1wr15nflch9g0i50bdki3cgng1d";
};
};
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 08733d21f790..cf7980582ff7 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -254,12 +254,12 @@ rec {
cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}";
- version = "9.6.0";
+ version = "9.8.1";
src = fetchzip {
stripRoot = false;
- url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.6/${name}/${name}.zip";
- sha256 = "08rk3b1va57jcy4s161fx0xmb8dn47akhhxd2f28hspq6i2jqicm";
+ url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.8/${name}/${name}.zip";
+ sha256 = "0kxmwz75i8mv4wics9n0hspxhzl3glf5ry2v5mnl5j9gcf73b0nv";
};
meta = with stdenv.lib; {
@@ -474,12 +474,12 @@ rec {
jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}";
- version = "4.10";
+ version = "4.12";
src = fetchzip {
stripRoot = false;
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.10-201812060815/org.eclipse.jdt-4.10.zip;
- sha256 = "1h11w3zd6xy5w4sk6xnyb2a27wxwhp83qfx67ji7bzdrwbvljqkz";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.12-201906051800/org.eclipse.jdt-4.12.zip;
+ sha256 = "0qscvqg69z4554n1yhl0xg1xz8ln3qsbgfzi7cg3xnnwnxfqz9cb";
};
meta = with stdenv.lib; {
From 32ff51cafb5017e3b52795b9a848b3fac278997d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 9 Jul 2019 15:18:35 -0500
Subject: [PATCH 17/23] lazydocker: 0.5 -> 0.5.5 (#64484)
---
pkgs/tools/misc/lazydocker/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix
index f0c1227274e2..ea8f781e4055 100644
--- a/pkgs/tools/misc/lazydocker/default.nix
+++ b/pkgs/tools/misc/lazydocker/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lazydocker";
- version = "0.5";
+ version = "0.5.5";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = "lazydocker";
rev = "v${version}";
- sha256 = "0f062xn58dbci22pg6y4ifcdfs8whzlv2jjprxxk2ygzixrrjwnc";
+ sha256 = "0h2c1f9r67i6a8ppspsg1ln9rkm272092aaaw55sd15xxr51s4hb";
};
- modSha256 = "02n0lg28icy11a2j2rrlmp70blby0kmjas5j48jwh9h9a0yplqic";
+ modSha256 = "1lrrwcr95fxk4dlinyg74vqyxwwzagymncfps9bgig5v5d8gdd8j";
subPackages = [ "." ];
From 8d33a03ac2f08633a53189f8c444ff7804ae6fc6 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Mon, 8 Jul 2019 10:19:06 +0200
Subject: [PATCH 18/23] vimPlugins: Update
---
pkgs/misc/vim-plugins/generated.nix | 48 ++++++++++++++---------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 64b250e3a4c7..37c3af2995fd 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -248,12 +248,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2019-07-08";
+ version = "2019-07-09";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "8c7241d7e3f56bc2efda92c05e0148dcf7c41bc6";
- sha256 = "0agn16dj800sydqwjdr85m3d66hfbn8hh1azb2hsniwd5d1qkr6v";
+ rev = "b24601e6af3677dd5fd0d70bdcdc97a30591ae37";
+ sha256 = "0zxbrjy141ci02hwds200b6v1gj1bm98wbhr5wjmir8r9k4hrqg9";
};
};
@@ -436,12 +436,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2019-07-08";
+ version = "2019-07-09";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "8a9f52235c32011c91ad3630bed88cdcc6b55b08";
- sha256 = "0wvawl32w3zg04l513h7cby0ks4zzxli6m3yzyyv92ajnkmj4n0h";
+ rev = "0538a6449e9d1237d6df738ec612b7c3fe01b6f1";
+ sha256 = "0jznqn9hpiy3z2smss7z7lv0d37brm6a104cagbxbk7qar6dl97w";
};
};
@@ -538,12 +538,12 @@ let
deoplete-ternjs = buildVimPluginFrom2Nix {
pname = "deoplete-ternjs";
- version = "2019-07-03";
+ version = "2019-07-09";
src = fetchFromGitHub {
owner = "carlitux";
repo = "deoplete-ternjs";
- rev = "d82a008e26e323b8b3290c58ee87fe9e3dbd83cd";
- sha256 = "0bzvd3wn46p8bv0mmwlhcr68mpghg5sj9gnc52syjn2302kibkar";
+ rev = "fe5935dcf3cbaa663c81e2b9705a93840a407e56";
+ sha256 = "04yqw92yjcvimwvx1dqqc50y52j3y4zkvjkxmpmfnyx86ah730fk";
};
};
@@ -1103,12 +1103,12 @@ let
limelight-vim = buildVimPluginFrom2Nix {
pname = "limelight-vim";
- version = "2016-06-23";
+ version = "2019-07-09";
src = fetchFromGitHub {
owner = "junegunn";
repo = "limelight.vim";
- rev = "106fb5749d227a0de72e36068ed72798c6fd48e6";
- sha256 = "0fp4yp50n5v5zx3a7afh9wip4nwcfhmdgdzwpnl79jvild1z9fgh";
+ rev = "26e913a2e061195245bc62d24009ab67143a3c32";
+ sha256 = "0bxmihv9i96k6pl37pzgri03vbvjwlp34rl4gkj8w2ajhhi6nsnn";
};
};
@@ -1312,12 +1312,12 @@ let
neomake = buildVimPluginFrom2Nix {
pname = "neomake";
- version = "2019-07-07";
+ version = "2019-07-09";
src = fetchFromGitHub {
owner = "neomake";
repo = "neomake";
- rev = "3fe8bea59e6f19538968ea41ac33d6418071ffd6";
- sha256 = "0rnwzwk4vqvnp42854vxzxllyqap44p9wfppp89c1j0x2hi3ylih";
+ rev = "bc68b453e2e28bcaa5fa1bf841c78a0a4b0cc5ec";
+ sha256 = "0y6qjj1czk2wiax60zsnjbixa3lp10y9777ll7r65jdrhjrysd7v";
};
};
@@ -2874,12 +2874,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2019-07-08";
+ version = "2019-07-09";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "102b3a50e20d857b38e4c392b78be9a340669a70";
- sha256 = "0q7icsjycxw4l5awapkj8sig297f37hcyk5s4ns0ldrylh0xckl9";
+ rev = "5f9602e12f27bd59e38a0814c524c7c385ef4137";
+ sha256 = "1w12n7m607sa8rl704m1wq763zzz556ii1izsqnlyyrag0ld51cq";
};
};
@@ -2951,12 +2951,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2019-07-04";
+ version = "2019-07-09";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "3ab5d6c5448258d6ec3939d900f6ad431c3bad86";
- sha256 = "16ngnyy31xyghiz02gmpdr3l08inp95ncfknf57y7bd711jjj09m";
+ rev = "09edd7a4ff02895ffe48a51b6c83e104b7cd013a";
+ sha256 = "0mki5zy1r36vbs8fn2arb6nbw4b88iqsgdw00lw3263c8bdw23z7";
};
};
@@ -3370,12 +3370,12 @@ let
vim-markdown = buildVimPluginFrom2Nix {
pname = "vim-markdown";
- version = "2019-06-05";
+ version = "2019-07-09";
src = fetchFromGitHub {
owner = "plasticboy";
repo = "vim-markdown";
- rev = "0e43b4c5b06466cb54540b7452db6c6b22e33539";
- sha256 = "0wl7i071ql5h1aqhjj1kiwzl8f1s69n1a37cmsrh2czdc8s85qlj";
+ rev = "da5a7ac96f517e0fd6f886bc3fbe27156ca1f946";
+ sha256 = "198bsv88njz6l2pf9yjxb8292aj7x8n2sxi50q3cdsg29a3y2i5c";
};
};
From f597e3eeaaf3464190abd53a5da951d79ebd050b Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Mon, 8 Jul 2019 10:20:03 +0200
Subject: [PATCH 19/23] vimPlugins: Init various coc extension plugins
---
pkgs/misc/vim-plugins/generated.nix | 352 +++++++++++++++++++++++++
pkgs/misc/vim-plugins/vim-plugin-names | 32 +++
2 files changed, 384 insertions(+)
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 37c3af2995fd..edfafc4e9d37 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -246,6 +246,358 @@ let
};
};
+ coc-css = buildVimPluginFrom2Nix {
+ pname = "coc-css";
+ version = "2019-06-25";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-css";
+ rev = "235009ac2a92172cdae66987b172264230c04f74";
+ sha256 = "1i7bhiibcr2k5c0l79ddsfxirkhxs3cp9x83b4ys1zy2yaxljlw6";
+ };
+ };
+
+ coc-denite = buildVimPluginFrom2Nix {
+ pname = "coc-denite";
+ version = "2019-01-26";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-denite";
+ rev = "ec7dfd56612664c20bb0f6a19c524100cd2047ed";
+ sha256 = "0fc03ndq7ys4lvqgfbh314fsvbcjf3nm4spfklsmz2c587qbvv1l";
+ };
+ };
+
+ coc-emmet = buildVimPluginFrom2Nix {
+ pname = "coc-emmet";
+ version = "2019-06-17";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-emmet";
+ rev = "557bc1b88a84d9191337169484603a56fdb30adb";
+ sha256 = "1fla5i3fimm5h31qrivralbmhb88n1pkwzdfj74i6rd20fmv4xcx";
+ };
+ };
+
+ coc-eslint = buildVimPluginFrom2Nix {
+ pname = "coc-eslint";
+ version = "2019-06-17";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-eslint";
+ rev = "c8f1639146748b46f871144ed471c44741492c97";
+ sha256 = "0adz0wv0kmyhgz5ahqrdkp8lp2nrxh06b6rri2z7jbgplyksa0qc";
+ };
+ };
+
+ coc-git = buildVimPluginFrom2Nix {
+ pname = "coc-git";
+ version = "2019-07-08";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-git";
+ rev = "5551aa4af056b790467aafc3ab734eb5f5e9a8f1";
+ sha256 = "0rzyrlhrkvi7nzwbq2bina1j9ml22kxddj76ykwbxqkb6wxlzjqn";
+ };
+ };
+
+ coc-go = buildVimPluginFrom2Nix {
+ pname = "coc-go";
+ version = "2019-05-24";
+ src = fetchFromGitHub {
+ owner = "josa42";
+ repo = "coc-go";
+ rev = "2393c9860927e91874f6d13174cc1edeec758d9c";
+ sha256 = "1szq2nr3gppza2rq8b6kh4a8f3h831gzbnbnv45ycrcyplb4w2sy";
+ };
+ };
+
+ coc-highlight = buildVimPluginFrom2Nix {
+ pname = "coc-highlight";
+ version = "2019-07-01";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-highlight";
+ rev = "00e3cc159b3ce427d9f4e7993bcd963f37a3eb54";
+ sha256 = "0q9dfnn598499b8r9nsw0fi5ng873rvhwl5l70zqnc8ny9rbv74r";
+ };
+ };
+
+ coc-html = buildVimPluginFrom2Nix {
+ pname = "coc-html";
+ version = "2019-06-17";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-html";
+ rev = "f88704f9f252ebf5c6bfbc65c0747a3fd668ca3e";
+ sha256 = "010p0dmd7x3sxmhjdrcawrrcgzz56dmgf0rxmi8vy3jk6x2ydnai";
+ };
+ };
+
+ coc-imselect = buildVimPluginFrom2Nix {
+ pname = "coc-imselect";
+ version = "2019-05-07";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-imselect";
+ rev = "21b40909211767701f639b2c55662e841ea34138";
+ sha256 = "188db3lw4n7m0ahkij43cvmrni4rji6gwxdsy5vydh30af0p4br7";
+ };
+ };
+
+ coc-java = buildVimPluginFrom2Nix {
+ pname = "coc-java";
+ version = "2019-06-17";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-java";
+ rev = "fb8309d745a075370654bcb810350e5accf590b6";
+ sha256 = "14mvfsp7k5m7591j2j9cvp56dyxr8s679jyjidb41v7jshqgh16g";
+ };
+ };
+
+ coc-jest = buildVimPluginFrom2Nix {
+ pname = "coc-jest";
+ version = "2019-06-17";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-jest";
+ rev = "a893464148ab205ef717f543e205c0ae6cb05009";
+ sha256 = "0d83cmpiq2x0v7bbnyka30pp1rl33idb6zfisahc25ycnkh32212";
+ };
+ };
+
+ coc-json = buildVimPluginFrom2Nix {
+ pname = "coc-json";
+ version = "2019-06-21";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-json";
+ rev = "fafaa178b3b4df80a4a6f3a23522fa1a7d16bccb";
+ sha256 = "1s9yr5pqk76bb6qsw05qzywm8k65b9wplg4kxn65vs1a9zl7m296";
+ };
+ };
+
+ coc-lists = buildVimPluginFrom2Nix {
+ pname = "coc-lists";
+ version = "2019-07-04";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-lists";
+ rev = "6d6da810f24484278cd227f1907f6f94931092d6";
+ sha256 = "143a0rxcpml30nbaig17c5vn076qscj48qcpb4pjdh0qkfk9mvp0";
+ };
+ };
+
+ coc-neco = buildVimPluginFrom2Nix {
+ pname = "coc-neco";
+ version = "2018-12-21";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-neco";
+ rev = "2c33b8b5a9847ff5b4abca37be88131cc4d746ab";
+ sha256 = "10b23y5g16ggb5mrn1f6dv5mr3ncg0wpn8bvn8g22zz4g737nzii";
+ };
+ };
+
+ coc-pairs = buildVimPluginFrom2Nix {
+ pname = "coc-pairs";
+ version = "2019-07-04";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-pairs";
+ rev = "79d02d8d3834c2a5fa44dde77b800de0b2d9746e";
+ sha256 = "00d97qx4fvnwsh82j33p5jm0lxqadns4104jx9gzha7rmx1z62al";
+ };
+ };
+
+ coc-prettier = buildVimPluginFrom2Nix {
+ pname = "coc-prettier";
+ version = "2019-06-30";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-prettier";
+ rev = "6f30d4c5f0b6c4cf1ff0f5f7229377fc95fe249a";
+ sha256 = "0882ppaa69fp2hcncd54znaff944iraypxilr31nr51a6d9lbcs9";
+ };
+ };
+
+ coc-python = buildVimPluginFrom2Nix {
+ pname = "coc-python";
+ version = "2019-06-28";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-python";
+ rev = "bfa80768fe1cb417c8d6a117f300378e2cab0cee";
+ sha256 = "1vqwcjjxkdf6q0rzj7ps2b05dsvccf0xphgb2hl3lgsw2dqdn24y";
+ };
+ };
+
+ coc-r-lsp = buildVimPluginFrom2Nix {
+ pname = "coc-r-lsp";
+ version = "2019-06-19";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-r-lsp";
+ rev = "2a7a544fba67233ed6d400ccf8d9fcea8f163d85";
+ sha256 = "0cjlfd31cpny4cwd3nwsv7n7rykfksqazxqap5q4iq1hpz8zsdh0";
+ };
+ };
+
+ coc-rls = buildVimPluginFrom2Nix {
+ pname = "coc-rls";
+ version = "2019-06-19";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-rls";
+ rev = "1053500ba968c685e96e55b536a7e1ba679dc822";
+ sha256 = "02ldgiay99vmi3033h8y40iz6fhqyjhxl63yvyp8ylr7x76lg0a0";
+ };
+ };
+
+ coc-smartf = buildVimPluginFrom2Nix {
+ pname = "coc-smartf";
+ version = "2019-06-26";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-smartf";
+ rev = "a77e6573be47d237957f0272a368f48c44b337a8";
+ sha256 = "0k2f4xa223yzbp32828f5j766v61dkl2yp87qd0dxsgzgcwigdzi";
+ };
+ };
+
+ coc-snippets = buildVimPluginFrom2Nix {
+ pname = "coc-snippets";
+ version = "2019-07-03";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-snippets";
+ rev = "aa77cb797953fdd8d41708701753f974663f94fc";
+ sha256 = "1c4rylcvhrnicaq6v9l8pgyhlic6m1p92z6061z2cj9m09lv2rc0";
+ };
+ };
+
+ coc-solargraph = buildVimPluginFrom2Nix {
+ pname = "coc-solargraph";
+ version = "2019-06-21";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-solargraph";
+ rev = "f7732c49d5173a4f32f3419eaf591857b9d753cb";
+ sha256 = "14fcl9zwyq8rpc9pdbydsf1jilc8wmylvs8wjc13l8h3avndpkwd";
+ };
+ };
+
+ coc-stylelint = buildVimPluginFrom2Nix {
+ pname = "coc-stylelint";
+ version = "2019-06-19";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-stylelint";
+ rev = "627d6aa41f4d64fba5bee5830a9fc0b9799ab5d5";
+ sha256 = "1jgd2w9kxgrf3sg55jfg8i2afwvsyvjs656fhb48ynhw0dxf0nvp";
+ };
+ };
+
+ coc-tabnine = buildVimPluginFrom2Nix {
+ pname = "coc-tabnine";
+ version = "2019-07-05";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-tabnine";
+ rev = "50504d07788c890c77675d8ca284ef219d72ee98";
+ sha256 = "0ha4yrj455icr2m4nflh0vqhc917xhn9732qlc1hg9rzhfk3a3zd";
+ };
+ };
+
+ coc-tslint = buildVimPluginFrom2Nix {
+ pname = "coc-tslint";
+ version = "2019-07-03";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-tslint";
+ rev = "6128761577806d7047fa05d1a527945490d6316c";
+ sha256 = "1vi4vrawknkd5wjyb0j143jbfis9vaanl219a7argirwjs057vpd";
+ };
+ };
+
+ coc-tslint-plugin = buildVimPluginFrom2Nix {
+ pname = "coc-tslint-plugin";
+ version = "2019-06-19";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-tslint-plugin";
+ rev = "c2134f487f892ff3beb60b856d21c6791486d460";
+ sha256 = "0jldrh5vlfijarmzz0zhpc8k9dwngxcsygfqr3nirmj8dcx7zccb";
+ };
+ };
+
+ coc-tsserver = buildVimPluginFrom2Nix {
+ pname = "coc-tsserver";
+ version = "2019-06-27";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-tsserver";
+ rev = "f574fc35bde261970455022eeb8202e387bfad90";
+ sha256 = "143pb96bfc1y7s2hnrp29dmy1rlwqv5ypj1vx0dy60qaymyvznwp";
+ };
+ };
+
+ coc-vetur = buildVimPluginFrom2Nix {
+ pname = "coc-vetur";
+ version = "2019-06-28";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-vetur";
+ rev = "56d3cd6cc30b160252f9c32cdbb4851ace2f10de";
+ sha256 = "16j89n0fkqxvs0ld44zlbm0w4xqfl0zsd82z2xa0dgj9hxqmpfyb";
+ };
+ };
+
+ coc-vimtex = buildVimPluginFrom2Nix {
+ pname = "coc-vimtex";
+ version = "2019-06-20";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-vimtex";
+ rev = "842b37bb4078863ca5f070731e21effad14f5d58";
+ sha256 = "07w1rp6jxn7q99p6gb28azgial71frjpx06ciz49yib8816rzim9";
+ };
+ };
+
+ coc-wxml = buildVimPluginFrom2Nix {
+ pname = "coc-wxml";
+ version = "2019-06-20";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-wxml";
+ rev = "f02550939d33a0175c34186904c376bbae878e60";
+ sha256 = "1448019dzdy55j4plhzlnp2qkfzk0zkqqs7kn94ndn60hn1x889m";
+ };
+ };
+
+ coc-yaml = buildVimPluginFrom2Nix {
+ pname = "coc-yaml";
+ version = "2019-06-20";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-yaml";
+ rev = "aca9aae69ecd7f0953ab3353361b4ce9f089dbd8";
+ sha256 = "1f7d4hbily073pdf3cmmb2vfhb65nxljpin2dhlh57f0l1jiipdn";
+ };
+ };
+
+ coc-yank = buildVimPluginFrom2Nix {
+ pname = "coc-yank";
+ version = "2019-06-28";
+ src = fetchFromGitHub {
+ owner = "neoclide";
+ repo = "coc-yank";
+ rev = "6b05809b9826db8ce4e124d0662522599a250ba0";
+ sha256 = "1h0479ds0j5bfc2amq3v3r1ilafgaksjxn7mmk4zpxrc0kbcjjdh";
+ };
+ };
+
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
version = "2019-07-09";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b0e4dad8911b..981965b323b9 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -126,6 +126,7 @@ jlanzarotta/bufexplorer
jnurmine/zenburn
jonbri/vim-colorstepper
joonty/vim-xdebug
+josa42/coc-go
jpalardy/vim-slime
JuliaEditorSupport/deoplete-julia
JuliaEditorSupport/julia-vim
@@ -228,7 +229,38 @@ ncm2/ncm2-jedi
ncm2/ncm2-path
ncm2/ncm2-tmux
ncm2/ncm2-ultisnips
+neoclide/coc-css
+neoclide/coc-denite
+neoclide/coc-emmet
+neoclide/coc-eslint
+neoclide/coc-git
+neoclide/coc-highlight
+neoclide/coc-html
+neoclide/coc-imselect
+neoclide/coc-java
+neoclide/coc-jest
+neoclide/coc-json
+neoclide/coc-lists
+neoclide/coc-neco
neoclide/coc.nvim
+neoclide/coc-pairs
+neoclide/coc-prettier
+neoclide/coc-python
+neoclide/coc-rls
+neoclide/coc-r-lsp
+neoclide/coc-smartf
+neoclide/coc-snippets
+neoclide/coc-solargraph
+neoclide/coc-stylelint
+neoclide/coc-tabnine
+neoclide/coc-tslint
+neoclide/coc-tslint-plugin
+neoclide/coc-tsserver
+neoclide/coc-vetur
+neoclide/coc-vimtex
+neoclide/coc-wxml
+neoclide/coc-yaml
+neoclide/coc-yank
neoclide/vim-easygit
neomake/neomake
neovimhaskell/haskell-vim
From 1b18ef672813b599b5b7ce1746aadb1e2d3ed8ca Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Mon, 8 Jul 2019 21:08:54 +0200
Subject: [PATCH 20/23] vimPlugins.coc-go: Ensure dependencies are available
---
pkgs/misc/vim-plugins/overrides.nix | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index cbeb4789e717..033a02a65848 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -11,13 +11,16 @@
, Cocoa, CoreFoundation, CoreServices
, buildVimPluginFrom2Nix
+# coc-go dependency
+, go
+
# vim-go denpencies
, asmfmt, delve, errcheck, godef, golint
, gomodifytags, gotags, gotools, go-motion
, gnused, reftools, gogetdoc, gometalinter
, impl, iferr, gocode, gocode-gomod, go-tools
-# vCoolor dep
+# vCoolor dependency
, gnome3
}:
@@ -109,6 +112,12 @@ self: super: {
'';
});
+ coc-go = super.coc-go.overrideAttrs(old: {
+ preFixup = ''
+ substituteInPlace "$out"/share/vim-plugins/coc-go/src/utils/tools.ts \
+ --replace 'const cmd = `GOPATH=''${gopath}; go ''${args}`' 'const cmd = `GOPATH=''${gopath}; ${go}/bin/go ''${args}`'
+ '';
+ });
coc-nvim = let
version = "0.0.72";
From acb11340749109b49757f7a6b58ff8fa75e03ca3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 9 Jul 2019 17:09:44 -0500
Subject: [PATCH 21/23] nixos/foundationdb: s/pidFile/pidfile/
Fixes an evaluation regression introduced by a case-typo in
de6e5ea8152b29c975096d7d4b7d0938874ee37a
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
nixos/modules/services/databases/foundationdb.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index 6182da5e7d65..3746b875c7f2 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -363,7 +363,7 @@ in
"d /etc/foundationdb 0755 ${cfg.user} ${cfg.group} - -"
"d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group} - -"
"d '${cfg.logDir}' 0770 ${cfg.user} ${cfg.group} - -"
- "F '${cfg.pidFile}' - ${cfg.user} ${cfg.group} - -"
+ "F '${cfg.pidfile}' - ${cfg.user} ${cfg.group} - -"
];
systemd.services.foundationdb = {
From def7d562e01430ab48f4ab84a6363bfdbe6e584a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 9 Jul 2019 20:18:51 -0400
Subject: [PATCH 22/23] pantheon.wingpanel-indicator-session: 2.2.3 -> 2.2.4
https://github.com/elementary/wingpanel-indicator-session/releases/tag/2.2.4
---
.../pantheon/desktop/wingpanel-indicators/session/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index 5b1bd161b05f..b6607d54a7e8 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-session";
- version = "2.2.3";
+ version = "2.2.4";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1y0blff02p3w23sv17yg7fq0yq0g2k8j7vjmk92k664fx72kjjzh";
+ sha256 = "1x2p2sjal42bspmqcg9lzixv6rnihvgmwk92gfcccrmvk8j4bx6s";
};
passthru = {
From d2c3c1f2bb169b15d649177865cb7cd9fc60459b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 2 Jul 2019 13:29:40 +0000
Subject: [PATCH 23/23] ocaml-ng.ocamlPackages_4_08: 4.08.0+rc2 -> 4.08.0
---
pkgs/development/compilers/ocaml/4.08.nix | 4 ++--
pkgs/top-level/ocaml-packages.nix | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix
index cdc5314f3c77..4f9b8ebd294c 100644
--- a/pkgs/development/compilers/ocaml/4.08.nix
+++ b/pkgs/development/compilers/ocaml/4.08.nix
@@ -1,8 +1,8 @@
import ./generic.nix {
major_version = "4";
minor_version = "08";
- patch_version = "0+rc2";
- sha256 = "09wp2iig6v5pivkjcnibdvkg5mchcj3q4zms6ij67039xczm8qrg";
+ patch_version = "0";
+ sha256 = "0si976y8snbmhm96671di65z0rrdyldxd55wjxn2mkn6654nryna";
# If the executable is stripped it does not work
dontStrip = true;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ffa25ada3e7b..3b807c932f0a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1084,7 +1084,7 @@ in let inherit (pkgs) callPackage; in rec
ocamlPackages_4_08 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.08.nix { });
- ocamlPackages_latest = ocamlPackages_4_07;
+ ocamlPackages_latest = ocamlPackages_4_08;
ocamlPackages = ocamlPackages_4_06;
}