Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -33,6 +33,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
#include <linux/sched/signal.h>
|
||||
#endif
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
struct task_struct *canaryTask;
|
||||
|
||||
static int kcanary(void *nothing)
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qpwgraph";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "rncbc";
|
||||
repo = "qpwgraph";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r3FoAV0wah9fwnqyMyu8927c4Uj0zZoQNvLoXP5AP/E=";
|
||||
sha256 = "sha256-SGx80fMFomNEa/jgH8Yeof+f7zXCDxx3Yqd0GxHZGMw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "16.1.2";
|
||||
version = "16.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
|
||||
sha256 = "b86ff3f77b17e7da66979fe8ea878685c0018273f5d0302f10d3094d502452ee";
|
||||
sha256 = "624f776478b6960adb1be565077f79aed72c95de5e995fc1216b78978c9c6857";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -86,6 +86,12 @@ stdenv.mkDerivation rec {
|
||||
--replace /opt/drawio/drawio $out/bin/drawio
|
||||
'';
|
||||
|
||||
doInstallCheckPhase = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/drawio --help > /dev/null
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A desktop application for creating diagrams";
|
||||
homepage = "https://about.draw.io/";
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||
let
|
||||
pname = "zettlr";
|
||||
version = "2.0.2";
|
||||
version = "2.1.1";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
|
||||
sha256 = "sha256-AUGfD7FFB5+pfKyIqvychD4mvFU+GTRneQTRI+8bwBM=";
|
||||
sha256 = "sha256-neqgUXvCxjKQii3uOwXed0S/2FhWly/1tiHY2snyHrc=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
|
||||
@@ -93,11 +93,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.34.80";
|
||||
version = "1.34.81";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "2N+dXQGVfm3GsaKKo3EBxLu+cu08OjlrqkgXX9knFys=";
|
||||
sha256 = "bMNk1l3MguQho0vck78U1e3A+/571DyoWSKKerQVE7s=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "2.2.2";
|
||||
commit = "03b17e0233e64787ffb5fcf65c740cc2a20822ba";
|
||||
version = "2.2.3";
|
||||
commit = "afbd59ba636cfd999fe6ead8a84323413882e230";
|
||||
tag = "v${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
rev = tag;
|
||||
sha256 = "sha256-xExtGKM3iNgX849xmLcgIwRbXJSJnGDuVhRMkti+Mkc=";
|
||||
sha256 = "sha256-Lw4/VmwD/IF2GEFzQP1kerXrST1kvWvG2nr/br/tO0w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-BVhts+gOM6nhcR1lkFzy7OJnainLXw5YdeseBBRF2xE=";
|
||||
|
||||
@@ -1,41 +1,42 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (6.1.4.1)
|
||||
activesupport (7.0.1)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
zeitwerk (~> 2.3)
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
cgi (0.3.1)
|
||||
colorize (0.8.1)
|
||||
concurrent-ruby (1.1.9)
|
||||
date (3.2.2)
|
||||
domain_name (0.5.20190701)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
ejson (1.3.0)
|
||||
faraday (1.8.0)
|
||||
ejson (1.3.1)
|
||||
faraday (1.9.3)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
faraday-httpclient (~> 1.0.1)
|
||||
faraday-httpclient (~> 1.0)
|
||||
faraday-multipart (~> 1.0)
|
||||
faraday-net_http (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.1)
|
||||
faraday-net_http_persistent (~> 1.0)
|
||||
faraday-patron (~> 1.0)
|
||||
faraday-rack (~> 1.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-retry (~> 1.0)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.0)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.0.3)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-net_http (1.0.1)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
ffi (1.15.4)
|
||||
faraday-retry (1.0.3)
|
||||
ffi (1.15.5)
|
||||
ffi-compiler (1.0.1)
|
||||
ffi (>= 1.0.0)
|
||||
rake
|
||||
@@ -59,36 +60,34 @@ GEM
|
||||
ffi-compiler (>= 1.0, < 2.0)
|
||||
i18n (1.8.11)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jsonpath (0.9.9)
|
||||
jsonpath (1.1.0)
|
||||
multi_json
|
||||
to_regexp (~> 0.2.1)
|
||||
jwt (2.3.0)
|
||||
krane (2.3.4)
|
||||
krane (2.4.0)
|
||||
activesupport (>= 5.0)
|
||||
cgi
|
||||
colorize (~> 0.8)
|
||||
concurrent-ruby (~> 1.1)
|
||||
date
|
||||
ejson (~> 1.0)
|
||||
googleauth (~> 0.8)
|
||||
jsonpath (~> 0.9.6)
|
||||
kubeclient (~> 4.3)
|
||||
jsonpath (~> 1.0)
|
||||
kubeclient (~> 4.9)
|
||||
oj (~> 3.0)
|
||||
statsd-instrument (>= 2.8, < 4)
|
||||
thor (>= 1.0, < 2.0)
|
||||
kubeclient (4.7.0)
|
||||
kubeclient (4.9.2)
|
||||
http (>= 3.0, < 5.0)
|
||||
jsonpath (~> 1.0)
|
||||
recursive-open-struct (~> 1.1, >= 1.1.1)
|
||||
rest-client (~> 2.0)
|
||||
memoist (0.16.2)
|
||||
mime-types (3.4.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2021.1115)
|
||||
minitest (5.14.4)
|
||||
mime-types-data (3.2022.0105)
|
||||
minitest (5.15.0)
|
||||
multi_json (1.15.0)
|
||||
multipart-post (2.1.1)
|
||||
netrc (0.11.0)
|
||||
oj (3.13.9)
|
||||
oj (3.13.11)
|
||||
os (1.1.4)
|
||||
public_suffix (4.0.6)
|
||||
rake (13.0.6)
|
||||
@@ -105,14 +104,12 @@ GEM
|
||||
jwt (>= 1.5, < 3.0)
|
||||
multi_json (~> 1.10)
|
||||
statsd-instrument (3.1.2)
|
||||
thor (1.1.0)
|
||||
to_regexp (0.2.1)
|
||||
thor (1.2.1)
|
||||
tzinfo (2.0.4)
|
||||
concurrent-ruby (~> 1.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.8)
|
||||
zeitwerk (2.5.1)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4";
|
||||
sha256 = "02lys9pnb99hsczs551iqzjn008i8k7c728xxba7acfi9rdw9pa6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.1";
|
||||
version = "7.0.1";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
@@ -21,16 +21,6 @@
|
||||
};
|
||||
version = "2.8.0";
|
||||
};
|
||||
cgi = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vy8g58ns18x3dl566wg5rp4hymlx9584ddf75isdyig0yxjl0sn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.1";
|
||||
};
|
||||
colorize = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@@ -51,16 +41,6 @@
|
||||
};
|
||||
version = "1.1.9";
|
||||
};
|
||||
date = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0j1ghv5lqpn8jdvvci2fqvl30j4x31hhgzzc0mj54cga1sgh97n7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.2";
|
||||
};
|
||||
domain_name = {
|
||||
dependencies = ["unf"];
|
||||
groups = ["default"];
|
||||
@@ -77,21 +57,21 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09584dhklhnxvgrf1b1lvb1illhzg79rsd9sgbpzrawiir789ksy";
|
||||
sha256 = "0gmfyyzzvb9k5nm1a5x83d7krajfghghfsakhxmdpvncyj2vnrpa";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"];
|
||||
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
|
||||
sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.0";
|
||||
version = "1.9.3";
|
||||
};
|
||||
faraday-em_http = {
|
||||
groups = ["default"];
|
||||
@@ -133,6 +113,17 @@
|
||||
};
|
||||
version = "1.0.1";
|
||||
};
|
||||
faraday-multipart = {
|
||||
dependencies = ["multipart-post"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
};
|
||||
faraday-net_http = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@@ -173,15 +164,25 @@
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
faraday-retry = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
};
|
||||
ffi = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
|
||||
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.4";
|
||||
version = "1.15.5";
|
||||
};
|
||||
ffi-compiler = {
|
||||
dependencies = ["ffi" "rake"];
|
||||
@@ -270,15 +271,15 @@
|
||||
version = "1.8.11";
|
||||
};
|
||||
jsonpath = {
|
||||
dependencies = ["multi_json" "to_regexp"];
|
||||
dependencies = ["multi_json"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1zim5bl7zsbccd502iy63f7c3b6dw0a820z7q8kpv66hncavb7gp";
|
||||
sha256 = "12hjsr0plnx6v0bh1rhhimfi7z3rqm19xb47ybdkc1h9yhynnmdq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.9";
|
||||
version = "1.1.0";
|
||||
};
|
||||
jwt = {
|
||||
groups = ["default"];
|
||||
@@ -291,26 +292,26 @@
|
||||
version = "2.3.0";
|
||||
};
|
||||
krane = {
|
||||
dependencies = ["activesupport" "cgi" "colorize" "concurrent-ruby" "date" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"];
|
||||
dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07pij3z7kz7n0nvf8xwcaackck8wyjwldjva7215k2dm8csdzaih";
|
||||
sha256 = "1xnf0cw5i1i8l5nm1c9z02h184ad6hvy7fydr4bdzckjkyinamv9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.4";
|
||||
version = "2.4.0";
|
||||
};
|
||||
kubeclient = {
|
||||
dependencies = ["http" "recursive-open-struct" "rest-client"];
|
||||
dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1k4w7h6fywhccv7fskwks9p71fvbh00qyvcx8cc4bnvwjn43680w";
|
||||
sha256 = "0kld1w4706dfd6jx3snsi4h2pvqfazz1fni5al2ln60s3b8sybq4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.7.0";
|
||||
version = "4.9.2";
|
||||
};
|
||||
memoist = {
|
||||
groups = ["default"];
|
||||
@@ -338,20 +339,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03m3fkix2haah20kvh1jgv262yg9jlzn6wq0y31kafxk8fysfy27";
|
||||
sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2021.1115";
|
||||
version = "3.2022.0105";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
|
||||
sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.14.4";
|
||||
version = "5.15.0";
|
||||
};
|
||||
multi_json = {
|
||||
groups = ["default"];
|
||||
@@ -388,10 +389,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hcmczbp9afxijzg0gvp9milyzk15phfmbpmmsj5ppmziwkdls16";
|
||||
sha256 = "0bm8sdh7vz7ss3y21v961rd8nww23w5g4yhgvnd7jk331kdjyyzl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.13.9";
|
||||
version = "3.13.11";
|
||||
};
|
||||
os = {
|
||||
groups = ["default"];
|
||||
@@ -480,20 +481,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
|
||||
sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
to_regexp = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1rgabfhnql6l4fx09mmj5d0vza924iczqf2blmn82l782b6qqi9v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.1";
|
||||
version = "1.2.1";
|
||||
};
|
||||
tzinfo = {
|
||||
dependencies = ["concurrent-ruby"];
|
||||
@@ -527,14 +518,4 @@
|
||||
};
|
||||
version = "0.0.8";
|
||||
};
|
||||
zeitwerk = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.1";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ] ++ (if stdenv.isDarwin then [ unzip ] else [ dpkg ]);
|
||||
|
||||
buildInputs = [ awscli ];
|
||||
|
||||
unpackPhase = if stdenv.isDarwin then "unzip $src" else "dpkg-deb -x $src .";
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -1,20 +1,32 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "starboard";
|
||||
version = "0.12.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6QIQsxqTKERo5x2Knv4IBeNt5KjvfoW0ryFJLlALqrA=";
|
||||
sha256 = "sha256-/k9lQS3oPOYxhaaXuaDwPnai7byDkge4yBu7/9g4RUE=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
commit="$(git rev-parse HEAD)"
|
||||
source_date_epoch=$(git log --date=format:'%Y-%m-%dT%H:%M:%SZ' -1 --pretty=%ad)
|
||||
substituteInPlace "$out/cmd/starboard/main.go" \
|
||||
--replace 'commit = "none"' "commit = \"$commit\"" \
|
||||
--replace 'date = "unknown"' "date = \"$source_date_epoch\""
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorSha256 = "sha256-7SVEyyJRE7oYIhuENraZy0aieIAoFFWtq4mrSXxURlQ=";
|
||||
|
||||
vendorSha256 = "sha256-r6wMSeW5Et6hYwoEKufmcOmucuHlYuBDOMuXXMT4W2Y=";
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# Don't build and check the integration tests
|
||||
excludedPackages = "itest";
|
||||
subPackages = [ "cmd/starboard" ];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X main.version=v${version}"
|
||||
@@ -23,6 +35,20 @@ buildGoModule rec {
|
||||
preCheck = ''
|
||||
# Remove test that requires networking
|
||||
rm pkg/plugin/aqua/client/client_integration_test.go
|
||||
|
||||
# Feed in all but the integration tests for testing
|
||||
# This is because subPackages above limits what is built to just what we
|
||||
# want but also limits the tests
|
||||
getGoDirs() {
|
||||
go list ./... | grep -v itest
|
||||
}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd starboard \
|
||||
--bash <($out/bin/starboard completion bash) \
|
||||
--fish <($out/bin/starboard completion fish) \
|
||||
--zsh <($out/bin/starboard completion zsh)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "catgirl";
|
||||
version = "2.0";
|
||||
version = "2.0a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-rk6nvfyaFxJ/7JN92L5tDraTngffVb6u/U7dbNjK9jI=";
|
||||
sha256 = "sha256-AbzzTqaulPDplntwRYw4fVxZXUIJ2L0MKZvyWq4lvro=";
|
||||
};
|
||||
|
||||
# catgirl's configure script uses pkg-config --variable exec_prefix openssl
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchzip
|
||||
, jre
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, makeWrapper
|
||||
, extraJavaArgs ? "-Xms512M -Xmx2000M"
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "gprojector";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.giss.nasa.gov/tools/gprojector/download/G.ProjectorJ-${version}.tgz";
|
||||
sha256 = "sha256-IvGZOYt2d8aWtlAJJzVrwkqOOhaUHUmEDlMeD/0NdwU=";
|
||||
};
|
||||
|
||||
desktopItems = [ (makeDesktopItem {
|
||||
name = "gprojector";
|
||||
exec = "gprojector";
|
||||
desktopName = "G.Projector";
|
||||
comment = meta.description;
|
||||
categories = "Science;";
|
||||
extraEntries = "StartupWMClass = gov-nasa-giss-projector-GProjector";
|
||||
}) ];
|
||||
|
||||
buildInputs = [ jre ];
|
||||
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontFixup = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share
|
||||
cp -r $src/jars $out/share/java
|
||||
makeWrapper ${jre}/bin/java $out/bin/gprojector --add-flags "-jar $out/share/java/G.Projector.jar" --add-flags "${extraJavaArgs}"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "G.Projector transforms an input map image into any of about 200 global and regional map projections";
|
||||
homepage = "https://www.giss.nasa.gov/tools/gprojector/";
|
||||
maintainers = with lib.maintainers; [ alyaeanyx ];
|
||||
license = lib.licenses.unfree;
|
||||
inherit (jre.meta) platforms;
|
||||
};
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
with python.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "deepTools";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deeptools";
|
||||
repo = "deepTools";
|
||||
rev = version;
|
||||
sha256 = "1bz8ln32mfc9k8l9wgp034vw80dxh6f92dfqxhcrpggk4akwj6ml";
|
||||
sha256 = "07v8vb2x4b0mgw0mvcj91vj1fqbcwizwsniysl2cvmv93gad8gbp";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,27 +1,27 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, which, ldc, zlib }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, which
|
||||
, ldc
|
||||
, zlib
|
||||
, lz4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sambamba";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biod";
|
||||
repo = "sambamba";
|
||||
rev = "v${version}";
|
||||
sha256 = "0f4qngnys2zjb0ri54k6kxqnssg938mnnscs4z9713hjn41rk7yd";
|
||||
sha256 = "sha256-FEa9QjQoGNUOAtMNMZcqpTKMKVtXoBuOomTy0mpos/0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# make ldc 1.27.1 compatible
|
||||
(fetchpatch {
|
||||
url = "https://github.com/biod/sambamba/pull/480/commits/b5c80feb62683d24ec0529f685a1d7a36962a1d4.patch";
|
||||
sha256 = "0yr9baxqbhyb4scwcwczk77z8gazhkl60jllhz9dnrb7p5qsvs7r";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ which python3 ldc ];
|
||||
buildInputs = [ zlib ];
|
||||
buildInputs = [ zlib lz4 ];
|
||||
|
||||
# Upstream's install target is broken; copy manually
|
||||
installPhase = ''
|
||||
|
||||
@@ -6,69 +6,29 @@
|
||||
, python3
|
||||
, spirv-headers
|
||||
, spirv-tools
|
||||
, argSpirv-tools ? null
|
||||
, argSpirv-headers ? null
|
||||
}:
|
||||
# glslang requires custom versions of spirv-tools and spirb-headers.
|
||||
# The exact versions are taken from:
|
||||
# https://github.com/KhronosGroup/glslang/blob/${version}/known_good.json
|
||||
|
||||
let
|
||||
localSpirv-tools = if argSpirv-tools == null
|
||||
then spirv-tools.overrideAttrs (_: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Tools";
|
||||
rev = "b27b1afd12d05bf238ac7368bb49de73cd620a8e";
|
||||
sha256 = "0v26ws6qx23jn4dcpsq6rqmdxgyxpl5pcvfm90wb3nz6iqbqx294";
|
||||
};
|
||||
})
|
||||
else argSpirv-tools;
|
||||
|
||||
localSpirv-headers = if argSpirv-headers == null
|
||||
then spirv-headers.overrideAttrs (_: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Headers";
|
||||
rev = "f027d53ded7e230e008d37c8b47ede7cd308e19d";
|
||||
sha256 = "12gp2mqcar6jj57jw9isfr62yn72kmvdcl0zga4gvrlyfhnf582q";
|
||||
};
|
||||
})
|
||||
else argSpirv-headers;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glslang";
|
||||
version = "11.1.0";
|
||||
version = "1.2.198.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "glslang";
|
||||
rev = version;
|
||||
sha256 = "1j81pghy7whyr8ygk7lx6g6qph61rky7fkkc8xp87c7n695a48rw";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "sha256-FRiqsfoyjUW2kbbphxcy0Hn0TLVaszatM/nnWBrchRY=";
|
||||
};
|
||||
|
||||
# These get set at all-packages, keep onto them for child drvs
|
||||
passthru = {
|
||||
spirv-tools = localSpirv-tools;
|
||||
spirv-headers = localSpirv-headers;
|
||||
spirv-tools = spirv-tools;
|
||||
spirv-headers = spirv-headers;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 bison jq ];
|
||||
|
||||
postPatch = ''
|
||||
cp --no-preserve=mode -r "${localSpirv-tools.src}" External/spirv-tools
|
||||
ln -s "${localSpirv-headers.src}" External/spirv-tools/external/spirv-headers
|
||||
'';
|
||||
|
||||
# Ensure spirv-headers and spirv-tools match exactly to what is expected
|
||||
preConfigure = ''
|
||||
HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit')
|
||||
TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit')
|
||||
if [ "$HEADERS_COMMIT" != "${localSpirv-headers.src.rev}" ] || [ "$TOOLS_COMMIT" != "${localSpirv-tools.src.rev}" ]; then
|
||||
echo "ERROR: spirv-tools commits do not match expected versions: expected tools at $TOOLS_COMMIT, headers at $HEADERS_COMMIT";
|
||||
exit 1;
|
||||
fi
|
||||
cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools
|
||||
ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "goffice";
|
||||
version = "0.10.50";
|
||||
version = "0.10.51";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "LFw93HsIs0UkCMgbEhxfASpzSYHXXkRN68yxxY5cv9w=";
|
||||
sha256 = "LoQQiE1qUa4AyUIJKKv6c/elUsGqIiNx308txazDzSM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spirv-headers";
|
||||
version = "unstable-2021-08-11";
|
||||
version = "1.2.198.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Headers";
|
||||
rev = "e71feddb3f17c5586ff7f4cfb5ed1258b800574b";
|
||||
sha256 = "sha256-9m0EBcgdya+KCNJHC3x+YV2sXoSNToTcgDkpeKzId6U=";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "sha256-cdEiRSCoX0New8ecUh7UTDz/is2v29zhf6Il2N1j3mw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-headers";
|
||||
version = "1.2.189.1";
|
||||
version = "1.2.198.0";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-Headers";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "1qggc7dv9jr83xr9w2h375wl3pz3rfgrk9hnrjmylkg9gz4p9q03";
|
||||
sha256 = "sha256-SvC0AX1wIZWLzws3ZS8Wi8fbNUw1+An/PRlFIfNj24Y=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-loader";
|
||||
version = "1.2.189.1";
|
||||
version = "1.2.198.0";
|
||||
|
||||
src = (assert version == vulkan-headers.version;
|
||||
fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-Loader";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "1745fdzi0n5qj2s41q6z1y52cq8pwswvh1a32d3n7kl6bhksagp6";
|
||||
sha256 = "sha256-k3eCdZqCjFxpKa0pZ0K4XcORxdSOlr1dFa7C3Qzi04Y=";
|
||||
});
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@@ -266,6 +266,7 @@
|
||||
, "stackdriver-statsd-backend"
|
||||
, "stf"
|
||||
, "stylelint"
|
||||
, "surge"
|
||||
, "svelte-check"
|
||||
, "svelte-language-server"
|
||||
, "svgo"
|
||||
|
||||
+777
-458
File diff suppressed because it is too large
Load Diff
@@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioapns";
|
||||
version = "2.0.2";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ea58ce685aa6d0ffbdc3be4a6999c7268b9c765f806d3e4da7677c098fb72cbc";
|
||||
sha256 = "2ce526910bc2514a84b8105abe80508526ceafc0097c89f86bbbc501f8666c99";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "downloader-cli";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepjyoti30";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0gbbjxb9vf5g890cls3mwzl8lmcn6jkpgm5cbrif740mn2b4q228";
|
||||
sha256 = "0hjwy3qa6al6p35pv01sdl3szh7asf6vlmhwjbkpppn4zi239k0y";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ urllib3 ];
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.20.30";
|
||||
version = "0.20.31";
|
||||
pname = "dulwich";
|
||||
format = "setuptools";
|
||||
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-QsCQqWv2F7oZhhElewMzsHw3vOaXX7TAkLMuMJxTTkE=";
|
||||
hash = "sha256-9vwYpVDNsU5xCjcqBflcnIMc/DEp/X7RGyASDuVwFYc=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "formbox";
|
||||
version = "0.3.0";
|
||||
version = "0.4.1";
|
||||
format = "flit";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@@ -10,7 +10,7 @@ buildPythonPackage rec {
|
||||
owner = "~cnx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-K8NqMi80UurirAZaw67nhW5hFC3+dbdoT84hW7iIcaM=";
|
||||
sha256 = "sha256-zOvXmSeBiwc0Z5mRMwMsHLU3A/iP7rpjXm0T0I2gUTk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ bleach markdown ];
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "launchpadlib";
|
||||
version = "1.10.15.1";
|
||||
version = "1.10.16";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4891f5b0c9bafbbb78aa06eeba1635629663c6aa80f621bcd1fc1057c8dd14b5";
|
||||
sha256 = "0df4b13936f988afd0ee485f40fa6922eab783b48c38ca0108cb73c8788fca80";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "liquidctl";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-N0Ebd0zIHFmuiIozkAy4SV3o8rFA1wmrGd+dJo8jdk0=";
|
||||
sha256 = "0cl1xg3rqpn4yjflwcz667pwfjnbq0g41pkg2nak7x9mxqnbdk70";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "1.2.57";
|
||||
version = "1.2.58";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-olh8DUYg3s72ll1+p+0QapdKR2+aaSvgSUrZuGFif1s=";
|
||||
sha256 = "sha256-USUqVzVfkp9X4zRl4D6gGDkJ/tRG3sN36MqcmJebwL4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,25 +1,32 @@
|
||||
{ lib
|
||||
, appdirs
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nmapthon2";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-6mGMB8nW6CqTPxgc1fveh6fJo/t+jpUS6rJ2VR2gU/g=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cblopez";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t4gAcDwHHejfipQmJvMLhKmdz8D6UN/Mmsrhpq0cygY=";
|
||||
};
|
||||
|
||||
# Tests are not part of the PyPI source and source is not tagged
|
||||
# https://github.com/cblopez/nmapthon2/issues/3
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests/scanner_tests.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nmapthon2"
|
||||
|
||||
@@ -7,6 +7,9 @@
|
||||
, virtualenv
|
||||
, pretend
|
||||
, pytest
|
||||
|
||||
# coupled downsteam dependencies
|
||||
, pip-tools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -32,6 +35,8 @@ buildPythonPackage rec {
|
||||
# Pip wants pytest, but tests are not distributed
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests = { inherit pip-tools; };
|
||||
|
||||
meta = {
|
||||
description = "The PyPA recommended tool for installing Python packages";
|
||||
license = with lib.licenses; [ mit ];
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, stdenv
|
||||
, wheel
|
||||
}:
|
||||
|
||||
@@ -23,16 +24,9 @@ buildPythonPackage rec {
|
||||
hash = "sha256-0Dl7oKB2xxq/a8do3HgBUIGay88yOGBUdOGo+QCtnUE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
botocore
|
||||
];
|
||||
propagatedBuildInputs = [ botocore ];
|
||||
|
||||
buildInputs = [
|
||||
docutils
|
||||
mock
|
||||
pytestCheckHook
|
||||
wheel
|
||||
];
|
||||
buildInputs = [ docutils mock pytestCheckHook wheel ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Requires network access
|
||||
@@ -42,11 +36,13 @@ buildPythonPackage rec {
|
||||
"tests/integration/test_processpool.py"
|
||||
"tests/integration/test_s3transfer.py"
|
||||
"tests/integration/test_upload.py"
|
||||
];
|
||||
] ++
|
||||
# There was a change in python 3.8 that defaults multiprocessing to spawn instead of fork on macOS
|
||||
# See https://bugs.python.org/issue33725 and https://github.com/python/cpython/pull/13603.
|
||||
# I suspect the underlying issue here is that upstream tests aren't compatible with spawn multiprocessing, and pass on linux where the default is still fork
|
||||
lib.optionals stdenv.isDarwin [ "tests/unit/test_compat.py" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"s3transfer"
|
||||
];
|
||||
pythonImportsCheck = [ "s3transfer" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for managing Amazon S3 transfers";
|
||||
|
||||
@@ -12,11 +12,12 @@
|
||||
, testVersion
|
||||
, tomlkit
|
||||
, staticjinja
|
||||
, callPackage
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "staticjinja";
|
||||
version = "4.1.1";
|
||||
version = "4.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -26,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "staticjinja";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Bpgff3VaTylnYpkWoaWEiRWu4sYSP6dLbHDOjAhj7BM=";
|
||||
sha256 = "sha256-YHhGohA24D4O/Bj7JZTj8qaEGEZAupvxWcZYjWFTHmM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -51,8 +52,9 @@ buildPythonPackage rec {
|
||||
export PATH="$PATH:$out/bin";
|
||||
'';
|
||||
|
||||
passthru.tests.version = testVersion {
|
||||
package = staticjinja;
|
||||
passthru.tests = {
|
||||
version = testVersion { package = staticjinja; };
|
||||
minimal-template = callPackage ./test-minimal-template {};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
{ stdenv, staticjinja }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "staticjinja-test-minimal-template";
|
||||
meta.timeout = 30;
|
||||
buildCommand = ''
|
||||
${staticjinja}/bin/staticjinja build --srcpath ${./templates}
|
||||
grep 'Hello World!' index
|
||||
touch $out
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
World
|
||||
@@ -0,0 +1 @@
|
||||
Hello {% include './include' %}!
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "treex";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cgarciae";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1hl3wj71c7cp7jzkhyjy7xgs2vc8c89icq0bgfr49y4pwv69n43m";
|
||||
sha256 = "0pi4c78vqhy7mh9ranssdxdjbqnvyagsfkx95k93bnvzgmnr2kxb";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,21 +2,21 @@
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "clojure-lsp";
|
||||
version = "2022.01.03-19.46.10";
|
||||
version = "2022.01.22-01.31.09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-BbhT4I4M7PwHHFwNDNY4mJxsreJVOEwlValZTgS0Zs8=";
|
||||
sha256 = "sha256-xQSOJRKKjX3AfQsYe4UNhFlLgWPkoY8NOPXCO1oc3BI=";
|
||||
};
|
||||
|
||||
jar = fetchurl {
|
||||
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp.jar";
|
||||
sha256 = "sha256-QG9Z4wkzh1kaX44oee325BvY2XqXRo4iBjY5LPnkLBQ=";
|
||||
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
|
||||
sha256 = "sha256-le0+ZmGyhM/UfGUV05FHyx5PlARxL/T2aC8UhiPYjxw";
|
||||
};
|
||||
|
||||
# https://github.com/clojure-lsp/clojure-lsp/blob/2021.11.02-15.24.47/graalvm/native-unix-compile.sh#L18-L27
|
||||
# https://github.com/clojure-lsp/clojure-lsp/blob/2022.01.22-01.31.09/cli/graalvm/native-unix-compile.sh#L18-L27
|
||||
# Needs to be inject on `nativeImageBuildArgs` inside shell environment,
|
||||
# otherwise we can't expand to the value set in `mktemp -d` call
|
||||
preBuild = ''
|
||||
@@ -50,12 +50,12 @@ buildGraalvmNativeImage rec {
|
||||
|
||||
latest_version=$(curl -s https://api.github.com/repos/clojure-lsp/clojure-lsp/releases/latest | jq --raw-output .tag_name)
|
||||
|
||||
old_jar_hash=$(nix-instantiate --eval --strict -A "clojure-lsp.jar.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')
|
||||
old_jar_hash=$(nix-instantiate --eval --strict -A "clojure-lsp-standalone.jar.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')
|
||||
|
||||
curl -o clojure-lsp.jar -sL https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp.jar
|
||||
new_jar_hash=$(nix-hash --flat --type sha256 clojure-lsp.jar | sed -re 's|[+]|\\&|g')
|
||||
curl -o clojure-lsp.jar -sL https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar
|
||||
new_jar_hash=$(nix-hash --flat --type sha256 clojure-lsp-standalone.jar | sed -re 's|[+]|\\&|g')
|
||||
|
||||
rm -f clojure-lsp.jar
|
||||
rm -f clojure-lsp-standalone.jar
|
||||
|
||||
nixFile=$(nix-instantiate --eval --strict -A "clojure-lsp.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inotify-tools";
|
||||
version = "3.21.9.6";
|
||||
version = "3.22.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "inotify-tools";
|
||||
owner = "inotify-tools";
|
||||
rev = version;
|
||||
sha256 = "sha256-oKcVmF39N43g8O1S+xwUhVJryFcW+ZUteyoe3fUkRH8=";
|
||||
sha256 = "sha256-I0kr+wFUWnovH9MXVsGaCBtp4+RnnMWD7sPecI3xz+Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@@ -1,27 +1,20 @@
|
||||
{ stdenv, lib, fetchFromGitHub
|
||||
, rustPlatform, pkg-config, openssl
|
||||
# testing packages
|
||||
, cargo-insta
|
||||
# darwin dependencies
|
||||
, Security, CoreFoundation, libiconv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-geiger";
|
||||
version = "0.10.2";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-secure-code";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1z920p8i3gkjadyd6bqjk4i5yr5ds3m3sbcnf7plcqr69dsjr4b8";
|
||||
sha256 = "sha256-KkOLDSnLneal3m+CrYKKIoeO61rjXEDq4GK3kPwQxj4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1wf9758gyaxgyajjzy5phirg922n9wv0qmy67zjmxj56ayf0l9lm";
|
||||
|
||||
checkPhase = ''
|
||||
${cargo-insta}/bin/cargo-insta test
|
||||
'';
|
||||
cargoSha256 = "sha256-i7xDEzZAN2ubW1Q6MhY+xsb9XiUajNDHLdtDuO5r6jA=";
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@@ -33,10 +26,33 @@ rustPlatform.buildRustPackage rec {
|
||||
export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE"
|
||||
'';
|
||||
|
||||
# skip tests with networking or other failures
|
||||
checkFlags = [
|
||||
"--skip serialize_test2_quick_report"
|
||||
"--skip serialize_test3_quick_report"
|
||||
"--skip serialize_test6_quick_report"
|
||||
"--skip serialize_test2_report"
|
||||
"--skip serialize_test3_report"
|
||||
"--skip serialize_test6_report"
|
||||
"--skip test_package::case_2"
|
||||
"--skip test_package::case_3"
|
||||
"--skip test_package::case_6"
|
||||
"--skip test_package_update_readme::case_2"
|
||||
"--skip test_package_update_readme::case_3"
|
||||
"--skip test_package_update_readme::case_5"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Detects usage of unsafe Rust in a Rust crate and its dependencies";
|
||||
homepage = "https://github.com/rust-secure-code/cargo-geiger";
|
||||
changelog = "https://github.com/rust-secure-code/cargo-geiger/blob/${pname}-${version}/CHANGELOG.md";
|
||||
description = "Detects usage of unsafe Rust in a Rust crate and its dependencies";
|
||||
longDescription = ''
|
||||
A cargo plugin that detects the usage of unsafe Rust in a Rust crate and
|
||||
its dependencies. It provides information to aid auditing and guide
|
||||
dependency selection but it can not help you decide when and why unsafe
|
||||
code is appropriate.
|
||||
'';
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ evanjs ];
|
||||
maintainers = with maintainers; [ evanjs jk ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# This updates cargo-lock.patch for the diesel version listed in default.nix.
|
||||
|
||||
set -eu -o verbose
|
||||
|
||||
here=$PWD
|
||||
version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2)
|
||||
checkout=$(mktemp -d)
|
||||
git clone -b "cargo-geiger-$version" --depth=1 https://github.com/rust-secure-code/cargo-geiger "$checkout"
|
||||
cd "$checkout"
|
||||
|
||||
rm -f rust-toolchain
|
||||
cargo generate-lockfile
|
||||
git add -f Cargo.lock
|
||||
git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch
|
||||
|
||||
cd "$here"
|
||||
rm -rf "$checkout"
|
||||
@@ -2,14 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spirv-tools";
|
||||
# Update spirv-headers rev in lockstep according to DEPs file
|
||||
version = "2021.3";
|
||||
version = "1.2.198.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-skpsxpgl6hR5uiKfphKFQJfh+LJvhGvDW/t2u5AhXzk=";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "sha256-8EJbTPY5dvsqx32POf2HcCV3j2fA68GtGZA66l9V4TI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
|
||||
@@ -13,38 +13,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
# vulkan-validation-layers requires a custom glslang & robin-hood-hashing
|
||||
# version, while glslang requires custom versions for spirv-tools and spirv-headers.
|
||||
#
|
||||
# The git hashes required for all of these deps is documented upstream here:
|
||||
# https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/scripts/known_good.json
|
||||
# and https://github.com/KhronosGroup/glslang/blob/master/known_good.json
|
||||
localSpirvHeaders = spirv-headers.overrideAttrs (_: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Headers";
|
||||
rev = "449bc986ba6f4c5e10e32828783f9daef2a77644"; # pin
|
||||
sha256 = "1249pvk4iz09caxm3kwckzwcx2hbw97cr2h8h770l6c061kb14z5";
|
||||
};
|
||||
});
|
||||
localGlslang = (glslang.override {
|
||||
argSpirv-tools = spirv-tools.overrideAttrs (_: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Tools";
|
||||
rev = "1fbed83c8aab8517d821fcb4164c08567951938f"; # pin
|
||||
sha256 = "0faz468bnxpvbg1np13gnbwf35s0hl9ad7r2p9wi9si5k336qjmj";
|
||||
};
|
||||
});
|
||||
argSpirv-headers = localSpirvHeaders;
|
||||
}).overrideAttrs (_: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "glslang";
|
||||
rev = "2fb89a0072ae7316af1c856f22663fde4928128a"; # pin
|
||||
sha256 = "04kkmphv0a5mb5javhmkc4kab8r0n107kb7djakj5h238ni2j7q9";
|
||||
};
|
||||
});
|
||||
robin-hood-hashing = fetchFromGitHub {
|
||||
owner = "martinus";
|
||||
repo = "robin-hood-hashing";
|
||||
@@ -54,19 +22,19 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-validation-layers";
|
||||
version = "1.2.189.1";
|
||||
version = "1.2.198.0";
|
||||
|
||||
# If we were to use "dev" here instead of headers, the setupHook would be
|
||||
# placed in that output instead of "out".
|
||||
outputs = ["out" "headers"];
|
||||
outputInclude = "headers";
|
||||
|
||||
src = (assert version == vulkan-headers.version;
|
||||
src = (assert (lib.all (pkg: pkg.version == version) [vulkan-headers glslang spirv-tools spirv-headers]);
|
||||
fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-ValidationLayers";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "0a5plvvffidgnqh5ymq315xscl08w298sn9da48b3x2rdbdqgw90";
|
||||
sha256 = "sha256-/pnXT55EQZcnjOzY2vBwp+gM6l2hktZHwB9yKP8vVTU=";
|
||||
});
|
||||
|
||||
# Include absolute paths to layer libraries in their associated
|
||||
@@ -88,8 +56,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGLSLANG_INSTALL_DIR=${localGlslang}"
|
||||
"-DSPIRV_HEADERS_INSTALL_DIR=${localSpirvHeaders}"
|
||||
"-DGLSLANG_INSTALL_DIR=${glslang}"
|
||||
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"
|
||||
"-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"
|
||||
"-DBUILD_LAYER_SUPPORT_FILES=ON"
|
||||
# Hide dev warnings that are useless for packaging
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{ lib, stdenv, fetchurl, cmake, pkg-config, SDL2, SDL2_image , curl
|
||||
, libogg, libvorbis, libGLU, libGL, openal, boost, glew
|
||||
, libpng, freetype
|
||||
, libpng, freetype, glm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "supertux";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz";
|
||||
sha256 = "167m3z4m8n76dvbv42m1fnvabpbpsxvr28zk9641916jl9pfba96";
|
||||
sha256 = "1xkr3ka2sxp5s0spp84iv294i29s1vxqzazb6kmjc0n415h0x57p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU libGL openal boost glew
|
||||
libpng freetype
|
||||
libpng freetype glm
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DENABLE_BOOST_STATIC_LIBS=OFF" ];
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c
|
||||
index 7cb521eb98b..5804b88be84 100644
|
||||
--- a/dlls/crypt32/unixlib.c
|
||||
+++ b/dlls/crypt32/unixlib.c
|
||||
@@ -654,6 +654,10 @@ static void load_root_certs(void)
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(CRYPT_knownLocations) && list_empty(&root_cert_list); i++)
|
||||
import_certs_from_path( CRYPT_knownLocations[i], TRUE );
|
||||
+
|
||||
+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE");
|
||||
+ if (nix_cert_file != NULL)
|
||||
+ import_certs_from_path(nix_cert_file, TRUE);
|
||||
}
|
||||
|
||||
static NTSTATUS enum_root_certs( void *args )
|
||||
@@ -1,16 +1,8 @@
|
||||
diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c
|
||||
index 035f2d936bb..959716d727a 100644
|
||||
index 7cb521eb98b..5804b88be84 100644
|
||||
--- a/dlls/crypt32/unixlib.c
|
||||
+++ b/dlls/crypt32/unixlib.c
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "wine/port.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
+#include <stdlib.h>
|
||||
#include <dirent.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
@@ -605,6 +606,10 @@ static void load_root_certs(void)
|
||||
@@ -654,6 +654,10 @@ static void load_root_certs(void)
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(CRYPT_knownLocations) && list_empty(&root_cert_list); i++)
|
||||
import_certs_from_path( CRYPT_knownLocations[i], TRUE );
|
||||
@@ -20,4 +12,4 @@ index 035f2d936bb..959716d727a 100644
|
||||
+ import_certs_from_path(nix_cert_file, TRUE);
|
||||
}
|
||||
|
||||
static BOOL WINAPI enum_root_certs( void *buffer, SIZE_T size, SIZE_T *needed )
|
||||
static NTSTATUS enum_root_certs( void *args )
|
||||
|
||||
@@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
|
||||
in rec {
|
||||
|
||||
stable = fetchurl rec {
|
||||
version = "6.0.2";
|
||||
url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-3+PFiseFwHIg4o8VtiKZ12wk0lametm//Yrvpns9u3A=";
|
||||
version = "7.0";
|
||||
url = "https://dl.winehq.org/wine/source/7.0/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-W0PifVwIXLGPlzlORhgDENXu98HZHGiVQyo4ibLeCGs=";
|
||||
|
||||
## see http://wiki.winehq.org/Gecko
|
||||
gecko32 = fetchurl rec {
|
||||
@@ -31,9 +31,9 @@ in rec {
|
||||
|
||||
## see http://wiki.winehq.org/Mono
|
||||
mono = fetchurl rec {
|
||||
version = "5.1.1";
|
||||
version = "7.0.0";
|
||||
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
||||
sha256 = "09wjrfxbw0072iv6d2vqnkc3y7dzj15vp8mv4ay44n1qp5ji4m3l";
|
||||
sha256 = "sha256-s35vyeWQ5YIkPcJdcqX8wzDDp5cN/cmKeoHSOEW6iQA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -42,30 +42,12 @@ in rec {
|
||||
];
|
||||
};
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "7.0-rc5";
|
||||
url = "https://dl.winehq.org/wine/source/7.0/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-jQjHneYAZ3H26EXje9cyoduXN7TakiLksDdzNoi3d1g=";
|
||||
inherit (stable) gecko32 gecko64;
|
||||
|
||||
## see http://wiki.winehq.org/Mono
|
||||
mono = fetchurl rec {
|
||||
version = "7.0.0";
|
||||
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
||||
sha256 = "sha256-s35vyeWQ5YIkPcJdcqX8wzDDp5cN/cmKeoHSOEW6iQA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Also look for root certificates at $NIX_SSL_CERT_FILE
|
||||
./cert-path-6.21.patch
|
||||
];
|
||||
};
|
||||
unstable = stable;
|
||||
|
||||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
sha256 = "sha256-RFwDI8eGw9BikQ8X+S1+EPHKAgNaYHuZOJzmlg12ROI=";
|
||||
sha256 = "sha256-2gBfsutKG0ok2ISnnAUhJit7H2TLPDpuP5gvfMVE44o=";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
||||
@@ -485,12 +485,12 @@ final: prev:
|
||||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2022-01-20";
|
||||
version = "2022-01-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "67d739c993549aea6eaa1d50aa341f8e8e3ae91a";
|
||||
sha256 = "04zxjm5qzkp0ydvgyqidzzrbw76n554c9212xxm4a8mkwprx1wnj";
|
||||
rev = "e6fe7bcc3d354f7da68bea64c612eb2f78e959d1";
|
||||
sha256 = "0rq82dz1s7xshbdydah50vpzhakbzcbxkx4j5mgg5pwgbglaj9xj";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
@@ -543,6 +543,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/yunlingz/ci_dark/";
|
||||
};
|
||||
|
||||
circles-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "circles.nvim";
|
||||
version = "2022-01-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "projekt0n";
|
||||
repo = "circles.nvim";
|
||||
rev = "3847feed23fa3ba6abecdf1b17a6c7d2022ebe65";
|
||||
sha256 = "1wxfix1fd8qwflc7id3g0yr7838j4vgnrk1nixv5q99d7wj0hadr";
|
||||
};
|
||||
meta.homepage = "https://github.com/projekt0n/circles.nvim/";
|
||||
};
|
||||
|
||||
clang_complete = buildVimPluginFrom2Nix {
|
||||
pname = "clang_complete";
|
||||
version = "2020-09-18";
|
||||
@@ -893,12 +905,12 @@ final: prev:
|
||||
|
||||
coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coc.nvim";
|
||||
version = "2022-01-19";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc.nvim";
|
||||
rev = "3710b54c51ff8cf97fe6686dd6220734726c42bf";
|
||||
sha256 = "1fj2rn3mnf29hpfjc8vz3n1w6jm0z96xazmg83mv1l0lg44ffwkd";
|
||||
rev = "6a510523b0bf697bffe5ba77d0e404532fd92e65";
|
||||
sha256 = "1xp8zvj1wbywfgy2kgvqmxpw675wlmpjdgbqzmb53rjjhsb9w107";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
||||
};
|
||||
@@ -1156,14 +1168,26 @@ final: prev:
|
||||
meta.homepage = "https://github.com/jvoorhis/coq.vim/";
|
||||
};
|
||||
|
||||
coq_nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coq_nvim";
|
||||
version = "2022-01-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq_nvim";
|
||||
rev = "9546c14f6664df71b9427b38fcebb7800b69799e";
|
||||
sha256 = "0nr2w65mirbrpr7iyimwjq7l5vyi4qr46ncic3whwlmyi2amkrjk";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
|
||||
};
|
||||
|
||||
Coqtail = buildVimPluginFrom2Nix {
|
||||
pname = "Coqtail";
|
||||
version = "2022-01-03";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "whonore";
|
||||
repo = "Coqtail";
|
||||
rev = "c8ffb3d358e85211b17dd18df6007e3be1bd2569";
|
||||
sha256 = "1y8gv10llnihpylzq9jca93g7gb0gf6rbr0pwhvirrvz514czfl8";
|
||||
rev = "cbe08b44bf2cba835c541f4b7eddc9f533dbe584";
|
||||
sha256 = "1g32297zkvdrmvjacwf6ig2q7whvzj8wzrxb71vzr9qskp0qx81v";
|
||||
};
|
||||
meta.homepage = "https://github.com/whonore/Coqtail/";
|
||||
};
|
||||
@@ -2039,12 +2063,12 @@ final: prev:
|
||||
|
||||
friendly-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "friendly-snippets";
|
||||
version = "2022-01-15";
|
||||
version = "2022-01-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafamadriz";
|
||||
repo = "friendly-snippets";
|
||||
rev = "d4f5c0507cfe4c67024f58c84ba982f7f5c71a7a";
|
||||
sha256 = "1g7q5a6c761a8y77081l0907qcyhvzd0mncqyg93p1r5jrbv1r9m";
|
||||
rev = "35bacce3c903dff2852e87a13196cad0dd166093";
|
||||
sha256 = "0inq7d48j4ck3zfkbvmi76xvis1sybk15mda23zfnm6zj0k3hjh1";
|
||||
};
|
||||
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
|
||||
};
|
||||
@@ -2315,12 +2339,12 @@ final: prev:
|
||||
|
||||
glow-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "glow.nvim";
|
||||
version = "2022-01-09";
|
||||
version = "2022-01-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ellisonleao";
|
||||
repo = "glow.nvim";
|
||||
rev = "42dcd3fff4052b41b241453880c6067dbfea55f6";
|
||||
sha256 = "140la8pli0jc3mi4zs91h8rvl989p2hw9gj12ag8zmizm1dic2il";
|
||||
rev = "df202bd09bab4b63f5f64857eb8f3411d46fdf11";
|
||||
sha256 = "1ndgrrlhw87vwy12fzvf5fhnjdsl9na1a3j4hj6slq9v48rkv87f";
|
||||
};
|
||||
meta.homepage = "https://github.com/ellisonleao/glow.nvim/";
|
||||
};
|
||||
@@ -2868,24 +2892,24 @@ final: prev:
|
||||
|
||||
kanagawa-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "kanagawa.nvim";
|
||||
version = "2022-01-17";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rebelot";
|
||||
repo = "kanagawa.nvim";
|
||||
rev = "a93be0c57248c552b3f7f91ffbb441c677e55d85";
|
||||
sha256 = "1cwmz2zzkci8jyrna7c3s4lw9a837adjjwpdh3ad7r4zjsjzim9a";
|
||||
rev = "e308a9e5e8b527d646bf485b9148db894a617560";
|
||||
sha256 = "07hky7mqz8zj21y0cvb7fadiv0fmxzkm6f2i490d85dj3i3njijv";
|
||||
};
|
||||
meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
|
||||
};
|
||||
|
||||
kommentary = buildVimPluginFrom2Nix {
|
||||
pname = "kommentary";
|
||||
version = "2022-01-16";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b3nj5m1n";
|
||||
repo = "kommentary";
|
||||
rev = "91c8819ea264b77d63b96b16ed0cf90c4b97f87a";
|
||||
sha256 = "16k1yc9ihbrrcshjz8jv3b1jggr990vsx2pf6y24cfqp9srn9gda";
|
||||
rev = "a190d052fca4ce74ffddb1c87c87ccf15f9111d5";
|
||||
sha256 = "0p2hyqv73gn1lrzf8yi84cfj199jx8ix0llm4jykkxlyx3qprwq2";
|
||||
};
|
||||
meta.homepage = "https://github.com/b3nj5m1n/kommentary/";
|
||||
};
|
||||
@@ -2988,12 +3012,12 @@ final: prev:
|
||||
|
||||
lean-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lean.nvim";
|
||||
version = "2022-01-19";
|
||||
version = "2022-01-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Julian";
|
||||
repo = "lean.nvim";
|
||||
rev = "bfb370349b5ebc09aee8dd172fec382cfd10d74c";
|
||||
sha256 = "0lkcqvk235f51ki2f3mcs607ardk1wknfn0qgbp77ii77ycjnl93";
|
||||
rev = "8dc39f1ce00cf50890e7a55c3bc24017531338f7";
|
||||
sha256 = "18aywn1hkhpxc3fgy9xys5fjh0l69nrgdwaiy9fzfqy8d6fk3ssf";
|
||||
};
|
||||
meta.homepage = "https://github.com/Julian/lean.nvim/";
|
||||
};
|
||||
@@ -3132,12 +3156,12 @@ final: prev:
|
||||
|
||||
lightspeed-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lightspeed.nvim";
|
||||
version = "2022-01-18";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggandor";
|
||||
repo = "lightspeed.nvim";
|
||||
rev = "56a54e3c7b792cca41881b69960499952fdc29c2";
|
||||
sha256 = "0gvzg8p900wcf72nzvyky747ils22fnm5yrg47bv04dz49zsx6p2";
|
||||
rev = "428051b2e5212cea914510eb9eb979ec06d5b2e1";
|
||||
sha256 = "01s3v3jfmgyrmwkifnyfh0wlm1d5fdvfvya0564y76bj4sh2lpzw";
|
||||
};
|
||||
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
|
||||
};
|
||||
@@ -3573,6 +3597,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/";
|
||||
};
|
||||
|
||||
Navigator-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "Navigator.nvim";
|
||||
version = "2021-11-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "numToStr";
|
||||
repo = "Navigator.nvim";
|
||||
rev = "f7b689d72649e1d5132116c76ac2ad8b97c210d4";
|
||||
sha256 = "17yfc7ss9yslf8dvwl0vi3mdpcxp5j1g6dc8qrz20v2dx8hjxd1q";
|
||||
};
|
||||
meta.homepage = "https://github.com/numToStr/Navigator.nvim/";
|
||||
};
|
||||
|
||||
ncm2 = buildVimPluginFrom2Nix {
|
||||
pname = "ncm2";
|
||||
version = "2021-10-08";
|
||||
@@ -3911,12 +3947,12 @@ final: prev:
|
||||
|
||||
neorg = buildVimPluginFrom2Nix {
|
||||
pname = "neorg";
|
||||
version = "2022-01-20";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neorg";
|
||||
repo = "neorg";
|
||||
rev = "cf26a69a816feda4f47b265fd420f9cf4ea058b5";
|
||||
sha256 = "10rhpxl1106f7jd9n2n8kx5fv4d5icmqdlnfkdj7n82v1npj7igw";
|
||||
rev = "e8b8cb0a75a4ca2da6b5a9bec79cd2002ef03882";
|
||||
sha256 = "1nf74v4147jyc1cb3scvja49160wcjqvgppiq7whgili1ic8s1d6";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neorg/neorg/";
|
||||
};
|
||||
@@ -3983,12 +4019,12 @@ final: prev:
|
||||
|
||||
neovim-ayu = buildVimPluginFrom2Nix {
|
||||
pname = "neovim-ayu";
|
||||
version = "2021-12-31";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shatur";
|
||||
repo = "neovim-ayu";
|
||||
rev = "afac814359bb03fc5a1cb9d86a45d619a59ba7d9";
|
||||
sha256 = "1smcibp3akb9mdgvvvh5ny0avbn5lnb5scvv3d4g181c39nmx1y9";
|
||||
rev = "0bca6a4382e7cc5e26da8dce49e7f69abfb0e998";
|
||||
sha256 = "0pfrmzcs4vkxg74hzrp8g4kwb33m1r503c0b1yq25z33scqwc6hp";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shatur/neovim-ayu/";
|
||||
};
|
||||
@@ -4163,24 +4199,24 @@ final: prev:
|
||||
|
||||
nord-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "nord.nvim";
|
||||
version = "2022-01-11";
|
||||
version = "2022-01-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "shaunsingh";
|
||||
repo = "nord.nvim";
|
||||
rev = "002d3fd2ad677b3a6f34b2f4dffbfff455abff11";
|
||||
sha256 = "0ylfx2d02r8ri015k5yd9gb78dwvc2sfpyw6krcqs07i0z7gaskz";
|
||||
rev = "2ec29eda54f5bbc8856794361847729b0f724095";
|
||||
sha256 = "1fz30h6nvgy71yc6ccn6m8wbc18kz29xm11zmsxc1qlp0a6j7c59";
|
||||
};
|
||||
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
|
||||
};
|
||||
|
||||
nordic-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "nordic.nvim";
|
||||
version = "2021-12-20";
|
||||
version = "2022-01-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "andersevenrud";
|
||||
repo = "nordic.nvim";
|
||||
rev = "c348fba712af0c15bfdf23b396fdcb0311dfbae9";
|
||||
sha256 = "17kmlc92wl1qya76kx9p2lq0v3n2503hlb1cf3kmys0d40xb8rsc";
|
||||
rev = "b97cc5faafb10edd8fb5b261423b2f917ba43e1b";
|
||||
sha256 = "0b1643j492v7pm9b1z6ana3pjvaf4dqz1zvbqnl5r0bmkl2bb4m4";
|
||||
};
|
||||
meta.homepage = "https://github.com/andersevenrud/nordic.nvim/";
|
||||
};
|
||||
@@ -4223,12 +4259,12 @@ final: prev:
|
||||
|
||||
null-ls-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "null-ls.nvim";
|
||||
version = "2022-01-19";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "null-ls.nvim";
|
||||
rev = "4d45075678db7442f4d78287efd11b08bd414bcd";
|
||||
sha256 = "0sr0y06cccdz8xa8dd0fqxm6yf243az0kri637q8l04b6z6x84bp";
|
||||
rev = "5213916f51a178287cf5162354f2f7c2c4e204bb";
|
||||
sha256 = "0v34s75srr2ds3jw100hjr2mwbycwhvrv6y02ddzmgw0bsqfgw9c";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
||||
};
|
||||
@@ -4257,6 +4293,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
|
||||
};
|
||||
|
||||
catppuccin-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "catppuccin-nvim";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "nvim";
|
||||
rev = "baf9a2c5d81f4336b0504e35c148482535dc2ac9";
|
||||
sha256 = "00nma5a4jybncm3dj388p03nd4kkpj11l1cmd1dfmnzd41iaia99";
|
||||
};
|
||||
meta.homepage = "https://github.com/catppuccin/nvim/";
|
||||
};
|
||||
|
||||
nvim-ale-diagnostic = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ale-diagnostic";
|
||||
version = "2021-11-06";
|
||||
@@ -4365,6 +4413,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/norcalli/nvim-colorizer.lua/";
|
||||
};
|
||||
|
||||
nvim-comment = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-comment";
|
||||
version = "2022-01-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "terrortylor";
|
||||
repo = "nvim-comment";
|
||||
rev = "f670649da497de12aa3d5afc0a693d5d50b17d85";
|
||||
sha256 = "0j3pay000yf79lz5plcnfp068fychnf7xa08cg7h5s0nx5cp5bgh";
|
||||
};
|
||||
meta.homepage = "https://github.com/terrortylor/nvim-comment/";
|
||||
};
|
||||
|
||||
nvim-compe = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-compe";
|
||||
version = "2021-10-02";
|
||||
@@ -4595,12 +4655,12 @@ final: prev:
|
||||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2022-01-20";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "58f260a603fc73ff537569ff2e81510554e54e38";
|
||||
sha256 = "1n7rhf60l9l1wbdmvwl871lq0dc0p6r7wdskmh530g0vch47kj0r";
|
||||
rev = "58d2ba6b968539a20d701be0bf98ae154456e265";
|
||||
sha256 = "04l70b5sl1c98gmk9s9zwa39gbp1w46ivwmyryr96g0znidh3ryk";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
@@ -4727,24 +4787,24 @@ final: prev:
|
||||
|
||||
nvim-tree-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-tree.lua";
|
||||
version = "2021-12-24";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyazdani42";
|
||||
repo = "nvim-tree.lua";
|
||||
rev = "0a2f6b0b6ba558a88c77a6b262af647760e6eca8";
|
||||
sha256 = "0svxndakxlin4jgmzmx7xj9ysbiy94hfszq89bv2qcxlkfxa78l0";
|
||||
rev = "2dfed89af7724f9e71d2fdbe3cde791a93e9b9e0";
|
||||
sha256 = "1842c6s3q8hd8cnnyniwjxkkl48zzdy7v2gx20fiacnf365vgzpc";
|
||||
};
|
||||
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
|
||||
};
|
||||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2022-01-20";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "f048886f828e369cac3b771071137b2c62ca29e4";
|
||||
sha256 = "1kifzwmwqjwkcfrpmv3kb00m1mjbnk3p2hdwpk7n1i90nqlix06d";
|
||||
rev = "3c462d362f49611c295e6c4870c97e2ae7f530cd";
|
||||
sha256 = "1sqr8q9mdggcwd2nm2wwdviad7nf9pzwxmv3wj7asnmw271a1n7b";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
@@ -4787,12 +4847,12 @@ final: prev:
|
||||
|
||||
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter-textobjects";
|
||||
version = "2022-01-19";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter-textobjects";
|
||||
rev = "c2e643b5db31e90f034c5412f38913523090378e";
|
||||
sha256 = "0yswhj8s6f6g8y5bc08zq6n806ybf8xpn4yp0m25phlrm1wwdd5c";
|
||||
rev = "5681ed6e8754efd3de748fadd14ce9b8f06c1fd7";
|
||||
sha256 = "0c3vj1lxp942qs0ghdp8m5ih1dxmnj8l14qjnh46dn5xrfxh73ss";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
|
||||
};
|
||||
@@ -4823,12 +4883,12 @@ final: prev:
|
||||
|
||||
nvim-ts-rainbow = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ts-rainbow";
|
||||
version = "2022-01-20";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "p00f";
|
||||
repo = "nvim-ts-rainbow";
|
||||
rev = "c758824b37868f0c6f9e41a0c22944372f6cfaea";
|
||||
sha256 = "0bhk0r7m84ab3fwkf6kg1icd30xajsyqnqwqqn3ny7zh48bic0qv";
|
||||
rev = "5470a3bb6e7ad316d63fab0951fd181ccfdc5716";
|
||||
sha256 = "1648zm3baqi9711r0ywpnj7a7c8giwy6bazbxhcwv0qsjnnm5n70";
|
||||
};
|
||||
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
|
||||
};
|
||||
@@ -4871,12 +4931,12 @@ final: prev:
|
||||
|
||||
nvim_context_vt = buildVimPluginFrom2Nix {
|
||||
pname = "nvim_context_vt";
|
||||
version = "2022-01-16";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "haringsrob";
|
||||
repo = "nvim_context_vt";
|
||||
rev = "7d8cfce794b32c9d98097edbce2d20980921c6b6";
|
||||
sha256 = "1cnjcr4jrphsw0ybwy7093vk2mr59sk5fwvsvvsllrc1gc60f7gi";
|
||||
rev = "9cf62516d16114c935eeb9bbe57b02e39c3bfbd7";
|
||||
sha256 = "1fvsjfcfm83kvcfgps39j845pkh89s4vq2wk49a0qi5g8a8mjphx";
|
||||
};
|
||||
meta.homepage = "https://github.com/haringsrob/nvim_context_vt/";
|
||||
};
|
||||
@@ -4919,12 +4979,12 @@ final: prev:
|
||||
|
||||
octo-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "octo.nvim";
|
||||
version = "2022-01-19";
|
||||
version = "2022-01-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwntester";
|
||||
repo = "octo.nvim";
|
||||
rev = "781f175b210f4c825a8c7e4922d8113c227f6fa4";
|
||||
sha256 = "0w8zyv7h7frzbp23fvwarbaj08qi2i15kh2y1py3ms97nvbj1qxr";
|
||||
rev = "c2ea3cba7d34ce9bce9d1e1d9710ab4b2be7e651";
|
||||
sha256 = "126fq92v72ljmdxrdh384yck3kd4avmss37rcyfryzhzfrjj2gcj";
|
||||
};
|
||||
meta.homepage = "https://github.com/pwntester/octo.nvim/";
|
||||
};
|
||||
@@ -5461,12 +5521,12 @@ final: prev:
|
||||
|
||||
refactoring-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "refactoring.nvim";
|
||||
version = "2022-01-20";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theprimeagen";
|
||||
repo = "refactoring.nvim";
|
||||
rev = "fc5de4af62272864f947d4af3bdd87c4f28c371c";
|
||||
sha256 = "1pcllxlmk4d6n2rgcgj8vwghfxa1y8gxdmk7w9fnjc83dczfh8nd";
|
||||
rev = "4f63e903fbcfa5d17fdbe6ae9b03e0b09ab5af89";
|
||||
sha256 = "0krvp2q20f6iwk33www097c2i8ah9pls6j1lmbx92n437k6sj5gj";
|
||||
};
|
||||
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
|
||||
};
|
||||
@@ -5641,12 +5701,12 @@ final: prev:
|
||||
|
||||
SchemaStore-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "SchemaStore.nvim";
|
||||
version = "2022-01-17";
|
||||
version = "2022-01-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b0o";
|
||||
repo = "SchemaStore.nvim";
|
||||
rev = "3608a47a5910f35fdbebcc6a9a9f7869aaab2b76";
|
||||
sha256 = "1dlqqndrp3pkrq2b4fzjp6s7bl0h23si3sjga2136619hvhsic86";
|
||||
rev = "4d03a1db6d00e4a413e15d1e5f5b090a7bc5f4b6";
|
||||
sha256 = "1zwc9n3rwsq7cqz0mryl05zggzdgir8kwsgpvd64lxmf92xzs1mv";
|
||||
};
|
||||
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
||||
};
|
||||
@@ -6087,12 +6147,12 @@ final: prev:
|
||||
|
||||
surround-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "surround.nvim";
|
||||
version = "2022-01-11";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "blackCauldron7";
|
||||
repo = "surround.nvim";
|
||||
rev = "4ddbef573eba3a8f31ac8da72d495efca33caac0";
|
||||
sha256 = "0q4zfa5gvc7v01d431bar8dry55yyb5gmxphmjbx0xq2vai1fcbf";
|
||||
rev = "bc07f9d15535b76e464bc4e9e94702136a60b785";
|
||||
sha256 = "1j0jq44a5kqfpca3hwhx1jzwl79d3apii0j5b3l4kwhgjgvjwjdm";
|
||||
};
|
||||
meta.homepage = "https://github.com/blackCauldron7/surround.nvim/";
|
||||
};
|
||||
@@ -6121,6 +6181,19 @@ final: prev:
|
||||
meta.homepage = "https://github.com/keith/swift.vim/";
|
||||
};
|
||||
|
||||
switch-vim = buildVimPluginFrom2Nix {
|
||||
pname = "switch.vim";
|
||||
version = "2021-09-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndrewRadev";
|
||||
repo = "switch.vim";
|
||||
rev = "900c5d3ee79b1771c5e07bf7290068ea35881756";
|
||||
sha256 = "0fqvwlf01v7bpsmb3ssqw1kbpvfrk7qvrwxsy4y1bnm60kvnqb7a";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/AndrewRadev/switch.vim/";
|
||||
};
|
||||
|
||||
symbols-outline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "symbols-outline.nvim";
|
||||
version = "2021-12-09";
|
||||
@@ -6389,12 +6462,12 @@ final: prev:
|
||||
|
||||
telescope-github-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-github.nvim";
|
||||
version = "2022-01-18";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope-github.nvim";
|
||||
rev = "abe424a49a5d3ba8532d4c245611874626795f24";
|
||||
sha256 = "1dyh2iiz2aqm43gwlm326n47bskm5g9skpb1l6s640x1zkhldimk";
|
||||
rev = "36df6b281eb3cb47494933a3dc44c874086fa688";
|
||||
sha256 = "1lra7c38m3amqgdlb4gnl3rnvszwzn0yv624v2h4lhax8nzzq85j";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/";
|
||||
};
|
||||
@@ -6750,12 +6823,12 @@ final: prev:
|
||||
|
||||
ultisnips = buildVimPluginFrom2Nix {
|
||||
pname = "ultisnips";
|
||||
version = "2022-01-17";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SirVer";
|
||||
repo = "ultisnips";
|
||||
rev = "016410284e41a67d2a29ca581ae016e56b66b000";
|
||||
sha256 = "0r988wimis7wx77zzvwqnzzyhq7rfnznvp9vr7vlwg5ilcy2mzy1";
|
||||
rev = "bc480c1aac4cb6237aa3316ab576e7a674f064ca";
|
||||
sha256 = "1xkw1m70fr4cqc4wjawzbrkkankbyi7ma61d727sqrigzaqk1zjh";
|
||||
};
|
||||
meta.homepage = "https://github.com/SirVer/ultisnips/";
|
||||
};
|
||||
@@ -7470,12 +7543,12 @@ final: prev:
|
||||
|
||||
vim-clap = buildVimPluginFrom2Nix {
|
||||
pname = "vim-clap";
|
||||
version = "2022-01-17";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "liuchengxu";
|
||||
repo = "vim-clap";
|
||||
rev = "7dfd2c779b7e4262a17ceb0b7491586e89a2a069";
|
||||
sha256 = "07v7czk68l5ab4lv9g51gm7lrd0p2wniyjf12d7zcnzja0ayhp22";
|
||||
rev = "7aa3959cad43302601d530671808f1b9cd1b5233";
|
||||
sha256 = "07298d5fzsg1jyvwiqpphn9add0ihvk0cdhmsvz3zvabh32mx8lz";
|
||||
};
|
||||
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
|
||||
};
|
||||
@@ -9214,12 +9287,12 @@ final: prev:
|
||||
pname = "vim-markdown";
|
||||
version = "2020-07-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "plasticboy";
|
||||
owner = "preservim";
|
||||
repo = "vim-markdown";
|
||||
rev = "8e5d86f7b85234d3d1b4207dceebc43a768ed5d4";
|
||||
sha256 = "013vh2rnfifm5j56imar03rvchz68ll4lbgy9y8fbw7s9a0k6yaa";
|
||||
};
|
||||
meta.homepage = "https://github.com/plasticboy/vim-markdown/";
|
||||
meta.homepage = "https://github.com/preservim/vim-markdown/";
|
||||
};
|
||||
|
||||
vim-markdown-composer = buildVimPluginFrom2Nix {
|
||||
@@ -10605,12 +10678,12 @@ final: prev:
|
||||
|
||||
vim-table-mode = buildVimPluginFrom2Nix {
|
||||
pname = "vim-table-mode";
|
||||
version = "2021-12-01";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhruvasagar";
|
||||
repo = "vim-table-mode";
|
||||
rev = "c547471c0ed32b8511f62752974cde5277e13df4";
|
||||
sha256 = "1qdrd87b91013z1br67j1j45s4iva7ah1r52zkkr0sj0pbiiqh7r";
|
||||
rev = "9191af46b6bee8d3e3474c7f8ea134c800e55985";
|
||||
sha256 = "0szp8n82qmjwpm8skq3zqbmk0j9b269h86v7p6qlwdjnvr39hnis";
|
||||
};
|
||||
meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/";
|
||||
};
|
||||
@@ -10846,12 +10919,12 @@ final: prev:
|
||||
|
||||
vim-tpipeline = buildVimPluginFrom2Nix {
|
||||
pname = "vim-tpipeline";
|
||||
version = "2022-01-14";
|
||||
version = "2022-01-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vimpostor";
|
||||
repo = "vim-tpipeline";
|
||||
rev = "021f2ebf017b32289ca9bd11b0e988315f34ea96";
|
||||
sha256 = "0pwf5bks7p3vj622vcab0rfxxkvh4lzn4f6l4wy92hccb1zv40ps";
|
||||
rev = "4190d800ec8e29e446c61011fee0dcec61f20199";
|
||||
sha256 = "0mq9mjypq101y593ji7biwvvqzbf5argwcdnpqzphk1ikldq3xh0";
|
||||
};
|
||||
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
|
||||
};
|
||||
@@ -10906,12 +10979,12 @@ final: prev:
|
||||
|
||||
vim-ultest = buildVimPluginFrom2Nix {
|
||||
pname = "vim-ultest";
|
||||
version = "2022-01-20";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcarriga";
|
||||
repo = "vim-ultest";
|
||||
rev = "858fd9c1813c59f19f8d70e0b5883894987e8683";
|
||||
sha256 = "1fgj68ik71ci53r3wszjmm9cq3275hn9v6giyjizhzgyk1h2p8ac";
|
||||
rev = "00da9eacaf4396bdc11817f987c35e5d09486eb4";
|
||||
sha256 = "1r5zdwm20110mzwawxik563l4bw5zxhrpdsn0cgq04icp5gbbxrc";
|
||||
};
|
||||
meta.homepage = "https://github.com/rcarriga/vim-ultest/";
|
||||
};
|
||||
@@ -11038,12 +11111,12 @@ final: prev:
|
||||
|
||||
vim-wakatime = buildVimPluginFrom2Nix {
|
||||
pname = "vim-wakatime";
|
||||
version = "2022-01-07";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wakatime";
|
||||
repo = "vim-wakatime";
|
||||
rev = "441f5c7ce8adce1d30403bca26ea5e6a3a2b82e4";
|
||||
sha256 = "1zflwz70iqfdrzlq9lvyi2awbj5s9s0daqx4rf4lkp58jb0q6jqr";
|
||||
rev = "e7f67547956667dd87c4c74bff2760567c3e3ab1";
|
||||
sha256 = "0v6kyjsw8ridyvvlwncprfz56iyk9rlsiva5k6sn5ir62cdwhipj";
|
||||
};
|
||||
meta.homepage = "https://github.com/wakatime/vim-wakatime/";
|
||||
};
|
||||
@@ -11326,12 +11399,12 @@ final: prev:
|
||||
|
||||
vimspector = buildVimPluginFrom2Nix {
|
||||
pname = "vimspector";
|
||||
version = "2022-01-18";
|
||||
version = "2022-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "puremourning";
|
||||
repo = "vimspector";
|
||||
rev = "3ebb4be89735771d43d2c5109f2a46df8ebe10c5";
|
||||
sha256 = "1z4s6rmia8qp516c0ryizs0q69zlrfa7b7ps5ylbz6w504kywqmm";
|
||||
rev = "2588e4c8dec5bd6a6803d1c86b9e7354409b7d8b";
|
||||
sha256 = "07yv643amq7q8bpdqd5m806bw28yzjgpb2hrhnjnh0bj0fqxhkqb";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/puremourning/vimspector/";
|
||||
|
||||
@@ -752,7 +752,7 @@ self: super: {
|
||||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-LSDtjQxmK+Qe0OJXoEbWeIAqP7NxU+UtVPdL86Hpv5Y=";
|
||||
cargoSha256 = "sha256-4VXXQjGmGGQXgfzSOvFnQS+iQjidj0FjaNKZ3VzBqw0=";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
||||
@@ -24,6 +24,7 @@ andrep/vimacs
|
||||
andreshazard/vim-logreview
|
||||
AndrewRadev/sideways.vim
|
||||
AndrewRadev/splitjoin.vim
|
||||
AndrewRadev/switch.vim
|
||||
AndrewRadev/tagalong.vim
|
||||
andsild/peskcolor.vim
|
||||
andviro/flake8-vim
|
||||
@@ -63,6 +64,7 @@ buoto/gotests-vim
|
||||
camspiers/lens.vim
|
||||
camspiers/snap
|
||||
carlitux/deoplete-ternjs
|
||||
catppuccin/nvim as catppuccin-nvim
|
||||
ccarpita/rtorrent-syntax-file
|
||||
cespare/vim-toml
|
||||
chaoren/vim-wordmotion
|
||||
@@ -500,6 +502,7 @@ morhetz/gruvbox
|
||||
motus/pig.vim
|
||||
mpickering/hlint-refactor-vim
|
||||
ms-jpq/chadtree@chad
|
||||
ms-jpq/coq_nvim
|
||||
mtikekar/vim-bsv
|
||||
MunifTanjim/nui.nvim@main
|
||||
mustache/vim-mustache-handlebars
|
||||
@@ -558,6 +561,7 @@ ntpeters/vim-better-whitespace
|
||||
numirias/semshi
|
||||
numtostr/comment.nvim
|
||||
numToStr/FTerm.nvim
|
||||
numToStr/Navigator.nvim
|
||||
nvie/vim-flake8
|
||||
nvim-lua/completion-nvim
|
||||
nvim-lua/diagnostic-nvim
|
||||
@@ -617,7 +621,6 @@ PeterRincker/vim-argumentative
|
||||
petRUShka/vim-opencl
|
||||
phaazon/hop.nvim
|
||||
phanviet/vim-monokai-pro
|
||||
plasticboy/vim-markdown
|
||||
Pocco81/TrueZen.nvim
|
||||
ponko2/deoplete-fish
|
||||
posva/vim-vue
|
||||
@@ -629,10 +632,12 @@ prabirshrestha/vim-lsp
|
||||
preservim/nerdcommenter
|
||||
preservim/nerdtree
|
||||
preservim/tagbar
|
||||
preservim/vim-markdown
|
||||
preservim/vim-pencil
|
||||
preservim/vim-wordy
|
||||
preservim/vimux
|
||||
prettier/vim-prettier
|
||||
projekt0n/circles.nvim
|
||||
psliwka/vim-smoothie
|
||||
ptzz/lf.vim
|
||||
puremourning/vimspector
|
||||
@@ -777,6 +782,7 @@ tami5/sqlite.lua
|
||||
tbastos/vim-lua
|
||||
tbodt/deoplete-tabnine
|
||||
ternjs/tern_for_vim
|
||||
terrortylor/nvim-comment
|
||||
terryma/vim-expand-region
|
||||
terryma/vim-multiple-cursors
|
||||
tex/vimpreviewpandoc
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
, readline
|
||||
, systemd
|
||||
, udev
|
||||
, withExperimental ? false
|
||||
}: let
|
||||
pythonPath = with python3.pkgs; [
|
||||
dbus-python
|
||||
@@ -84,7 +85,8 @@ in stdenv.mkDerivation rec {
|
||||
# To provide ciptool, sdptool, and rfcomm (unmaintained)
|
||||
# superseded by new D-Bus APIs
|
||||
"--enable-deprecated"
|
||||
];
|
||||
] ++ lib.optional withExperimental "--enable-experimental";
|
||||
|
||||
|
||||
# Work around `make install' trying to create /var/lib/bluetooth.
|
||||
installFlags = [ "statedir=$(TMPDIR)/var/lib/bluetooth" ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
, libxmlxx3
|
||||
, pkg-config
|
||||
, python3
|
||||
, sconsPackages
|
||||
, scons
|
||||
, which
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
@@ -45,7 +45,7 @@ mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
sconsPackages.scons_3_1_2
|
||||
scons
|
||||
pkg-config
|
||||
which
|
||||
python
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
, gcc11
|
||||
, gnome
|
||||
, gssdp
|
||||
, lame
|
||||
, lib
|
||||
, libgmpris
|
||||
, llvmPackages_10
|
||||
@@ -45,11 +46,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hqplayerd";
|
||||
version = "4.28.2-76";
|
||||
version = "4.29.1-80";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}sse42.fc34.x86_64.rpm";
|
||||
sha256 = "sha256-LWNC4tXDddkW1zFf99CQTZjXJq7EMWuDkxS8HJ9AGiY=";
|
||||
sha256 = "sha256-TL5zq7fu7tLoWadmVDMXrE8oiVhHbggpmwWrIGRuAnI=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
@@ -67,6 +68,7 @@ stdenv.mkDerivation rec {
|
||||
gssdp
|
||||
gupnp_1_2
|
||||
gupnp-av_0_12
|
||||
lame
|
||||
libgmpris
|
||||
llvmPackages_10.openmp
|
||||
mpg123
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "miniflux";
|
||||
version = "2.0.34";
|
||||
version = "2.0.35";
|
||||
|
||||
in buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -11,10 +11,10 @@ in buildGoModule {
|
||||
owner = pname;
|
||||
repo = "v2";
|
||||
rev = version;
|
||||
sha256 = "sha256-6fXmi0q6J1XyxEtOuKO8efkwLrfkMiqeKTHZPuoKYAs=";
|
||||
sha256 = "sha256-tOainlvEB0O6yMzIm0df4r8D68swtjXBFUDsPcNc3uA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-P8ukjBrkPZ0n8HtfyEf2pG3DAXl7D10Ib+dmtwI4KqI=";
|
||||
vendorSha256 = "sha256-dxtQAGlNOVO9NtuGbF6Nifa4QhnFGyHKhlDS3+V5HuM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
{ lib, fetchurl, makeWrapper, runCommand, callPackage }:
|
||||
|
||||
let
|
||||
version = "1.3.1";
|
||||
version = "1.3.4";
|
||||
|
||||
programs = callPackage ./programs.nix {};
|
||||
programs = callPackage ./programs.nix { };
|
||||
|
||||
webapp = fetchurl {
|
||||
url = "https://github.com/root-gg/plik/releases/download/${version}/plik-${version}-linux-amd64.tar.gz";
|
||||
sha256 = "KN6cp29KKdGamYnfL3jYltx0EDx6syDPfV0jShOk7Zw=";
|
||||
sha256 = "1qp96va5l0m7jp4g007bhgcpf4ydg3cpg2x9wa9rkpp9k1svdhjy";
|
||||
};
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
|
||||
inherit (programs) plik plikd-unwrapped;
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchurl, makeWrapper, runCommand }:
|
||||
|
||||
let
|
||||
version = "1.3.1";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "root-gg";
|
||||
repo = "plik";
|
||||
rev = version;
|
||||
sha256 = "C/1Uwjsqd9n3WSXlnlq9K3EJHkLOSavS9cPqF2UqmGo=";
|
||||
sha256 = "0kmcidnjw26vnxx9h3swcg72i507awg89s4nfxw6rwbyw36iiiqf";
|
||||
};
|
||||
|
||||
vendorSha256 = "klmWXC3tkoOcQHhiQZjR2C5jqaRJqMQOLtVxZ0cFq/Y=";
|
||||
vendorSha256 = null;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://plik.root.gg/";
|
||||
@@ -18,7 +18,8 @@ let
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
|
||||
plik = buildGoModule {
|
||||
pname = "plik";
|
||||
|
||||
@@ -14,7 +14,7 @@ in
|
||||
### vim tests
|
||||
##################
|
||||
vim_with_vim2nix = vim_configurable.customize {
|
||||
name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ];
|
||||
name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim2nix" ];
|
||||
};
|
||||
|
||||
# test cases:
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "panicparse";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maruel";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Bwvxj9Ifcq2WpicUBK+03fbGuoVAVF2Zmtpy/utUxoo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZHUxzGqsGX1c4mBA4TBO2+WnGDhwAOGi0uYQx+3OgL8=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Crash your app in style (Golang)";
|
||||
homepage = "https://github.com/maruel/panicparse";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
@@ -11,17 +11,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plocate";
|
||||
version = "1.1.7";
|
||||
version = "1.1.14";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sesse.net/plocate";
|
||||
rev = version;
|
||||
sha256 = "sha256-5Ie4qgiKUoI9Kma6YvjXirvBbpbKVuaMSSAZa36zN3M=";
|
||||
sha256 = "sha256-SgvCy03H5aKolbkI1dg/0G5VwT3TdSGenn2h9H4gfTY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i meson.build \
|
||||
-e "s@unitdir =.*@unitdir = '$out/lib/systemd/system'@" \
|
||||
-e '/mkdir\.sh/d'
|
||||
'';
|
||||
|
||||
@@ -30,8 +29,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ systemd liburing zstd ];
|
||||
|
||||
mesonFlags = [
|
||||
# I don't know why we can't do this but instead have to resort to patching meson.build
|
||||
# "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
|
||||
"-Dsystemunitdir=${placeholder "out"}/etc/systemd/system"
|
||||
"-Dsharedstatedir=/var/lib"
|
||||
];
|
||||
|
||||
|
||||
@@ -16,30 +16,25 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ytfzf";
|
||||
version = "2.0";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pystardust";
|
||||
repo = "ytfzf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JuLfFC3oz2FvCaD+XPuL1N8tGKmv4atyZIBeDKWYgT8=";
|
||||
hash = "sha256-NJLXXam7FmBWj9sM+S71e5o5e6OtVpw0m32kUo3Fbec=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}/bin" ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installFlags = [ "PREFIX=${placeholder "out"}" "doc" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [
|
||||
chafa coreutils curl dmenu fzf gnused jq mpv ueberzug yt-dlp
|
||||
]}
|
||||
|
||||
gzip -c docs/man/ytfzf.1 > docs/man/ytfzf.1.gz
|
||||
gzip -c docs/man/ytfzf.5 > docs/man/ytfzf.5.gz
|
||||
install -Dt "$out/share/man/man1" docs/man/ytfzf.1.gz
|
||||
install -Dt "$out/share/man/man5" docs/man/ytfzf.5.gz
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnma";
|
||||
version = "1.8.32";
|
||||
version = "1.8.34";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Cle5Oi+tQ6zHY/Mg3Tp6k8QpsOMRjfpUnWeCTN3E6QU=";
|
||||
sha256 = "9eLnOOD8p/KlSQeSkLLYAXUR1IWoMiDDbfOAo7R1MwQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -2,23 +2,44 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.31.1";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3V8qBgRIogZNisUshhs9Va9cbZ5D2hBJwqXPvqSmEWw=";
|
||||
sha256 = "sha256-jn28IusHgHHFFrvqZLIvbqCFMhMQ5K/gqC4hVQLffY0=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
commit="$(git rev-parse HEAD)"
|
||||
source_date_epoch=$(git log --date=format:'%Y-%m-%dT%H:%M:%SZ' -1 --pretty=%ad)
|
||||
substituteInPlace "$out/internal/version/build.go" \
|
||||
--replace 'gitCommit = valueNotProvided' "gitCommit = \"$commit\"" \
|
||||
--replace 'buildDate = valueNotProvided' "buildDate = \"$source_date_epoch\""
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/Z0tRzd7v84h8TSfbT4EqwyHWpAb30VNr4EDrNlHyd4=";
|
||||
vendorSha256 = "sha256-05/xFjgiqbXy7Y2LTGHcXtvusGgfZ/TwLQHaO8rIjvc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X github.com/anchore/grype/internal/version.version=${version}"
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/anchore/grype/internal/version.version=${version}"
|
||||
"-X github.com/anchore/grype/internal/version.gitTreeState=clean"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# grype version also displays the version of the syft library used
|
||||
# we need to grab it from the go.sum and add an ldflag for it
|
||||
SYFTVERSION="$(grep "github.com/anchore/syft" go.sum -m 1 | awk '{print $2}')"
|
||||
ldflags+=" -X github.com/anchore/grype/internal/version.syftVersion=$SYFTVERSION"
|
||||
'';
|
||||
|
||||
# Tests require a running Docker instance
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "maigret";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soxoj";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1jvfi3d7b1x4x1h0hz193n541fa0qgp7lynd6j0w050cgg753hpz";
|
||||
sha256 = "0igfxg238awdn1ly8s3r655yi3gpxink7g2hr6xb0c1nrm7z0kad";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "proxmark3-rrg";
|
||||
version = "4.14434";
|
||||
version = "4.14831";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RfidResearchGroup";
|
||||
repo = "proxmark3";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QscV/RxycpU8ypP1Pv6eKtQrOVC+oikass4tvxUszMI=";
|
||||
sha256 = "sha256-s0D04V6vlGW7SVkJwzMKaVfXQoT3Wi0lu7RC61Es89A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gcc-arm-embedded ];
|
||||
|
||||
@@ -6051,6 +6051,8 @@ with pkgs;
|
||||
hamlib = hamlib_4;
|
||||
};
|
||||
|
||||
gprojector = callPackage ../applications/science/astronomy/gprojector { };
|
||||
|
||||
gptfdisk = callPackage ../tools/system/gptfdisk { };
|
||||
|
||||
grafx2 = callPackage ../applications/graphics/grafx2 {};
|
||||
@@ -8116,6 +8118,8 @@ with pkgs;
|
||||
|
||||
pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { };
|
||||
|
||||
panicparse = callPackage ../tools/misc/panicparse { };
|
||||
|
||||
patray = callPackage ../tools/audio/patray { };
|
||||
|
||||
pasystray = callPackage ../tools/audio/pasystray { };
|
||||
@@ -22091,6 +22095,10 @@ with pkgs;
|
||||
|
||||
bluez5 = callPackage ../os-specific/linux/bluez { };
|
||||
|
||||
bluez5-experimental = callPackage ../os-specific/linux/bluez {
|
||||
withExperimental = true;
|
||||
};
|
||||
|
||||
pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt {
|
||||
# pulseaudio-modules-bt is most likely to be used with pulseaudioFull
|
||||
pulseaudio = pulseaudioFull;
|
||||
|
||||
@@ -367,7 +367,7 @@ in {
|
||||
rtw88 = callPackage ../os-specific/linux/rtw88 { };
|
||||
rtlwifi_new = rtw88;
|
||||
|
||||
rtw89 = callPackage ../os-specific/linux/rtw89 { };
|
||||
rtw89 = if lib.versionOlder kernel.version "5.16" then callPackage ../os-specific/linux/rtw89 { } else null;
|
||||
|
||||
openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { };
|
||||
openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { };
|
||||
|
||||
Reference in New Issue
Block a user