Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
121cc02fe8
@ -13,10 +13,10 @@ let
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0c0m5qkqv3zhcxmwx72b7z67sjcd1miv8d10kxpk9vffyrxkmj93";
|
||||
x86_64-darwin = "1spd5rbhra4n38lp0sgxd2cr1bngsmi32a43g02vdmmhkmk0iixc";
|
||||
aarch64-linux = "1ql3hn6c59g7d0cwhg54ixww2i9jmkjw3nyzz97yw8wk63zwz024";
|
||||
armv7l-linux = "0pdqcbw7rygvdzys787kf8ag17g9qyv7k33dqhi5h2zc96j867c0";
|
||||
x86_64-linux = "1px6x99cv8nb8lcy3vgcicr4ar0bfj5rfnc5a1yw8rs5p1qnflgw";
|
||||
x86_64-darwin = "0grzivqb2fyvwh0fjh9vr205fjcsrd1iqhkwk3mgv792zfrb7ksf";
|
||||
aarch64-linux = "0p0msxgc13kqmpq7wk61igc1qbgmgg9463s44dp4ii3630iyr4lw";
|
||||
armv7l-linux = "147lki1wr5nzsg1mq12jmdjq9qr6vbdpmzbpr5nrvq23cak94ff8";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
@ -25,7 +25,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.53.2";
|
||||
version = "1.54.2";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dasel";
|
||||
version = "1.13.3";
|
||||
version = "1.13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jjQem7ymwjmOZypMxsQyQGYWtQ0YwWvoxZDXJwCBDgs=";
|
||||
sha256 = "sha256-4/67GwNIRcbC6qYe5s8DD16b2uVcG0DI1ScQk31Ffk0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY=";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, pkg-config, which, perl, libXrandr
|
||||
, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
|
||||
, gtk3, wayland, wayland-protocols
|
||||
, libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false
|
||||
, libXinerama, libnotify, pango, xorgproto, librsvg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "dunst-project";
|
||||
repo = "dunst";
|
||||
rev = "v${version}";
|
||||
sha256 = "0irwkqcgwkqaylcpvqgh25gn2ysbdm2kydipxfzcq1ddj9ns6f9c";
|
||||
sha256 = "0lga1kj2vjbj9g9rl93nivngjmk5fkxdxwal8w96x9whwk9jvdga";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];
|
||||
@ -29,15 +29,12 @@ stdenv.mkDerivation rec {
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"VERSION=$(version)"
|
||||
"SYSCONFDIR=$(out)/etc"
|
||||
"SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
|
||||
"SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
|
||||
];
|
||||
|
||||
buildFlags = if dunstify then [ "dunstify" ] else [];
|
||||
|
||||
postInstall = lib.optionalString dunstify ''
|
||||
install -Dm755 dunstify $out/bin
|
||||
'' + ''
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/dunst \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
|
||||
'';
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.0-k3s2" }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.4-k3s1" }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kube3d";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
excludedPackages = "tools";
|
||||
|
||||
@ -10,20 +10,17 @@ buildGoModule rec {
|
||||
owner = "rancher";
|
||||
repo = "k3d";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-R2RbQlceOD/uY3IdLLiM23gESh/oWnsiTWxHeH/Si18=";
|
||||
sha256 = "sha256-ybEYKr0rQY8Qg74V1mXqShq5Z2d/Adf0bSSbEMIyo3I=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags="
|
||||
"-w"
|
||||
"-s"
|
||||
"-X github.com/rancher/k3d/v4/version.Version=v${version}"
|
||||
"-X github.com/rancher/k3d/v4/version.K3sVersion=v${k3sVersion}"
|
||||
];
|
||||
preBuild = let t = "github.com/rancher/k3d/v4/version"; in
|
||||
''
|
||||
buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.K3sVersion=v${k3sVersion}")
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -36,6 +33,7 @@ buildGoModule rec {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rancher/k3d";
|
||||
changelog = "https://github.com/rancher/k3d/blob/v${version}/CHANGELOG.md";
|
||||
description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d";
|
||||
longDescription = ''
|
||||
k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s
|
||||
@ -44,7 +42,7 @@ buildGoModule rec {
|
||||
multi-node k3s cluster on a single machine using docker.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
|
||||
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
|
||||
, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper
|
||||
, libssh, nghttp2, zlib, cmake, makeWrapper
|
||||
, withQt ? true, qt5 ? null
|
||||
, ApplicationServices, SystemConfiguration, gmp
|
||||
}:
|
||||
@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
|
||||
with lib;
|
||||
|
||||
let
|
||||
version = "3.4.3";
|
||||
version = "3.4.4";
|
||||
variant = if withQt then "qt" else "cli";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
|
||||
sha256 = "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl";
|
||||
sha256 = "0aad3m8nh4i75dgjs68217135bzqmhmlgjklmpjh1ihmjwgd373j";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
@ -33,13 +33,11 @@ in stdenv.mkDerivation {
|
||||
# Avoid referencing -dev paths because of debug assertions.
|
||||
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison cmake flex pkg-config
|
||||
] ++ optional withQt qt5.wrapQtAppsHook;
|
||||
nativeBuildInputs = [ bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook;
|
||||
|
||||
buildInputs = [
|
||||
gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt
|
||||
libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper
|
||||
libgpgerror gnutls geoip c-ares python3 glib zlib
|
||||
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
|
||||
++ optionals stdenv.isLinux [ libcap libnl ]
|
||||
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
|
||||
@ -96,7 +94,7 @@ in stdenv.mkDerivation {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.wireshark.org/";
|
||||
description = "Powerful network protocol analyzer";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
longDescription = ''
|
||||
Wireshark (formerly known as "Ethereal") is a powerful network
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mruby";
|
||||
version = "2.1.2";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mruby";
|
||||
repo = "mruby";
|
||||
rev = version;
|
||||
sha256 = "0fhfv8pi7i8jn2vgk2n2rjnbnfa12nhj514v8i4k353n7q4pmkh3";
|
||||
sha256 = "sha256-C3K7ZooaOMa+V2HjxwiKxrrMb7ffl4QAgPsftRtb60c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ruby bison rake ];
|
||||
|
||||
@ -23,7 +23,7 @@ jruby = stdenv.mkDerivation rec {
|
||||
|
||||
for i in $out/bin/jruby{,.bash}; do
|
||||
wrapProgram $i \
|
||||
--set JAVA_HOME ${jre}
|
||||
--set JAVA_HOME ${jre.home}
|
||||
done
|
||||
|
||||
ln -s $out/bin/jruby $out/bin/ruby
|
||||
|
||||
@ -20,7 +20,7 @@ let
|
||||
"-DLWS_WITH_PLUGINS=ON"
|
||||
"-DLWS_WITH_IPV6=ON"
|
||||
"-DLWS_WITH_SOCKS5=ON"
|
||||
];
|
||||
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON";
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
CFPropertyList (3.0.2)
|
||||
activesupport (5.2.4.4)
|
||||
CFPropertyList (3.0.3)
|
||||
activesupport (5.2.4.5)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
@ -14,10 +14,10 @@ GEM
|
||||
json (>= 1.5.1)
|
||||
atomos (0.1.3)
|
||||
claide (1.0.3)
|
||||
cocoapods (1.10.0)
|
||||
cocoapods (1.10.1)
|
||||
addressable (~> 2.6)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
cocoapods-core (= 1.10.0)
|
||||
cocoapods-core (= 1.10.1)
|
||||
cocoapods-deintegrate (>= 1.0.3, < 2.0)
|
||||
cocoapods-downloader (>= 1.4.0, < 2.0)
|
||||
cocoapods-plugins (>= 1.0.0, < 2.0)
|
||||
@ -32,7 +32,7 @@ GEM
|
||||
nap (~> 1.0)
|
||||
ruby-macho (~> 1.4)
|
||||
xcodeproj (>= 1.19.0, < 2.0)
|
||||
cocoapods-core (1.10.0)
|
||||
cocoapods-core (1.10.1)
|
||||
activesupport (> 5.0, < 6)
|
||||
addressable (~> 2.6)
|
||||
algoliasearch (~> 1.0)
|
||||
@ -52,19 +52,19 @@ GEM
|
||||
netrc (~> 0.11)
|
||||
cocoapods-try (1.2.0)
|
||||
colored2 (3.1.2)
|
||||
concurrent-ruby (1.1.7)
|
||||
concurrent-ruby (1.1.8)
|
||||
escape (0.0.4)
|
||||
ethon (0.12.0)
|
||||
ffi (>= 1.3.0)
|
||||
ffi (1.13.1)
|
||||
ffi (1.15.0)
|
||||
fourflusher (2.3.1)
|
||||
fuzzy_match (2.0.4)
|
||||
gh_inspector (1.1.3)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.8.5)
|
||||
i18n (1.8.9)
|
||||
concurrent-ruby (~> 1.0)
|
||||
json (2.3.1)
|
||||
minitest (5.14.2)
|
||||
json (2.5.1)
|
||||
minitest (5.14.4)
|
||||
molinillo (0.6.6)
|
||||
nanaimo (0.3.0)
|
||||
nap (1.1.0)
|
||||
@ -74,7 +74,7 @@ GEM
|
||||
thread_safe (0.3.6)
|
||||
typhoeus (1.4.0)
|
||||
ethon (>= 0.9.0)
|
||||
tzinfo (1.2.7)
|
||||
tzinfo (1.2.9)
|
||||
thread_safe (~> 0.1)
|
||||
xcodeproj (1.19.0)
|
||||
CFPropertyList (>= 2.3.3, < 4.0)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
CFPropertyList (3.0.2)
|
||||
activesupport (5.2.4.4)
|
||||
CFPropertyList (3.0.3)
|
||||
activesupport (5.2.4.5)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
@ -14,10 +14,10 @@ GEM
|
||||
json (>= 1.5.1)
|
||||
atomos (0.1.3)
|
||||
claide (1.0.3)
|
||||
cocoapods (1.10.0)
|
||||
cocoapods (1.10.1)
|
||||
addressable (~> 2.6)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
cocoapods-core (= 1.10.0)
|
||||
cocoapods-core (= 1.10.1)
|
||||
cocoapods-deintegrate (>= 1.0.3, < 2.0)
|
||||
cocoapods-downloader (>= 1.4.0, < 2.0)
|
||||
cocoapods-plugins (>= 1.0.0, < 2.0)
|
||||
@ -32,7 +32,7 @@ GEM
|
||||
nap (~> 1.0)
|
||||
ruby-macho (~> 1.4)
|
||||
xcodeproj (>= 1.19.0, < 2.0)
|
||||
cocoapods-core (1.10.0)
|
||||
cocoapods-core (1.10.1)
|
||||
activesupport (> 5.0, < 6)
|
||||
addressable (~> 2.6)
|
||||
algoliasearch (~> 1.0)
|
||||
@ -52,19 +52,19 @@ GEM
|
||||
netrc (~> 0.11)
|
||||
cocoapods-try (1.2.0)
|
||||
colored2 (3.1.2)
|
||||
concurrent-ruby (1.1.7)
|
||||
concurrent-ruby (1.1.8)
|
||||
escape (0.0.4)
|
||||
ethon (0.12.0)
|
||||
ffi (>= 1.3.0)
|
||||
ffi (1.13.1)
|
||||
ffi (1.15.0)
|
||||
fourflusher (2.3.1)
|
||||
fuzzy_match (2.0.4)
|
||||
gh_inspector (1.1.3)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.8.5)
|
||||
i18n (1.8.9)
|
||||
concurrent-ruby (~> 1.0)
|
||||
json (2.3.1)
|
||||
minitest (5.14.2)
|
||||
json (2.5.1)
|
||||
minitest (5.14.4)
|
||||
molinillo (0.6.6)
|
||||
nanaimo (0.3.0)
|
||||
nap (1.1.0)
|
||||
@ -74,7 +74,7 @@ GEM
|
||||
thread_safe (0.3.6)
|
||||
typhoeus (1.4.0)
|
||||
ethon (>= 0.9.0)
|
||||
tzinfo (1.2.7)
|
||||
tzinfo (1.2.9)
|
||||
thread_safe (~> 0.1)
|
||||
xcodeproj (1.19.0)
|
||||
CFPropertyList (>= 2.3.3, < 4.0)
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd";
|
||||
sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.4";
|
||||
version = "5.2.4.5";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
@ -47,10 +47,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf";
|
||||
sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
};
|
||||
claide = {
|
||||
groups = ["default"];
|
||||
@ -68,10 +68,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j";
|
||||
sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
};
|
||||
cocoapods-core = {
|
||||
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
|
||||
@ -79,10 +79,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4";
|
||||
sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
};
|
||||
cocoapods-deintegrate = {
|
||||
groups = ["default"];
|
||||
@ -161,10 +161,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
|
||||
sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
};
|
||||
escape = {
|
||||
groups = ["default"];
|
||||
@ -192,10 +192,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
|
||||
sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.1";
|
||||
version = "1.15.0";
|
||||
};
|
||||
fourflusher = {
|
||||
groups = ["default"];
|
||||
@ -243,30 +243,30 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
|
||||
sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.5";
|
||||
version = "1.8.9";
|
||||
};
|
||||
json = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
|
||||
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.1";
|
||||
version = "2.5.1";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
|
||||
sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.14.2";
|
||||
version = "5.14.4";
|
||||
};
|
||||
molinillo = {
|
||||
groups = ["default"];
|
||||
@ -355,10 +355,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
|
||||
sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.7";
|
||||
version = "1.2.9";
|
||||
};
|
||||
xcodeproj = {
|
||||
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd";
|
||||
sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.4.4";
|
||||
version = "5.2.4.5";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
@ -45,10 +45,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf";
|
||||
sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
};
|
||||
claide = {
|
||||
groups = ["default"];
|
||||
@ -66,10 +66,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j";
|
||||
sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
};
|
||||
cocoapods-core = {
|
||||
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
|
||||
@ -77,10 +77,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4";
|
||||
sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
};
|
||||
cocoapods-deintegrate = {
|
||||
groups = ["default"];
|
||||
@ -153,10 +153,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
|
||||
sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
};
|
||||
escape = {
|
||||
source = {
|
||||
@ -182,10 +182,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
|
||||
sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.1";
|
||||
version = "1.15.0";
|
||||
};
|
||||
fourflusher = {
|
||||
groups = ["default"];
|
||||
@ -229,30 +229,30 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
|
||||
sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.5";
|
||||
version = "1.8.9";
|
||||
};
|
||||
json = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
|
||||
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.1";
|
||||
version = "2.5.1";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
|
||||
sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.14.2";
|
||||
version = "5.14.4";
|
||||
};
|
||||
molinillo = {
|
||||
source = {
|
||||
@ -333,10 +333,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
|
||||
sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.7";
|
||||
version = "1.2.9";
|
||||
};
|
||||
xcodeproj = {
|
||||
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hcloud";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "11sdyays90lmkbdxhllc8ccx0xhrafb7dknqgjlrfpzq04v67vyy";
|
||||
sha256 = "1yq7g9hk6b95nqd0f7kvh9r8ij8k9hs6gmjif83qip98xvkdwf0b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future requests python-dateutil ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchPypi
|
||||
, isPyPy
|
||||
, substituteAll
|
||||
, graphvizPkg
|
||||
, graphvizPkgs
|
||||
, graphviz
|
||||
, mock
|
||||
}:
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./hardcode-graphviz-path.patch;
|
||||
graphviz = graphvizPkg;
|
||||
graphviz = graphvizPkgs;
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, pkgs
|
||||
, reattach-to-user-namespace
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
@ -10,10 +9,10 @@ let
|
||||
|
||||
addRtp = path: rtpFilePath: attrs: derivation:
|
||||
derivation // { rtp = "${derivation}/${path}/${rtpFilePath}"; } // {
|
||||
overrideAttrs = f: mkDerivation (attrs // f attrs);
|
||||
overrideAttrs = f: mkTmuxPlugin (attrs // f attrs);
|
||||
};
|
||||
|
||||
mkDerivation = a@{
|
||||
mkTmuxPlugin = a@{
|
||||
pluginName,
|
||||
rtpFilePath ? (builtins.replaceStrings ["-"] ["_"] pluginName) + ".tmux",
|
||||
namePrefix ? "tmuxplugin-",
|
||||
@ -50,10 +49,7 @@ let
|
||||
}));
|
||||
|
||||
in rec {
|
||||
|
||||
inherit mkDerivation;
|
||||
|
||||
battery = mkDerivation {
|
||||
battery = mkTmuxPlugin {
|
||||
pluginName = "battery";
|
||||
version = "unstable-2019-07-04";
|
||||
src = fetchFromGitHub {
|
||||
@ -64,7 +60,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
continuum = mkDerivation {
|
||||
continuum = mkTmuxPlugin {
|
||||
pluginName = "continuum";
|
||||
version = "unstable-2020-10-16";
|
||||
src = fetchFromGitHub {
|
||||
@ -94,7 +90,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
copycat = mkDerivation {
|
||||
copycat = mkTmuxPlugin {
|
||||
pluginName = "copycat";
|
||||
version = "unstable-2020-01-09";
|
||||
src = fetchFromGitHub {
|
||||
@ -105,7 +101,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
cpu = mkDerivation {
|
||||
cpu = mkTmuxPlugin {
|
||||
pluginName = "cpu";
|
||||
version = "unstable-2020-07-25";
|
||||
src = fetchFromGitHub {
|
||||
@ -116,7 +112,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
ctrlw = mkDerivation rec {
|
||||
ctrlw = mkTmuxPlugin rec {
|
||||
pluginName = "ctrlw";
|
||||
version = "0.1.1";
|
||||
src = fetchFromGitHub {
|
||||
@ -127,7 +123,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
dracula = mkDerivation rec {
|
||||
dracula = mkTmuxPlugin rec {
|
||||
pluginName = "dracula";
|
||||
version = "unstable-2021-02-18";
|
||||
src = fetchFromGitHub {
|
||||
@ -145,7 +141,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
fingers = mkDerivation rec {
|
||||
fingers = mkTmuxPlugin rec {
|
||||
pluginName = "fingers";
|
||||
rtpFilePath = "tmux-fingers.tmux";
|
||||
version = "1.0.1";
|
||||
@ -159,7 +155,7 @@ in rec {
|
||||
dependencies = [ pkgs.gawk ];
|
||||
};
|
||||
|
||||
fpp = mkDerivation {
|
||||
fpp = mkTmuxPlugin {
|
||||
pluginName = "fpp";
|
||||
version = "unstable-2016-03-08";
|
||||
src = fetchFromGitHub {
|
||||
@ -174,7 +170,7 @@ in rec {
|
||||
dependencies = [ pkgs.fpp ];
|
||||
};
|
||||
|
||||
fzf-tmux-url = mkDerivation {
|
||||
fzf-tmux-url = mkTmuxPlugin {
|
||||
pluginName = "fzf-tmux-url";
|
||||
rtpFilePath = "fzf-url.tmux";
|
||||
version = "unstable-2019-12-02";
|
||||
@ -186,7 +182,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
gruvbox = mkDerivation {
|
||||
gruvbox = mkTmuxPlugin {
|
||||
pluginName = "gruvbox";
|
||||
rtpFilePath = "gruvbox-tpm.tmux";
|
||||
version = "unstable-2019-05-05";
|
||||
@ -198,7 +194,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
jump = mkDerivation {
|
||||
jump = mkTmuxPlugin {
|
||||
pluginName = "jump";
|
||||
version = "2020-06-26";
|
||||
rtpFilePath = "tmux-jump.tmux";
|
||||
@ -222,7 +218,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
logging = mkDerivation {
|
||||
logging = mkTmuxPlugin {
|
||||
pluginName = "logging";
|
||||
version = "unstable-2019-04-19";
|
||||
src = fetchFromGitHub {
|
||||
@ -233,7 +229,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
net-speed = mkDerivation {
|
||||
net-speed = mkTmuxPlugin {
|
||||
pluginName = "net-speed";
|
||||
version = "unstable-2018-12-02";
|
||||
src = fetchFromGitHub {
|
||||
@ -244,7 +240,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
nord = mkDerivation rec {
|
||||
nord = mkTmuxPlugin rec {
|
||||
pluginName = "nord";
|
||||
version = "0.3.0";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
@ -255,7 +251,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
maildir-counter = mkDerivation {
|
||||
maildir-counter = mkTmuxPlugin {
|
||||
pluginName = "maildir-counter";
|
||||
version = "unstable-2016-11-25";
|
||||
src = fetchFromGitHub {
|
||||
@ -266,7 +262,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
online-status = mkDerivation {
|
||||
online-status = mkTmuxPlugin {
|
||||
pluginName = "online-status";
|
||||
version = "unstable-2018-11-30";
|
||||
src = fetchFromGitHub {
|
||||
@ -277,7 +273,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
open = mkDerivation {
|
||||
open = mkTmuxPlugin {
|
||||
pluginName = "open";
|
||||
version = "unstable-2019-12-02";
|
||||
src = fetchFromGitHub {
|
||||
@ -288,7 +284,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
onedark-theme = mkDerivation {
|
||||
onedark-theme = mkTmuxPlugin {
|
||||
pluginName = "onedark-theme";
|
||||
rtpFilePath = "tmux-onedark-theme.tmux";
|
||||
version = "unstable-2020-06-07";
|
||||
@ -300,7 +296,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
pain-control = mkDerivation {
|
||||
pain-control = mkTmuxPlugin {
|
||||
pluginName = "pain-control";
|
||||
version = "unstable-2020-02-18";
|
||||
src = fetchFromGitHub {
|
||||
@ -311,7 +307,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
plumb = mkDerivation rec {
|
||||
plumb = mkTmuxPlugin rec {
|
||||
pluginName = "plumb";
|
||||
version = "0.1.1";
|
||||
src = fetchFromGitHub {
|
||||
@ -325,7 +321,7 @@ in rec {
|
||||
'';
|
||||
};
|
||||
|
||||
power-theme = mkDerivation {
|
||||
power-theme = mkTmuxPlugin {
|
||||
pluginName = "power";
|
||||
rtpFilePath = "tmux-power.tmux";
|
||||
version = "unstable-2020-11-18";
|
||||
@ -337,7 +333,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
prefix-highlight = mkDerivation {
|
||||
prefix-highlight = mkTmuxPlugin {
|
||||
pluginName = "prefix-highlight";
|
||||
version = "unstable-2020-03-26";
|
||||
src = fetchFromGitHub {
|
||||
@ -348,7 +344,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
resurrect = mkDerivation {
|
||||
resurrect = mkTmuxPlugin {
|
||||
pluginName = "resurrect";
|
||||
version = "unstable-2020-09-18";
|
||||
src = fetchFromGitHub {
|
||||
@ -385,7 +381,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
sensible = mkDerivation {
|
||||
sensible = mkTmuxPlugin {
|
||||
pluginName = "sensible";
|
||||
version = "unstable-2017-09-05";
|
||||
src = fetchFromGitHub {
|
||||
@ -394,12 +390,12 @@ in rec {
|
||||
rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5";
|
||||
sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx";
|
||||
};
|
||||
postInstall = lib.optionalString pkgs.stdenv.isDarwin ''
|
||||
sed -e 's:reattach-to-user-namespace:${reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
sed -e 's:reattach-to-user-namespace:${pkgs.reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux
|
||||
'';
|
||||
};
|
||||
|
||||
sessionist = mkDerivation {
|
||||
sessionist = mkTmuxPlugin {
|
||||
pluginName = "sessionist";
|
||||
version = "unstable-2017-12-03";
|
||||
src = fetchFromGitHub {
|
||||
@ -410,7 +406,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
sidebar = mkDerivation {
|
||||
sidebar = mkTmuxPlugin {
|
||||
pluginName = "sidebar";
|
||||
version = "unstable-2018-11-30";
|
||||
src = fetchFromGitHub {
|
||||
@ -421,7 +417,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
sysstat = mkDerivation {
|
||||
sysstat = mkTmuxPlugin {
|
||||
pluginName = "sysstat";
|
||||
version = "unstable-2017-12-12";
|
||||
src = fetchFromGitHub {
|
||||
@ -432,7 +428,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
tilish = mkDerivation {
|
||||
tilish = mkTmuxPlugin {
|
||||
pluginName = "tilish";
|
||||
version = "2020-08-12";
|
||||
src = fetchFromGitHub {
|
||||
@ -451,7 +447,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
tmux-colors-solarized = mkDerivation {
|
||||
tmux-colors-solarized = mkTmuxPlugin {
|
||||
pluginName = "tmuxcolors";
|
||||
version = "unstable-2019-07-14";
|
||||
src = fetchFromGitHub {
|
||||
@ -462,7 +458,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
tmux-fzf = mkDerivation {
|
||||
tmux-fzf = mkTmuxPlugin {
|
||||
pluginName = "tmux-fzf";
|
||||
rtpFilePath = "main.tmux";
|
||||
version = "unstable-2020-12-07";
|
||||
@ -498,7 +494,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
urlview = mkDerivation {
|
||||
urlview = mkTmuxPlugin {
|
||||
pluginName = "urlview";
|
||||
version = "unstable-2016-01-06";
|
||||
src = fetchFromGitHub {
|
||||
@ -513,7 +509,7 @@ in rec {
|
||||
dependencies = [ pkgs.urlview ];
|
||||
};
|
||||
|
||||
vim-tmux-focus-events = mkDerivation {
|
||||
vim-tmux-focus-events = mkTmuxPlugin {
|
||||
pluginName = "vim-tmux-focus-events";
|
||||
version = "unstable-2020-10-05";
|
||||
src = fetchFromGitHub {
|
||||
@ -532,7 +528,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
vim-tmux-navigator = mkDerivation {
|
||||
vim-tmux-navigator = mkTmuxPlugin {
|
||||
pluginName = "vim-tmux-navigator";
|
||||
rtpFilePath = "vim-tmux-navigator.tmux";
|
||||
version = "unstable-2019-12-10";
|
||||
@ -544,7 +540,7 @@ in rec {
|
||||
};
|
||||
};
|
||||
|
||||
yank = mkDerivation {
|
||||
yank = mkTmuxPlugin {
|
||||
pluginName = "yank";
|
||||
version = "unstable-2019-12-02";
|
||||
src = fetchFromGitHub {
|
||||
@ -554,5 +550,4 @@ in rec {
|
||||
sha256 = "1zg9k8yk1iw01vl8m44w4sv20lln4l0lq9dafc09lxmgxm9dllj4";
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -12,10 +12,10 @@
|
||||
|
||||
let
|
||||
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
|
||||
version = "1.3";
|
||||
gitRev = "a26745e404c3a201fe98af4c000bb27f910542b1";
|
||||
sha256 = "0gfkqvla2cphyhnl5xw19yf1v4pvwsvphr019y5r914cwqwnkb92";
|
||||
cargoSha256 = "1a1alhpivlmxy8iv0ki7s0b8hf3hadashf81rzn207wn3yihsnaf";
|
||||
version = "1.3.1";
|
||||
gitRev = "df83b9b175fecc8ec8b02096c5cfe2db3d00b92e";
|
||||
sha256 = "1df6p0b482vhymw3z7gimc441jr7aix9lhdbcm5wjvw9f276016f";
|
||||
cargoSha256 = "1f9b2h3zakw7qmlnc4rqhxnw80sl5h4mj8cghr82iacxwqz499ql";
|
||||
|
||||
in (rustPlatform.buildRustPackage rec {
|
||||
pname = "lorri";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user