Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2020-06-15 08:07:00 +02:00
commit 59dda0a42a
106 changed files with 1073 additions and 729 deletions

View file

@ -89,7 +89,7 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
NixOS partition. They are installed by default on NixOS, but you don't have
NixOS yet..
</para>
<screen><prompt>$ </prompt>nix-env -iE "_: with import &lt;nixpkgs/nixos&gt; { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]"</screen>
<screen><prompt>$ </prompt>nix-env -f '&lt;nixpkgs/nixos&gt;' --arg configuration {} -iA config.system.build.{nixos-generate-config,nixos-install,nixos-enter,manual.manpages}</screen>
</listitem>
<listitem>
<note>

View file

@ -466,6 +466,14 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
initrd file has not been deleted.
</para>
</listitem>
<listitem>
<para>
The <link xlink:href="https://github.com/okTurtles/dnschain">DNSChain</link>
package and NixOS module have been removed from Nixpkgs as the software is
unmaintained and can't be built. For more information see issue
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/89205">#89205</link>.
</para>
</listitem>
</itemizedlist>
</section>

View file

@ -129,7 +129,7 @@ fi
if test -n "$compressImage"; then
echo "Compressing image..."
zstd -T$NIX_BUILD_CORES $out/iso/$isoName
zstd -T$NIX_BUILD_CORES --rm $out/iso/$isoName
fi
mkdir -p $out/nix-support

View file

@ -190,7 +190,7 @@ in
fsck.vfat -vn firmware_part.img
dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS
if test -n "$compressImage"; then
zstd -T$NIX_BUILD_CORES $img
zstd -T$NIX_BUILD_CORES --rm $img
fi
'';
}) {};

View file

@ -239,7 +239,6 @@ in
shout = 206;
gateone = 207;
namecoin = 208;
dnschain = 209;
#lxd = 210; # unused
kibana = 211;
xtreemfs = 212;
@ -549,7 +548,6 @@ in
#shout = 206; #unused
gateone = 207;
namecoin = 208;
#dnschain = 209; #unused
lxd = 210; # unused
#kibana = 211;
xtreemfs = 212;

View file

@ -602,7 +602,6 @@
./services/networking/dhcpcd.nix
./services/networking/dhcpd.nix
./services/networking/dnscache.nix
./services/networking/dnschain.nix
./services/networking/dnscrypt-proxy2.nix
./services/networking/dnscrypt-wrapper.nix
./services/networking/dnsdist.nix

View file

@ -4,14 +4,50 @@ with lib;
let
cfg = config.services.corerad;
writeTOML = name: x:
pkgs.runCommandNoCCLocal name {
passAsFile = ["config"];
config = builtins.toJSON x;
buildInputs = [ pkgs.go-toml ];
} "jsontoml < $configPath > $out";
in {
meta = {
maintainers = with maintainers; [ mdlayher ];
};
meta.maintainers = with maintainers; [ mdlayher ];
options.services.corerad = {
enable = mkEnableOption "CoreRAD IPv6 NDP RA daemon";
settings = mkOption {
type = types.uniq types.attrs;
example = literalExample ''
{
interfaces = [
# eth0 is an upstream interface monitoring for IPv6 router advertisements.
{
name = "eth0";
monitor = true;
}
# eth1 is a downstream interface advertising IPv6 prefixes for SLAAC.
{
name = "eth1";
advertise = true;
prefix = [{ prefix = "::/64"; }];
}
];
# Optionally enable Prometheus metrics.
debug = {
address = "localhost:9430";
prometheus = true;
};
}
'';
description = ''
Configuration for CoreRAD, see <link xlink:href="https://github.com/mdlayher/corerad/blob/master/internal/config/default.toml"/>
for supported values. Ignored if configFile is set.
'';
};
configFile = mkOption {
type = types.path;
example = literalExample "\"\${pkgs.corerad}/etc/corerad/corerad.toml\"";
@ -27,6 +63,9 @@ in {
};
config = mkIf cfg.enable {
# Prefer the config file over settings if both are set.
services.corerad.configFile = mkDefault (writeTOML "corerad.toml" cfg.settings);
systemd.services.corerad = {
description = "CoreRAD IPv6 NDP RA daemon";
after = [ "network.target" ];

View file

@ -1,184 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfgs = config.services;
cfg = cfgs.dnschain;
dataDir = "/var/lib/dnschain";
username = "dnschain";
configFile = pkgs.writeText "dnschain.conf" ''
[log]
level = info
[dns]
host = ${cfg.dns.address}
port = ${toString cfg.dns.port}
oldDNSMethod = NO_OLD_DNS
externalIP = ${cfg.dns.externalAddress}
[http]
host = ${cfg.api.hostname}
port = ${toString cfg.api.port}
tlsPort = ${toString cfg.api.tlsPort}
${cfg.extraConfig}
'';
in
{
###### interface
options = {
services.dnschain = {
enable = mkEnableOption ''
DNSChain, a blockchain based DNS + HTTP server.
To resolve .bit domains set <literal>services.namecoind.enable = true;</literal>
and an RPC username/password.
'';
dns.address = mkOption {
type = types.str;
default = "127.0.0.1";
description = ''
The IP address the DNSChain resolver will bind to.
Leave this unchanged if you do not wish to directly expose the resolver.
'';
};
dns.externalAddress = mkOption {
type = types.str;
default = cfg.dns.address;
description = ''
The IP address used by clients to reach the resolver and the value of
the <literal>namecoin.dns</literal> record. Set this in case the bind address
is not the actual IP address (e.g. the machine is behind a NAT).
'';
};
dns.port = mkOption {
type = types.int;
default = 5333;
description = ''
The port the DNSChain resolver will bind to.
'';
};
api.hostname = mkOption {
type = types.str;
default = "0.0.0.0";
description = ''
The hostname (or IP address) the DNSChain API server will bind to.
'';
};
api.port = mkOption {
type = types.int;
default = 8080;
description = ''
The port the DNSChain API server (HTTP) will bind to.
'';
};
api.tlsPort = mkOption {
type = types.int;
default = 4433;
description = ''
The port the DNSChain API server (HTTPS) will bind to.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
example = ''
[log]
level = debug
'';
description = ''
Additional options that will be appended to the configuration file.
'';
};
};
services.dnsmasq.resolveDNSChainQueries = mkOption {
type = types.bool;
default = false;
description = ''
Resolve <literal>.bit</literal> top-level domains using DNSChain and namecoin.
'';
};
services.pdns-recursor.resolveDNSChainQueries = mkOption {
type = types.bool;
default = false;
description = ''
Resolve <literal>.bit</literal> top-level domains using DNSChain and namecoin.
'';
};
};
###### implementation
config = mkIf cfg.enable {
services.dnsmasq.servers = optionals cfgs.dnsmasq.resolveDNSChainQueries
[ "/.bit/127.0.0.1#${toString cfg.dns.port}"
"/.dns/127.0.0.1#${toString cfg.dns.port}"
];
services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveDNSChainQueries {
forwardZonesRecurse =
{ bit = "127.0.0.1:${toString cfg.dns.port}";
dns = "127.0.0.1:${toString cfg.dns.port}";
};
luaConfig =''
addNTA("bit", "namecoin doesn't support DNSSEC")
addNTA("dns", "namecoin doesn't support DNSSEC")
'';
};
users.users.${username} = {
description = "DNSChain daemon user";
home = dataDir;
createHome = true;
uid = config.ids.uids.dnschain;
extraGroups = optional cfgs.namecoind.enable "namecoin";
};
systemd.services.dnschain = {
description = "DNSChain daemon";
after = optional cfgs.namecoind.enable "namecoind.target";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = "dnschain";
Restart = "on-failure";
ExecStart = "${pkgs.nodePackages.dnschain}/bin/dnschain";
};
preStart = ''
# Link configuration file into dnschain home directory
configPath=${dataDir}/.dnschain/dnschain.conf
mkdir -p ${dataDir}/.dnschain
if [ "$(realpath $configPath)" != "${configFile}" ]; then
rm -f $configPath
ln -s ${configFile} $configPath
fi
'';
};
};
meta.maintainers = with lib.maintainers; [ rnhmjoj ];
}

View file

@ -149,11 +149,6 @@ in
config = mkIf cfg.enable {
services.dnschain.extraConfig = ''
[namecoin]
config = ${configFile}
'';
users.users.namecoin = {
uid = config.ids.uids.namecoin;
description = "Namecoin daemon user";

View file

@ -1178,14 +1178,22 @@ in
users.users.systemd-network.group = "systemd-network";
systemd.additionalUpstreamSystemUnits = [
"systemd-networkd.service" "systemd-networkd-wait-online.service"
"systemd-networkd-wait-online.service"
"systemd-networkd.service"
"systemd-networkd.socket"
];
systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
// mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;
# systemd-networkd is socket-activated by kernel netlink route change
# messages. It is important to have systemd buffer those on behalf of
# networkd.
systemd.sockets.systemd-networkd.wantedBy = [ "sockets.target" ];
systemd.services.systemd-networkd = {
wantedBy = [ "multi-user.target" ];
aliases = [ "dbus-org.freedesktop.network1.service" ];
restartTriggers = map (x: x.source) (attrValues unitFiles);
# prevent race condition with interface renaming (#39069)
requires = [ "systemd-udev-settle.service" ];

View file

@ -148,6 +148,7 @@ in
systemd.services.systemd-resolved = {
wantedBy = [ "multi-user.target" ];
aliases = [ "dbus-org.freedesktop.resolve1.service" ];
restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ];
};

View file

@ -41,6 +41,7 @@ with lib;
systemd.services.systemd-timesyncd = {
wantedBy = [ "sysinit.target" ];
aliases = [ "dbus-org.freedesktop.timesync1.service" ];
restartTriggers = [ config.environment.etc."systemd/timesyncd.conf".source ];
};

View file

@ -3,7 +3,7 @@ import ./make-test-python.nix (
nodes = {
router = {config, pkgs, ...}: {
config = {
# This machines simulates a router with IPv6 forwarding and a static IPv6 address.
# This machine simulates a router with IPv6 forwarding and a static IPv6 address.
boot.kernel.sysctl = {
"net.ipv6.conf.all.forwarding" = true;
};
@ -14,13 +14,25 @@ import ./make-test-python.nix (
enable = true;
# Serve router advertisements to the client machine with prefix information matching
# any IPv6 /64 prefixes configured on this interface.
configFile = pkgs.writeText "corerad.toml" ''
[[interfaces]]
name = "eth1"
advertise = true
[[interfaces.prefix]]
prefix = "::/64"
'';
#
# This configuration is identical to the example in the CoreRAD NixOS module.
settings = {
interfaces = [
{
name = "eth0";
monitor = true;
}
{
name = "eth1";
advertise = true;
prefix = [{ prefix = "::/64"; }];
}
];
debug = {
address = "localhost:9430";
prometheus = true;
};
};
};
};
};
@ -66,5 +78,12 @@ import ./make-test-python.nix (
assert (
"/64 scope global temporary" in addrs
), "SLAAC temporary address was not configured on client after router advertisement"
with subtest("Verify HTTP debug server is configured"):
out = router.succeed("curl localhost:9430/metrics")
assert (
"corerad_build_info" in out
), "Build info metric was not found in Prometheus output"
'';
})

View file

@ -1,21 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23070d9..83b6772 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -275,8 +275,6 @@ optional_component(LIBPULSE ON "Pulse audio integration"
optional_component(VISUALISATIONS ON "Visualisations")
if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
- "code must be compiled in")
elseif(CRYPTOPP_FOUND)
set(HAVE_CRYPTOPP ON)
set(HAVE_SPOTIFY_DOWNLOADER ON)
@@ -434,7 +432,6 @@ if(HAVE_BREAKPAD)
endif(HAVE_BREAKPAD)
if(HAVE_SPOTIFY_BLOB)
- add_subdirectory(ext/clementine-spotifyblob)
endif(HAVE_SPOTIFY_BLOB)
if(HAVE_MOODBAR)

View file

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
, qtbase, qtx11extras
, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
, qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }:
@ -9,30 +10,17 @@ let
withCD = config.clementine.cd or true;
withCloud = config.clementine.cloud or true;
version = "1.3.1";
version = "1.4.0rc1";
src = fetchFromGitHub {
owner = "clementine-player";
repo = "Clementine";
rev = version;
sha256 = "0i3jkfs8dbfkh47jq3cnx7pip47naqg7w66vmfszk4d8vj37j62j";
sha256 = "1rqk0hrsn8f8bjk0j0vq1af0ygy6xx7qi9fw0jjw2cmj6kzckyi2";
};
patches = [
./clementine-spotify-blob.patch
# Required so as to avoid adding libspotify as a build dependency (as it is
# unfree and thus would prevent us from having a free package).
./clementine-spotify-blob-remove-from-build.patch
(fetchpatch {
# Fix w/gcc7
url = "https://github.com/clementine-player/Clementine/pull/5630.patch";
sha256 = "0px7xp1m4nvrncx8sga1qlxppk562wrk2qqk19iiry84nxg20mk4";
})
(fetchpatch {
# Fixes compilation with chromaprint >= 1.4
url = "https://github.com/clementine-player/Clementine/commit/d3ea0c8482dfd3f6264a30cfceb456076d76e6cd.patch";
sha256 = "1ifrs5aqdzw16jbnf0z1ilir20chdnr9k5n21r99miq9hzjpbh12";
})
];
nativeBuildInputs = [ cmake pkgconfig ];
@ -54,6 +42,8 @@ let
protobuf
qca2
qjson
qtbase
qtx11extras
sqlite
taglib
]
@ -71,7 +61,7 @@ let
-e 's,libprotobuf.a,protobuf,g'
'';
free = stdenv.mkDerivation {
free = mkDerivation {
pname = "clementine-free";
inherit version;
inherit src patches nativeBuildInputs postPatch;
@ -79,7 +69,14 @@ let
# gst_plugins needed for setup-hooks
buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins;
cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];
preConfigure = ''
rm -rf ext/{,lib}clementine-spotifyblob
'';
cmakeFlags = [
"-DUSE_SYSTEM_PROJECTM=ON"
"-DSPOTIFY_BLOB=OFF"
];
enableParallelBuilding = true;
@ -100,15 +97,11 @@ let
};
# Unfree Spotify blob for Clementine
unfree = stdenv.mkDerivation {
unfree = mkDerivation {
pname = "clementine-blob";
inherit version;
# Use the same patches and sources as Clementine
inherit src nativeBuildInputs postPatch;
patches = [
./clementine-spotify-blob.patch
];
inherit src nativeBuildInputs patches postPatch;
buildInputs = buildInputs ++ [ libspotify makeWrapper ];
# Only build and install the Spotify blob

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dragonfly-reverb";
version = "3.0.0";
version = "3.1.1";
src = fetchFromGitHub {
owner = "michaelwillis";
repo = "dragonfly-reverb";
rev = version;
sha256 = "1z2x33lzpd26dv1p29ca7vy8mjfzkfpin35iq46spwd9k3sqn1ja";
sha256 = "188cm45hr0i33m4h2irql1wrsmsfis65s706wjiid0z59q47rf9p";
fetchSubmodules = true;
};

View file

@ -4,7 +4,6 @@
, fetchFromGitHub
, fftwSinglePrec
, ruby
, libffi
, aubio
, cmake
, pkgconfig
@ -12,7 +11,6 @@
, bash
, jack2Full
, supercollider
, qscintilla
, qwt
, osmid
}:
@ -24,14 +22,14 @@ let
in
mkDerivation rec {
version = "3.1.0";
version = "3.2.2";
pname = "sonic-pi";
src = fetchFromGitHub {
owner = "samaaron";
repo = "sonic-pi";
rev = "v${version}";
sha256 = "0gi4a73szaa8iz5q1gxgpsnyvhhghcfqm6bfwwxbix4m5csbfgh9";
sha256 = "1nlkpkpg9iz2hvf5pymvk6lqhpdpjbdrvr0hrnkc3ymj7llvf1cm";
};
buildInputs = [
@ -39,10 +37,8 @@ mkDerivation rec {
cmake
pkgconfig
qtbase
qscintilla
qwt
ruby
libffi
aubio
supercollider_single_prec
boost
@ -71,23 +67,34 @@ mkDerivation rec {
popd
pushd app/gui/qt
cp -f ruby_help.tmpl ruby_help.h
../../server/ruby/bin/qt-doc.rb -o ruby_help.h
cp -f utils/ruby_help.tmpl utils/ruby_help.h
../../server/ruby/bin/qt-doc.rb -o utils/ruby_help.h
substituteInPlace SonicPi.pro \
--replace "LIBS += -lrt -lqt5scintilla2" \
"LIBS += -lrt -lqscintilla2 -lqwt"
lrelease lang/*.ts
lrelease SonicPi.pro
qmake SonicPi.pro
make
mkdir build
pushd build
cmake -G "Unix Makefiles" ..
make
popd
popd
'';
installPhase = ''
runHook preInstall
cp -r . $out
mkdir $out
cp -r {bin,etc} $out/
# Copy server whole.
mkdir -p $out/app
cp -r app/server $out/app/
# Copy only necessary files for the gui app.
mkdir -p $out/app/gui/qt/build
cp -r app/gui/qt/{book,fonts,help,html,images,image_source,info,lang,theme} $out/app/gui/qt/
cp app/gui/qt/build/sonic-pi $out/app/gui/qt/build/sonic-pi
runHook postInstall
'';
@ -103,9 +110,7 @@ mkDerivation rec {
homepage = "https://sonic-pi.net/";
description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Phlogistique kamilchm ];
maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict ];
platforms = lib.platforms.linux;
# sonic-pi depends on ruby 2.4 which we don't support anymore
broken = true;
};
}

View file

@ -3,12 +3,12 @@
mkDerivation rec {
pname = "notepadqq";
version = "1.4.8";
src = fetchFromGitHub {
owner = "notepadqq";
repo = "notepadqq";
rev = "v${version}";
sha256 = "0lbv4s7ng31dkznzbkmp2cvkqglmfj6lv4mbg3r410fif2nrva7k";
fetchSubmodules = true;
};
nativeBuildInputs = [

View file

@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0zdg6z6h0h8vvwdrnihwd76bik41spv6xbw7cdh7hz97sjsh15zq";
x86_64-darwin = "1c5c24vj8nqsxx8hwfj04as7vsl9gnl97yniw36pdfgv88v8qzin";
x86_64-linux = "0hmmqdamsjhjy1q8m85bs081cwmskpsp57rkj7vc2wj918wgissm";
x86_64-darwin = "00xwvi53h9rnwyba12jmsp6grkymmn6vjibypaxb96q7q7p894gh";
}.${system};
in
callPackage ./generic.nix rec {
@ -21,7 +21,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.45.1";
version = "1.46.0";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

View file

@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "1m965d8ggg2ffbhyrgadfrgikcavyjszc3sgbsd930b8pxrmqlxp";
x86_64-darwin = "017fj7imjxa0n3r7c9kcz7192rxkw18bry6rfkv2hycfja70j5qj";
x86_64-linux = "088nsflscak315704vqnh8m4q7601fczglbhdz5i70kfyg89ar4w";
x86_64-darwin = "0fxpx1ydsag4gyn2kq5ddq55lpw15w176p3fypk80fyfix4kziqf";
}.${system};
sourceRoot = {
@ -27,7 +27,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.45.1";
version = "1.46.0";
pname = "vscodium";
executableName = "codium";

View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "13.0.3";
version = "13.2.2";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
sha256 = "104pfwipm8ch9xqlsz1gh18icr1p6i3n4c77bbdjakxcy4s5n7sg";
sha256 = "0npqw4ih047d9s1yyllcvcih2r61fgji4rvzsw88r02mj5q5rgdn";
};
nativeBuildInputs = [

View file

@ -121,6 +121,8 @@ rustPlatform.buildRustPackage rec {
install -dm 755 "$out/share/man/man1"
gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz"
install -Dm 644 alacritty.yml $out/share/doc/alacritty.yml
install -dm 755 "$terminfo/share/terminfo/a/"
tic -xe alacritty,alacritty-direct -o "$terminfo/share/terminfo" extra/alacritty.info
mkdir -p $out/nix-support

View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "cointop";
version = "1.4.4";
version = "1.4.6";
src = fetchFromGitHub {
owner = "miguelmota";
repo = pname;
rev = version;
sha256 = "12yi1lmyd5y4cgcjclkczf93jj7wd6k8aqnhq21dd1mx65l77swv";
sha256 = "1mkb97x73vzxnbvhnxx3msicr1z0b3sjmydx257ax3nscrmf1l5z";
};
goPackagePath = "github.com/miguelmota/cointop";

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "cpu-x";
version = "4.0.0";
version = "4.0.1";
src = fetchFromGitHub {
owner = "X0rg";
repo = "CPU-X";
rev = "v${version}";
sha256 = "00xngmlayblvkg3l0rcfpxmnkkdz49ydh4smlhpii23gqii0rds3";
sha256 = "191zkkswlbbsw492yygc3idf7wh3bxs97drrqvqqw0mqvrzykxm3";
};
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm makeWrapper ];

View file

@ -3,12 +3,12 @@
}:
mkDerivation rec {
version = "2.3.4.3";
version = "2.3.5.1";
pname = "lyx";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
sha256 = "1rpp6wq0dc0bxwc0pipajv98vi7cpg391nq10d3c4pmpq38m08wx";
sha256 = "0mv32s26igm0pd8vs7d2mk1240dpr83y0a2wyh3xz6b67ph0w157";
};
# LaTeX is used from $PATH, as people often want to have it with extra pkgs

View file

@ -0,0 +1,20 @@
{ stdenv, buildPythonApplication, fetchPypi, python3Packages }:
buildPythonApplication rec {
pname = "remarkable-mouse";
version = "5.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "0k2wjfcgnvb8yqn4c4ddfyyhrvl6hj61kn1ddnyp6ay9vklnw160";
};
propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ];
meta = with stdenv.lib; {
description = "A program to use a reMarkable as a graphics tablet";
homepage = "https://github.com/evidlo/remarkable_mouse";
license = licenses.gpl3;
maintainers = [ maintainers.nickhu ];
};
}

View file

@ -45,11 +45,11 @@ let
flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi";
version = "32.0.0.371";
version = "32.0.0.387";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "1nks2wx74b21hv0l7bnrzkxn7c6p6r8zgwbqvy3cqpi8famyr5v9";
sha256 = "1igs8nh3zpfcps97ahzh7kknx3rddh6yliig8lxf6jskbpf0qgzf";
stripRoot = false;
};

View file

@ -74,7 +74,7 @@ let
in
stdenv.mkDerivation rec {
pname = "flashplayer";
version = "32.0.0.371";
version = "32.0.0.387";
src = fetchurl {
url =
@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"1zrl7cxcl9hkafji15br8wp5vf9a5lb88xcpz6vi9q73j45mhzjd"
"1wmk60lnlrj9f8dvk4b6j7pqyl00w00qbzbdw4awzx91wmgfc4x0"
else
"0cgnsn9zanadbacb660mj4k103cdyb2cak7ixnp1varqklss83n6"
"1afjxhi5jzn8zbkva940i9fayzxj1r3n6rqsiny02fpnv0waypfy"
else
if arch == "x86_64" then
"1zc90gjixfhjng7pbx8vci1l69wf5m40149178zwzs6kz4ma5hb2"
"0si8rx955kyfsprk5465hfzafxvrdm7g686q7p5xykmh88nck6k2"
else
"0fqgas1g52a0zir2cxz3anizk3lkmwl68nbcn5rihgvjfqykbhn8";
"02pw2knvgdkahyp7lmy7fmynmplaz5wswdz48h3sdj6ibr066h97";
};
nativeBuildInputs = [ unzip ];

View file

@ -50,7 +50,7 @@
stdenv.mkDerivation {
pname = "flashplayer-standalone";
version = "32.0.0.371";
version = "32.0.0.387";
src = fetchurl {
url =
@ -60,9 +60,9 @@ stdenv.mkDerivation {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"0n3bk2y1djaqrdygnr81n8lsnj2k60kaziffl41zpdvzi1jc7wgn"
"1yxdwmm2gz162rmc9hwlccqgq613gnrihjicnzgan4vk7hjlga5y"
else
"18ll9rnfhbnz54q4d7q9fb13lix4i62zr6z6n574qvwngrvbrr8a";
"0hm5is3giz45a4v9m77q0i1dgyhpqqkagpjndbnynsnl9a61r0ly";
};
nativeBuildInputs = [ unzip ];

View file

@ -19,16 +19,16 @@ let
in
buildGoModule rec {
pname = "argo";
version = "2.6.1";
version = "2.8.1";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
sha256 = "12wq79h4m8wlzf18r66965mbbjjb62kvnxdj50ra7nxa8jjxpsmf";
sha256 = "193nxc27fh37wf035mclvwwwxjjfc8nnbncg009fg19ycqmvmgvc";
};
vendorSha256 = "0dhzr62x2lzf3w0j2r496cr7jvkdcavfqaqr2xh972k3qqc9caky";
vendorSha256 = "1p9b2m20gxc7iyq08mvllf5dpi4m06aw233sb45d05d624kw4aps";
subPackages = [ "cmd/argo" ];
@ -39,6 +39,15 @@ buildGoModule rec {
${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app
'';
buildFlagsArray = ''
-ldflags=
-s -w
-X github.com/argoproj/argo.version=${version}
-X github.com/argoproj/argo.gitCommit=${src.rev}
-X github.com/argoproj/argo.gitTreeState=clean
-X github.com/argoproj/argo.gitTag=${version}
'';
meta = with lib; {
description = "Container native workflow engine for Kubernetes";
homepage = "https://github.com/argoproj/argo";
@ -46,4 +55,4 @@ buildGoModule rec {
maintainers = with maintainers; [ groodt ];
platforms = platforms.unix;
};
}
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "helmsman";
version = "3.4.1";
version = "3.4.3";
src = fetchFromGitHub {
owner = "Praqma";
repo = "helmsman";
rev = "v${version}";
sha256 = "0h89lgp3n7nd7dy8nq4bfxg938imdjsvs1k6yg8j37vgdmi24sa6";
sha256 = "0jbinnzdw32l7zh02k81gnw9rnqi8f5k5sp2qv8p9l9kgziaycvn";
};
vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl";

View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "luigi";
version = "2.8.13";
version = "3.0.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0x14549iwj7r1knc0hmic9ny9hp960yjjqi4mxl78jb69gd3bhmf";
sha256 = "1km9fnq4pf0iqqcmz94idm0zb3l92zinz0bn6ip86xqhchafd4vf";
};
propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ];
@ -18,12 +18,13 @@ python3Packages.buildPythonApplication rec {
makeWrapperArgs = ["--prefix PYTHONPATH . :"];
meta = with lib; {
homepage = "https://github.com/spotify/luigi";
description = "Python package that helps you build complex pipelines of batch jobs";
longDescription = ''
Luigi handles dependency resolution, workflow management, visualization,
handling failures, command line integration, and much more.
'';
homepage = "https://github.com/spotify/luigi";
changelog = "https://github.com/spotify/luigi/releases/tag/${version}";
license = [ licenses.asl20 ];
maintainers = [ maintainers.bhipple ];
};

View file

@ -40,11 +40,11 @@
stdenv.mkDerivation rec {
pname = "bluejeans";
version = "2.1.0";
version = "2.3.0";
src = fetchurl {
url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans.rpm";
sha256 = "1zhh0pla5gk75p8x84va9flvnk456pbcm1n6x8l82c9682fwr7dd";
sha256 = "06lcpkga8h0zpl2wlysj6n979f0yg361frp3zr0vwzln3fiil2a7";
};
nativeBuildInputs = [ rpmextract makeWrapper ];
@ -110,6 +110,9 @@ stdenv.mkDerivation rec {
--set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/opt/BlueJeans \
--set LD_PRELOAD "$out"/opt/BlueJeans/liblocaltime64_stub.so
substituteInPlace "$out"/share/applications/bluejeans-v2.desktop \
--replace "/opt/BlueJeans/bluejeans-v2" "$out/bin/bluejeans"
patchShebangs "$out"
'';

View file

@ -17,6 +17,7 @@ in stdenv.mkDerivation rec {
autoPatchelfHook
cups
libdrm
libuuid
libX11
libXScrnSaver
libXtst

View file

@ -43,6 +43,7 @@
, rustc
, sqlite
, stdenv
, systemd
, unzip
, which
, writeScript
@ -305,11 +306,11 @@ stdenv.mkDerivation rec {
)
'';
# FIXME: This can probably be removed as soon as we package a
# Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
# FIXME: The XUL portion of this can probably be removed as soon as we
# package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
postFixup = ''
local xul="$out/lib/thunderbird/libxul.so"
patchelf --set-rpath "${libnotify}/lib:$(patchelf --print-rpath $xul)" $xul
patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul
'';
doInstallCheck = true;

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lean";
version = "3.15.0";
version = "3.16.2";
src = fetchFromGitHub {
owner = "leanprover-community";
repo = "lean";
rev = "v${version}";
sha256 = "0fl8v8n53fr5qdnabici1mj3zpmjrkssx970y3q4m48s68q665v6";
sha256 = "0fvm7gvbr5kn258sqpnxa7dvzz84iv1dx1n066vih5gz80plz4lh";
};
nativeBuildInputs = [ cmake ];

View file

@ -0,0 +1,107 @@
{ stdenv
, fetchurl
, coreutils
, makeWrapper
, sway-unwrapped
, installShellFiles
, wl-clipboard
, libnotify
, slurp
, grim
, jq
, python3Packages
}:
{
grimshot = stdenv.mkDerivation rec {
pname = "grimshot";
version = "2020-05-08";
rev = "b1d08db5f5112ab562f89564825e3e791b0682c4";
# master has new fixes and features, and a man page
# after sway-1.5 these may be switched to sway-unwrapped.src
bsrc = fetchurl {
url = "https://raw.githubusercontent.com/swaywm/sway/${rev}/contrib/grimshot";
sha256 = "1awzmzkib8a7q5s78xyh8za03lplqfpbasqp3lidqqmjqs882jq9";
};
msrc = fetchurl {
url = "https://raw.githubusercontent.com/swaywm/sway/${rev}/contrib/grimshot.1";
sha256 = "191xxjfhf61gkxl3b0f694h0nrwd7vfnyp5afk8snhhr6q7ia4jz";
};
dontBuild = true;
dontUnpack = true;
dontConfigure = true;
outputs = [ "out" "man" ];
nativeBuildInputs = [ makeWrapper installShellFiles ];
installPhase = ''
installManPage ${msrc}
install -Dm 0755 ${bsrc} $out/bin/grimshot
wrapProgram $out/bin/grimshot --set PATH \
"${stdenv.lib.makeBinPath [
sway-unwrapped
wl-clipboard
coreutils
libnotify
slurp
grim
jq
] }"
'';
doInstallCheck = true;
installCheckPhase = ''
# check always returns 0
if [[ $($out/bin/grimshot check | grep "NOT FOUND") ]]; then false
else
echo "grimshot check passed"
fi
'';
meta = with stdenv.lib; {
description = "A helper for screenshots within sway";
homepage = "https://github.com/swaywm/sway/tree/master/contrib";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [
sway-unwrapped.meta.maintainers
evils
];
};
};
inactive-windows-transparency = python3Packages.buildPythonApplication rec {
# long name is long
lname = "inactive-windows-transparency";
pname = "sway-${lname}";
version = sway-unwrapped.version;
src = sway-unwrapped.src;
format = "other";
dontBuild = true;
dontConfigure = true;
propagatedBuildInputs = [ python3Packages.i3ipc ];
installPhase = ''
install -Dm 0755 $src/contrib/${lname}.py $out/bin/${lname}.py
'';
meta = sway-unwrapped.meta // {
description = "It makes inactive sway windows transparent";
homepage = "https://github.com/swaywm/sway/tree/${sway-unwrapped.version}/contrib";
};
};
}

View file

@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
version = "4";
version = "5.2";
in fetchzip {
name = "fira-code-${version}";
@ -9,11 +9,10 @@ in fetchzip {
postFetch = ''
mkdir -p $out/share/fonts
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
'';
sha256 = "0n9qkng31ydvpdjc1an4ylpfy4x883c6czhyzvhjsmavd7bv4j9a";
sha256 = "16v62wj872ba4w7qxn4l6zjgqh7lrpwh1xax1bp1x9dpz08mnq06";
meta = with stdenv.lib; {
homepage = "https://github.com/tonsky/FiraCode";

View file

@ -1,11 +1,11 @@
{ stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }:
let
defaultVersion = "93";
defaultVersion = "94";
# Map from git revs to SHA256 hashes
sha256s = {
version_93 = "15y3703ha6mxcq168br0wlydas5rq66msrcsd650zrjz0ndxwsfx";
version_94 = "1wk20fhyppb2ljni7ifqnsx9kl1kcl6c0svc0qljf0bs6rvr9qdm";
"1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y";
};
in

View file

@ -2,11 +2,11 @@
let params =
if stdenv.lib.versionAtLeast coq.coq-version "8.7" then {
version = "3.2.0";
sha256 = "15bi36x7zj0glsb3s2gwqd4wswhfzh36rbp7imbyff53a7nna95l";
version = "3.3.1";
sha256 = "0k1nfgiszmai5dihhpfa5mgq9rwigl0n38dw10jn79x89xbdpyh5";
} else {
version = "2.6.1";
sha256 = "1y4czkfrd8p37vwv198nns4hz1brfv71na17pxsidwpxy7qnyfw1";
sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj";
}
; in
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
]);
buildPhase = ''
${bash}/bin/bash autogen.sh
${bash}/bin/bash autogen.sh || autoconf
${bash}/bin/bash configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Flocq
./remake
'';
@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
};
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ];
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
};
}

View file

@ -195,9 +195,10 @@ let
hardeningDisable = [ "bindnow" ];
preConfigure = ''
# Don't record the configure flags since this causes unnecessary
# runtime dependencies
preConfigure =
# Don't record the configure flags since this causes unnecessary
# runtime dependencies
''
for i in main/build-defs.h.in scripts/php-config.in; do
substituteInPlace $i \
--replace '@CONFIGURE_COMMAND@' '(omitted)' \
@ -206,7 +207,14 @@ let
done
export EXTENSION_DIR=$out/lib/php/extensions
''
# PKG_CONFIG need not be a relative path
+ lib.optionalString (! lib.versionAtLeast version "7.4") ''
for i in $(find . -type f -name "*.m4"); do
substituteInPlace $i \
--replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null'
done
'' + ''
./buildconf --copy --force
if test -f $src/genfiles; then

View file

@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub
, cmake, pkgconfig
, cmake, pkg-config
, libva, libpciaccess, intel-gmmlib, libX11
}:
stdenv.mkDerivation rec {
pname = "intel-media-driver";
version = "19.4.0r";
version = "20.1.1";
src = fetchFromGitHub {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
sha256 = "0gnd82z0wgiw5my1hnqlk9hcjjqpsgasqq5xcdrbkfa40wpb132a";
sha256 = "1mww20c9r7a57njqa2835ayjvk46lrv2yks9a2y8i0s5qzdi8m1i";
};
cmakeFlags = [
@ -21,15 +21,21 @@ stdenv.mkDerivation rec {
"-DMEDIA_RUN_TEST_SUITE=OFF"
];
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libva libpciaccess intel-gmmlib libX11 ];
meta = with stdenv.lib; {
homepage = "https://github.com/intel/media-driver";
license = with licenses; [ bsd3 mit ];
description = "Intel Media Driver for VAAPI Broadwell+ iGPUs";
longDescription = ''
The Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API)
user mode driver supporting hardware accelerated decoding, encoding, and
video post processing for GEN based graphics hardware.
'';
homepage = "https://github.com/intel/media-driver";
changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}";
license = with licenses; [ bsd3 mit ];
platforms = platforms.linux;
maintainers = with maintainers; [ jfrankenau ];
maintainers = with maintainers; [ primeos jfrankenau ];
};
}

View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake
{ stdenv, fetchurl, pkgconfig, which, cmake
, fftwSinglePrec, libsamplerate, qtbase
, darwin }:
let version = "1.1.0"; in
@ -14,16 +15,22 @@ stdenv.mkDerivation rec {
sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace 'find_package(Qt5Core QUIET)' \
'find_package(Qt5 REQUIRED COMPONENTS Core Network Sql Test Xml)'
'';
prefixKey = "--prefix ";
propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
nativeBuildInputs = [ pkgconfig which cmake ];
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
meta = with stdenv.lib; {
homepage = "https://github.com/lastfm/liblastfm";
repositories.git = "git://github.com/lastfm/liblastfm.git";
description = "Official LastFM library";
inherit (qt4.meta) platforms;
platforms = platforms.unix;
maintainers = [ maintainers.phreedom ];
license = licenses.gpl3;
};

View file

@ -5,6 +5,7 @@
, enableQT ? false
, enableXM ? false
, enableOpenGLX11 ? true
, enablePython ? false
, enableRaytracerX11 ? false
# Standard build environment with cmake.
@ -33,8 +34,16 @@
, libGLU, libGL
, xlibsWrapper
, libXmu
# For enablePython
, boost
, python3
}:
let
boost_python = boost.override { enablePython = true; python = python3; };
in
stdenv.mkDerivation rec {
version = "10.6.2";
pname = "geant4";
@ -44,6 +53,16 @@ stdenv.mkDerivation rec {
sha256 = "0vznm3pjlbihjy1wsxc4gj229k0dzc283wvil2xghyl08vwdpnpc";
};
boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}";
postPatch = ''
# Fix for boost 1.67+
substituteInPlace environments/g4py/CMakeLists.txt \
--replace "find_package(Boost REQUIRED python)" \
"find_package(Boost REQUIRED COMPONENTS $boost_python_lib)"
substituteInPlace environments/g4py/G4PythonHelpers.cmake \
--replace "Boost::python" "Boost::$boost_python_lib"
'';
cmakeFlags = [
"-DGEANT4_INSTALL_DATA=OFF"
"-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"
@ -52,11 +71,14 @@ stdenv.mkDerivation rec {
"-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
"-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
"-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
"-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}"
"-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
"-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}"
"-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
"-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
"-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
] ++ stdenv.lib.optionals (enableMultiThreading && enablePython) [
"-DGEANT4_BUILD_TLS_MODEL=global-dynamic"
] ++ stdenv.lib.optionals enableInventor [
"-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
"-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
@ -66,7 +88,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libGLU xlibsWrapper libXmu ]
++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ];
++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ]
++ stdenv.lib.optionals enablePython [ boost_python python3 ];
propagatedBuildInputs = [ clhep expat zlib libGL ]
++ stdenv.lib.optionals enableGDML [ xercesc ]

View file

@ -1,65 +0,0 @@
{ stdenv, cmake, xercesc
# The target version of Geant4
, geant4
# Python (obviously) and boost::python for wrapping.
, python
, boost
}:
let
# g4py does not support MT and will fail to build against MT geant
geant4_nomt = geant4.override { enableMultiThreading = false; };
boost_python = boost.override { enablePython = true; inherit python; };
in
stdenv.mkDerivation {
inherit (geant4_nomt) version src;
pname = "g4py";
nativeBuildInputs = [ cmake ];
buildInputs = [ geant4_nomt xercesc boost_python python ];
GEANT4_INSTALL = geant4_nomt;
postPatch = ''
cd environments/g4py
'';
preConfigure = ''
# Fix for boost 1.67+
substituteInPlace CMakeLists.txt \
--replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.pythonVersion})"
for f in `find . -name CMakeLists.txt`; do
substituteInPlace "$f" \
--replace "boost_python" "\''${Boost_LIBRARIES}"
done
'';
enableParallelBuilding = true;
setupHook = ./setup-hook.sh;
# Make sure we set PYTHONPATH
shellHook = ''
source $out/nix-support/setup-hook
'';
meta = {
description = "Python bindings and utilities for Geant4";
longDescription = ''
Geant4 is a toolkit for the simulation of the passage of particles
through matter. Its areas of application include high energy,
nuclear and accelerator physics, as well as studies in medical and
space science. The two main reference papers for Geant4 are
published in Nuclear Instruments and Methods in Physics Research A
506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1
(2006) 270-278.
'';
homepage = "http://www.geant4.org";
license = stdenv.lib.licenses.g4sl;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -1 +0,0 @@
export PYTHONPATH=$PYTHONPATH:@out@/lib

View file

@ -2,22 +2,14 @@
stdenv.mkDerivation rec {
pname = "uriparser";
version = "0.9.3";
version = "0.9.4";
# Release tarball differs from source tarball
src = fetchurl {
url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2";
sha256 = "13z234jdaqs9jj7i66gcv4q1rgsypjz6cighnlm1j4g80pdlmbr8";
sha256 = "0yzqp1j6sglyrmwcasgn7zlwg841p3nbxy0h78ngq20lc7jspkdp";
};
patches = [
# fixes tests
(fetchpatch {
url = "https://github.com/uriparser/uriparser/commit/f870e6c68696a6018702caa5c8a2feba9b0f99fa.diff";
sha256 = "1nd6bhys9hwy6ippa42vm95zhw6hldm1s4xbdzmdjswc96as1ff5";
})
];
nativeBuildInputs = [ cmake ];
cmakeFlags = [

View file

@ -39,14 +39,6 @@ let
meta.broken = since "12";
};
dnschain = super.dnschain.override {
buildInputs = [ pkgs.makeWrapper super.coffee-script ];
postInstall = ''
wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
'';
meta.broken = since "14";
};
bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: {
name = "bitwarden-cli-${drv.version}";
});

View file

@ -60,7 +60,6 @@
, "csslint"
, "dat"
, "dhcp"
, "dnschain"
, "dockerfile-language-server-nodejs"
, "elasticdump"
, "elm-oracle"

View file

@ -1,5 +1,6 @@
{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-time
, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv }:
, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv
, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest }:
buildDunePackage {
pname = "dns-client";
@ -7,8 +8,11 @@ buildDunePackage {
useDune2 = true;
propagatedBuildInputs = [ dns mtime ocaml_lwt randomconv mirage-clock mirage-time
mirage-random mirage-stack mirage-crypto-rng ];
propagatedBuildInputs = [ cstruct fmt logs dns rresult randomconv domain-name ipaddr
ocaml_lwt mirage-stack mirage-random mirage-time mirage-clock
mtime mirage-crypto-rng ];
checkInputs = [ alcotest ];
doCheck = true;
meta = dns.meta // {
description = "Pure DNS resolver API";

View file

@ -1,19 +1,19 @@
{ lib, buildDunePackage, fetchurl, alcotest
, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, rresult
, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, rresult, astring, fmt
}:
buildDunePackage rec {
pname = "dns";
version = "4.5.0";
version = "4.6.0";
minimumOCamlVersion = "4.07";
src = fetchurl {
url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz";
sha256 = "10jrnnxvp06rvzk285wibyi9hn15qhjnqjy9xsfbwl8yhmzzqnq0";
sha256 = "1gkswpc91j4ps60bp52ggg4qwj5g88f49x6p6d619p4x8vmhjylv";
};
propagatedBuildInputs = [ cstruct domain-name duration gmap ipaddr logs lru metrics ptime rresult ];
propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
doCheck = true;
checkInputs = lib.optional doCheck alcotest;

View file

@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocsigen-start-${version}";
version = "2.16.1";
version = "2.18.0";
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "ocsigen";
repo = "ocsigen-start";
rev = version;
sha256 = "1pzpyrd3vbhc7zvzh6bv44793ikx5bglpd5p4wk5jj65v1w39jwd";
sha256 = "0wvh4c26g6qd6i1fryilcqz9giz7v6pnhc90sknhxh6jmwrbjl50";
};
meta = {

View file

@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
pname = "ocsigen-toolkit";
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "2.5.0";
version = "2.7.0";
propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ];
buildInputs = [ ocaml findlib opaline ];
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "ocsigen";
repo = pname;
rev = version;
sha256 = "0hll8qr363pbb65jnr2w36zcbplbwn08xb7826ayiwigakj783p9";
sha256 = "0jan5779nc0jf993hmvfii15ralcs20sm4mcnqwqrnhjbq6f6zpk";
};
createFindlibDestdir = true;

View file

@ -6,12 +6,12 @@
buildDunePackage rec {
minimumOCamlVersion = "4.07";
version = "0.12.0";
version = "0.12.1";
pname = "tls";
src = fetchurl {
url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz";
sha256 = "0fy38qmy7rcld1b4qzz4ycl1fr0v1wa7qd24125lpd6hly86fn57";
sha256 = "09jhzjhni3il5bmy2c6gylmg9s45ppckjc7nm5nyg5dbm699cwxg";
};
useDune2 = true;

View file

@ -1,8 +1,11 @@
{ stdenv
, python
, buildPythonPackage
, fetchPypi
, isPy3k
, substituteAll
, pyparsing
, graphviz
, texlive
}:
buildPythonPackage rec {
@ -14,11 +17,26 @@ buildPythonPackage rec {
sha256 = "1kp77wiv7b5qib82i3y3sn9r49rym43aaqm5aw1bwnzfbbq2m6i9";
};
# Tests fail with 3.x. Furthermore, package is no longer maintained.
disabled = isPy3k;
patches = [
(substituteAll {
src = ./path.patch;
inherit graphviz;
})
./test.patch # https://github.com/kjellmf/dot2tex/issues/5
];
propagatedBuildInputs = [ pyparsing ];
checkInputs = [
(texlive.combine {
inherit (texlive) scheme-small preview pstricks;
})
];
checkPhase = ''
${python.interpreter} tests/test_dot2tex.py
'';
meta = with stdenv.lib; {
description = "Convert graphs generated by Graphviz to LaTeX friendly formats";
homepage = "https://github.com/kjellmf/dot2tex";

View file

@ -0,0 +1,104 @@
diff --git a/dot2tex/dotparsing.py b/dot2tex/dotparsing.py
index 391b5dc..6dc77a3 100644
--- a/dot2tex/dotparsing.py
+++ b/dot2tex/dotparsing.py
@@ -180,18 +180,8 @@ def __find_executables(path):
def find_graphviz():
"""Locate Graphviz's executables in the system.
- Tries three methods:
-
- First: Windows Registry (Windows only)
- This requires Mark Hammond's pywin32 is installed.
-
- Secondly: Search the path
- It will look for 'dot', 'twopi' and 'neato' in all the directories
- specified in the PATH environment variable.
-
- Thirdly: Default install location (Windows only)
- It will look for 'dot', 'twopi' and 'neato' in the default install
- location under the "Program Files" directory.
+ It will look for 'dot', 'twopi' and 'neato' in
+ @graphviz@/bin.
It will return a dictionary containing the program names as keys
and their paths as values.
@@ -199,75 +189,9 @@ def find_graphviz():
If this fails, it returns None.
"""
- # Method 1 (Windows only)
- #
- if os.sys.platform == 'win32':
- try:
- import win32api, win32con
-
- # Get the GraphViz install path from the registry
- #
- hkey = win32api.RegOpenKeyEx(win32con.HKEY_LOCAL_MACHINE,
- "SOFTWARE\AT&T Research Labs\Graphviz", 0, win32con.KEY_QUERY_VALUE)
-
- path = win32api.RegQueryValueEx(hkey, "InstallPath")[0]
- win32api.RegCloseKey(hkey)
-
- # Now append the "bin" subdirectory:
- #
- path = os.path.join(path, "bin")
- progs = __find_executables(path)
- if progs is not None:
- # print("Used Windows registry")
- return progs
-
- except ImportError:
- # Print a messaged suggesting they install these?
- #
- log.debug('The win32api is not installed')
- pass
- except:
- log.debug('Failed to access the registry key')
-
- # Method 2 (Linux, Windows etc)
- #
- if 'PATH' in os.environ:
- for path in os.environ['PATH'].split(os.pathsep):
- progs = __find_executables(path)
- if progs is not None:
- return progs
-
- # Method 3 (Windows only)
- #
- if os.sys.platform == 'win32':
- # Try and work out the equivalent of "C:\Program Files" on this
- # machine (might be on drive D:, or in a different language)
- #
- if 'PROGRAMFILES' in os.environ:
- # Note, we could also use the win32api to get this
- # information, but win32api may not be installed.
-
- path = os.path.join(os.environ['PROGRAMFILES'], 'ATT', 'GraphViz', 'bin')
-
- else:
- # Just in case, try the default...
- path = r"C:\Program Files\att\Graphviz\bin"
-
- progs = __find_executables(path)
-
- if progs is not None:
- # print("Used default install location")
- return progs
-
- for path in (
- '/usr/bin', '/usr/local/bin',
- '/opt/local/bin',
- '/opt/bin', '/sw/bin', '/usr/share',
- '/Applications/Graphviz.app/Contents/MacOS/'):
- progs = __find_executables(path)
- if progs is not None:
- # print("Used path")
- return progs
+ progs = __find_executables('@graphviz@/bin')
+ if progs is not None:
+ return progs
# Failed to find GraphViz
#

View file

@ -0,0 +1,12 @@
diff --git a/tests/test_dot2tex.py b/tests/test_dot2tex.py
index 74b01ed..7be9aba 100644
--- a/tests/test_dot2tex.py
+++ b/tests/test_dot2tex.py
@@ -147,6 +147,7 @@ class NeedsQuotesTests(unittest.TestCase):
class MultipleStatements(unittest.TestCase):
# https://github.com/kjellmf/dot2tex/issues/5
+ @unittest.skip('fails upstream')
def test_semicolon(self):
"""Test for issue 5"""
testgraph1 = """

View file

@ -0,0 +1,22 @@
{ stdenv, fetchPypi, buildPythonPackage, six, pytest }:
buildPythonPackage rec {
pname = "fake-useragent";
version = "0.1.11";
src = fetchPypi {
inherit pname version;
sha256 = "0dfz3bpmjmaxlhda6hfgsac7afb65pljibi8zkp9gc0ffn5rj161";
};
propagatedBuildInputs = [ six ];
checkInputs = [ pytest ];
meta = with stdenv.lib; {
description = "Up to date simple useragent faker with real world database";
homepage = "https://github.com/hellysmile/fake-useragent";
license = licenses.asl20;
maintainers = with maintainers; [ evanjs ];
};
}

View file

@ -0,0 +1,21 @@
{ stdenv, buildPythonPackage, isPy27, fetchPypi }:
buildPythonPackage rec {
pname = "libevdev";
version = "0.7";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "10gwj08kn2rs4waq7807mq34cbavgkpg8fpir8mvnba601b8q4r4";
};
doCheck = false;
meta = with stdenv.lib; {
description = "Python wrapper around the libevdev C library";
homepage = "https://gitlab.freedesktop.org/libevdev/python-libevdev";
license = licenses.mit;
maintainers = with maintainers; [ nickhu ];
};
}

View file

@ -0,0 +1,25 @@
{ stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib }:
buildPythonPackage rec {
pname = "pynput";
version = "1.6.8";
src = fetchPypi {
inherit pname version;
sha256 = "16h4wn7f54rw30jrya7rmqkx3f51pxn8cplid95v880md8yqdhb8";
};
nativeBuildInputs = [ sphinx ];
propagatedBuildInputs = [ setuptools-lint xlib ];
doCheck = false;
meta = with stdenv.lib; {
description = "A library to control and monitor input devices";
homepage = "https://github.com/moses-palmer/pynput";
license = licenses.lgpl3;
maintainers = with maintainers; [ nickhu ];
};
}

View file

@ -0,0 +1,22 @@
{ stdenv, fetchPypi, buildPythonPackage, pytest, scrapy, bsddb3 }:
buildPythonPackage rec {
pname = "scrapy-deltafetch";
version = "1.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "1m511psddvlapg492ny36l8rzy7z4i39yx6a1agxzfz6s9b83fq8";
};
propagatedBuildInputs = [ bsddb3 scrapy ];
checkInputs = [ pytest ];
meta = with stdenv.lib; {
description = "Scrapy spider middleware to ignore requests to pages containing items seen in previous crawls";
homepage = "https://github.com/scrapy-plugins/scrapy-deltafetch";
license = licenses.bsd3;
maintainers = with maintainers; [ evanjs ];
};
}

View file

@ -0,0 +1,21 @@
{ stdenv, fetchPypi, buildPythonPackage, pytest, fake-useragent, scrapy }:
buildPythonPackage rec {
pname = "scrapy-fake-useragent";
version = "1.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "02mayk804vdl15wjpx7jcjkc4zgrra4izf6iv00mcxq4fd4ck03l";
};
propagatedBuildInputs = [ fake-useragent ];
checkInputs = [ pytest scrapy ];
meta = with stdenv.lib; {
description = "Random User-Agent middleware based on fake-useragent";
homepage = "https://github.com/alecxe/scrapy-fake-useragent";
license = licenses.bsd3;
};
}

View file

@ -0,0 +1,20 @@
{ stdenv, fetchPypi, buildPythonPackage, pytest, hypothesis, scrapy }:
buildPythonPackage rec {
pname = "scrapy-splash";
version = "0.7.2";
src = fetchPypi {
inherit pname version;
sha256 = "1dg7csdza2hzqskd9b9gx0v3saqsch4f0fwdp0a3p0822aqqi488";
};
checkInputs = [ pytest hypothesis scrapy ];
meta = with stdenv.lib; {
description = "Scrapy+Splash for JavaScript integration";
homepage = "https://github.com/scrapy-plugins/scrapy-splash";
license = licenses.bsd3;
maintainers = with maintainers; [ evanjs ];
};
}

View file

@ -0,0 +1,35 @@
{ stdenv, buildPythonApplication, fetchPypi, isPy36, dataclasses, libX11, libXinerama, libXrandr }:
buildPythonApplication rec {
pname = "screeninfo";
version = "0.6.5";
src = fetchPypi {
inherit pname version;
sha256 = "0vcw54crdgmbzwlrfg80kd1a8p9i10yks8k0szzi0k5q80zhp8xz";
};
# dataclasses is a compatibility shim for python 3.6 ONLY
patchPhase = if isPy36 then "" else ''
substituteInPlace setup.py \
--replace "\"dataclasses\"," ""
'' + ''
substituteInPlace screeninfo/enumerators/xinerama.py \
--replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \
--replace "load_library(\"Xinerama\")" "ctypes.cdll.LoadLibrary(\"${libXinerama}/lib/libXinerama.so\")"
substituteInPlace screeninfo/enumerators/xrandr.py \
--replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \
--replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")"
'';
propagatedBuildInputs = stdenv.lib.optional isPy36 dataclasses;
buildInputs = [ libX11 libXinerama libXrandr];
meta = with stdenv.lib; {
description = "Fetch location and size of physical screens";
homepage = "https://github.com/rr-/screeninfo";
license = licenses.mit;
maintainers = [ maintainers.nickhu ];
};
}

View file

@ -0,0 +1,21 @@
{ stdenv, buildPythonPackage, fetchPypi, pylint }:
buildPythonPackage rec {
pname = "setuptools-lint";
version = "0.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "16a1ac5n7k7sx15cnk03gw3fmslab3a7m74dc45rgpldgiff3577";
};
propagatedBuildInputs = [ pylint ];
meta = with stdenv.lib; {
description = "Package to expose pylint as a lint command into setup.py";
homepage = "https://github.com/johnnoone/setuptools-pylint";
license = licenses.bsdOriginal;
maintainers = with maintainers; [ nickhu ];
};
}

View file

@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "SoMaJo";
version = "2.0.5";
version = "2.0.6";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "tsproisl";
repo = pname;
rev = "v${version}";
sha256 = "01zvmqilnndh2b257z7bhcc7av5vhjm1g8gmdiiw15gcd2xfmqjs";
sha256 = "08nicj3nj6pi6djli26gf0kf3s2da9ysn1cpkyw7j88v8vav0p7s";
};
propagatedBuildInputs = [ regex ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.126.1";
version = "0.127.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "1acmhyhbl4s2c907nj8jwgg9fjjrfr306vagwkcx2lza4clb2aan";
sha256 = "0daacbb4il3mm8fkbk5qlpvzp3pmrqagq2hr1gsjaf8vnmissvvm";
};
installPhase = ''

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "cloudfoundry-cli";
version = "6.46.1";
version = "6.51.0";
goPackagePath = "code.cloudfoundry.org/cli";
@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "cloudfoundry";
repo = "cli";
rev = "v${version}";
sha256 = "0dqrkimwhw016icgyf4cyipzy6vdz5jgickm33xxd9018dh3ibwq";
sha256 = "189cqng7y12knqm4n1bfajbc2lx027rwb44wddmj5iya27i7fv8f";
};
nativeBuildInputs = [ installShellFiles ];

View file

@ -0,0 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "buildkite-cli";
version = "1.1.0";
src = fetchFromGitHub {
owner = "buildkite";
repo = "cli";
rev = "v${version}";
sha256 = "05hz59qzadkk4ji5icv5sxih31pnn0abnmiwcyfa2mr3l5jaqjnd";
};
vendorSha256 = "0jxh3yhh0sdvaykhinxngpipk369hw8z1y3g2z4c1115m5rjp2bb";
subPackages = [ "cmd/bk" ];
buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];
meta = with lib; {
description = "A command line interface for Buildkite";
homepage = "https://github.com/buildkite/cli";
license = licenses.mit;
maintainers = with maintainers; [ groodt ];
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fly";
version = "6.1.0";
version = "6.3.0";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${version}";
sha256 = "14sm3xwhm6pfln18i9f9dyj7s2wcri43rxj4s1cja7nwqr5sqb3x";
sha256 = "006qkg661hzbc2gpcnpxm09bp1kbb98y0bgdr49bjlnapcmdgr1b";
};
vendorSha256 = "1c099sn5rrvj805va1lyjlbv7i2g1z5bxyaisv5l9365z0lv1cwm";
vendorSha256 = "03az7l9rf2syw837zliny82xhkqlad16z0vfcg5h21m3bhz6v6jy";
subPackages = [ "fly" ];

View file

@ -5,7 +5,7 @@
buildGoPackage rec {
pname = "dapper";
version = "0.4.1";
version = "0.5.1";
goPackagePath = "github.com/rancher/dapper";
@ -13,7 +13,7 @@ buildGoPackage rec {
owner = "rancher";
repo = "dapper";
rev = "v${version}";
sha256 = "03rmkmlvhmfwcln5v1rqww1kirxm0d1p58h6pj8f5fnhk9spb162";
sha256 = "0sf56ii4sn2wdq5kiyl02sgvq0lvynzgiq8v5wrkkabj5107fiqw";
};
patchPhase = ''
substituteInPlace main.go --replace 0.0.0 ${version}

View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
version = "1.45.0";
version = "1.45.1";
vendorSha256 = null;
@ -30,7 +30,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
sha256 = "1wnrvswysms8p26d8hnxpimx12bhi3sa9k4kwd2dbxg74569gq6d";
sha256 = "1zzdjpbag23kr6j3c7zkgqaavlna1q792qhs6s234vxm85zmwh4j";
};
meta = with lib; {

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "lazygit";
version = "0.20.3";
version = "0.20.4";
goPackagePath = "github.com/jesseduffield/lazygit";
@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
sha256 = "1p05lfm74g28ci5575vr22q5db50h19fcvc3lzddp0vyiw570isl";
sha256 = "134f04ybzgghm7ghyxair111aflmkjrbfj0bkxfp1w0a3jm6sfsk";
};
meta = with stdenv.lib; {

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "circleci-cli";
version = "0.1.7868";
version = "0.1.7971";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
sha256 = "1a9gnqrkvifrwr8wpv5f6zv8xs8myzbzlhn5w72xxzh2gxdaflwg";
sha256 = "0nrmdql3h9jnfgmp8898c9v07f5h5r9dvabaqhk98r6a77g3rr98";
};
vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9";

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pkgconf";
version = "1.7.0";
version = "1.7.3";
nativeBuildInputs = [ removeReferencesTo ];
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz";
sha256 = "0sb1a2lgiqaninv5s3zq09ilrkpsamcl68dyhqyz7yi9vsgb0vhy";
sha256 = "1h7rf5cch0cbxp8nmjkkf272zrz2jgpqpr8a58ww75pn3jjswimq";
};
# Debian has outputs like these too:

View file

@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "merlin";
version = "3.3.4";
version = "3.3.6";
minimumOCamlVersion = "4.02.1";
src = fetchurl {
url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
sha256 = "12wxric6n3rmsn0w16xm8vjd8p5aw24cj76zw2x87qfwwgmy1kdd";
sha256 = "1360cm0jkn2v2y5p3yzdyw9661a1vpddcibkbfblmk95qafx4civ";
};
buildInputs = [ yojson ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
version = "4.5.0";
version = "4.8.0";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "0pr9b36s63xplmyjgjdifw5pgas7bxwbnsckjix7djyln0j5ja3q";
sha256 = "0wivvh3fhyhxx9f6vp0kgqkjj4957hj0b15r2igbxnyqvahwxgx7";
};
# don't remove runtime deps

View file

@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2020-05-22";
version = "2020-06-11";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "7265ceb6d050d1a4642741d248f11e4f2abd37e1";
sha256 = "172ip0wbrmrwxhv5nvpgb0g982w9smyzlwg16gphrjiwnxllj1w7";
rev = "1428c7b29e50af56f53ee1d587679d97a027dd72";
sha256 = "0zhrgfsk7fvs8wabgdp5ps73ggsghsw19cnjvlbw4cnib6p9176a";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -269,12 +269,12 @@ let
calendar-vim = buildVimPluginFrom2Nix {
pname = "calendar-vim";
version = "2020-05-24";
version = "2020-06-09";
src = fetchFromGitHub {
owner = "itchyny";
repo = "calendar.vim";
rev = "b2e7a69945c2b452598a1d4fa25d8fc94aa8b02c";
sha256 = "03fx03pdw4bwqyd4jyk0ixb5fhv900x0lg615ig0i4qg9nqjnc8n";
rev = "932648c890d27b3a1f0e5f5f63e4564384dfdb63";
sha256 = "1p1lrxk45qphpmnkszhaks7li0h3y3biif9427n6mjckl860g5c7";
};
meta.homepage = "https://github.com/itchyny/calendar.vim/";
};
@ -401,36 +401,36 @@ let
coc-fzf = buildVimPluginFrom2Nix {
pname = "coc-fzf";
version = "2020-06-02";
version = "2020-06-13";
src = fetchFromGitHub {
owner = "antoinemadec";
repo = "coc-fzf";
rev = "8c89226acc29fe2695e8f86355c04ce1587f0fda";
sha256 = "04616lzpch9r5cj6nh4dw4b666iyi314n95mi62n5qcaibr6r85s";
rev = "2c98c9f34718f5f639bfaae1c193fbe39749f7fc";
sha256 = "126yqr53y4y30p4sp7942nic6lql6lfx0a1wb0psrrvrc8ccbbpp";
};
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
};
coc-git = buildVimPluginFrom2Nix {
pname = "coc-git";
version = "2020-05-12";
version = "2020-06-11";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-git";
rev = "b45372104d2234612f89658570887c55e6efea83";
sha256 = "1p7ah0dr31h0pllx00ms46fd5pmkp604zlkk08z40w54hzhr5qhh";
rev = "bbddf4a9447848cdd18a693268bffcc0fe523c08";
sha256 = "11c5rnlf45wz0slvl0gcqcdc9xb859pxy44xynfbbsl0ii1l8zc1";
};
meta.homepage = "https://github.com/neoclide/coc-git/";
};
coc-go = buildVimPluginFrom2Nix {
pname = "coc-go";
version = "2020-05-25";
version = "2020-06-10";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-go";
rev = "d9756fd65dc1d6740e797fa22d3f6f4fdb2b00d5";
sha256 = "14qc9ny12y52rbxn0gcwh6cpqc2zpwgb4jlla5p72w9pfh9gfh6z";
rev = "38b0b30355f85a7952a2e6602fdb1cdf9141a501";
sha256 = "0wmdfcglvixfqahjg3lc5q7y36wk6lzczr5nhnwixh9cis1nybx6";
};
meta.homepage = "https://github.com/josa42/coc-go/";
};
@ -521,12 +521,12 @@ let
coc-metals = buildVimPluginFrom2Nix {
pname = "coc-metals";
version = "2020-06-01";
version = "2020-06-12";
src = fetchFromGitHub {
owner = "ckipp01";
repo = "coc-metals";
rev = "0286d7f11647dca4a63d84fe4101dbabc7731c04";
sha256 = "068aqynvzsnrz2dh68zdy40h342nfrf8kvv9234qdr91mhbvrxv4";
rev = "b6ed6dad8c9f57e2ee84b60c0cf69c88c5ccf3bc";
sha256 = "0abvls1vxyzxzsrlmm5javahsxxslgli43b1ffbrk7cz8cbhgdsy";
};
meta.homepage = "https://github.com/ckipp01/coc-metals/";
};
@ -605,12 +605,12 @@ let
coc-rust-analyzer = buildVimPluginFrom2Nix {
pname = "coc-rust-analyzer";
version = "2020-06-04";
version = "2020-06-11";
src = fetchFromGitHub {
owner = "fannheyward";
repo = "coc-rust-analyzer";
rev = "acd5e7fca38dbc8ad8bfe9f187f1f4e6ee64ea88";
sha256 = "14qyszmyzykibdkdv38cypc8gmhaz0301prirjbpf2gijryk922b";
rev = "a2e98801bcbe88d100f2fcb23087ba61203ad101";
sha256 = "0a2a6pjvbb29syhh796z3gfrgjx4vpkbjirsgzdfb12icigbjdz7";
};
meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/";
};
@ -629,12 +629,12 @@ let
coc-snippets = buildVimPluginFrom2Nix {
pname = "coc-snippets";
version = "2020-05-20";
version = "2020-06-10";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-snippets";
rev = "f5e7a3575a04ee9cacd659380d0d0118fa4bb5cd";
sha256 = "0zrllqqdgf1ckzgaxhk7459cbkv7x1vkfgwsvilcjspxaww1s1bv";
rev = "a36f36afe7094562756202d1bb88c1f80597393e";
sha256 = "117idj29gk8psj27zmwazanwxf4br08mlkcpnkxyw6blm5aibzpp";
};
meta.homepage = "https://github.com/neoclide/coc-snippets/";
};
@ -785,12 +785,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
version = "2020-06-04";
version = "2020-06-13";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "d992e129997d9bda225a4e59ed5e5a57fca1896a";
sha256 = "0f4vsg2fbwn4jpfj8lv8ib8i8adzvr9inw4q861w87zssk65bi8g";
rev = "d66250193333f786b0706d4f1aebbd3e17505c43";
sha256 = "0k4f0xf9h6v5xhvkzklg233x6y15bn22yg07g3nkgh10b8mpspbs";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@ -1014,12 +1014,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
version = "2020-05-30";
version = "2020-06-09";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
rev = "5d8133aba89acaab3b532b15eed8e6cba77b1cd2";
sha256 = "1gw73cybp1qxgnqfa6hn6g2ky30canhmrchf550kp5j8nflqa887";
rev = "bc2a3fcbe9db21623dcc7c2d5c4c1b1289283dfc";
sha256 = "00gyrfhz7mf93swqzi4n459vbk9rpcqsc9qfzgnv38myh800s2ih";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@ -1062,12 +1062,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2020-06-01";
version = "2020-06-11";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "7c971aa2e40853b21f7967788e9ea3baa4e97ab2";
sha256 = "04v3v14g7nnmc6rhz5vpppqgkk8z67am4nc6k8jwbrv61sq1ga6b";
rev = "6139d4cd2d6944be8b713766f92f521eaa056c18";
sha256 = "0v64fj9jjq51h2cr1haih4ac4kffvzp6g0gli2vs4vjcbjbcil5r";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
@ -1209,12 +1209,12 @@ let
deoplete-lsp = buildVimPluginFrom2Nix {
pname = "deoplete-lsp";
version = "2020-05-30";
version = "2020-06-11";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete-lsp";
rev = "2994bf57fed476a5b9878e842b14b5b5c5b22211";
sha256 = "0y22nay6qkn0sl74hlhhri3hjw5r3fwmmxby3j9q0avszlmq7352";
rev = "64a8663e529686fc43390942672ff2b33beda0e3";
sha256 = "1z8axvcrzip4bgmnn62p3q7rr3y7avkf7l4k2r266bkxwgsmh50k";
};
meta.homepage = "https://github.com/Shougo/deoplete-lsp/";
};
@ -1293,12 +1293,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
version = "2020-06-02";
version = "2020-06-11";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
rev = "921688d72168e436c82f3d413a5de7d78369a0c7";
sha256 = "01wpq4majnhh4lxmai0ix5dqvfxrbdsj2pic785x3kaqn4all31w";
rev = "e04bfc18b604c54ebc319d2eebf8fe3a830a9212";
sha256 = "01bf55zbw2v2qzbpk0jm5j4dhq8rs78m2pbljsnl2772vll4iv38";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@ -1341,12 +1341,12 @@ let
echodoc-vim = buildVimPluginFrom2Nix {
pname = "echodoc-vim";
version = "2020-04-08";
version = "2020-06-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "echodoc.vim";
rev = "31533d9c6c2723dfb4cf5691c83f330a3a0ccddd";
sha256 = "1ygm4g90zv009iqv8k8n4930a7gpij5jxbz7dqq2dfyj4jn37rkf";
rev = "4719626bfd477f1189dd9992614ff452d3ea3caf";
sha256 = "0bpaav7yf06wlzfiyx6iylxan8a9hici041pnmlw7kgf176h6w7b";
};
meta.homepage = "https://github.com/Shougo/echodoc.vim/";
};
@ -1548,12 +1548,12 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
version = "2020-06-01";
version = "2020-06-07";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
rev = "5aa5977d744d1183806079d307f023b0c5ceaaef";
sha256 = "0b7lgdr66q99dfc73iwgb11pd4b465qmslfzqypsp8jamckk1jii";
rev = "8f1e73b598d27d78dfb5843be19a73b6a3b222b1";
sha256 = "0zdimx6q2fivimdvh0cnm6w718vjxj0abv67869ijh1d4mfrmvyf";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
@ -1572,24 +1572,24 @@ let
gentoo-syntax = buildVimPluginFrom2Nix {
pname = "gentoo-syntax";
version = "2020-06-04";
version = "2020-06-05";
src = fetchFromGitHub {
owner = "gentoo";
repo = "gentoo-syntax";
rev = "632d0a72c83cd0ccf7f40cb64470dc84f51bdce2";
sha256 = "0q5cj2zpcdxmwm8dcj0nbyffjs1a075fgqbang4s0ikangbhx586";
rev = "47b6900c425614d4ba22223c13a23920f0618d9f";
sha256 = "0agswv1r5nxbnw0nddhw9vqvrfsvsgh18nwrg83c01sj97075qmv";
};
meta.homepage = "https://github.com/gentoo/gentoo-syntax/";
};
ghcid = buildVimPluginFrom2Nix {
pname = "ghcid";
version = "2020-05-17";
version = "2020-06-06";
src = fetchFromGitHub {
owner = "ndmitchell";
repo = "ghcid";
rev = "64f693f6581c3acdee71897eaba7c4e793eaa946";
sha256 = "194njs7nfdmpnv1bkadamvicp735834kq0ijha5s41i492hb589i";
rev = "bddd18ffabbdb10ca1fadf25e7d7d1201470f444";
sha256 = "1sxh3zdrwajz0nabqbzg24sxlc8kwiqrwh4mvrwavwyh7xr29jxd";
};
meta.homepage = "https://github.com/ndmitchell/ghcid/";
};
@ -1632,12 +1632,12 @@ let
goyo-vim = buildVimPluginFrom2Nix {
pname = "goyo-vim";
version = "2019-06-13";
version = "2020-06-08";
src = fetchFromGitHub {
owner = "junegunn";
repo = "goyo.vim";
rev = "6b6ed2734084fdbb6315357ddcaecf9c8e6f143d";
sha256 = "1ywlz1hn54kxyp5q0angriaarimq7ys7m6sk6l4x8jr1g2yh0afz";
rev = "3e129198bba7d6b50406902002ad7d213a6cccaa";
sha256 = "1b2wsxbg27nmwxrncwddkl2ck8hbiqdqi821vl9d1fl5nx042y2b";
};
meta.homepage = "https://github.com/junegunn/goyo.vim/";
};
@ -1897,12 +1897,12 @@ let
Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
pname = "Jenkinsfile-vim-syntax";
version = "2019-12-31";
version = "2020-06-05";
src = fetchFromGitHub {
owner = "martinda";
repo = "Jenkinsfile-vim-syntax";
rev = "164b457d87b65c6ca9e5998b69c6cd24248f62ac";
sha256 = "14s26hlsdqys7br84l9wiyvhcy17s6966mhgr9n6sdqmhz6lc4nm";
rev = "a701341879c6db93f5dffa37f4589eef3c4ded85";
sha256 = "0nm3lf37l1g8lpa4yz1va0s6vw0vw99zghy3dzq933j0kqmspgvp";
};
meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/";
};
@ -1921,12 +1921,12 @@ let
julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim";
version = "2020-05-21";
version = "2020-06-06";
src = fetchFromGitHub {
owner = "JuliaEditorSupport";
repo = "julia-vim";
rev = "2d0b6e4018d6cc01b96ab326ff6495876200866d";
sha256 = "1ijmxxw63mraa5afddahfvwbh9acrf11q7g6hf32k6923rfccrnq";
rev = "f0fab9a2df5223815f7dc46f44f69566aa9e51d1";
sha256 = "145wxlv5rifk93lvai17625r1c94lnbi8rnda0vidr0dhhgcl7v7";
};
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
};
@ -2029,12 +2029,12 @@ let
lf-vim = buildVimPluginFrom2Nix {
pname = "lf-vim";
version = "2020-05-12";
version = "2020-06-11";
src = fetchFromGitHub {
owner = "ptzz";
repo = "lf.vim";
rev = "8dbdb135f3704790f9e66a141d2785d4b65c238d";
sha256 = "0phfqg6ax79vsz1sy6pvjflz1929x58k7nifiqki9bzp2m6knls9";
rev = "8eef4095f0ca4ec37b6877b7b01047146e987c6b";
sha256 = "17clfc8shmv485r6anpkkcq88x6n2pm54ir1pjy852spzykycika";
};
meta.homepage = "https://github.com/ptzz/lf.vim/";
};
@ -2245,12 +2245,12 @@ let
neco-ghc = buildVimPluginFrom2Nix {
pname = "neco-ghc";
version = "2018-05-13";
version = "2020-06-06";
src = fetchFromGitHub {
owner = "eagletmt";
repo = "neco-ghc";
rev = "682869aca5dd0bde71a09ba952acb59c543adf7d";
sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h";
rev = "b4ea02c537975a5a2bf00cb5f24cd784b2b6f5ad";
sha256 = "13la3slqkljn7y8y9p8ic3majnvjf7pnrwr16cdpacklmz733x1f";
};
meta.homepage = "https://github.com/eagletmt/neco-ghc/";
};
@ -2317,12 +2317,12 @@ let
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2020-05-17";
version = "2020-06-12";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
rev = "a3561bf2032a162bc9f53d96fa4e5a2ada98854c";
sha256 = "15lsxwf4f1mg5h716zikwv1hbb0i41d24hrvyrqhwqlnqbwizlbi";
rev = "1cee66fe6219f8cc698eb244ba4001bdad1d09cb";
sha256 = "0w5hw5qc5n0i2hal91nilmxazskixv6c1rcszgqar4dfh951kazy";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
@ -2377,12 +2377,12 @@ let
neosnippet-vim = buildVimPluginFrom2Nix {
pname = "neosnippet-vim";
version = "2020-05-12";
version = "2020-06-13";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neosnippet.vim";
rev = "70f855d93c4bc727873c42111432660cf6929cdc";
sha256 = "1gh7vh3qc9k8xhpmcvhdn5nfff81y7hkfky0mgs75a97mkd8qhnz";
rev = "a52edf794bae0174a682131333c891717633994b";
sha256 = "1k3ncjlikdbsjk33fi14y88yqywrpzdfz8kwzjfxjlidbzzlzk0w";
};
meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
};
@ -2449,12 +2449,12 @@ let
nerdcommenter = buildVimPluginFrom2Nix {
pname = "nerdcommenter";
version = "2020-02-19";
version = "2020-06-08";
src = fetchFromGitHub {
owner = "preservim";
repo = "nerdcommenter";
rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8";
sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs";
rev = "fade3d4b26f5a0d58f256a06ba7b0a04d9fb4f3b";
sha256 = "1vb5n4g5x3hpnc013gjf8frxxdrcq1zdcm3mpx90b0cjxi252cn3";
};
meta.homepage = "https://github.com/preservim/nerdcommenter/";
};
@ -2569,12 +2569,12 @@ let
nvim-lsp = buildVimPluginFrom2Nix {
pname = "nvim-lsp";
version = "2020-06-02";
version = "2020-06-13";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lsp";
rev = "a7fdf268b1c51f6395900e437060728701aa8b77";
sha256 = "04v1g4sa6dccaffrlkmyh410ppza5zlrnrapf9c3sfj6bmsr4jd3";
rev = "9ec118cdc7ce6442bf8beba903ab395b2f60190f";
sha256 = "1idam76jwvs82c2384y4az4rqp5cg29qhic12fnpy8m74b3rqla8";
};
meta.homepage = "https://github.com/neovim/nvim-lsp/";
};
@ -2617,12 +2617,12 @@ let
onehalf = buildVimPluginFrom2Nix {
pname = "onehalf";
version = "2020-05-06";
version = "2020-06-11";
src = fetchFromGitHub {
owner = "sonph";
repo = "onehalf";
rev = "970abdf26b399100cbb59c6b6e693c4ff877c59d";
sha256 = "1v34n0cz7jkx0wlbl6kv693qgifs0frcw4mv32ll36pmqfyb4m0h";
rev = "3aa42a39ed3cddde0c53976a700b81b8a7067890";
sha256 = "0x01c7930hlzvjac3r2wbkdha8j6mmhyk7nwgdazh1z4sxqjyj1l";
};
meta.homepage = "https://github.com/sonph/onehalf/";
};
@ -2965,12 +2965,12 @@ let
rust-vim = buildVimPluginFrom2Nix {
pname = "rust-vim";
version = "2020-05-13";
version = "2020-06-11";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust.vim";
rev = "953b10061f595496b35aec84b75c413ee5751a23";
sha256 = "1abacayriz439lj4r3s1x92pp3wwxqav3kqsanxq9k6f6p2b2fyb";
rev = "0d8ce07aaa3b95e61bf319b25bb3b1a4ecc780c2";
sha256 = "0bwj60zvafv5z61yy66ab6ng1ilnj20k3xnxl6myzvfn70rsp5yd";
};
meta.homepage = "https://github.com/rust-lang/rust.vim/";
};
@ -3169,12 +3169,12 @@ let
splitjoin-vim = buildVimPluginFrom2Nix {
pname = "splitjoin-vim";
version = "2020-05-16";
version = "2020-06-11";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "splitjoin.vim";
rev = "99d12007112b63b8e3fd0fcf435471ac63ccf030";
sha256 = "1mar7v4sp3zbvbczs54n8zj17bh042g0384ichwvqkamfcfxgdid";
rev = "03dc38772d59e78de3d87b27438fecab70dd6688";
sha256 = "0xn972gppr87lx37p01x1ikh2nwn56szhgnikw1v269vnysic15m";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@ -3278,12 +3278,12 @@ let
tagbar = buildVimPluginFrom2Nix {
pname = "tagbar";
version = "2020-05-30";
version = "2020-06-11";
src = fetchFromGitHub {
owner = "majutsushi";
repo = "tagbar";
rev = "a36880be2217814b7034f05eb0f402e8183befc9";
sha256 = "16rj8pv8b9knbxi2967h96kgwp4r631kmpxdy74xsf938z4cya0j";
rev = "56399f446c64d187c106e112afa4d97985508eba";
sha256 = "1bmfv09lxwq9b8hp4v2avmd979178lm60xxf5g0qiifrr4ym2gqk";
};
meta.homepage = "https://github.com/majutsushi/tagbar/";
};
@ -3483,12 +3483,12 @@ let
unicode-vim = buildVimPluginFrom2Nix {
pname = "unicode-vim";
version = "2020-04-20";
version = "2020-06-09";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "unicode.vim";
rev = "ce061819e4304a9ff2f82779e12e5a30363ab47c";
sha256 = "0k9gmf2rdvnlfqqhjlk206wimlh5di3smmrr9cgz0djq5pd3r5jz";
rev = "76e95c6f8c863f5079cd103b18990684bb02d525";
sha256 = "0v3w117bimd74r9i209hgqy75x83hdd3za26l8g729w56kqgq5r8";
};
meta.homepage = "https://github.com/chrisbra/unicode.vim/";
};
@ -3543,12 +3543,12 @@ let
verilog_systemverilog-vim = buildVimPluginFrom2Nix {
pname = "verilog_systemverilog-vim";
version = "2020-05-24";
version = "2020-06-12";
src = fetchFromGitHub {
owner = "vhda";
repo = "verilog_systemverilog.vim";
rev = "e2449daa3272a6d5ad33e433cca3208bf68607a7";
sha256 = "16w1nskfxsfs9dhk1yxmk16i5vjg0wq8l3fsqwa0904rh5wnakjn";
rev = "c37bcf010fcb73599d690d8da6ac966dac02a07e";
sha256 = "1f4kicgr7wv0dprvr91wi4lmk0d9bb9f4wcng4rfkq1cdwfkqdw4";
};
meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/";
};
@ -3807,12 +3807,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2020-05-31";
version = "2020-06-11";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "d221dc531298f467a6901861b0360741c2a387b0";
sha256 = "0w4lwpynn5cj9si3apyfmxb8x8hv0acggsyfvmhpi41638sz2310";
rev = "ee85ed4c673b859cf8c3626a6669b8e3cd2392fa";
sha256 = "1wayink1n9l590kfi28xp37kw186g7j0dr5kgfr7xz8mk2g0wg0k";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@ -3843,12 +3843,12 @@ let
vim-anzu = buildVimPluginFrom2Nix {
pname = "vim-anzu";
version = "2018-02-28";
version = "2020-06-10";
src = fetchFromGitHub {
owner = "osyo-manga";
repo = "vim-anzu";
rev = "45b60d37cb9de90f6c89f7ddeacb7ae430ebcae2";
sha256 = "1p5lh4xsv9xsl8kx0h1bg6iy0if4a69hvairq69p50ffka83pv00";
rev = "1b95ec384487e559f0ee70e0f46c33683ff533ac";
sha256 = "0q6s9bb1yv7ir2al4gv69vv4c8m09j1ax47qbhchgz23iwka3vmz";
};
meta.homepage = "https://github.com/osyo-manga/vim-anzu/";
};
@ -4023,12 +4023,12 @@ let
vim-codefmt = buildVimPluginFrom2Nix {
pname = "vim-codefmt";
version = "2020-06-02";
version = "2020-06-08";
src = fetchFromGitHub {
owner = "google";
repo = "vim-codefmt";
rev = "e083709f482332e5ff765f4d7b7901d51ddc9ef4";
sha256 = "0d46h4jx01mib4wyj60qx4r34y201gaj1vpkb48pkw9qlsaqs31i";
rev = "90335990808167d910671a625f3ee9de9aac1058";
sha256 = "1rq0ivynsq35h5kpzpd963bgkbx9lb26wlxrb2l8xha0zzzsmhpz";
};
meta.homepage = "https://github.com/google/vim-codefmt/";
};
@ -4215,12 +4215,12 @@ let
vim-devicons = buildVimPluginFrom2Nix {
pname = "vim-devicons";
version = "2020-05-30";
version = "2020-06-12";
src = fetchFromGitHub {
owner = "ryanoasis";
repo = "vim-devicons";
rev = "15b532ebd4455d9d099e9ccebab09915e0562754";
sha256 = "0cfiwdaj43fx2gq7916i98iyn3ky79d359ylgpznczn88k37s1wi";
rev = "84ec4562c21882dfe80b779cd645c607ec9d9727";
sha256 = "1nv7aivnrxa91b2ylxzfiss46r9m2qf13v8wlhav85mgd51nhj99";
};
meta.homepage = "https://github.com/ryanoasis/vim-devicons/";
};
@ -4371,12 +4371,12 @@ let
vim-elm-syntax = buildVimPluginFrom2Nix {
pname = "vim-elm-syntax";
version = "2020-01-25";
version = "2020-06-10";
src = fetchFromGitHub {
owner = "andys8";
repo = "vim-elm-syntax";
rev = "846a5929bff5795256fbca96707e451dbc755e36";
sha256 = "05jkx4dbkb646wy0igqpwc55iamm0a030dswhirg6nyl3x6qzgym";
rev = "68cd8988fe9eaa190052fadaee0fea2c21338d4c";
sha256 = "0yhvx8k83xfzmgy10r9mz0rjagbyzx5rrmn8123vw49ncksvw49q";
};
meta.homepage = "https://github.com/andys8/vim-elm-syntax/";
};
@ -4455,12 +4455,12 @@ let
vim-fireplace = buildVimPluginFrom2Nix {
pname = "vim-fireplace";
version = "2020-04-18";
version = "2020-06-08";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fireplace";
rev = "6c968f26f0bd3dd04b18fad8761e0e9e1220a3da";
sha256 = "1x74j3gghfmqh1mxswzhb6d0zdll735r5lrgn4g3z580y15h37w5";
rev = "15fcf3db308ce34a12c1e41a88178c7cccea0d96";
sha256 = "148qjhln1v4cv15idsn36n82g0g7bjq2vhf0il9a6djwycf374kb";
};
meta.homepage = "https://github.com/tpope/vim-fireplace/";
};
@ -4611,12 +4611,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
version = "2020-05-29";
version = "2020-06-10";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
rev = "9784226ba766662d298554a5c66fd938497f2233";
sha256 = "19f28c3wasgck78xqdygsyiwv17qqh69nkn9n1gajcbmbr55lhzn";
rev = "e31e9bb35f7346caab4fcf972d44449bdfd3230a";
sha256 = "1mmasjz0d6nyjjrlgwiz9kd420l16q90mhscwz3i65xw0zqlmcgj";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@ -4647,12 +4647,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2020-05-31";
version = "2020-06-09";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "8e72eef0b35839db0a028a37bd28debc20c1201b";
sha256 = "0rpay08m3q0syvw9ks45b3cvggghi1350h7dp87bx24jd3dqvdvf";
rev = "354774cd7aea891cf553c34d79582be3346c1615";
sha256 = "0pqmm6s50vxs9788f6avgwrdp1vi5mv3lzrxi2nxqdxvrcxngk93";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@ -4887,12 +4887,12 @@ let
vim-illuminate = buildVimPluginFrom2Nix {
pname = "vim-illuminate";
version = "2020-02-21";
version = "2020-06-09";
src = fetchFromGitHub {
owner = "RRethy";
repo = "vim-illuminate";
rev = "80dafb9b0e7b9f4ce7c843d4104f455c8c5b1f42";
sha256 = "1yijaj1dqfmw4dsdmgj01sxizyraisxwjqh2hhbq93pdln4lm51f";
rev = "0778289e391c419f7a3af9de8229f798ee292013";
sha256 = "1l5s5f4fw96w437rdf85lym7g75hnz8sb2fdj9hygyg0sp42r0cf";
};
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
};
@ -5044,12 +5044,12 @@ let
vim-jsdoc = buildVimPluginFrom2Nix {
pname = "vim-jsdoc";
version = "2020-05-16";
version = "2020-06-09";
src = fetchFromGitHub {
owner = "heavenshell";
repo = "vim-jsdoc";
rev = "5e8eac9d8e38c273cc05c359730a2a74a1578f2b";
sha256 = "0biyf2vzvnqzzdykq0agf1hzs2ynbbly4fxfwrfablznbdgsm0pz";
rev = "3b88595805ac7c0499dc05bc8aa5cc7909c6f5b7";
sha256 = "04yjjcfmaby466krqzmvwg0cb2ydri6pj49x48z15h4s9ac47p66";
};
meta.homepage = "https://github.com/heavenshell/vim-jsdoc/";
};
@ -5164,12 +5164,12 @@ let
vim-ledger = buildVimPluginFrom2Nix {
pname = "vim-ledger";
version = "2020-05-25";
version = "2020-06-08";
src = fetchFromGitHub {
owner = "ledger";
repo = "vim-ledger";
rev = "b3e6f3dfaa922cda7771a4db20d3ae0267e08133";
sha256 = "1jx814sqs0n0mrdi2lrh6xa3d2cmgyc78176gd5c1n8k5q7qkp40";
rev = "d5f2af4883351aa437ca1c3157d21917dc2bb1b0";
sha256 = "0bdyhbablays384gssfdfavkxcrwcj89y8vn5kdk11xs0r78b5wr";
};
meta.homepage = "https://github.com/ledger/vim-ledger/";
};
@ -5224,24 +5224,24 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
version = "2020-06-02";
version = "2020-06-10";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
rev = "baa44d450043cc020e1d6f0609d0e081bbcc6f9e";
sha256 = "07m2wqich31pxp9jgh3fzjqqdm7vdjh8rjf67d4l6kkf13dw89yh";
rev = "b34ad0fdd1223e5c1c39d23c01f13954ca2ad500";
sha256 = "1zqk0zimq2qyqhhfb5693zkcxz16vyrd7k2wd488avqi1jbhiffc";
};
meta.homepage = "https://github.com/natebosch/vim-lsc/";
};
vim-maktaba = buildVimPluginFrom2Nix {
pname = "vim-maktaba";
version = "2020-05-29";
version = "2020-06-13";
src = fetchFromGitHub {
owner = "google";
repo = "vim-maktaba";
rev = "2636a0fabaae80e3bebdb3c571220aebf875dfcf";
sha256 = "1vcc8gaikbgdq1k4f3jdjrmlwad1z44g3biifgqyp0sgd7bjd9lp";
rev = "5c49c44be62e595d3d1d81a15259cd1bfc722825";
sha256 = "0nr7hbwpwzzzxinpjfdlaia3ys6vrw10i3wbjhr41iga6gkg6w2v";
};
meta.homepage = "https://github.com/google/vim-maktaba/";
};
@ -5644,12 +5644,12 @@ let
vim-plug = buildVimPluginFrom2Nix {
pname = "vim-plug";
version = "2020-06-03";
version = "2020-06-08";
src = fetchFromGitHub {
owner = "junegunn";
repo = "vim-plug";
rev = "6583b990321f03500505dc43a3f62cbbc7369862";
sha256 = "1k9y119xwb84fgsyyp1npjh5z1wlbbm1922n411h70cfa4928rfh";
rev = "01aab60adef47c6606aa68c8783f5b994fda9fc4";
sha256 = "1x5m98k20ncvhz6sngzxwhh74s2ll3d119p1g0di4vr59rkx8szq";
};
meta.homepage = "https://github.com/junegunn/vim-plug/";
};
@ -5668,12 +5668,12 @@ let
vim-polyglot = buildVimPluginFrom2Nix {
pname = "vim-polyglot";
version = "2020-06-01";
version = "2020-06-13";
src = fetchFromGitHub {
owner = "sheerun";
repo = "vim-polyglot";
rev = "5b3866302755da9e5a917ca42a38a4a03fb5f3e5";
sha256 = "0v6ll98j44hgmczhl6cp4rw734x582iz7942cw5jmbp7wg83nz88";
rev = "a86c0179ebc99b15d403e3f1d4a4cfff83b47de8";
sha256 = "0bsq2nvzxb6j0zn6c9hvrsz47ahcp3iki5acz4l1y841xgd880zm";
};
meta.homepage = "https://github.com/sheerun/vim-polyglot/";
};
@ -5992,12 +5992,12 @@ let
vim-signify = buildVimPluginFrom2Nix {
pname = "vim-signify";
version = "2020-05-18";
version = "2020-06-08";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-signify";
rev = "dfa1e55fe1c7f309f8cce4db0243f14f6edb2d4c";
sha256 = "0p1hnjwhqmrczwns7h8gsmdl95yxcb6sqw59xshz7ji0b80h45mf";
rev = "c3d450eb5f5e76d99d23b10493d4e08c5bb1ae71";
sha256 = "0ms0c36zsqqpxrq4mx9k5viblcapw9kpjm9cdrs8fnldlz6i0yhh";
};
meta.homepage = "https://github.com/mhinz/vim-signify/";
};
@ -6148,12 +6148,12 @@ let
vim-spirv = buildVimPluginFrom2Nix {
pname = "vim-spirv";
version = "2019-11-20";
version = "2020-06-12";
src = fetchFromGitHub {
owner = "kbenzie";
repo = "vim-spirv";
rev = "e71404f92990aa4718925ade568427c0d8631469";
sha256 = "0aimpcz6vvrkcfgsj0xp12xdy1l83n387rsy74dzk23a220d59na";
rev = "9b005a0569fa5e18f71fcccbacda227c1cef7eaa";
sha256 = "0qby4bfjav2xijh732l7d2jli0adnv6cc8kcalbh5315vi4mpnfk";
};
meta.homepage = "https://github.com/kbenzie/vim-spirv/";
};
@ -6292,12 +6292,12 @@ let
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
version = "2020-06-03";
version = "2020-06-08";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
rev = "e819de903fe10fdcbb3714f3e96bafd918e4d117";
sha256 = "05jh89rgd4p6mkryv5dm83jhxfmg1k77rk4zq35i8dy8i6cvi41z";
rev = "2f185e0e5b0e7344c1e391045dc33a2e7a41d8eb";
sha256 = "1djl6phjc7vzhwbaxsc70mqp1f83iz99bcfyghphs9fhgdg46jiz";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@ -6532,12 +6532,12 @@ let
vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi";
version = "2020-05-30";
version = "2020-06-08";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-visual-multi";
rev = "40991d51a6a3b22d56eefe9f6145602dfe1d494b";
sha256 = "0kawg12w7ssk58lv6ppv85c75x4af7dbkw9ngx7n91y1f1wkinjj";
rev = "f972b5357af0e5c9b840f8e82eceb313891ef8b2";
sha256 = "0ngvl4ikd45d1nhfpnpp003mfwx9mv5ywgk9mi5fjn2bc9a2y4l7";
};
meta.homepage = "https://github.com/mg979/vim-visual-multi/";
};
@ -6592,12 +6592,12 @@ let
vim-which-key = buildVimPluginFrom2Nix {
pname = "vim-which-key";
version = "2020-05-25";
version = "2020-06-10";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-which-key";
rev = "786dceaab0987e164dcee125b8ff6111851df625";
sha256 = "01afdf37fqz6i9g9371yh0ymv9lsw81z52vcpnwyysbj8n7qswwc";
rev = "dffbb044f7974bf4615960689a3ff64e63daeab3";
sha256 = "0ggnz2bz6mh9i38cgpkf87j27bhr8klk9a4ws57rkwfz3qppd4lj";
};
meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
};
@ -6784,12 +6784,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2020-06-02";
version = "2020-06-09";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "7ef9c50aaf110debb54a8b1f4bafcb34ec86a623";
sha256 = "1i9phcxb29x14n202971vflqlwd9y2wa74v8aic4xhvqb5rli8as";
rev = "49bc335fffa40a7b7b84b6110b57ebcbaaf019ea";
sha256 = "06zdj0pgr6d8vddx87rk36lb00nngydl367g06zi8jkx4673rzz8";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@ -6832,12 +6832,12 @@ let
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
version = "2020-05-23";
version = "2020-06-06";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
rev = "dab956b05534359fd4e498b45e518f63f097ae9c";
sha256 = "1wf7plybcrrdx459f0g2rzzl9drik7w264y0i1jxf43y7nlm138n";
rev = "bfd70f620d30dc756d8ae57056b7a67a3fbbff22";
sha256 = "1a60qbswwdl58pqg6d9llj4l96h9vz7vp99s7ji0zjg8vzzklyxm";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};
@ -6965,12 +6965,12 @@ let
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
version = "2020-05-25";
version = "2020-06-12";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
rev = "27362f850ceca80e5369f46512fdd3ba042de4d7";
sha256 = "1gm8z7rshn2ffc3hdwif2910ckbz01x6aysp0yk8nfmqb7iacnjc";
rev = "8bc02ee4877bfe07ed92cc4d471c353f1ab84ef6";
sha256 = "1m1qhyqax7pdrsw9zdwy64d8rg5hcvmbyl8fqmbhz22lxdg5bvzv";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "yabai";
version = "3.1.2";
version = "3.2.0";
src = fetchFromGitHub {
owner = "koekeishiya";
repo = pname;
rev = "v${version}";
sha256 = "01vkx8nqds4f7nnzml4qf976xm89w6psxbpswkn98r5k03zfa8r0";
sha256 = "1iq5p4k6klffglxfhmzc2jvlilwn0w97vb5v4b91spiyp39nqcfw";
};
buildInputs = [ Carbon Cocoa ScriptingBridge ];

View file

@ -4,13 +4,13 @@
buildGoModule rec {
pname = "fscrypt";
version = "0.2.8";
version = "0.2.9";
src = fetchFromGitHub {
owner = "google";
repo = "fscrypt";
rev = "v${version}";
sha256 = "0433f9kx43842ic8dydxhz8plyyrrxvqqwg7kd5ghn599ix28avy";
sha256 = "020hhdarbn3bwlc2j2g89868v8nfx8562z1a778ihpvvsa4ykr31";
};
postPatch = ''

View file

@ -11,7 +11,7 @@ in {
};
fuse_3 = mkFuse {
version = "3.9.1";
sha256Hash = "1i3f4h3vnjxls8hdi6w2n2ksrgbs7brbzj65rvxginyxicykh857";
version = "3.9.2";
sha256Hash = "10xsbly7rv895c9zv4fqmnrxbdc0kd1qhlk75x4m9cv95f93k843";
};
}

View file

@ -1,22 +1,22 @@
{
"4.14": {
"name": "linux-hardened-4.14.183.a.patch",
"sha256": "0k9dg37q3hcm13iyw662indwy23aylc03ldqfn7613c7ymqmbzj7",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.183.a/linux-hardened-4.14.183.a.patch"
"name": "linux-hardened-4.14.184.a.patch",
"sha256": "1g12kz6ikdwp6b7000pfy3myga90mvxyl04b9267fk88jwih6yhk",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.184.a/linux-hardened-4.14.184.a.patch"
},
"4.19": {
"name": "linux-hardened-4.19.127.a.patch",
"sha256": "00nfcs5yn2a70an3ygzzv4s3qa3hf7pni4ad70aw87vyvrqlyx3k",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.127.a/linux-hardened-4.19.127.a.patch"
"name": "linux-hardened-4.19.128.a.patch",
"sha256": "19ayzx9rf4j31ypavxwamd290lm95wmi7v165avxslahnx6pdsxs",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.128.a/linux-hardened-4.19.128.a.patch"
},
"5.4": {
"name": "linux-hardened-5.4.45.a.patch",
"sha256": "0gihrcxqg3hax20xhvna4lmgsivari6wwsyqz09w34v8p1fhd5nx",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.45.a/linux-hardened-5.4.45.a.patch"
"name": "linux-hardened-5.4.46.a.patch",
"sha256": "0f2d53na7g6dhiba2ym09lm4fp3hwm6kw6mpm5jk46jmb6j7iwk5",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.46.a/linux-hardened-5.4.46.a.patch"
},
"5.6": {
"name": "linux-hardened-5.6.17.a.patch",
"sha256": "0nci30k7xh56b6454cd0hkpvpkfqb98cqdpvjaamlnmiphz4sk1f",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.17.a/linux-hardened-5.6.17.a.patch"
"name": "linux-hardened-5.6.18.a.patch",
"sha256": "0idvgjg7kji4w3341acfqywi0qqn3pvxcmiz70cd7inhlqaqrw63",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.18.a/linux-hardened-5.6.18.a.patch"
}
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "1.8.1";
version = "1.8.2";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "1b8y0wq3myhvjdnwl0i4x85iil7i7kmsjajvbw1a47afm83jkbaw";
sha256 = "0s2a0q3lgrdz7w69sacn23k4dybw6wrk63xxnylj88wss7mqnpj8";
};
vendorSha256 = "1za47n08iamhfl4ky928rixgadflmz86vnmnwbczd167bdndh5rq";
vendorSha256 = "0hpjvpai2i9jn8hlxhx4pvvawjh6lfmlz7ffi320pp7vanzqhch1";
buildFlagsArray = [
"-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs"

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man
{ lib, stdenv, fetchurl, fetchpatch, runCommand, makeWrapper, python3Packages, docutils, help2man
, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg_4, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R
@ -16,11 +16,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "146";
version = "147";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "1iy4f05ws7qsd5p7hadc1979l77543pwi2c5zx1yr5zc674kwb3y";
sha256 = "1pichn3l10401cqk08zrys2ya9b6cjznk7ra28awnmvlg6l1cypj";
};
outputs = [ "out" "man" ];
@ -28,6 +28,12 @@ python3Packages.buildPythonApplication rec {
patches = [
./ignore_links.patch
./skip-failing-test.patch
# Fix for CBFS comparator
(fetchpatch {
url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/39ec527371c469d61e4afc04b3ee6ae3563f7b4c.patch";
sha256 = "1mzdcbxg3ad5ynpf79phvif5hzckmhf7vzd82l1sffhlqxh0v4h3";
})
];
postPatch = ''
@ -82,7 +88,7 @@ python3Packages.buildPythonApplication rec {
'';
homepage = "https://diffoscope.org/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dezgeg ma27 ];
maintainers = with maintainers; [ dezgeg ma27 danielfullmer ];
platforms = platforms.unix;
};
}

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "hexyl";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
sha256 = "0blq81zpmzldngk9ymcg56syspjp1g1ziap4z69idv05mfkf6sp3";
sha256 = "0aj2sysl0spf5zlcd5kfzlw97w7dzf9x93pv0d1v9blnbd1rz7lm";
};
cargoSha256 = "09kccd1brcbvzimm05dyybwrkganqxdkjrvzgcf1l93xs1z2h94b";
cargoSha256 = "1am9vs7l2wzgwqakrsl27x1y7jpn9xaqa4kr48wwqzka401h6j4m";
meta = with stdenv.lib; {
changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}";

View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "lazydocker";
version = "0.8";
version = "0.9";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = "lazydocker";
rev = "v${version}";
sha256 = "02x03nmkbj0133bziaqmqlh3x515w3n01iqvg7q6b55r7nan7hv7";
sha256 = "08j2qp632fdmswnb92wxa9lhnal4mrmq6gmxaxngnxiqgkfx37zy";
};
goPackagePath = "github.com/jesseduffield/lazydocker";

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "pistol";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "doronbehar";
repo = pname;
rev = "v${version}";
sha256 = "1d9c1bhidh781dis4427wramfrla4avqw9y2bmpjp81cqq3nc27d";
sha256 = "1ar8c7s8ihcwrwfspmqw7cb5560wkbdc5qyvddkx8lj03cjhcslj";
};
vendorSha256 = "1f780vhxw0brvnr8hhah4sf6ms8spar29rqmy1kcqf9m75n94g56";
vendorSha256 = "1mhxb72fzpa2n88i9h154aci346dgcs2njznkjxchivz28crbqr8";
subPackages = [ "cmd/pistol" ];

View file

@ -1,19 +1,21 @@
{ stdenv, fetchFromGitHub, cmake, perl, openssl, curl, libusb1
{ stdenv, fetchFromGitHub
, cmake, perl, pkgconfig
, openssl, curl, libusb1, protobufc
, enableUnsafe ? false }:
stdenv.mkDerivation {
pname = "ttwatch";
version = "2018-12-04";
version = "2020-02-05";
src = fetchFromGitHub {
owner = "ryanbinns";
repo = "ttwatch";
rev = "eeb4e19bf7ca7ca2cee7f5fbeb483b27198d86a1";
sha256 = "18384apdkq35120cgmda686d293354aibwcq2hwhvvjmnq49fnzr";
rev = "bfdf1372515574e1fb3871dc1039f8d8a5dbdada";
sha256 = "07nd4dbkchxy8js1h1f6pzn63pls2afww97wyiiw6zid43mpqyg4";
};
nativeBuildInputs = [ cmake perl ];
buildInputs = [ openssl curl libusb1 ];
nativeBuildInputs = [ cmake perl pkgconfig ];
buildInputs = [ openssl curl libusb1 protobufc ];
cmakeFlags = stdenv.lib.optional enableUnsafe [ "-Dunsafe=on" ];

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "amass";
version = "3.6.2";
version = "3.7.2";
src = fetchFromGitHub {
owner = "OWASP";
repo = "Amass";
rev = "v${version}";
sha256 = "1ih681790sp0lqfbsl153dpr5vzxp1jjza28pajrqjzs7zyjmkgs";
sha256 = "1acjqpa9xg9ji2mzxag57yq589cdq3rh78a8vz8wnkkkp7b8why8";
};
vendorSha256 = "1f8za3z5pv1pznbd91fk5j4y8qg93qk5zvnchjl7inyirciawdf6";
vendorSha256 = "1s8g0qqg3m6hdvc5v3s86l3ba5grmyhx0lf2ymi39k5dpcg8l19s";
outputs = [ "out" "wordlists" ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cassowary";
version = "0.7.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "rogerwelin";
repo = pname;
rev = "v${version}";
sha256 = "0p5vcs25h5nj36dm9yjmdjymcq0zldm3zlqfppxcjx862h48k8zj";
sha256 = "161wzcdq7kpny6fzxsqk2ivnah0xwmh2knv37jn0x18lclga1k9s";
};
vendorSha256 = "1m5jaqf5jrib415k0i7w6rf5bjjwfn572wk94jwfpwjcbbvh8fck";
vendorSha256 = "1qgilmkai9isbbg4pzqic6i8v5z8cay0ilw1gb69z4a6f2q4zhkp";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "findomain";
version = "1.5.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "Edu4rdSHL";
repo = pname;
rev = version;
sha256 = "1w3parmk3836v5ghn3cgcxyk0alk05r5ljl3j1fpnly5xvl131rd";
sha256 = "1q8yxl4y8f787a0q87gxgj1p9lgzhhfk3fgysq9xj8yfvwm8abji";
};
cargoSha256 = "1cs076cgkzjan6y78a3bhriv2q2s83hp5vzhkjwz4dqn83r6b8hx";
cargoSha256 = "02d538j13v3f1dc99vpzhby42ps7lig000idwdsxa1mwkjxrf2z2";
nativeBuildInputs = [ installShellFiles perl ];
buildInputs = lib.optional stdenv.isDarwin Security;

View file

@ -6,13 +6,13 @@
# No gems used, so mkDerivation is fine.
stdenv.mkDerivation rec {
pname = "nix-universal-prefetch";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "samueldr";
repo = "nix-universal-prefetch";
rev = "v${version}";
sha256 = "1id9iaibrm2d3fa9dkcxnb3sd0j1vh502181gdd199a1cfsmzh1i";
sha256 = "1nmxp6846ip2x3mibys3ymgi0813g18p9szqnsciiib3dbis4kwf";
};
installPhase = ''

View file

@ -1,10 +1,10 @@
GEM
remote: https://rubygems.org/
specs:
bundler-audit (0.6.1)
bundler-audit (0.7.0.1)
bundler (>= 1.2.0, < 3)
thor (~> 0.18)
thor (0.20.3)
thor (>= 0.18, < 2)
thor (1.0.1)
PLATFORMS
ruby

View file

@ -21,6 +21,7 @@ bundlerEnv rec {
- Does not require a network connection.
'';
homepage = "https://github.com/rubysec/bundler-audit";
changelog = "https://github.com/rubysec/bundler-audit/blob/v${version}/ChangeLog.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ primeos nicknovitski ];
platforms = platforms.unix;

View file

@ -1,19 +1,23 @@
{
bundler-audit = {
dependencies = ["thor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pm22xpn3xyymsainixnrk8v3l3xi9bzwkjkspx00cfzp84xvxbq";
sha256 = "04l9rs56rlvihbr2ybkrigjajgd3swa98lxvmdl8iylj1g5m7n0j";
type = "gem";
};
version = "0.6.1";
version = "0.7.0.1";
};
thor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
type = "gem";
};
version = "0.20.3";
version = "1.0.1";
};
}

View file

@ -6,7 +6,7 @@
buildGoPackage rec {
pname = "keybase";
version = "5.4.2";
version = "5.5.1";
goPackagePath = "github.com/keybase/client";
subPackages = [ "go/kbnm" "go/keybase" ];
@ -17,7 +17,7 @@ buildGoPackage rec {
owner = "keybase";
repo = "client";
rev = "v${version}";
sha256 = "08lw5aw962f75xi42bwbgba94hiql2n2jnsxrkx84czi0ijs1wlr";
sha256 = "03y69zmzbnfay173xkbzvnhh8zjjd2rfnqmpgr0wvh1psn7mgpsh";
};
patches = [

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "saml2aws";
version = "2.25.0";
version = "2.26.1";
src = fetchFromGitHub {
owner = "Versent";
repo = "saml2aws";
rev = "v${version}";
sha256 = "12aidylamrq4rvy2cfdz669lr1p20yqrshigcc5x1hrlhh9y64xc";
sha256 = "09b217x10mn3y244rwym0fcqr4ly6n83wnykb77488kn960b0pqb";
};
hid = fetchFromGitHub {

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gotop";
version = "3.5.3";
version = "4.0.1";
src = fetchFromGitHub {
owner = "xxxserxxx";
repo = pname;
rev = "v${version}";
sha256 = "0m1a5bdqjgsm9fy3d2c6r4nil013cizqyqf19k6r4p9bq8rajnzp";
sha256 = "10qfzmq1wdgpvv319khzicalix1x4fqava0wry3bzz84k5c9dabs";
};
vendorSha256 = "1pxp0a1hldkdmh174adhq8q0wyz005g7wm8yxknchvp7krxi9r0v";
vendorSha256 = "1crphp41bfivfmfp3cl7pjca3ypds6mr3847msd4wvfq4g6imk55";
meta = with stdenv.lib; {
description = "A terminal based graphical activity monitor inspired by gtop and vtop";

View file

@ -22,13 +22,13 @@ let
++ recommendedDisplayInformationPrograms;
in stdenv.mkDerivation rec {
pname = "inxi";
version = "3.1.01-1";
version = "3.1.03-1";
src = fetchFromGitHub {
owner = "smxi";
repo = "inxi";
rev = version;
sha256 = "0r204w0r06ibdr4dck7yw2nmvj7xq68bjr7xwwiy7liqdml0n0yc";
sha256 = "0539hvlq021wxhbwzdp7qliiq1jgw60mxlwrwx0z2x8qi1zqdzg6";
};
buildInputs = [ perl makeWrapper ];

View file

@ -5,13 +5,13 @@ with stdenv.lib;
let
self = stdenv.mkDerivation rec {
pname = "highlight";
version = "3.56";
version = "3.57";
src = fetchFromGitLab {
owner = "saalen";
repo = "highlight";
rev = "v${version}";
sha256 = "1pilx58dg96zm0yx7i6k92vibwpvpj8ir39f2akrsyjgijnv3sx4";
sha256 = "1xrk7c7akjiwh3wh9bll0qh4g0kqvbzjz9ancpadnk0k7bqi0kxf";
};
enableParallelBuilding = true;

Some files were not shown because too many files have changed in this diff Show more