Merge master into staging-next
This commit is contained in:
commit
26fdaef6b2
|
@ -0,0 +1,57 @@
|
||||||
|
From 29ec6fada935ef966e5859082435ed57daa9522d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
|
||||||
|
Date: Tue, 16 Mar 2021 15:03:59 -0400
|
||||||
|
Subject: [PATCH] [NixOS] Unwrap executable name for .desktop search
|
||||||
|
|
||||||
|
Why is this necessary even though -a "$0" is used in the wrapper?
|
||||||
|
Because it's completely bypassing argv0! This looks at the executable
|
||||||
|
file in-use according to the kernel!
|
||||||
|
|
||||||
|
Wrappers cannot affect the `/proc/.../exe` symlink!
|
||||||
|
---
|
||||||
|
service_utils.h | 28 +++++++++++++++++++++++++++-
|
||||||
|
1 file changed, 27 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/service_utils.h b/service_utils.h
|
||||||
|
index 8a70c1fad..6674f553b 100644
|
||||||
|
--- a/service_utils.h
|
||||||
|
+++ b/service_utils.h
|
||||||
|
@@ -26,8 +26,34 @@ namespace KWin
|
||||||
|
const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces");
|
||||||
|
const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces");
|
||||||
|
|
||||||
|
-static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName)
|
||||||
|
+static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName)
|
||||||
|
{
|
||||||
|
+ // !! Start NixOS fix
|
||||||
|
+ // NixOS fixes many packaging issues through "wrapper" scripts that manipulates the environment or does
|
||||||
|
+ // miscellaneous trickeries and mischievous things to make the programs work.
|
||||||
|
+ // In turn, programs often employs different mischievous schemes and trickeries to do *other things.
|
||||||
|
+ // It often happens that they conflict.
|
||||||
|
+ // Here, `kwin` tries to detect the .desktop file for a given process.
|
||||||
|
+ // `kwin` followed the process `/proc/.../exe` up to the actual binary running.
|
||||||
|
+ // It normally would be fine, e.g. /usr/bin/foobar is what's in the desktop file.
|
||||||
|
+ // But it's not the truth here! It's extremely likely the resolved path is /nix/store/.../bin/.foobar-wrapped
|
||||||
|
+ // rather than what the desktop file points to, something like /nix/store/.../bin/foobar !!
|
||||||
|
+ // Since the wrappers for Nixpkgs *always* prepend a dot and append -wrapped, we assume here that we can keep
|
||||||
|
+ // `/^(.*)\/\.([^/]*)-wrapped/` until the (equivalent) regex does not match.
|
||||||
|
+ // This should canonicalize the wrapper name to the expected name to look for in the desktop file.
|
||||||
|
+
|
||||||
|
+ // Use a copy of the const string
|
||||||
|
+ QString executablePath(in_executablePath);
|
||||||
|
+
|
||||||
|
+ // While the parts needed are present, "unwrap" one layer of wrapper names.
|
||||||
|
+ while (executablePath.endsWith("-wrapped") && executablePath[executablePath.lastIndexOf("/")+1] == QChar('.')) {
|
||||||
|
+ // Approximately equivalent to s/-wrapped$//
|
||||||
|
+ executablePath.remove(executablePath.length() - 8, 8);
|
||||||
|
+ // Approximately equivalent to s;/\.;/;
|
||||||
|
+ executablePath.remove(executablePath.lastIndexOf("/")+1, 1);
|
||||||
|
+ }
|
||||||
|
+ // !! End NixOS fix
|
||||||
|
+
|
||||||
|
// needed to be able to use the logging category in a header static function
|
||||||
|
static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg);
|
||||||
|
const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) {
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
|
@ -38,6 +38,7 @@ mkDerivation {
|
||||||
./0001-follow-symlinks.patch
|
./0001-follow-symlinks.patch
|
||||||
./0002-xwayland.patch
|
./0002-xwayland.patch
|
||||||
./0003-plugins-qpa-allow-using-nixos-wrapper.patch
|
./0003-plugins-qpa-allow-using-nixos-wrapper.patch
|
||||||
|
./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
|
||||||
];
|
];
|
||||||
CXXFLAGS = [
|
CXXFLAGS = [
|
||||||
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
|
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
|
||||||
|
|
|
@ -6,7 +6,7 @@ import re
|
||||||
import requests
|
import requests
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15")
|
releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16")
|
||||||
oses = ("mac", "linux")
|
oses = ("mac", "linux")
|
||||||
types = ("jre", "jdk")
|
types = ("jre", "jdk")
|
||||||
impls = ("hotspot", "openj9")
|
impls = ("hotspot", "openj9")
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
let
|
||||||
|
sources = builtins.fromJSON (builtins.readFile ./sources.json);
|
||||||
|
in
|
||||||
|
{
|
||||||
|
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; };
|
||||||
|
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.hotspot; };
|
||||||
|
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.openj9; };
|
||||||
|
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.openj9; };
|
||||||
|
}
|
|
@ -0,0 +1,9 @@
|
||||||
|
let
|
||||||
|
sources = builtins.fromJSON (builtins.readFile ./sources.json);
|
||||||
|
in
|
||||||
|
{
|
||||||
|
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.hotspot; };
|
||||||
|
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.hotspot; };
|
||||||
|
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.openj9; };
|
||||||
|
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.openj9; };
|
||||||
|
}
|
|
@ -531,6 +531,148 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"openjdk16": {
|
||||||
|
"linux": {
|
||||||
|
"jdk": {
|
||||||
|
"hotspot": {
|
||||||
|
"aarch64": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
},
|
||||||
|
"armv6l": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
},
|
||||||
|
"armv7l": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
},
|
||||||
|
"packageType": "jdk",
|
||||||
|
"vmType": "hotspot",
|
||||||
|
"x86_64": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"openj9": {
|
||||||
|
"aarch64": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "f4d4e0c0e9e0a4d0f14172878cee5e1a0ae73170058e1c183a452f8d97331ac0",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz",
|
||||||
|
"version": "16.0.0-ea"
|
||||||
|
},
|
||||||
|
"packageType": "jdk",
|
||||||
|
"vmType": "openj9",
|
||||||
|
"x86_64": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"jre": {
|
||||||
|
"hotspot": {
|
||||||
|
"aarch64": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
},
|
||||||
|
"armv6l": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
},
|
||||||
|
"armv7l": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
},
|
||||||
|
"packageType": "jre",
|
||||||
|
"vmType": "hotspot",
|
||||||
|
"x86_64": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"openj9": {
|
||||||
|
"aarch64": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "13ae42f5040d4e5d97b8809e27ebfdf8f7326604771963d85b2c1385abe13742",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz",
|
||||||
|
"version": "16.0.0-ea"
|
||||||
|
},
|
||||||
|
"packageType": "jre",
|
||||||
|
"vmType": "openj9",
|
||||||
|
"x86_64": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"mac": {
|
||||||
|
"jdk": {
|
||||||
|
"hotspot": {
|
||||||
|
"packageType": "jdk",
|
||||||
|
"vmType": "hotspot",
|
||||||
|
"x86_64": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "b66761b55fd493ed2a5f4df35a32b338ec34a9e0a1244439e3156561ab27c511",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_mac_hotspot_16_36.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"openj9": {
|
||||||
|
"packageType": "jdk",
|
||||||
|
"vmType": "openj9",
|
||||||
|
"x86_64": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "e6075cbe939b4de165cc8b4b91352f8885d549873f5cd419e75eba737502542e",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"jre": {
|
||||||
|
"hotspot": {
|
||||||
|
"packageType": "jre",
|
||||||
|
"vmType": "hotspot",
|
||||||
|
"x86_64": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "92cb07e9e9d075996d1a9e0ccfc1d35e6f97f7e188e9bb78088ee1066062a428",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_mac_hotspot_16_36.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"openj9": {
|
||||||
|
"packageType": "jre",
|
||||||
|
"vmType": "openj9",
|
||||||
|
"x86_64": {
|
||||||
|
"build": "36",
|
||||||
|
"sha256": "9e5c31582778ca5c08fc221e185dc0f4dbce2091cbc69966a1e2617344b722f1",
|
||||||
|
"url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz",
|
||||||
|
"version": "16.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"openjdk8": {
|
"openjdk8": {
|
||||||
"linux": {
|
"linux": {
|
||||||
"jdk": {
|
"jdk": {
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "pack";
|
pname = "pack";
|
||||||
version = "0.17.0";
|
version = "0.18.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "buildpacks";
|
owner = "buildpacks";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-VTQ3NOskBp7ic8a/nn/ZbALJVff+Pb/ZHHbld/OxQdo=";
|
sha256 = "sha256-+fYw5dIDJJKGQKBL6RQh1SCQufbAkKeuJpPlywzbbnM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-n8X2NyQiOpEQ0d/ek1kdxKFfaCFf0EucflVLZjOGMfY=";
|
vendorSha256 = "sha256-fSUTl5W/DyloCuCpEqA5z4bhB7wYxzPt6E0SfjorfQ0=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
|
|
@ -65,12 +65,12 @@ let
|
||||||
|
|
||||||
ale = buildVimPluginFrom2Nix {
|
ale = buildVimPluginFrom2Nix {
|
||||||
pname = "ale";
|
pname = "ale";
|
||||||
version = "2021-03-23";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dense-analysis";
|
owner = "dense-analysis";
|
||||||
repo = "ale";
|
repo = "ale";
|
||||||
rev = "eb0ebe622102cc6da3d7e943a3b739db7b6ed216";
|
rev = "b1f95dc4fb15efb1d5238845c99548f2906e2ba3";
|
||||||
sha256 = "10dp9xq8k0svr7z117a3bha4rvlgsx1j8qqdfnza94rbh8zy096k";
|
sha256 = "0sx2k1wqv0cl3a489cqz1mf0bvr8xsjbqax8pgw1d0c4kdz17py6";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/dense-analysis/ale/";
|
meta.homepage = "https://github.com/dense-analysis/ale/";
|
||||||
};
|
};
|
||||||
|
@ -389,12 +389,12 @@ let
|
||||||
|
|
||||||
chadtree = buildVimPluginFrom2Nix {
|
chadtree = buildVimPluginFrom2Nix {
|
||||||
pname = "chadtree";
|
pname = "chadtree";
|
||||||
version = "2021-03-23";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ms-jpq";
|
owner = "ms-jpq";
|
||||||
repo = "chadtree";
|
repo = "chadtree";
|
||||||
rev = "18e39f1550980bc21761018e191742e66d86854d";
|
rev = "e52b59c999bb713ea6ee4d7e88c40f9c8ca76567";
|
||||||
sha256 = "12grx41z5qf7p4ls56ww8rai0nfcl01v8iy1vayx463lb7dsvlxm";
|
sha256 = "0pccr6rqgk1m291pa8505y246p00fkvdzkgb9hz63qnab29h08l0";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||||
};
|
};
|
||||||
|
@ -545,12 +545,12 @@ let
|
||||||
|
|
||||||
coc-nvim = buildVimPluginFrom2Nix {
|
coc-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "coc-nvim";
|
pname = "coc-nvim";
|
||||||
version = "2021-03-23";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "neoclide";
|
owner = "neoclide";
|
||||||
repo = "coc.nvim";
|
repo = "coc.nvim";
|
||||||
rev = "e916ef84b95897a713773642bc768a88e4b8e449";
|
rev = "67fb4d138f34c12c6b44d87be66ede26d51b95c2";
|
||||||
sha256 = "0svmsacpa6wvkdcdb4jb7lc7zdc31r9mqdvznskhgwzmjlhnbq8d";
|
sha256 = "0nnh0gnc6g0a67na3zar6zvpc3i2qlna3l783hhy3832ih79v9s9";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -894,12 +894,12 @@ let
|
||||||
|
|
||||||
defx-nvim = buildVimPluginFrom2Nix {
|
defx-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "defx-nvim";
|
pname = "defx-nvim";
|
||||||
version = "2021-03-22";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Shougo";
|
owner = "Shougo";
|
||||||
repo = "defx.nvim";
|
repo = "defx.nvim";
|
||||||
rev = "a07fdb14c2ae04f1dd4cd78ddeaba9ce1eda4070";
|
rev = "e5a757e2dc2f3409f5ccc4e4df384df93b0ef09d";
|
||||||
sha256 = "0z57vvw7jjh021qis4bywznwaywyznrh2zns6wl3ar65zys4dym7";
|
sha256 = "1qfwpwb7r94hnjidggn1fwcshikac8j0ckf1qb0fppfx1akyf78q";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/Shougo/defx.nvim/";
|
meta.homepage = "https://github.com/Shougo/defx.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -942,12 +942,12 @@ let
|
||||||
|
|
||||||
denite-nvim = buildVimPluginFrom2Nix {
|
denite-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "denite-nvim";
|
pname = "denite-nvim";
|
||||||
version = "2021-03-23";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Shougo";
|
owner = "Shougo";
|
||||||
repo = "denite.nvim";
|
repo = "denite.nvim";
|
||||||
rev = "b0cc470c63b0ed3b6497f659588b004ed05872ee";
|
rev = "4c8eb502feb8e9601cbcd82ea937aa620a6626b4";
|
||||||
sha256 = "15ngimlnprp73fy3sa9vz39avq75mcqhr90ygj3drjj1d33vk3f3";
|
sha256 = "1hgcdl29rn0ag12k663qfx9z3drl94xi0n50jcisk5z4y8xpi6r4";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/Shougo/denite.nvim/";
|
meta.homepage = "https://github.com/Shougo/denite.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -1414,12 +1414,12 @@ let
|
||||||
|
|
||||||
fern-vim = buildVimPluginFrom2Nix {
|
fern-vim = buildVimPluginFrom2Nix {
|
||||||
pname = "fern-vim";
|
pname = "fern-vim";
|
||||||
version = "2021-03-14";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lambdalisue";
|
owner = "lambdalisue";
|
||||||
repo = "fern.vim";
|
repo = "fern.vim";
|
||||||
rev = "31c76b351f6d995009dcd117d7910b80df96928a";
|
rev = "3f9f1957699346f240a9e71eee83fcb67c8fc0e5";
|
||||||
sha256 = "1qkf6bsff6cfrqyhdrmn91diq9p53i3i3fvgcb5m9az33p42fqgn";
|
sha256 = "1wkxih5glkpvjy6ka42y0x1di2iqm1y7rc93av4gfqhhskryfv0h";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/lambdalisue/fern.vim/";
|
meta.homepage = "https://github.com/lambdalisue/fern.vim/";
|
||||||
};
|
};
|
||||||
|
@ -1535,12 +1535,12 @@ let
|
||||||
|
|
||||||
fzf-vim = buildVimPluginFrom2Nix {
|
fzf-vim = buildVimPluginFrom2Nix {
|
||||||
pname = "fzf-vim";
|
pname = "fzf-vim";
|
||||||
version = "2021-03-14";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "junegunn";
|
owner = "junegunn";
|
||||||
repo = "fzf.vim";
|
repo = "fzf.vim";
|
||||||
rev = "1ef72b14ccd05fdbdb01d253b91a74c4760ae655";
|
rev = "caf7754b2636eabdf1bc11d30daccc5de66951ef";
|
||||||
sha256 = "1yrj8dq0n3wfdrl5c93cfzsjyv175b9h65iwxkincag926m6sr06";
|
sha256 = "1743br19x41rycc1iqh2jiwaa2z80bi2zcd0lr9n17dc733ww5n2";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/junegunn/fzf.vim/";
|
meta.homepage = "https://github.com/junegunn/fzf.vim/";
|
||||||
};
|
};
|
||||||
|
@ -1643,12 +1643,12 @@ let
|
||||||
|
|
||||||
gitsigns-nvim = buildVimPluginFrom2Nix {
|
gitsigns-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "gitsigns-nvim";
|
pname = "gitsigns-nvim";
|
||||||
version = "2021-03-23";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lewis6991";
|
owner = "lewis6991";
|
||||||
repo = "gitsigns.nvim";
|
repo = "gitsigns.nvim";
|
||||||
rev = "6bc3dba1a73466282215491d9ede85261199b7f2";
|
rev = "2e371a3b89a85ea74afcd2f2926b23919a96e1c8";
|
||||||
sha256 = "0qfpadjv4qd92kgjvwga285404wzzy0q4vylbdfwngf9s29bpj40";
|
sha256 = "0bw2sc02w8ln9sj86p0iwfcwi51n4xyxkby9ib37y3mdiz623vig";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -1811,12 +1811,12 @@ let
|
||||||
|
|
||||||
hop-nvim = buildVimPluginFrom2Nix {
|
hop-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "hop-nvim";
|
pname = "hop-nvim";
|
||||||
version = "2021-03-23";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "phaazon";
|
owner = "phaazon";
|
||||||
repo = "hop.nvim";
|
repo = "hop.nvim";
|
||||||
rev = "4c6d776005eed4ebc66bf3af8a336d004ae238a3";
|
rev = "a0e9e229bbd0e493511fb9d27d917f55c5e4191a";
|
||||||
sha256 = "17dcvi3jlwzm11lykjz3dh2ckbbmdp221y0d7wl0xq12s2g1v4pg";
|
sha256 = "090waig8fqq1s9z66ykr64ns3g9yb6qy32jf5fwamx43m9xcws2s";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/phaazon/hop.nvim/";
|
meta.homepage = "https://github.com/phaazon/hop.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -2340,12 +2340,12 @@ let
|
||||||
|
|
||||||
lualine-nvim = buildVimPluginFrom2Nix {
|
lualine-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "lualine-nvim";
|
pname = "lualine-nvim";
|
||||||
version = "2021-03-23";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hoob3rt";
|
owner = "hoob3rt";
|
||||||
repo = "lualine.nvim";
|
repo = "lualine.nvim";
|
||||||
rev = "7bf5076ece80cde0a48dac403799a89c8caefd1d";
|
rev = "62c22d0f05c79a1bc890b15c1a1a5a0215936e2f";
|
||||||
sha256 = "0zc1s75dqxb1dxma59mlc88lf74i0mpbz15khcfv1pfp5cr3hhih";
|
sha256 = "1j3f4i48bi54ck14sv8vnknz68v21jggf1gw8p7vq77h08il7gbi";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
|
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -2724,12 +2724,12 @@ let
|
||||||
|
|
||||||
neogit = buildVimPluginFrom2Nix {
|
neogit = buildVimPluginFrom2Nix {
|
||||||
pname = "neogit";
|
pname = "neogit";
|
||||||
version = "2021-03-23";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "TimUntersberger";
|
owner = "TimUntersberger";
|
||||||
repo = "neogit";
|
repo = "neogit";
|
||||||
rev = "537cc6e1757c41bd75717ebd4421c27b7ebe9205";
|
rev = "84768d4ab4df212c7fe96785a007382218e0fc56";
|
||||||
sha256 = "0s0z2qmsnqj5mgsqb6x4cwh507sc3y4ahqvzc3bijd224xff97b1";
|
sha256 = "0z86l7bwr6s3rmamhjyy5hg51f75ca2laki3pwpczfhllxbnwax5";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/TimUntersberger/neogit/";
|
meta.homepage = "https://github.com/TimUntersberger/neogit/";
|
||||||
};
|
};
|
||||||
|
@ -2868,12 +2868,12 @@ let
|
||||||
|
|
||||||
nerdtree = buildVimPluginFrom2Nix {
|
nerdtree = buildVimPluginFrom2Nix {
|
||||||
pname = "nerdtree";
|
pname = "nerdtree";
|
||||||
version = "2021-03-01";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "preservim";
|
owner = "preservim";
|
||||||
repo = "nerdtree";
|
repo = "nerdtree";
|
||||||
rev = "f63fb6984f9cd07cf723c3e2e20f6ccc0aad48c2";
|
rev = "81f3eaba295b3fceb2d032db57e5eae99ae480f8";
|
||||||
sha256 = "1lm4dqp8rxr5sl6faxyncz5jibkgzjwjxadvgcja81wnm71sr0xa";
|
sha256 = "0zws0b20n8ak2s3hffsb0rrwdjh8sx3sgrilmmmvr0d2ivsfqwlb";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/preservim/nerdtree/";
|
meta.homepage = "https://github.com/preservim/nerdtree/";
|
||||||
};
|
};
|
||||||
|
@ -2976,12 +2976,12 @@ let
|
||||||
|
|
||||||
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
|
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
|
||||||
pname = "nvcode-color-schemes-vim";
|
pname = "nvcode-color-schemes-vim";
|
||||||
version = "2021-03-20";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ChristianChiarulli";
|
owner = "ChristianChiarulli";
|
||||||
repo = "nvcode-color-schemes.vim";
|
repo = "nvcode-color-schemes.vim";
|
||||||
rev = "e22ce2c391e0fe82f66c767cf2b99ff1e044d428";
|
rev = "18b21cd97d8675d0a37ea7a0de1b767c51418f19";
|
||||||
sha256 = "1dl967mc8slsfm8c8dk7kbzsrnr6ll7y8m36aq5v827f49f1byak";
|
sha256 = "18gzdax70hcjs7ckfq6c4b0kplh9q5fsay9hwz5kyqym28ndrvx3";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
|
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
|
||||||
};
|
};
|
||||||
|
@ -3000,24 +3000,24 @@ let
|
||||||
|
|
||||||
nvim-autopairs = buildVimPluginFrom2Nix {
|
nvim-autopairs = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-autopairs";
|
pname = "nvim-autopairs";
|
||||||
version = "2021-02-08";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "windwp";
|
owner = "windwp";
|
||||||
repo = "nvim-autopairs";
|
repo = "nvim-autopairs";
|
||||||
rev = "1596756a90114cbe25d0f383825a1ae2145b459b";
|
rev = "b8272f539017ffb6de6a05247e7c333b3721279b";
|
||||||
sha256 = "1c0h0082lkngn0ly4qpla98xgg71ax5r26v4q4h3gc77jf6mlqrd";
|
sha256 = "11ng14pb14l0hsv27r24wwkjkw2l77kvd114pij3k5dl8b9zdgv2";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
|
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
|
||||||
};
|
};
|
||||||
|
|
||||||
nvim-bqf = buildVimPluginFrom2Nix {
|
nvim-bqf = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-bqf";
|
pname = "nvim-bqf";
|
||||||
version = "2021-03-16";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kevinhwang91";
|
owner = "kevinhwang91";
|
||||||
repo = "nvim-bqf";
|
repo = "nvim-bqf";
|
||||||
rev = "fae71d14f2cd61becc87bae223f0c3a6fb72245c";
|
rev = "ba1acb0440e3ddc96b1835ce89d910bae216e98b";
|
||||||
sha256 = "054v62pp33kxfx9rcqh7dqa2glpi1fsm0z4gsh9nwf4y60hx0fhs";
|
sha256 = "1kx5a5zngk8bw7qsklmhzvwqpc0nnhfcj9wasp28dayh3f35m5s0";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
|
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
|
||||||
};
|
};
|
||||||
|
@ -3060,12 +3060,12 @@ let
|
||||||
|
|
||||||
nvim-compe = buildVimPluginFrom2Nix {
|
nvim-compe = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-compe";
|
pname = "nvim-compe";
|
||||||
version = "2021-03-23";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hrsh7th";
|
owner = "hrsh7th";
|
||||||
repo = "nvim-compe";
|
repo = "nvim-compe";
|
||||||
rev = "777b98390da6638583b0e7ba2316aa1257462cad";
|
rev = "a39284243014c1414134b99ee2f7ae1fdd070273";
|
||||||
sha256 = "1ggh7038kzc61ihjbf8zvq1vxgjg9hpwqvjj979mf3qzrznrd89i";
|
sha256 = "0648gz8rc6l79hg3xqkr0049fn762v7rcyvq50ya81ljrs2jl004";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
|
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
|
||||||
};
|
};
|
||||||
|
@ -3084,12 +3084,12 @@ let
|
||||||
|
|
||||||
nvim-dap = buildVimPluginFrom2Nix {
|
nvim-dap = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-dap";
|
pname = "nvim-dap";
|
||||||
version = "2021-03-22";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mfussenegger";
|
owner = "mfussenegger";
|
||||||
repo = "nvim-dap";
|
repo = "nvim-dap";
|
||||||
rev = "f5180887cbf0505f64e43516072e74b74652a5f9";
|
rev = "cd0afafc788f9d4d9df5fef5d348841906b295d6";
|
||||||
sha256 = "1cy36pxj6kfggjds8bb13ggj91c4vq3b37i78pjyh8jynyfd0va7";
|
sha256 = "1zh35qjxmkf37khagn8722byzjq2pns20cbmc821hfqdkj6q3pc8";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
|
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
|
||||||
};
|
};
|
||||||
|
@ -3132,12 +3132,12 @@ let
|
||||||
|
|
||||||
nvim-hlslens = buildVimPluginFrom2Nix {
|
nvim-hlslens = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-hlslens";
|
pname = "nvim-hlslens";
|
||||||
version = "2021-03-22";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kevinhwang91";
|
owner = "kevinhwang91";
|
||||||
repo = "nvim-hlslens";
|
repo = "nvim-hlslens";
|
||||||
rev = "fb6bf0c836b384f3afa66c43b24de112e2e05764";
|
rev = "fdce47e0bd9669e2424cc2a0112ecb47ba571d13";
|
||||||
sha256 = "1p887iysf2a2nhj3cih9a7mzlipqakglzgw6ll065ghrn4dmr28p";
|
sha256 = "1dn9wr23dizhs7byrim9zd3yi22g629jc2aqfx0q1v1i2i9g107v";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
|
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
|
||||||
};
|
};
|
||||||
|
@ -3156,12 +3156,12 @@ let
|
||||||
|
|
||||||
nvim-jdtls = buildVimPluginFrom2Nix {
|
nvim-jdtls = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-jdtls";
|
pname = "nvim-jdtls";
|
||||||
version = "2021-03-22";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mfussenegger";
|
owner = "mfussenegger";
|
||||||
repo = "nvim-jdtls";
|
repo = "nvim-jdtls";
|
||||||
rev = "fede58fdb67c451697bd1028bf084d4f0fbfc38b";
|
rev = "b29410eff3459fc415048cd5569ad03d5e959296";
|
||||||
sha256 = "052rvsl0prhvbic350x1q5ma5c8km8sf3y92gng4sc2wj37fs2k8";
|
sha256 = "060ig6w3lhfp4lb83hmk7v33mfk6k5hs8ifpx5fvxk0v5g0cd9g1";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
|
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
|
||||||
};
|
};
|
||||||
|
@ -3180,12 +3180,12 @@ let
|
||||||
|
|
||||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-lspconfig";
|
pname = "nvim-lspconfig";
|
||||||
version = "2021-03-22";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "neovim";
|
owner = "neovim";
|
||||||
repo = "nvim-lspconfig";
|
repo = "nvim-lspconfig";
|
||||||
rev = "487ea4a2393fd6d3fc1bf5d198e4f4583c5082ac";
|
rev = "f9785053a4ef4aaa2d0aac958bc09a1a289d2fbf";
|
||||||
sha256 = "1dr0my4y7qvy7d7ypkz4d0d1p223092vsn5wfpj4qv84k84ilpp8";
|
sha256 = "182ys6zrwjw1jqs6rjqz3lbv51jw0ija5jmrpj4rs7psin7mcx0j";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||||
};
|
};
|
||||||
|
@ -3250,6 +3250,18 @@ let
|
||||||
meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/";
|
meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
|
||||||
|
pname = "nvim-toggleterm-lua";
|
||||||
|
version = "2021-03-23";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "akinsho";
|
||||||
|
repo = "nvim-toggleterm.lua";
|
||||||
|
rev = "84980bd3f549821fe58d1821fdc1e7c54d1ebf3a";
|
||||||
|
sha256 = "09dcajyfbimfzgxj57c988rqr6y6ah4p97j04gyvg1mrvlj95dg4";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
|
||||||
|
};
|
||||||
|
|
||||||
nvim-tree-lua = buildVimPluginFrom2Nix {
|
nvim-tree-lua = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-tree-lua";
|
pname = "nvim-tree-lua";
|
||||||
version = "2021-03-23";
|
version = "2021-03-23";
|
||||||
|
@ -3264,12 +3276,12 @@ let
|
||||||
|
|
||||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-treesitter";
|
pname = "nvim-treesitter";
|
||||||
version = "2021-03-23";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nvim-treesitter";
|
owner = "nvim-treesitter";
|
||||||
repo = "nvim-treesitter";
|
repo = "nvim-treesitter";
|
||||||
rev = "09045354c0245ca866104c526bc57c2a06d7f381";
|
rev = "88ac3d23653a27973be8ff60e500848cacfcf968";
|
||||||
sha256 = "182jvkwixmv1i39npvxkj0nr19cazqkab1kbprx7282dad68x30b";
|
sha256 = "1diy0j045kcr38nwi641ccq89bzahfacicny2zphyrml1ff7hgff";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||||
};
|
};
|
||||||
|
@ -3312,12 +3324,12 @@ let
|
||||||
|
|
||||||
nvim-ts-rainbow = buildVimPluginFrom2Nix {
|
nvim-ts-rainbow = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-ts-rainbow";
|
pname = "nvim-ts-rainbow";
|
||||||
version = "2021-03-23";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "p00f";
|
owner = "p00f";
|
||||||
repo = "nvim-ts-rainbow";
|
repo = "nvim-ts-rainbow";
|
||||||
rev = "f61093c56a53c6790b142f76bdfaa476f497b93f";
|
rev = "8714eade54870231b1df247453a5535a40b0a7b4";
|
||||||
sha256 = "1wzg1y0gksprdxhww0vcswfa0imkkrnhczljhlb94lrrmknv3nxv";
|
sha256 = "192376c6nbx5kgj96wvpmds7ird8hfk4v8ayg1gay18vljyszxj9";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
|
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
|
||||||
};
|
};
|
||||||
|
@ -3444,12 +3456,12 @@ let
|
||||||
|
|
||||||
packer-nvim = buildVimPluginFrom2Nix {
|
packer-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "packer-nvim";
|
pname = "packer-nvim";
|
||||||
version = "2021-03-22";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "wbthomason";
|
owner = "wbthomason";
|
||||||
repo = "packer.nvim";
|
repo = "packer.nvim";
|
||||||
rev = "77cd1d1e0cfcb582b210d75745594f4fb60d3418";
|
rev = "df33faeef884d55ca8f97479ea55b8d9bd2ffb3f";
|
||||||
sha256 = "0yhdxh6768z4dalpmzhhypnjfx3mjx7d6r722lv9g15xg7i1lg3q";
|
sha256 = "1pizzzmb551c2pr0srw27ya8a4awfgq14k2dswmk8i8vra54vsj6";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
|
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -5140,12 +5152,12 @@ let
|
||||||
|
|
||||||
vim-clap = buildVimPluginFrom2Nix {
|
vim-clap = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-clap";
|
pname = "vim-clap";
|
||||||
version = "2021-03-13";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "liuchengxu";
|
owner = "liuchengxu";
|
||||||
repo = "vim-clap";
|
repo = "vim-clap";
|
||||||
rev = "b7b1d078f4556a6829400185bbfb47be171e6828";
|
rev = "fc5060933e9f35a107d1646c90d4e1216301ab48";
|
||||||
sha256 = "1vncq3ypp5x3v9vq90zwg12ih45nph6g5mrl0xh2m82llqsp5r7c";
|
sha256 = "0g36p0wqrvm6v4ga64z84jri5c8n5hq6y7f5yig7kszk01wvc6hh";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
|
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
|
||||||
};
|
};
|
||||||
|
@ -5188,12 +5200,12 @@ let
|
||||||
|
|
||||||
vim-closetag = buildVimPluginFrom2Nix {
|
vim-closetag = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-closetag";
|
pname = "vim-closetag";
|
||||||
version = "2020-10-09";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "alvan";
|
owner = "alvan";
|
||||||
repo = "vim-closetag";
|
repo = "vim-closetag";
|
||||||
rev = "bd6bbc33c7e178673aa1dd17a5d249bbd4e3a6a6";
|
rev = "c0779ef575d5c239162f4ca3506cfb4a95d45a58";
|
||||||
sha256 = "0nqzjma6mqg19cxq0ck2lym51ajb1x97z497zf9pbp47hkg5875j";
|
sha256 = "1mkn6d7m23ak06pl8i328hd9x6qx5fzrg8ijz32lgd4a56k98n6i";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/alvan/vim-closetag/";
|
meta.homepage = "https://github.com/alvan/vim-closetag/";
|
||||||
};
|
};
|
||||||
|
@ -5788,12 +5800,12 @@ let
|
||||||
|
|
||||||
vim-floaterm = buildVimPluginFrom2Nix {
|
vim-floaterm = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-floaterm";
|
pname = "vim-floaterm";
|
||||||
version = "2021-03-23";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "voldikss";
|
owner = "voldikss";
|
||||||
repo = "vim-floaterm";
|
repo = "vim-floaterm";
|
||||||
rev = "a1403fd295edeffdc2e387f9308dc4392f057e68";
|
rev = "ae7eea5c5c6c082fe66410e72306b5b1bcb693dd";
|
||||||
sha256 = "1dc1169lwz1wjgqp27g8wa37yqsvc4fgmrcprc3ys4r3s9m6y5m6";
|
sha256 = "1lvaww22rj9jnd8b8fjcaclvj8n6vqc390l3z5d7ivm6fc5h1k1j";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
|
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
|
||||||
};
|
};
|
||||||
|
@ -5848,12 +5860,12 @@ let
|
||||||
|
|
||||||
vim-fugitive = buildVimPluginFrom2Nix {
|
vim-fugitive = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-fugitive";
|
pname = "vim-fugitive";
|
||||||
version = "2021-03-23";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tpope";
|
owner = "tpope";
|
||||||
repo = "vim-fugitive";
|
repo = "vim-fugitive";
|
||||||
rev = "857496c32f02ebe74e821bdd2240aafc1455f8ea";
|
rev = "7de9b5a04b9ab63bba381d3cc2c48331ba8e4e7f";
|
||||||
sha256 = "11kyccfmcm7jpvaidd84wdn5vypg9lcdpkpmy2hy7k23gg7hzpza";
|
sha256 = "0d33gzblnz4gzd6grfmyb5rfp59jcj86n95ajwn9q2d4snk45h4n";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/tpope/vim-fugitive/";
|
meta.homepage = "https://github.com/tpope/vim-fugitive/";
|
||||||
};
|
};
|
||||||
|
@ -6835,12 +6847,12 @@ let
|
||||||
|
|
||||||
vim-mundo = buildVimPluginFrom2Nix {
|
vim-mundo = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-mundo";
|
pname = "vim-mundo";
|
||||||
version = "2020-12-29";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "simnalamburt";
|
owner = "simnalamburt";
|
||||||
repo = "vim-mundo";
|
repo = "vim-mundo";
|
||||||
rev = "4f8628caebe393ac1b84564e965f894d89a7582d";
|
rev = "c6dcea90166750bb5ed40321749966b1a8020a1a";
|
||||||
sha256 = "0hmww1xln0rvvi8hy7sv9arjwlp40ks0b07irzqpm5xi93hgyq2n";
|
sha256 = "1bd9xab96m2j6zcp6bh7k958wj95m8w40hczmn2qzpq3cvpy8nb0";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/simnalamburt/vim-mundo/";
|
meta.homepage = "https://github.com/simnalamburt/vim-mundo/";
|
||||||
};
|
};
|
||||||
|
@ -7567,12 +7579,12 @@ let
|
||||||
|
|
||||||
vim-scriptease = buildVimPluginFrom2Nix {
|
vim-scriptease = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-scriptease";
|
pname = "vim-scriptease";
|
||||||
version = "2021-03-08";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tpope";
|
owner = "tpope";
|
||||||
repo = "vim-scriptease";
|
repo = "vim-scriptease";
|
||||||
rev = "9450c4ea654649b6199750edc9f3f84637268d7b";
|
rev = "dbdc88f2ca38613a089354823fb2cec4d87d104d";
|
||||||
sha256 = "0nkxcykn63187jwzw0anl3chzhm31yzgmkhqra0c9071jzi149xg";
|
sha256 = "0i89vrnfphr32qcix9ah9cf68xnw6n8jm03xmgys29gkfim4v7sq";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/tpope/vim-scriptease/";
|
meta.homepage = "https://github.com/tpope/vim-scriptease/";
|
||||||
};
|
};
|
||||||
|
@ -7747,12 +7759,12 @@ let
|
||||||
|
|
||||||
vim-snippets = buildVimPluginFrom2Nix {
|
vim-snippets = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-snippets";
|
pname = "vim-snippets";
|
||||||
version = "2021-03-22";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "honza";
|
owner = "honza";
|
||||||
repo = "vim-snippets";
|
repo = "vim-snippets";
|
||||||
rev = "164bc3aa42feaa3c1deec84f7a10840418aec300";
|
rev = "67e506c5598c19de4fcdf8780377a92aaddfdbad";
|
||||||
sha256 = "0snzmjl4qiw6598a3ajc7v6l4q35wxf8b9lklk47pmfmalvril6w";
|
sha256 = "1gabnzgrjkrf2x32i55js8xf6zm0vzwnzmlbwqkjf1xi25wgbx1n";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/honza/vim-snippets/";
|
meta.homepage = "https://github.com/honza/vim-snippets/";
|
||||||
};
|
};
|
||||||
|
@ -7976,12 +7988,12 @@ let
|
||||||
|
|
||||||
vim-test = buildVimPluginFrom2Nix {
|
vim-test = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-test";
|
pname = "vim-test";
|
||||||
version = "2021-03-03";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vim-test";
|
owner = "vim-test";
|
||||||
repo = "vim-test";
|
repo = "vim-test";
|
||||||
rev = "f5619460b77b9b444311aa3b6f31ecd9ffdaa6d8";
|
rev = "a0a3f130dddfde95700f8d07e51884a2bc0a53c4";
|
||||||
sha256 = "1izzpfvppiyf4pcxdny0na634bl147rwiijyaj7rg679w9lv6qwg";
|
sha256 = "07qv8l3rz63ksrv8shphqk42p1yzcjjck6s5sv3sz2z1xwr2dy0x";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/vim-test/vim-test/";
|
meta.homepage = "https://github.com/vim-test/vim-test/";
|
||||||
};
|
};
|
||||||
|
@ -8144,12 +8156,12 @@ let
|
||||||
|
|
||||||
vim-tpipeline = buildVimPluginFrom2Nix {
|
vim-tpipeline = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-tpipeline";
|
pname = "vim-tpipeline";
|
||||||
version = "2021-03-11";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vimpostor";
|
owner = "vimpostor";
|
||||||
repo = "vim-tpipeline";
|
repo = "vim-tpipeline";
|
||||||
rev = "327944d0d7824e6de4dda33bc2b008708a6cb447";
|
rev = "b36abe2613191912e12b9562b209f157a8b927de";
|
||||||
sha256 = "16nsick3p5nj9vmi6h531l8lc5c6gy2c1zd83xbgav38x655kjws";
|
sha256 = "1ly3iy1c05ry7yfsph0rribiagcyw07daj2dbfj0la3pbfmvip24";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
|
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
|
||||||
};
|
};
|
||||||
|
@ -8276,12 +8288,12 @@ let
|
||||||
|
|
||||||
vim-vsnip = buildVimPluginFrom2Nix {
|
vim-vsnip = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-vsnip";
|
pname = "vim-vsnip";
|
||||||
version = "2021-03-21";
|
version = "2021-03-24";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hrsh7th";
|
owner = "hrsh7th";
|
||||||
repo = "vim-vsnip";
|
repo = "vim-vsnip";
|
||||||
rev = "fe1f56cb924a67ce3b3b70583f00e05e780509e5";
|
rev = "4eb5f669c11c497fa075912eb03294b11fca2c07";
|
||||||
sha256 = "0kd4pfjrjcssql154pnrzvw3kgp6rnll2p0d4bgph1b0lc5xp1nk";
|
sha256 = "1imrkir6ir2fl63wh91yh5jp64kxd3zh1m7p05dcfbyd7rc2l9c1";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
|
meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
|
||||||
};
|
};
|
||||||
|
@ -8565,12 +8577,12 @@ let
|
||||||
|
|
||||||
vimtex = buildVimPluginFrom2Nix {
|
vimtex = buildVimPluginFrom2Nix {
|
||||||
pname = "vimtex";
|
pname = "vimtex";
|
||||||
version = "2021-03-23";
|
version = "2021-03-25";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lervag";
|
owner = "lervag";
|
||||||
repo = "vimtex";
|
repo = "vimtex";
|
||||||
rev = "3109f140196716b3b3a430f06df35723d85f991d";
|
rev = "428906647a22fdb30409554935eacdd9932726cb";
|
||||||
sha256 = "1n44sg35xm1jc70wpjgc5xjf8h6hrpa2f9jwq6x3dcrppj781naq";
|
sha256 = "1kyg2j06b6677pfaj2aqw9ivdlrg02hhpy2jyr11xrqy83k461hi";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||||
};
|
};
|
||||||
|
|
|
@ -4,6 +4,7 @@ ackyshake/Spacegray.vim@main
|
||||||
airblade/vim-gitgutter
|
airblade/vim-gitgutter
|
||||||
airblade/vim-rooter
|
airblade/vim-rooter
|
||||||
akinsho/nvim-bufferline.lua
|
akinsho/nvim-bufferline.lua
|
||||||
|
akinsho/nvim-toggleterm.lua
|
||||||
aklt/plantuml-syntax
|
aklt/plantuml-syntax
|
||||||
altercation/vim-colors-solarized
|
altercation/vim-colors-solarized
|
||||||
alvan/vim-closetag
|
alvan/vim-closetag
|
||||||
|
|
26
pkgs/os-specific/linux/dlm/default.nix
Normal file
26
pkgs/os-specific/linux/dlm/default.nix
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
{ lib
|
||||||
|
, rustPlatform
|
||||||
|
, fetchFromSourcehut
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "dlm";
|
||||||
|
version = "2020-01-07";
|
||||||
|
|
||||||
|
src = fetchFromSourcehut {
|
||||||
|
owner = "~kennylevinsen";
|
||||||
|
repo = pname;
|
||||||
|
rev = "6b0e11c4f453b1a4d7a32019227539a980b7ce66";
|
||||||
|
sha256 = "1r3w7my0g3v2ya317qnvjx8wnagjahpj7yx72a65hf2pjbf5x42p";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "OFMCsUmrRYlobiUAqm1huuzDxdf1BWmU2RqZ9Y6Yjew=";
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A stupid simple graphical login manager";
|
||||||
|
homepage = "https://git.sr.ht/~kennylevinsen/dlm";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
maintainers = with maintainers; [ luc65r ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
51
pkgs/os-specific/linux/greetd/default.nix
Normal file
51
pkgs/os-specific/linux/greetd/default.nix
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
{ rustPlatform
|
||||||
|
, lib
|
||||||
|
, fetchFromSourcehut
|
||||||
|
, pam
|
||||||
|
, scdoc
|
||||||
|
, installShellFiles
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "greetd";
|
||||||
|
version = "0.7.0";
|
||||||
|
|
||||||
|
src = fetchFromSourcehut {
|
||||||
|
owner = "~kennylevinsen";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "b+S3fuJ8gjnSQzLHl3Bs9iO/Un2ynggAplz01GjJvFI=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "w6d8rIc03Qa2/TpztpyVijjd3y0Vo38+JDhsOkSFG5E=";
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
scdoc
|
||||||
|
installShellFiles
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
pam
|
||||||
|
];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
for f in man/*; do
|
||||||
|
scdoc < "$f" > "$(sed 's/-\([0-9]\)\.scd$/.\1/' <<< "$f")"
|
||||||
|
rm "$f"
|
||||||
|
done
|
||||||
|
installManPage man/*
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Minimal and flexible login manager daemon";
|
||||||
|
longDescription = ''
|
||||||
|
greetd is a minimal and flexible login manager daemon
|
||||||
|
that makes no assumptions about what you want to launch.
|
||||||
|
Comes with agreety, a simple, text-based greeter.
|
||||||
|
'';
|
||||||
|
homepage = "https://kl.wtf/projects/greetd/";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
maintainers = with maintainers; [ luc65r ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
50
pkgs/os-specific/linux/gtkgreet/default.nix
Normal file
50
pkgs/os-specific/linux/gtkgreet/default.nix
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromSourcehut
|
||||||
|
, pkg-config
|
||||||
|
, cmake
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, gtk3
|
||||||
|
, gtk-layer-shell
|
||||||
|
, json_c
|
||||||
|
, scdoc
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "gtkgreet";
|
||||||
|
version = "0.7";
|
||||||
|
|
||||||
|
src = fetchFromSourcehut {
|
||||||
|
owner = "~kennylevinsen";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "ms+2FdtzzNlmlzNxFhu4cpX5H+5H+9ZOtZ0p8uVA3lo=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkg-config
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
|
cmake
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
gtk3
|
||||||
|
gtk-layer-shell
|
||||||
|
json_c
|
||||||
|
scdoc
|
||||||
|
];
|
||||||
|
|
||||||
|
mesonFlags = [
|
||||||
|
"-Dlayershell=enabled"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "GTK based greeter for greetd, to be run under cage or similar";
|
||||||
|
homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
maintainers = with maintainers; [ luc65r ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
26
pkgs/os-specific/linux/tuigreet/default.nix
Normal file
26
pkgs/os-specific/linux/tuigreet/default.nix
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
{ lib
|
||||||
|
, rustPlatform
|
||||||
|
, fetchFromGitHub
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "tuigreet";
|
||||||
|
version = "0.2.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "apognu";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "1fk8ppxr3a8vdp7g18pp3sgr8b8s11j30mcqpdap4ai14v19idh8";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "0qpambizjy6z44spnjnh2kd8nay5953mf1ga2iff2mjlv97zpq22";
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Graphical console greter for greetd";
|
||||||
|
homepage = "https://github.com/apognu/tuigreet";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
maintainers = with maintainers; [ luc65r ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
26
pkgs/os-specific/linux/wlgreet/default.nix
Normal file
26
pkgs/os-specific/linux/wlgreet/default.nix
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
{ lib
|
||||||
|
, rustPlatform
|
||||||
|
, fetchFromSourcehut
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "wlgreet";
|
||||||
|
version = "2020-10-20";
|
||||||
|
|
||||||
|
src = fetchFromSourcehut {
|
||||||
|
owner = "~kennylevinsen";
|
||||||
|
repo = pname;
|
||||||
|
rev = "4425d296b81550cce01f044fbd7ff083e37550f4";
|
||||||
|
sha256 = "0n0lzg3y1z5s9s6kfkdj5q8w67bqpw08hqfccc5kz0ninzy9j0cc";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "01bfv2kzg2r9z75b8pq61n2ydc8l5zh69jdyjpj931l642f6kd5a";
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Raw wayland greeter for greetd, to be run under sway or similar";
|
||||||
|
homepage = "https://git.sr.ht/~kennylevinsen/wlgreet";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
maintainers = with maintainers; [ luc65r ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,15 +2,15 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "traefik";
|
pname = "traefik";
|
||||||
version = "2.4.7";
|
version = "2.4.8";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
|
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
|
||||||
sha256 = "sha256-K1uSfsi/uC41ukDGaWaYIKX6A+SU59x3a/DYip9/LPI=";
|
sha256 = "sha256-hCBhJazI0Y1qQjULF+CBfUfz6PvkgLXafvXKR6iKHmU=";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-MCQbSy2TOSkZoqC2POIq8mDRld4fe245m0Xe0drxEq8=";
|
vendorSha256 = "sha256-MW/JG4TbUvbo4dQnQbKIbLlLgkQvOqsfagpXILJ/BYQ=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "clair";
|
pname = "clair";
|
||||||
version = "4.0.3";
|
version = "4.0.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "quay";
|
owner = "quay";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-ztp3t55EOUQqTAEUZtHvHK8nTTVOAmYR9vN2hXLhpVw=";
|
sha256 = "sha256-KY9POvwmyUVx9jcn02Ltcz2a1ULqyKW73A9Peb6rpYE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-+0jp/TvUjpeJJxEs2drVkUb/ua9qqqxome4M9TkpfP4=";
|
vendorSha256 = "sha256-+p3ucnvgOpSLS/uP9RAkWixCkaDoF64qCww013jPqSs=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -9679,6 +9679,24 @@ in
|
||||||
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||||
};
|
};
|
||||||
|
|
||||||
|
adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix;
|
||||||
|
adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix;
|
||||||
|
|
||||||
|
adoptopenjdk-hotspot-bin-16 = if stdenv.isLinux
|
||||||
|
then callPackage adoptopenjdk-bin-16-packages-linux.jdk-hotspot {}
|
||||||
|
else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-hotspot {};
|
||||||
|
adoptopenjdk-jre-hotspot-bin-16 = if stdenv.isLinux
|
||||||
|
then callPackage adoptopenjdk-bin-16-packages-linux.jre-hotspot {}
|
||||||
|
else callPackage adoptopenjdk-bin-16-packages-darwin.jre-hotspot {};
|
||||||
|
|
||||||
|
adoptopenjdk-openj9-bin-16 = if stdenv.isLinux
|
||||||
|
then callPackage adoptopenjdk-bin-16-packages-linux.jdk-openj9 {}
|
||||||
|
else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-openj9 {};
|
||||||
|
|
||||||
|
adoptopenjdk-jre-openj9-bin-16 = if stdenv.isLinux
|
||||||
|
then callPackage adoptopenjdk-bin-16-packages-linux.jre-openj9 {}
|
||||||
|
else callPackage adoptopenjdk-bin-16-packages-darwin.jre-openj9 {};
|
||||||
|
|
||||||
adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix;
|
adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix;
|
||||||
adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix;
|
adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix;
|
||||||
|
|
||||||
|
@ -22571,6 +22589,14 @@ in
|
||||||
|
|
||||||
grandorgue = callPackage ../applications/audio/grandorgue { };
|
grandorgue = callPackage ../applications/audio/grandorgue { };
|
||||||
|
|
||||||
|
greetd = recurseIntoAttrs {
|
||||||
|
greetd = callPackage ../os-specific/linux/greetd { };
|
||||||
|
gtkgreet = callPackage ../os-specific/linux/gtkgreet { };
|
||||||
|
dlm = callPackage ../os-specific/linux/dlm { };
|
||||||
|
wlgreet = callPackage ../os-specific/linux/wlgreet { };
|
||||||
|
tuigreet = callPackage ../os-specific/linux/tuigreet { };
|
||||||
|
};
|
||||||
|
|
||||||
goldendict = libsForQt5.callPackage ../applications/misc/goldendict {
|
goldendict = libsForQt5.callPackage ../applications/misc/goldendict {
|
||||||
inherit (darwin) libiconv;
|
inherit (darwin) libiconv;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue