git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit59dda0a42aa88005dab38cbdf1c39267431756a5 authorFrederik Rietdijk <fridh@fridh.nl> dateMon 15 Jun 2020, 08:07 (6 years ago) parent6857bcc9d0c3ff
106 files changed+1072−728
nixos/doc/manual/installation/installing-from-other-distro.xml+1−1 nixos/doc/manual/release-notes/rl-2009.xml+8 nixos/lib/make-iso9660-image.sh+1−1 nixos/modules/installer/cd-dvd/sd-image.nix+1−1 nixos/modules/misc/ids.nix−2 nixos/modules/module-list.nix−1 nixos/modules/services/networking/corerad.nix+42−3 nixos/modules/services/networking/dnschain.nix−184 nixos/modules/services/networking/namecoind.nix−5 nixos/modules/system/boot/networkd.nix+9−1 nixos/modules/system/boot/resolved.nix+1 nixos/modules/system/boot/timesyncd.nix+1 nixos/tests/corerad.nix+27−8 pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch−21 pkgs/applications/audio/clementine/default.nix+17−24 pkgs/applications/audio/dragonfly-reverb/default.nix+2−2 pkgs/applications/audio/sonic-pi/default.nix+24−19 pkgs/applications/editors/notepadqq/default.nix+1−1 pkgs/applications/editors/vscode/vscode.nix+3−3 pkgs/applications/editors/vscode/vscodium.nix+3−3 pkgs/applications/graphics/drawio/default.nix+2−2 pkgs/applications/misc/alacritty/default.nix+2 pkgs/applications/misc/cointop/default.nix+2−2 pkgs/applications/misc/cpu-x/default.nix+2−2 pkgs/applications/misc/lyx/default.nix+2−2 pkgs/applications/misc/remarkable/remarkable-mouse/default.nix+20 pkgs/applications/networking/browsers/chromium/plugins.nix+2−2 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix+5−5 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix+3−3 pkgs/applications/networking/cluster/argo/default.nix+13−4 pkgs/applications/networking/cluster/helmsman/default.nix+2−2 pkgs/applications/networking/cluster/luigi/default.nix+4−3 pkgs/applications/networking/instant-messengers/bluejeans/default.nix+5−2 pkgs/applications/networking/instant-messengers/discord/base.nix+1 pkgs/applications/networking/mailreaders/thunderbird/default.nix+4−3 pkgs/applications/science/logic/lean/default.nix+2−2 pkgs/applications/window-managers/sway/contrib.nix+107 pkgs/data/fonts/fira-code/default.nix+2−3 pkgs/development/compilers/binaryen/default.nix+2−2 pkgs/development/coq-modules/flocq/default.nix+5−5 pkgs/development/interpreters/php/default.nix+12−4 pkgs/development/libraries/intel-media-driver/default.nix+12−6 pkgs/development/libraries/liblastfm/default.nix+11−4 pkgs/development/libraries/physics/geant4/default.nix+24−1 pkgs/development/libraries/physics/geant4/g4py/default.nix−65 pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh−1 pkgs/development/libraries/uriparser/default.nix+2−10 pkgs/development/node-packages/default.nix−8 pkgs/development/node-packages/node-packages.json−1 pkgs/development/ocaml-modules/dns/client.nix+7−3 pkgs/development/ocaml-modules/dns/default.nix+4−4 pkgs/development/ocaml-modules/ocsigen-start/default.nix+2−2 pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix+2−2 pkgs/development/ocaml-modules/tls/default.nix+2−2 pkgs/development/python-modules/dot2tex/default.nix+21−3 pkgs/development/python-modules/dot2tex/path.patch+104 pkgs/development/python-modules/dot2tex/test.patch+12 pkgs/development/python-modules/fake-useragent/default.nix+22 pkgs/development/python-modules/libevdev/default.nix+21 pkgs/development/python-modules/pynput/default.nix+25 pkgs/development/python-modules/scrapy-deltafetch/default.nix+22 pkgs/development/python-modules/scrapy-fake-useragent/default.nix+21 pkgs/development/python-modules/scrapy-splash/default.nix+20 pkgs/development/python-modules/screeninfo/default.nix+35 pkgs/development/python-modules/setuptools-lint/default.nix+21 pkgs/development/python-modules/somajo/default.nix+2−2 pkgs/development/tools/analysis/flow/default.nix+2−2 pkgs/development/tools/cloudfoundry-cli/default.nix+2−2 pkgs/development/tools/continuous-integration/buildkite-cli/default.nix+26 pkgs/development/tools/continuous-integration/fly/default.nix+3−3 pkgs/development/tools/dapper/default.nix+2−2 pkgs/development/tools/doctl/default.nix+2−2 pkgs/development/tools/lazygit/default.nix+2−2 pkgs/development/tools/misc/circleci-cli/default.nix+2−2 pkgs/development/tools/misc/pkgconf/default.nix+2−2 pkgs/development/tools/ocaml/merlin/default.nix+2−2 pkgs/development/web/cypress/default.nix+2−2 pkgs/misc/vim-plugins/generated.nix+165−165 pkgs/os-specific/darwin/yabai/default.nix+2−2 pkgs/os-specific/linux/fscrypt/default.nix+2−2 pkgs/os-specific/linux/fuse/default.nix+2−2 pkgs/os-specific/linux/kernel/hardened/patches.json+12−12 pkgs/tools/misc/chezmoi/default.nix+3−3 pkgs/tools/misc/diffoscope/default.nix+10−4 pkgs/tools/misc/hexyl/default.nix+3−3 pkgs/tools/misc/lazydocker/default.nix+2−2 pkgs/tools/misc/pistol/default.nix+3−3 pkgs/tools/misc/ttwatch/default.nix+8−6 pkgs/tools/networking/amass/default.nix+3−3 pkgs/tools/networking/cassowary/default.nix+3−3 pkgs/tools/networking/findomain/default.nix+3−3 pkgs/tools/package-management/nix-universal-prefetch/default.nix+2−2 pkgs/tools/security/bundler-audit/Gemfile.lock+3−3 pkgs/tools/security/bundler-audit/default.nix+1 pkgs/tools/security/bundler-audit/gemset.nix+8−4 pkgs/tools/security/keybase/default.nix+2−2 pkgs/tools/security/saml2aws/default.nix+2−2 pkgs/tools/system/gotop/default.nix+3−3 pkgs/tools/system/inxi/default.nix+2−2 pkgs/tools/text/highlight/default.nix+2−2 pkgs/tools/typesetting/scdoc/default.nix+3−2 pkgs/tools/video/rav1e/default.nix+9−23 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+9−5 pkgs/top-level/python-packages.nix+24−1 pkgs/top-level/release-lib.nix+1−1
nixos/doc/manual/installation/installing-from-other-distro.xml+1−1
@@ -89,7 +89,7 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
8989 NixOS partition. They are installed by default on NixOS, but you don't have
9090 NixOS yet..
9191 </para>
92−<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>
92+<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>
9393 </listitem>
9494 <listitem>
9595 <note>
nixos/doc/manual/release-notes/rl-2009.xml+8
@@ -466,6 +466,14 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
466466 initrd file has not been deleted.
467467 </para>
468468 </listitem>
469+ <listitem>
470+ <para>
471+ The <link xlink:href="https://github.com/okTurtles/dnschain">DNSChain</link>
472+ package and NixOS module have been removed from Nixpkgs as the software is
473+ unmaintained and can't be built. For more information see issue
474+ <link xlink:href="https://github.com/NixOS/nixpkgs/issues/89205">#89205</link>.
475+ </para>
476+ </listitem>
469477 </itemizedlist>
470478 </section>
471479
nixos/lib/make-iso9660-image.sh+1−1
@@ -129,7 +129,7 @@ fi
129129
130130if test -n "$compressImage"; then
131131 echo "Compressing image..."
132− zstd -T$NIX_BUILD_CORES $out/iso/$isoName
132+ zstd -T$NIX_BUILD_CORES --rm $out/iso/$isoName
133133fi
134134
135135mkdir -p $out/nix-support
nixos/modules/installer/cd-dvd/sd-image.nix+1−1
@@ -190,7 +190,7 @@ in
190190 fsck.vfat -vn firmware_part.img
191191 dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS
192192 if test -n "$compressImage"; then
193− zstd -T$NIX_BUILD_CORES $img
193+ zstd -T$NIX_BUILD_CORES --rm $img
194194 fi
195195 '';
196196 }) {};
nixos/modules/misc/ids.nix−2
@@ -239,7 +239,6 @@ in
239239 shout = 206;
240240 gateone = 207;
241241 namecoin = 208;
242− dnschain = 209;
243242 #lxd = 210; # unused
244243 kibana = 211;
245244 xtreemfs = 212;
@@ -549,7 +548,6 @@ in
549548 #shout = 206; #unused
550549 gateone = 207;
551550 namecoin = 208;
552− #dnschain = 209; #unused
553551 lxd = 210; # unused
554552 #kibana = 211;
555553 xtreemfs = 212;
nixos/modules/module-list.nix−1
@@ -602,7 +602,6 @@
602602 ./services/networking/dhcpcd.nix
603603 ./services/networking/dhcpd.nix
604604 ./services/networking/dnscache.nix
605− ./services/networking/dnschain.nix
606605 ./services/networking/dnscrypt-proxy2.nix
607606 ./services/networking/dnscrypt-wrapper.nix
608607 ./services/networking/dnsdist.nix
nixos/modules/services/networking/corerad.nix+42−3
@@ -4,14 +4,50 @@ with lib;
44
55let
66 cfg = config.services.corerad;
7+
8+ writeTOML = name: x:
9+ pkgs.runCommandNoCCLocal name {
10+ passAsFile = ["config"];
11+ config = builtins.toJSON x;
12+ buildInputs = [ pkgs.go-toml ];
13+ } "jsontoml < $configPath > $out";
14+
715in {
8− meta = {
9− maintainers = with maintainers; [ mdlayher ];
10− };
16+ meta.maintainers = with maintainers; [ mdlayher ];
1117
1218 options.services.corerad = {
1319 enable = mkEnableOption "CoreRAD IPv6 NDP RA daemon";
1420
21+ settings = mkOption {
22+ type = types.uniq types.attrs;
23+ example = literalExample ''
24+ {
25+ interfaces = [
26+ # eth0 is an upstream interface monitoring for IPv6 router advertisements.
27+ {
28+ name = "eth0";
29+ monitor = true;
30+ }
31+ # eth1 is a downstream interface advertising IPv6 prefixes for SLAAC.
32+ {
33+ name = "eth1";
34+ advertise = true;
35+ prefix = [{ prefix = "::/64"; }];
36+ }
37+ ];
38+ # Optionally enable Prometheus metrics.
39+ debug = {
40+ address = "localhost:9430";
41+ prometheus = true;
42+ };
43+ }
44+ '';
45+ description = ''
46+ Configuration for CoreRAD, see <link xlink:href="https://github.com/mdlayher/corerad/blob/master/internal/config/default.toml"/>
47+ for supported values. Ignored if configFile is set.
48+ '';
49+ };
50+
1551 configFile = mkOption {
1652 type = types.path;
1753 example = literalExample "\"\${pkgs.corerad}/etc/corerad/corerad.toml\"";
@@ -27,6 +63,9 @@ in {
2763 };
2864
2965 config = mkIf cfg.enable {
66+ # Prefer the config file over settings if both are set.
67+ services.corerad.configFile = mkDefault (writeTOML "corerad.toml" cfg.settings);
68+
3069 systemd.services.corerad = {
3170 description = "CoreRAD IPv6 NDP RA daemon";
3271 after = [ "network.target" ];
nixos/modules/services/networking/dnschain.nixdeleted−184
@@ -1,184 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−
3−with lib;
4−
5−let
6− cfgs = config.services;
7− cfg = cfgs.dnschain;
8−
9− dataDir = "/var/lib/dnschain";
10− username = "dnschain";
11−
12− configFile = pkgs.writeText "dnschain.conf" ''
13− [log]
14− level = info
15−
16− [dns]
17− host = ${cfg.dns.address}
18− port = ${toString cfg.dns.port}
19− oldDNSMethod = NO_OLD_DNS
20− externalIP = ${cfg.dns.externalAddress}
21−
22− [http]
23− host = ${cfg.api.hostname}
24− port = ${toString cfg.api.port}
25− tlsPort = ${toString cfg.api.tlsPort}
26−
27− ${cfg.extraConfig}
28− '';
29−
30−in
31−
32−{
33−
34− ###### interface
35−
36− options = {
37−
38− services.dnschain = {
39−
40− enable = mkEnableOption ''
41− DNSChain, a blockchain based DNS + HTTP server.
42− To resolve .bit domains set <literal>services.namecoind.enable = true;</literal>
43− and an RPC username/password.
44− '';
45−
46− dns.address = mkOption {
47− type = types.str;
48− default = "127.0.0.1";
49− description = ''
50− The IP address the DNSChain resolver will bind to.
51− Leave this unchanged if you do not wish to directly expose the resolver.
52− '';
53− };
54−
55− dns.externalAddress = mkOption {
56− type = types.str;
57− default = cfg.dns.address;
58− description = ''
59− The IP address used by clients to reach the resolver and the value of
60− the <literal>namecoin.dns</literal> record. Set this in case the bind address
61− is not the actual IP address (e.g. the machine is behind a NAT).
62− '';
63− };
64−
65− dns.port = mkOption {
66− type = types.int;
67− default = 5333;
68− description = ''
69− The port the DNSChain resolver will bind to.
70− '';
71− };
72−
73− api.hostname = mkOption {
74− type = types.str;
75− default = "0.0.0.0";
76− description = ''
77− The hostname (or IP address) the DNSChain API server will bind to.
78− '';
79− };
80−
81− api.port = mkOption {
82− type = types.int;
83− default = 8080;
84− description = ''
85− The port the DNSChain API server (HTTP) will bind to.
86− '';
87− };
88−
89− api.tlsPort = mkOption {
90− type = types.int;
91− default = 4433;
92− description = ''
93− The port the DNSChain API server (HTTPS) will bind to.
94− '';
95− };
96−
97− extraConfig = mkOption {
98− type = types.lines;
99− default = "";
100− example = ''
101− [log]
102− level = debug
103− '';
104− description = ''
105− Additional options that will be appended to the configuration file.
106− '';
107− };
108−
109− };
110−
111− services.dnsmasq.resolveDNSChainQueries = mkOption {
112− type = types.bool;
113− default = false;
114− description = ''
115− Resolve <literal>.bit</literal> top-level domains using DNSChain and namecoin.
116− '';
117− };
118−
119− services.pdns-recursor.resolveDNSChainQueries = mkOption {
120− type = types.bool;
121− default = false;
122− description = ''
123− Resolve <literal>.bit</literal> top-level domains using DNSChain and namecoin.
124− '';
125− };
126−
127− };
128−
129−
130− ###### implementation
131−
132− config = mkIf cfg.enable {
133−
134− services.dnsmasq.servers = optionals cfgs.dnsmasq.resolveDNSChainQueries
135− [ "/.bit/127.0.0.1#${toString cfg.dns.port}"
136− "/.dns/127.0.0.1#${toString cfg.dns.port}"
137− ];
138−
139− services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveDNSChainQueries {
140− forwardZonesRecurse =
141− { bit = "127.0.0.1:${toString cfg.dns.port}";
142− dns = "127.0.0.1:${toString cfg.dns.port}";
143− };
144− luaConfig =''
145− addNTA("bit", "namecoin doesn't support DNSSEC")
146− addNTA("dns", "namecoin doesn't support DNSSEC")
147− '';
148− };
149−
150− users.users.${username} = {
151− description = "DNSChain daemon user";
152− home = dataDir;
153− createHome = true;
154− uid = config.ids.uids.dnschain;
155− extraGroups = optional cfgs.namecoind.enable "namecoin";
156− };
157−
158− systemd.services.dnschain = {
159− description = "DNSChain daemon";
160− after = optional cfgs.namecoind.enable "namecoind.target";
161− wantedBy = [ "multi-user.target" ];
162−
163− serviceConfig = {
164− User = "dnschain";
165− Restart = "on-failure";
166− ExecStart = "${pkgs.nodePackages.dnschain}/bin/dnschain";
167− };
168−
169− preStart = ''
170− # Link configuration file into dnschain home directory
171− configPath=${dataDir}/.dnschain/dnschain.conf
172− mkdir -p ${dataDir}/.dnschain
173− if [ "$(realpath $configPath)" != "${configFile}" ]; then
174− rm -f $configPath
175− ln -s ${configFile} $configPath
176− fi
177− '';
178− };
179−
180− };
181−
182− meta.maintainers = with lib.maintainers; [ rnhmjoj ];
183−
184−}
nixos/modules/services/networking/namecoind.nix−5
@@ -149,11 +149,6 @@ in
149149
150150 config = mkIf cfg.enable {
151151
152− services.dnschain.extraConfig = ''
153− [namecoin]
154− config = ${configFile}
155− '';
156−
157152 users.users.namecoin = {
158153 uid = config.ids.uids.namecoin;
159154 description = "Namecoin daemon user";
nixos/modules/system/boot/networkd.nix+9−1
@@ -1178,14 +1178,22 @@ in
11781178 users.users.systemd-network.group = "systemd-network";
11791179
11801180 systemd.additionalUpstreamSystemUnits = [
1181− "systemd-networkd.service" "systemd-networkd-wait-online.service"
1181+ "systemd-networkd-wait-online.service"
1182+ "systemd-networkd.service"
1183+ "systemd-networkd.socket"
11821184 ];
11831185
11841186 systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
11851187 // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;
11861188
1189+ # systemd-networkd is socket-activated by kernel netlink route change
1190+ # messages. It is important to have systemd buffer those on behalf of
1191+ # networkd.
1192+ systemd.sockets.systemd-networkd.wantedBy = [ "sockets.target" ];
1193+
11871194 systemd.services.systemd-networkd = {
11881195 wantedBy = [ "multi-user.target" ];
1196+ aliases = [ "dbus-org.freedesktop.network1.service" ];
11891197 restartTriggers = map (x: x.source) (attrValues unitFiles);
11901198 # prevent race condition with interface renaming (#39069)
11911199 requires = [ "systemd-udev-settle.service" ];
nixos/modules/system/boot/resolved.nix+1
@@ -148,6 +148,7 @@ in
148148
149149 systemd.services.systemd-resolved = {
150150 wantedBy = [ "multi-user.target" ];
151+ aliases = [ "dbus-org.freedesktop.resolve1.service" ];
151152 restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ];
152153 };
153154
nixos/modules/system/boot/timesyncd.nix+1
@@ -41,6 +41,7 @@ with lib;
4141
4242 systemd.services.systemd-timesyncd = {
4343 wantedBy = [ "sysinit.target" ];
44+ aliases = [ "dbus-org.freedesktop.timesync1.service" ];
4445 restartTriggers = [ config.environment.etc."systemd/timesyncd.conf".source ];
4546 };
4647
nixos/tests/corerad.nix+27−8
@@ -3,7 +3,7 @@ import ./make-test-python.nix (
33 nodes = {
44 router = {config, pkgs, ...}: {
55 config = {
6− # This machines simulates a router with IPv6 forwarding and a static IPv6 address.
6+ # This machine simulates a router with IPv6 forwarding and a static IPv6 address.
77 boot.kernel.sysctl = {
88 "net.ipv6.conf.all.forwarding" = true;
99 };
@@ -14,13 +14,25 @@ import ./make-test-python.nix (
1414 enable = true;
1515 # Serve router advertisements to the client machine with prefix information matching
1616 # any IPv6 /64 prefixes configured on this interface.
17− configFile = pkgs.writeText "corerad.toml" ''
18− [[interfaces]]
19− name = "eth1"
20− advertise = true
21− [[interfaces.prefix]]
22− prefix = "::/64"
23− '';
17+ #
18+ # This configuration is identical to the example in the CoreRAD NixOS module.
19+ settings = {
20+ interfaces = [
21+ {
22+ name = "eth0";
23+ monitor = true;
24+ }
25+ {
26+ name = "eth1";
27+ advertise = true;
28+ prefix = [{ prefix = "::/64"; }];
29+ }
30+ ];
31+ debug = {
32+ address = "localhost:9430";
33+ prometheus = true;
34+ };
35+ };
2436 };
2537 };
2638 };
@@ -66,5 +78,12 @@ import ./make-test-python.nix (
6678 assert (
6779 "/64 scope global temporary" in addrs
6880 ), "SLAAC temporary address was not configured on client after router advertisement"
81+
82+ with subtest("Verify HTTP debug server is configured"):
83+ out = router.succeed("curl localhost:9430/metrics")
84+
85+ assert (
86+ "corerad_build_info" in out
87+ ), "Build info metric was not found in Prometheus output"
6988 '';
7089 })
pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patchdeleted−21
@@ -1,21 +0,0 @@
1−diff --git a/CMakeLists.txt b/CMakeLists.txt
2−index 23070d9..83b6772 100644
3−--- a/CMakeLists.txt
4−+++ b/CMakeLists.txt
5−@@ -275,8 +275,6 @@ optional_component(LIBPULSE ON "Pulse audio integration"
6− optional_component(VISUALISATIONS ON "Visualisations")
7−
8− if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
9−- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
10−- "code must be compiled in")
11− elseif(CRYPTOPP_FOUND)
12− set(HAVE_CRYPTOPP ON)
13− set(HAVE_SPOTIFY_DOWNLOADER ON)
14−@@ -434,7 +432,6 @@ if(HAVE_BREAKPAD)
15− endif(HAVE_BREAKPAD)
16−
17− if(HAVE_SPOTIFY_BLOB)
18−- add_subdirectory(ext/clementine-spotifyblob)
19− endif(HAVE_SPOTIFY_BLOB)
20−
21− if(HAVE_MOODBAR)
pkgs/applications/audio/clementine/default.nix+17−24
@@ -1,4 +1,5 @@
1−{ stdenv, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
1+{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
2+, qtbase, qtx11extras
23, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
34, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
45, qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }:
@@ -9,30 +10,17 @@ let
910 withCD = config.clementine.cd or true;
1011 withCloud = config.clementine.cloud or true;
1112
12− version = "1.3.1";
13+ version = "1.4.0rc1";
1314
1415 src = fetchFromGitHub {
1516 owner = "clementine-player";
1617 repo = "Clementine";
1718 rev = version;
18− sha256 = "0i3jkfs8dbfkh47jq3cnx7pip47naqg7w66vmfszk4d8vj37j62j";
19+ sha256 = "1rqk0hrsn8f8bjk0j0vq1af0ygy6xx7qi9fw0jjw2cmj6kzckyi2";
1920 };
2021
2122 patches = [
2223 ./clementine-spotify-blob.patch
23− # Required so as to avoid adding libspotify as a build dependency (as it is
24− # unfree and thus would prevent us from having a free package).
25− ./clementine-spotify-blob-remove-from-build.patch
26− (fetchpatch {
27− # Fix w/gcc7
28− url = "https://github.com/clementine-player/Clementine/pull/5630.patch";
29− sha256 = "0px7xp1m4nvrncx8sga1qlxppk562wrk2qqk19iiry84nxg20mk4";
30− })
31− (fetchpatch {
32− # Fixes compilation with chromaprint >= 1.4
33− url = "https://github.com/clementine-player/Clementine/commit/d3ea0c8482dfd3f6264a30cfceb456076d76e6cd.patch";
34− sha256 = "1ifrs5aqdzw16jbnf0z1ilir20chdnr9k5n21r99miq9hzjpbh12";
35− })
3624 ];
3725
3826 nativeBuildInputs = [ cmake pkgconfig ];
@@ -54,6 +42,8 @@ let
5442 protobuf
5543 qca2
5644 qjson
45+ qtbase
46+ qtx11extras
5747 sqlite
5848 taglib
5949 ]
@@ -71,7 +61,7 @@ let
7161 -e 's,libprotobuf.a,protobuf,g'
7262 '';
7363
74− free = stdenv.mkDerivation {
64+ free = mkDerivation {
7565 pname = "clementine-free";
7666 inherit version;
7767 inherit src patches nativeBuildInputs postPatch;
@@ -79,7 +69,14 @@ let
7969 # gst_plugins needed for setup-hooks
8070 buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins;
8171
82− cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];
72+ preConfigure = ''
73+ rm -rf ext/{,lib}clementine-spotifyblob
74+ '';
75+
76+ cmakeFlags = [
77+ "-DUSE_SYSTEM_PROJECTM=ON"
78+ "-DSPOTIFY_BLOB=OFF"
79+ ];
8380
8481 enableParallelBuilding = true;
8582
@@ -100,15 +97,11 @@ let
10097 };
10198
10299 # Unfree Spotify blob for Clementine
103− unfree = stdenv.mkDerivation {
100+ unfree = mkDerivation {
104101 pname = "clementine-blob";
105102 inherit version;
106103 # Use the same patches and sources as Clementine
107− inherit src nativeBuildInputs postPatch;
108−
109− patches = [
110− ./clementine-spotify-blob.patch
111− ];
104+ inherit src nativeBuildInputs patches postPatch;
112105
113106 buildInputs = buildInputs ++ [ libspotify makeWrapper ];
114107 # Only build and install the Spotify blob
pkgs/applications/audio/dragonfly-reverb/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "dragonfly-reverb";
5− version = "3.0.0";
5+ version = "3.1.1";
66
77 src = fetchFromGitHub {
88 owner = "michaelwillis";
99 repo = "dragonfly-reverb";
1010 rev = version;
11− sha256 = "1z2x33lzpd26dv1p29ca7vy8mjfzkfpin35iq46spwd9k3sqn1ja";
11+ sha256 = "188cm45hr0i33m4h2irql1wrsmsfis65s706wjiid0z59q47rf9p";
1212 fetchSubmodules = true;
1313 };
1414
pkgs/applications/audio/sonic-pi/default.nix+24−19
@@ -4,7 +4,6 @@
44, fetchFromGitHub
55, fftwSinglePrec
66, ruby
7−, libffi
87, aubio
98, cmake
109, pkgconfig
@@ -12,7 +11,6 @@
1211, bash
1312, jack2Full
1413, supercollider
15−, qscintilla
1614, qwt
1715, osmid
1816}:
@@ -24,14 +22,14 @@ let
2422in
2523
2624mkDerivation rec {
27− version = "3.1.0";
25+ version = "3.2.2";
2826 pname = "sonic-pi";
2927
3028 src = fetchFromGitHub {
3129 owner = "samaaron";
3230 repo = "sonic-pi";
3331 rev = "v${version}";
34− sha256 = "0gi4a73szaa8iz5q1gxgpsnyvhhghcfqm6bfwwxbix4m5csbfgh9";
32+ sha256 = "1nlkpkpg9iz2hvf5pymvk6lqhpdpjbdrvr0hrnkc3ymj7llvf1cm";
3533 };
3634
3735 buildInputs = [
@@ -39,10 +37,8 @@ mkDerivation rec {
3937 cmake
4038 pkgconfig
4139 qtbase
42− qscintilla
4340 qwt
4441 ruby
45− libffi
4642 aubio
4743 supercollider_single_prec
4844 boost
@@ -71,23 +67,34 @@ mkDerivation rec {
7167 popd
7268
7369 pushd app/gui/qt
74− cp -f ruby_help.tmpl ruby_help.h
75− ../../server/ruby/bin/qt-doc.rb -o ruby_help.h
70+ cp -f utils/ruby_help.tmpl utils/ruby_help.h
71+ ../../server/ruby/bin/qt-doc.rb -o utils/ruby_help.h
7672
77− substituteInPlace SonicPi.pro \
78− --replace "LIBS += -lrt -lqt5scintilla2" \
79− "LIBS += -lrt -lqscintilla2 -lqwt"
73+ lrelease lang/*.ts
8074
81− lrelease SonicPi.pro
82− qmake SonicPi.pro
83−
84− make
75+ mkdir build
76+ pushd build
77+ cmake -G "Unix Makefiles" ..
78+ make
79+ popd
8580 popd
8681 '';
8782
8883 installPhase = ''
8984 runHook preInstall
90− cp -r . $out
85+
86+ mkdir $out
87+ cp -r {bin,etc} $out/
88+
89+ # Copy server whole.
90+ mkdir -p $out/app
91+ cp -r app/server $out/app/
92+
93+ # Copy only necessary files for the gui app.
94+ mkdir -p $out/app/gui/qt/build
95+ cp -r app/gui/qt/{book,fonts,help,html,images,image_source,info,lang,theme} $out/app/gui/qt/
96+ cp app/gui/qt/build/sonic-pi $out/app/gui/qt/build/sonic-pi
97+
9198 runHook postInstall
9299 '';
93100
@@ -103,9 +110,7 @@ mkDerivation rec {
103110 homepage = "https://sonic-pi.net/";
104111 description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
105112 license = lib.licenses.mit;
106− maintainers = with lib.maintainers; [ Phlogistique kamilchm ];
113+ maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict ];
107114 platforms = lib.platforms.linux;
108− # sonic-pi depends on ruby 2.4 which we don't support anymore
109− broken = true;
110115 };
111116}
pkgs/applications/editors/notepadqq/default.nix+1−1
@@ -3,12 +3,12 @@
33mkDerivation rec {
44 pname = "notepadqq";
55 version = "1.4.8";
6+
67 src = fetchFromGitHub {
78 owner = "notepadqq";
89 repo = "notepadqq";
910 rev = "v${version}";
1011 sha256 = "0lbv4s7ng31dkznzbkmp2cvkqglmfj6lv4mbg3r410fif2nrva7k";
11− fetchSubmodules = true;
1212 };
1313
1414 nativeBuildInputs = [
pkgs/applications/editors/vscode/vscode.nix+3−3
@@ -11,8 +11,8 @@ let
1111 archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
1212
1313 sha256 = {
14− x86_64-linux = "0zdg6z6h0h8vvwdrnihwd76bik41spv6xbw7cdh7hz97sjsh15zq";
15− x86_64-darwin = "1c5c24vj8nqsxx8hwfj04as7vsl9gnl97yniw36pdfgv88v8qzin";
14+ x86_64-linux = "0hmmqdamsjhjy1q8m85bs081cwmskpsp57rkj7vc2wj918wgissm";
15+ x86_64-darwin = "00xwvi53h9rnwyba12jmsp6grkymmn6vjibypaxb96q7q7p894gh";
1616 }.${system};
1717in
1818 callPackage ./generic.nix rec {
@@ -21,7 +21,7 @@ in
2121
2222 # Please backport all compatible updates to the stable release.
2323 # This is important for the extension ecosystem.
24− version = "1.45.1";
24+ version = "1.46.0";
2525 pname = "vscode";
2626
2727 executableName = "code" + lib.optionalString isInsiders "-insiders";
pkgs/applications/editors/vscode/vscodium.nix+3−3
@@ -11,8 +11,8 @@ let
1111 archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
1212
1313 sha256 = {
14− x86_64-linux = "1m965d8ggg2ffbhyrgadfrgikcavyjszc3sgbsd930b8pxrmqlxp";
15− x86_64-darwin = "017fj7imjxa0n3r7c9kcz7192rxkw18bry6rfkv2hycfja70j5qj";
14+ x86_64-linux = "088nsflscak315704vqnh8m4q7601fczglbhdz5i70kfyg89ar4w";
15+ x86_64-darwin = "0fxpx1ydsag4gyn2kq5ddq55lpw15w176p3fypk80fyfix4kziqf";
1616 }.${system};
1717
1818 sourceRoot = {
@@ -27,7 +27,7 @@ in
2727
2828 # Please backport all compatible updates to the stable release.
2929 # This is important for the extension ecosystem.
30− version = "1.45.1";
30+ version = "1.46.0";
3131 pname = "vscodium";
3232
3333 executableName = "codium";
pkgs/applications/graphics/drawio/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212stdenv.mkDerivation rec {
1313 pname = "drawio";
14− version = "13.0.3";
14+ version = "13.2.2";
1515
1616 src = fetchurl {
1717 url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
18− sha256 = "104pfwipm8ch9xqlsz1gh18icr1p6i3n4c77bbdjakxcy4s5n7sg";
18+ sha256 = "0npqw4ih047d9s1yyllcvcih2r61fgji4rvzsw88r02mj5q5rgdn";
1919 };
2020
2121 nativeBuildInputs = [
pkgs/applications/misc/alacritty/default.nix+2
@@ -121,6 +121,8 @@ rustPlatform.buildRustPackage rec {
121121 install -dm 755 "$out/share/man/man1"
122122 gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz"
123123
124+ install -Dm 644 alacritty.yml $out/share/doc/alacritty.yml
125+
124126 install -dm 755 "$terminfo/share/terminfo/a/"
125127 tic -xe alacritty,alacritty-direct -o "$terminfo/share/terminfo" extra/alacritty.info
126128 mkdir -p $out/nix-support
pkgs/applications/misc/cointop/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoPackage rec {
44 pname = "cointop";
5− version = "1.4.4";
5+ version = "1.4.6";
66
77 src = fetchFromGitHub {
88 owner = "miguelmota";
99 repo = pname;
1010 rev = version;
11− sha256 = "12yi1lmyd5y4cgcjclkczf93jj7wd6k8aqnhq21dd1mx65l77swv";
11+ sha256 = "1mkb97x73vzxnbvhnxx3msicr1z0b3sjmydx257ax3nscrmf1l5z";
1212 };
1313
1414 goPackagePath = "github.com/miguelmota/cointop";
pkgs/applications/misc/cpu-x/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "cpu-x";
6− version = "4.0.0";
6+ version = "4.0.1";
77
88 src = fetchFromGitHub {
99 owner = "X0rg";
1010 repo = "CPU-X";
1111 rev = "v${version}";
12− sha256 = "00xngmlayblvkg3l0rcfpxmnkkdz49ydh4smlhpii23gqii0rds3";
12+ sha256 = "191zkkswlbbsw492yygc3idf7wh3bxs97drrqvqqw0mqvrzykxm3";
1313 };
1414
1515 nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm makeWrapper ];
pkgs/applications/misc/lyx/default.nix+2−2
@@ -3,12 +3,12 @@
33}:
44
55mkDerivation rec {
6− version = "2.3.4.3";
6+ version = "2.3.5.1";
77 pname = "lyx";
88
99 src = fetchurl {
1010 url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
11− sha256 = "1rpp6wq0dc0bxwc0pipajv98vi7cpg391nq10d3c4pmpq38m08wx";
11+ sha256 = "0mv32s26igm0pd8vs7d2mk1240dpr83y0a2wyh3xz6b67ph0w157";
1212 };
1313
1414 # LaTeX is used from $PATH, as people often want to have it with extra pkgs
pkgs/applications/misc/remarkable/remarkable-mouse/default.nixnew file+20
@@ -0,0 +1,20 @@
1+{ stdenv, buildPythonApplication, fetchPypi, python3Packages }:
2+
3+buildPythonApplication rec {
4+ pname = "remarkable-mouse";
5+ version = "5.2.1";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "0k2wjfcgnvb8yqn4c4ddfyyhrvl6hj61kn1ddnyp6ay9vklnw160";
10+ };
11+
12+ propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ];
13+
14+ meta = with stdenv.lib; {
15+ description = "A program to use a reMarkable as a graphics tablet";
16+ homepage = "https://github.com/evidlo/remarkable_mouse";
17+ license = licenses.gpl3;
18+ maintainers = [ maintainers.nickhu ];
19+ };
20+}
pkgs/applications/networking/browsers/chromium/plugins.nix+2−2
@@ -45,11 +45,11 @@ let
4545
4646 flash = stdenv.mkDerivation rec {
4747 pname = "flashplayer-ppapi";
48− version = "32.0.0.371";
48+ version = "32.0.0.387";
4949
5050 src = fetchzip {
5151 url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
52− sha256 = "1nks2wx74b21hv0l7bnrzkxn7c6p6r8zgwbqvy3cqpi8famyr5v9";
52+ sha256 = "1igs8nh3zpfcps97ahzh7kknx3rddh6yliig8lxf6jskbpf0qgzf";
5353 stripRoot = false;
5454 };
5555
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix+5−5
@@ -74,7 +74,7 @@ let
7474in
7575stdenv.mkDerivation rec {
7676 pname = "flashplayer";
77− version = "32.0.0.371";
77+ version = "32.0.0.387";
7878
7979 src = fetchurl {
8080 url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
8585 sha256 =
8686 if debug then
8787 if arch == "x86_64" then
88− "1zrl7cxcl9hkafji15br8wp5vf9a5lb88xcpz6vi9q73j45mhzjd"
88+ "1wmk60lnlrj9f8dvk4b6j7pqyl00w00qbzbdw4awzx91wmgfc4x0"
8989 else
90− "0cgnsn9zanadbacb660mj4k103cdyb2cak7ixnp1varqklss83n6"
90+ "1afjxhi5jzn8zbkva940i9fayzxj1r3n6rqsiny02fpnv0waypfy"
9191 else
9292 if arch == "x86_64" then
93− "1zc90gjixfhjng7pbx8vci1l69wf5m40149178zwzs6kz4ma5hb2"
93+ "0si8rx955kyfsprk5465hfzafxvrdm7g686q7p5xykmh88nck6k2"
9494 else
95− "0fqgas1g52a0zir2cxz3anizk3lkmwl68nbcn5rihgvjfqykbhn8";
95+ "02pw2knvgdkahyp7lmy7fmynmplaz5wswdz48h3sdj6ibr066h97";
9696 };
9797
9898 nativeBuildInputs = [ unzip ];
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix+3−3
@@ -50,7 +50,7 @@
5050
5151stdenv.mkDerivation {
5252 pname = "flashplayer-standalone";
53− version = "32.0.0.371";
53+ version = "32.0.0.387";
5454
5555 src = fetchurl {
5656 url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation {
6060 "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
6161 sha256 =
6262 if debug then
63− "0n3bk2y1djaqrdygnr81n8lsnj2k60kaziffl41zpdvzi1jc7wgn"
63+ "1yxdwmm2gz162rmc9hwlccqgq613gnrihjicnzgan4vk7hjlga5y"
6464 else
65− "18ll9rnfhbnz54q4d7q9fb13lix4i62zr6z6n574qvwngrvbrr8a";
65+ "0hm5is3giz45a4v9m77q0i1dgyhpqqkagpjndbnynsnl9a61r0ly";
6666 };
6767
6868 nativeBuildInputs = [ unzip ];
pkgs/applications/networking/cluster/argo/default.nix+13−4
@@ -19,16 +19,16 @@ let
1919in
2020buildGoModule rec {
2121 pname = "argo";
22− version = "2.6.1";
22+ version = "2.8.1";
2323
2424 src = fetchFromGitHub {
2525 owner = "argoproj";
2626 repo = "argo";
2727 rev = "v${version}";
28− sha256 = "12wq79h4m8wlzf18r66965mbbjjb62kvnxdj50ra7nxa8jjxpsmf";
28+ sha256 = "193nxc27fh37wf035mclvwwwxjjfc8nnbncg009fg19ycqmvmgvc";
2929 };
3030
31− vendorSha256 = "0dhzr62x2lzf3w0j2r496cr7jvkdcavfqaqr2xh972k3qqc9caky";
31+ vendorSha256 = "1p9b2m20gxc7iyq08mvllf5dpi4m06aw233sb45d05d624kw4aps";
3232
3333 subPackages = [ "cmd/argo" ];
3434
@@ -39,6 +39,15 @@ buildGoModule rec {
3939 ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app
4040 '';
4141
42+ buildFlagsArray = ''
43+ -ldflags=
44+ -s -w
45+ -X github.com/argoproj/argo.version=${version}
46+ -X github.com/argoproj/argo.gitCommit=${src.rev}
47+ -X github.com/argoproj/argo.gitTreeState=clean
48+ -X github.com/argoproj/argo.gitTag=${version}
49+ '';
50+
4251 meta = with lib; {
4352 description = "Container native workflow engine for Kubernetes";
4453 homepage = "https://github.com/argoproj/argo";
@@ -46,4 +55,4 @@ buildGoModule rec {
4655 maintainers = with maintainers; [ groodt ];
4756 platforms = platforms.unix;
4857 };
49−}
58+}
pkgs/applications/networking/cluster/helmsman/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "helmsman";
5− version = "3.4.1";
5+ version = "3.4.3";
66
77 src = fetchFromGitHub {
88 owner = "Praqma";
99 repo = "helmsman";
1010 rev = "v${version}";
11− sha256 = "0h89lgp3n7nd7dy8nq4bfxg938imdjsvs1k6yg8j37vgdmi24sa6";
11+ sha256 = "0jbinnzdw32l7zh02k81gnw9rnqi8f5k5sp2qv8p9l9kgziaycvn";
1212 };
1313
1414 vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl";
pkgs/applications/networking/cluster/luigi/default.nix+4−3
@@ -2,11 +2,11 @@
22
33python3Packages.buildPythonApplication rec {
44 pname = "luigi";
5− version = "2.8.13";
5+ version = "3.0.0";
66
77 src = python3Packages.fetchPypi {
88 inherit pname version;
9− sha256 = "0x14549iwj7r1knc0hmic9ny9hp960yjjqi4mxl78jb69gd3bhmf";
9+ sha256 = "1km9fnq4pf0iqqcmz94idm0zb3l92zinz0bn6ip86xqhchafd4vf";
1010 };
1111
1212 propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ];
@@ -18,12 +18,13 @@ python3Packages.buildPythonApplication rec {
1818 makeWrapperArgs = ["--prefix PYTHONPATH . :"];
1919
2020 meta = with lib; {
21− homepage = "https://github.com/spotify/luigi";
2221 description = "Python package that helps you build complex pipelines of batch jobs";
2322 longDescription = ''
2423 Luigi handles dependency resolution, workflow management, visualization,
2524 handling failures, command line integration, and much more.
2625 '';
26+ homepage = "https://github.com/spotify/luigi";
27+ changelog = "https://github.com/spotify/luigi/releases/tag/${version}";
2728 license = [ licenses.asl20 ];
2829 maintainers = [ maintainers.bhipple ];
2930 };
pkgs/applications/networking/instant-messengers/bluejeans/default.nix+5−2
@@ -40,11 +40,11 @@
4040
4141stdenv.mkDerivation rec {
4242 pname = "bluejeans";
43− version = "2.1.0";
43+ version = "2.3.0";
4444
4545 src = fetchurl {
4646 url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans.rpm";
47− sha256 = "1zhh0pla5gk75p8x84va9flvnk456pbcm1n6x8l82c9682fwr7dd";
47+ sha256 = "06lcpkga8h0zpl2wlysj6n979f0yg361frp3zr0vwzln3fiil2a7";
4848 };
4949
5050 nativeBuildInputs = [ rpmextract makeWrapper ];
@@ -110,6 +110,9 @@ stdenv.mkDerivation rec {
110110 --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/opt/BlueJeans \
111111 --set LD_PRELOAD "$out"/opt/BlueJeans/liblocaltime64_stub.so
112112
113+ substituteInPlace "$out"/share/applications/bluejeans-v2.desktop \
114+ --replace "/opt/BlueJeans/bluejeans-v2" "$out/bin/bluejeans"
115+
113116 patchShebangs "$out"
114117 '';
115118
pkgs/applications/networking/instant-messengers/discord/base.nix+1
@@ -17,6 +17,7 @@ in stdenv.mkDerivation rec {
1717 autoPatchelfHook
1818 cups
1919 libdrm
20+ libuuid
2021 libX11
2122 libXScrnSaver
2223 libXtst
pkgs/applications/networking/mailreaders/thunderbird/default.nix+4−3
@@ -43,6 +43,7 @@
4343, rustc
4444, sqlite
4545, stdenv
46+, systemd
4647, unzip
4748, which
4849, writeScript
@@ -305,11 +306,11 @@ stdenv.mkDerivation rec {
305306 )
306307 '';
307308
308− # FIXME: This can probably be removed as soon as we package a
309− # Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
309+ # FIXME: The XUL portion of this can probably be removed as soon as we
310+ # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
310311 postFixup = ''
311312 local xul="$out/lib/thunderbird/libxul.so"
312− patchelf --set-rpath "${libnotify}/lib:$(patchelf --print-rpath $xul)" $xul
313+ patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul
313314 '';
314315
315316 doInstallCheck = true;
pkgs/applications/science/logic/lean/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "lean";
5− version = "3.15.0";
5+ version = "3.16.2";
66
77 src = fetchFromGitHub {
88 owner = "leanprover-community";
99 repo = "lean";
1010 rev = "v${version}";
11− sha256 = "0fl8v8n53fr5qdnabici1mj3zpmjrkssx970y3q4m48s68q665v6";
11+ sha256 = "0fvm7gvbr5kn258sqpnxa7dvzz84iv1dx1n066vih5gz80plz4lh";
1212 };
1313
1414 nativeBuildInputs = [ cmake ];
pkgs/applications/window-managers/sway/contrib.nixnew file+107
@@ -0,0 +1,107 @@
1+{ stdenv
2+
3+, fetchurl
4+, coreutils
5+, makeWrapper
6+, sway-unwrapped
7+, installShellFiles
8+, wl-clipboard
9+, libnotify
10+, slurp
11+, grim
12+, jq
13+
14+, python3Packages
15+}:
16+
17+{
18+
19+grimshot = stdenv.mkDerivation rec {
20+ pname = "grimshot";
21+ version = "2020-05-08";
22+ rev = "b1d08db5f5112ab562f89564825e3e791b0682c4";
23+
24+ # master has new fixes and features, and a man page
25+ # after sway-1.5 these may be switched to sway-unwrapped.src
26+ bsrc = fetchurl {
27+ url = "https://raw.githubusercontent.com/swaywm/sway/${rev}/contrib/grimshot";
28+ sha256 = "1awzmzkib8a7q5s78xyh8za03lplqfpbasqp3lidqqmjqs882jq9";
29+ };
30+
31+ msrc = fetchurl {
32+ url = "https://raw.githubusercontent.com/swaywm/sway/${rev}/contrib/grimshot.1";
33+ sha256 = "191xxjfhf61gkxl3b0f694h0nrwd7vfnyp5afk8snhhr6q7ia4jz";
34+ };
35+
36+ dontBuild = true;
37+ dontUnpack = true;
38+ dontConfigure = true;
39+
40+ outputs = [ "out" "man" ];
41+
42+ nativeBuildInputs = [ makeWrapper installShellFiles ];
43+
44+ installPhase = ''
45+ installManPage ${msrc}
46+
47+ install -Dm 0755 ${bsrc} $out/bin/grimshot
48+ wrapProgram $out/bin/grimshot --set PATH \
49+ "${stdenv.lib.makeBinPath [
50+ sway-unwrapped
51+ wl-clipboard
52+ coreutils
53+ libnotify
54+ slurp
55+ grim
56+ jq
57+ ] }"
58+ '';
59+
60+ doInstallCheck = true;
61+
62+ installCheckPhase = ''
63+ # check always returns 0
64+ if [[ $($out/bin/grimshot check | grep "NOT FOUND") ]]; then false
65+ else
66+ echo "grimshot check passed"
67+ fi
68+ '';
69+
70+ meta = with stdenv.lib; {
71+ description = "A helper for screenshots within sway";
72+ homepage = "https://github.com/swaywm/sway/tree/master/contrib";
73+ license = licenses.mit;
74+ platforms = platforms.all;
75+ maintainers = with maintainers; [
76+ sway-unwrapped.meta.maintainers
77+ evils
78+ ];
79+ };
80+};
81+
82+
83+inactive-windows-transparency = python3Packages.buildPythonApplication rec {
84+ # long name is long
85+ lname = "inactive-windows-transparency";
86+ pname = "sway-${lname}";
87+ version = sway-unwrapped.version;
88+
89+ src = sway-unwrapped.src;
90+
91+ format = "other";
92+ dontBuild = true;
93+ dontConfigure = true;
94+
95+ propagatedBuildInputs = [ python3Packages.i3ipc ];
96+
97+ installPhase = ''
98+ install -Dm 0755 $src/contrib/${lname}.py $out/bin/${lname}.py
99+ '';
100+
101+ meta = sway-unwrapped.meta // {
102+ description = "It makes inactive sway windows transparent";
103+ homepage = "https://github.com/swaywm/sway/tree/${sway-unwrapped.version}/contrib";
104+ };
105+};
106+
107+}
pkgs/data/fonts/fira-code/default.nix+2−3
@@ -1,7 +1,7 @@
11{ stdenv, fetchzip }:
22
33let
4− version = "4";
4+ version = "5.2";
55in fetchzip {
66 name = "fira-code-${version}";
77
@@ -9,11 +9,10 @@ in fetchzip {
99
1010 postFetch = ''
1111 mkdir -p $out/share/fonts
12− unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
1312 unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
1413 '';
1514
16− sha256 = "0n9qkng31ydvpdjc1an4ylpfy4x883c6czhyzvhjsmavd7bv4j9a";
15+ sha256 = "16v62wj872ba4w7qxn4l6zjgqh7lrpwh1xax1bp1x9dpz08mnq06";
1716
1817 meta = with stdenv.lib; {
1918 homepage = "https://github.com/tonsky/FiraCode";
pkgs/development/compilers/binaryen/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }:
22
33let
4− defaultVersion = "93";
4+ defaultVersion = "94";
55
66 # Map from git revs to SHA256 hashes
77 sha256s = {
8− version_93 = "15y3703ha6mxcq168br0wlydas5rq66msrcsd650zrjz0ndxwsfx";
8+ version_94 = "1wk20fhyppb2ljni7ifqnsx9kl1kcl6c0svc0qljf0bs6rvr9qdm";
99 "1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y";
1010 };
1111in
pkgs/development/coq-modules/flocq/default.nix+5−5
@@ -2,11 +2,11 @@
22
33let params =
44 if stdenv.lib.versionAtLeast coq.coq-version "8.7" then {
5− version = "3.2.0";
6− sha256 = "15bi36x7zj0glsb3s2gwqd4wswhfzh36rbp7imbyff53a7nna95l";
5+ version = "3.3.1";
6+ sha256 = "0k1nfgiszmai5dihhpfa5mgq9rwigl0n38dw10jn79x89xbdpyh5";
77 } else {
88 version = "2.6.1";
9− sha256 = "1y4czkfrd8p37vwv198nns4hz1brfv71na17pxsidwpxy7qnyfw1";
9+ sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj";
1010 }
1111; in
1212
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 ]);
2727
2828 buildPhase = ''
29− ${bash}/bin/bash autogen.sh
29+ ${bash}/bin/bash autogen.sh || autoconf
3030 ${bash}/bin/bash configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Flocq
3131 ./remake
3232 '';
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
4444 };
4545
4646 passthru = {
47− compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ];
47+ compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
4848 };
4949}
pkgs/development/interpreters/php/default.nix+12−4
@@ -195,9 +195,10 @@ let
195195
196196 hardeningDisable = [ "bindnow" ];
197197
198− preConfigure = ''
199− # Don't record the configure flags since this causes unnecessary
200− # runtime dependencies
198+ preConfigure =
199+ # Don't record the configure flags since this causes unnecessary
200+ # runtime dependencies
201+ ''
201202 for i in main/build-defs.h.in scripts/php-config.in; do
202203 substituteInPlace $i \
203204 --replace '@CONFIGURE_COMMAND@' '(omitted)' \
@@ -206,7 +207,14 @@ let
206207 done
207208
208209 export EXTENSION_DIR=$out/lib/php/extensions
209−
210+ ''
211+ # PKG_CONFIG need not be a relative path
212+ + lib.optionalString (! lib.versionAtLeast version "7.4") ''
213+ for i in $(find . -type f -name "*.m4"); do
214+ substituteInPlace $i \
215+ --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null'
216+ done
217+ '' + ''
210218 ./buildconf --copy --force
211219
212220 if test -f $src/genfiles; then
pkgs/development/libraries/intel-media-driver/default.nix+12−6
@@ -1,17 +1,17 @@
11{ stdenv, fetchFromGitHub
2−, cmake, pkgconfig
2+, cmake, pkg-config
33, libva, libpciaccess, intel-gmmlib, libX11
44}:
55
66stdenv.mkDerivation rec {
77 pname = "intel-media-driver";
8− version = "19.4.0r";
8+ version = "20.1.1";
99
1010 src = fetchFromGitHub {
1111 owner = "intel";
1212 repo = "media-driver";
1313 rev = "intel-media-${version}";
14− sha256 = "0gnd82z0wgiw5my1hnqlk9hcjjqpsgasqq5xcdrbkfa40wpb132a";
14+ sha256 = "1mww20c9r7a57njqa2835ayjvk46lrv2yks9a2y8i0s5qzdi8m1i";
1515 };
1616
1717 cmakeFlags = [
@@ -21,15 +21,21 @@ stdenv.mkDerivation rec {
2121 "-DMEDIA_RUN_TEST_SUITE=OFF"
2222 ];
2323
24− nativeBuildInputs = [ cmake pkgconfig ];
24+ nativeBuildInputs = [ cmake pkg-config ];
2525
2626 buildInputs = [ libva libpciaccess intel-gmmlib libX11 ];
2727
2828 meta = with stdenv.lib; {
29+ description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs";
30+ longDescription = ''
31+ The Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API)
32+ user mode driver supporting hardware accelerated decoding, encoding, and
33+ video post processing for GEN based graphics hardware.
34+ '';
2935 homepage = "https://github.com/intel/media-driver";
36+ changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}";
3037 license = with licenses; [ bsd3 mit ];
31− description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs";
3238 platforms = platforms.linux;
33− maintainers = with maintainers; [ jfrankenau ];
39+ maintainers = with maintainers; [ primeos jfrankenau ];
3440 };
3541}
pkgs/development/libraries/liblastfm/default.nix+11−4
@@ -1,4 +1,5 @@
1−{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake
1+{ stdenv, fetchurl, pkgconfig, which, cmake
2+, fftwSinglePrec, libsamplerate, qtbase
23, darwin }:
34
45let version = "1.1.0"; in
@@ -14,16 +15,22 @@ stdenv.mkDerivation rec {
1415 sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x";
1516 };
1617
18+ postPatch = ''
19+ substituteInPlace CMakeLists.txt \
20+ --replace 'find_package(Qt5Core QUIET)' \
21+ 'find_package(Qt5 REQUIRED COMPONENTS Core Network Sql Test Xml)'
22+ '';
23+
1724 prefixKey = "--prefix ";
18− propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
1925 nativeBuildInputs = [ pkgconfig which cmake ];
20− buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
26+ buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
27+ ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
2128
2229 meta = with stdenv.lib; {
2330 homepage = "https://github.com/lastfm/liblastfm";
2431 repositories.git = "git://github.com/lastfm/liblastfm.git";
2532 description = "Official LastFM library";
26− inherit (qt4.meta) platforms;
33+ platforms = platforms.unix;
2734 maintainers = [ maintainers.phreedom ];
2835 license = licenses.gpl3;
2936 };
pkgs/development/libraries/physics/geant4/default.nix+24−1
@@ -5,6 +5,7 @@
55, enableQT ? false
66, enableXM ? false
77, enableOpenGLX11 ? true
8+, enablePython ? false
89, enableRaytracerX11 ? false
910
1011# Standard build environment with cmake.
@@ -33,8 +34,16 @@
3334, libGLU, libGL
3435, xlibsWrapper
3536, libXmu
37+
38+# For enablePython
39+, boost
40+, python3
3641}:
3742
43+let
44+ boost_python = boost.override { enablePython = true; python = python3; };
45+in
46+
3847stdenv.mkDerivation rec {
3948 version = "10.6.2";
4049 pname = "geant4";
@@ -44,6 +53,16 @@ stdenv.mkDerivation rec {
4453 sha256 = "0vznm3pjlbihjy1wsxc4gj229k0dzc283wvil2xghyl08vwdpnpc";
4554 };
4655
56+ boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}";
57+ postPatch = ''
58+ # Fix for boost 1.67+
59+ substituteInPlace environments/g4py/CMakeLists.txt \
60+ --replace "find_package(Boost REQUIRED python)" \
61+ "find_package(Boost REQUIRED COMPONENTS $boost_python_lib)"
62+ substituteInPlace environments/g4py/G4PythonHelpers.cmake \
63+ --replace "Boost::python" "Boost::$boost_python_lib"
64+ '';
65+
4766 cmakeFlags = [
4867 "-DGEANT4_INSTALL_DATA=OFF"
4968 "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"
@@ -52,11 +71,14 @@ stdenv.mkDerivation rec {
5271 "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
5372 "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
5473 "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
74+ "-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}"
5575 "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
5676 "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}"
5777 "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
5878 "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
5979 "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
80+ ] ++ stdenv.lib.optionals (enableMultiThreading && enablePython) [
81+ "-DGEANT4_BUILD_TLS_MODEL=global-dynamic"
6082 ] ++ stdenv.lib.optionals enableInventor [
6183 "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
6284 "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
@@ -66,7 +88,8 @@ stdenv.mkDerivation rec {
6688 nativeBuildInputs = [ cmake ];
6789
6890 buildInputs = [ libGLU xlibsWrapper libXmu ]
69− ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ];
91+ ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ]
92+ ++ stdenv.lib.optionals enablePython [ boost_python python3 ];
7093
7194 propagatedBuildInputs = [ clhep expat zlib libGL ]
7295 ++ stdenv.lib.optionals enableGDML [ xercesc ]
pkgs/development/libraries/physics/geant4/g4py/default.nixdeleted−65
@@ -1,65 +0,0 @@
1−{ stdenv, cmake, xercesc
2−
3−# The target version of Geant4
4−, geant4
5−
6−# Python (obviously) and boost::python for wrapping.
7−, python
8−, boost
9−}:
10−
11−let
12− # g4py does not support MT and will fail to build against MT geant
13− geant4_nomt = geant4.override { enableMultiThreading = false; };
14− boost_python = boost.override { enablePython = true; inherit python; };
15−in
16−
17−stdenv.mkDerivation {
18− inherit (geant4_nomt) version src;
19− pname = "g4py";
20−
21− nativeBuildInputs = [ cmake ];
22− buildInputs = [ geant4_nomt xercesc boost_python python ];
23−
24− GEANT4_INSTALL = geant4_nomt;
25−
26− postPatch = ''
27− cd environments/g4py
28− '';
29−
30− preConfigure = ''
31− # Fix for boost 1.67+
32− substituteInPlace CMakeLists.txt \
33− --replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.pythonVersion})"
34− for f in `find . -name CMakeLists.txt`; do
35− substituteInPlace "$f" \
36− --replace "boost_python" "\''${Boost_LIBRARIES}"
37− done
38− '';
39−
40− enableParallelBuilding = true;
41−
42− setupHook = ./setup-hook.sh;
43−
44− # Make sure we set PYTHONPATH
45− shellHook = ''
46− source $out/nix-support/setup-hook
47− '';
48−
49− meta = {
50− description = "Python bindings and utilities for Geant4";
51− longDescription = ''
52− Geant4 is a toolkit for the simulation of the passage of particles
53− through matter. Its areas of application include high energy,
54− nuclear and accelerator physics, as well as studies in medical and
55− space science. The two main reference papers for Geant4 are
56− published in Nuclear Instruments and Methods in Physics Research A
57− 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1
58− (2006) 270-278.
59− '';
60− homepage = "http://www.geant4.org";
61− license = stdenv.lib.licenses.g4sl;
62− maintainers = [ ];
63− platforms = stdenv.lib.platforms.all;
64− };
65−}
pkgs/development/libraries/physics/geant4/g4py/setup-hook.shdeleted−1
@@ -1 +0,0 @@
1−export PYTHONPATH=$PYTHONPATH:@out@/lib
pkgs/development/libraries/uriparser/default.nix+2−10
@@ -2,22 +2,14 @@
22
33stdenv.mkDerivation rec {
44 pname = "uriparser";
5− version = "0.9.3";
5+ version = "0.9.4";
66
77 # Release tarball differs from source tarball
88 src = fetchurl {
99 url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2";
10− sha256 = "13z234jdaqs9jj7i66gcv4q1rgsypjz6cighnlm1j4g80pdlmbr8";
10+ sha256 = "0yzqp1j6sglyrmwcasgn7zlwg841p3nbxy0h78ngq20lc7jspkdp";
1111 };
1212
13− patches = [
14− # fixes tests
15− (fetchpatch {
16− url = "https://github.com/uriparser/uriparser/commit/f870e6c68696a6018702caa5c8a2feba9b0f99fa.diff";
17− sha256 = "1nd6bhys9hwy6ippa42vm95zhw6hldm1s4xbdzmdjswc96as1ff5";
18− })
19− ];
20−
2113 nativeBuildInputs = [ cmake ];
2214
2315 cmakeFlags = [
pkgs/development/node-packages/default.nix−8
@@ -39,14 +39,6 @@ let
3939 meta.broken = since "12";
4040 };
4141
42− dnschain = super.dnschain.override {
43− buildInputs = [ pkgs.makeWrapper super.coffee-script ];
44− postInstall = ''
45− wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
46− '';
47− meta.broken = since "14";
48− };
49−
5042 bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: {
5143 name = "bitwarden-cli-${drv.version}";
5244 });
pkgs/development/node-packages/node-packages.json−1
@@ -60,7 +60,6 @@
6060, "csslint"
6161, "dat"
6262, "dhcp"
63−, "dnschain"
6463, "dockerfile-language-server-nodejs"
6564, "elasticdump"
6665, "elm-oracle"
pkgs/development/ocaml-modules/dns/client.nix+7−3
@@ -1,5 +1,6 @@
11{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-time
2−, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv }:
2+, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv
3+, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest }:
34
45buildDunePackage {
56 pname = "dns-client";
@@ -7,8 +8,11 @@ buildDunePackage {
78
89 useDune2 = true;
910
10− propagatedBuildInputs = [ dns mtime ocaml_lwt randomconv mirage-clock mirage-time
11− mirage-random mirage-stack mirage-crypto-rng ];
11+ propagatedBuildInputs = [ cstruct fmt logs dns rresult randomconv domain-name ipaddr
12+ ocaml_lwt mirage-stack mirage-random mirage-time mirage-clock
13+ mtime mirage-crypto-rng ];
14+ checkInputs = [ alcotest ];
15+ doCheck = true;
1216
1317 meta = dns.meta // {
1418 description = "Pure DNS resolver API";
pkgs/development/ocaml-modules/dns/default.nix+4−4
@@ -1,19 +1,19 @@
11{ lib, buildDunePackage, fetchurl, alcotest
2−, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, rresult
2+, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, rresult, astring, fmt
33}:
44
55buildDunePackage rec {
66 pname = "dns";
7− version = "4.5.0";
7+ version = "4.6.0";
88
99 minimumOCamlVersion = "4.07";
1010
1111 src = fetchurl {
1212 url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz";
13− sha256 = "10jrnnxvp06rvzk285wibyi9hn15qhjnqjy9xsfbwl8yhmzzqnq0";
13+ sha256 = "1gkswpc91j4ps60bp52ggg4qwj5g88f49x6p6d619p4x8vmhjylv";
1414 };
1515
16− propagatedBuildInputs = [ cstruct domain-name duration gmap ipaddr logs lru metrics ptime rresult ];
16+ propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
1717
1818 doCheck = true;
1919 checkInputs = lib.optional doCheck alcotest;
pkgs/development/ocaml-modules/ocsigen-start/default.nix+2−2
@@ -5,7 +5,7 @@
55
66stdenv.mkDerivation rec {
77 name = "ocaml${ocaml.version}-ocsigen-start-${version}";
8− version = "2.16.1";
8+ version = "2.18.0";
99
1010 buildInputs = [ ocaml findlib ];
1111 propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 owner = "ocsigen";
2323 repo = "ocsigen-start";
2424 rev = version;
25− sha256 = "1pzpyrd3vbhc7zvzh6bv44793ikx5bglpd5p4wk5jj65v1w39jwd";
25+ sha256 = "0wvh4c26g6qd6i1fryilcqz9giz7v6pnhc90sknhxh6jmwrbjl50";
2626 };
2727
2828 meta = {
pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix+2−2
@@ -5,7 +5,7 @@
55stdenv.mkDerivation rec {
66 pname = "ocsigen-toolkit";
77 name = "ocaml${ocaml.version}-${pname}-${version}";
8− version = "2.5.0";
8+ version = "2.7.0";
99
1010 propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ];
1111 buildInputs = [ ocaml findlib opaline ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 owner = "ocsigen";
2222 repo = pname;
2323 rev = version;
24− sha256 = "0hll8qr363pbb65jnr2w36zcbplbwn08xb7826ayiwigakj783p9";
24+ sha256 = "0jan5779nc0jf993hmvfii15ralcs20sm4mcnqwqrnhjbq6f6zpk";
2525 };
2626
2727 createFindlibDestdir = true;
pkgs/development/ocaml-modules/tls/default.nix+2−2
@@ -6,12 +6,12 @@
66buildDunePackage rec {
77 minimumOCamlVersion = "4.07";
88
9− version = "0.12.0";
9+ version = "0.12.1";
1010 pname = "tls";
1111
1212 src = fetchurl {
1313 url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz";
14− sha256 = "0fy38qmy7rcld1b4qzz4ycl1fr0v1wa7qd24125lpd6hly86fn57";
14+ sha256 = "09jhzjhni3il5bmy2c6gylmg9s45ppckjc7nm5nyg5dbm699cwxg";
1515 };
1616
1717 useDune2 = true;
pkgs/development/python-modules/dot2tex/default.nix+21−3
@@ -1,8 +1,11 @@
11{ stdenv
2+, python
23, buildPythonPackage
34, fetchPypi
4−, isPy3k
5+, substituteAll
56, pyparsing
7+, graphviz
8+, texlive
69}:
710
811buildPythonPackage rec {
@@ -14,11 +17,26 @@ buildPythonPackage rec {
1417 sha256 = "1kp77wiv7b5qib82i3y3sn9r49rym43aaqm5aw1bwnzfbbq2m6i9";
1518 };
1619
17− # Tests fail with 3.x. Furthermore, package is no longer maintained.
18− disabled = isPy3k;
20+ patches = [
21+ (substituteAll {
22+ src = ./path.patch;
23+ inherit graphviz;
24+ })
25+ ./test.patch # https://github.com/kjellmf/dot2tex/issues/5
26+ ];
1927
2028 propagatedBuildInputs = [ pyparsing ];
2129
30+ checkInputs = [
31+ (texlive.combine {
32+ inherit (texlive) scheme-small preview pstricks;
33+ })
34+ ];
35+
36+ checkPhase = ''
37+ ${python.interpreter} tests/test_dot2tex.py
38+ '';
39+
2240 meta = with stdenv.lib; {
2341 description = "Convert graphs generated by Graphviz to LaTeX friendly formats";
2442 homepage = "https://github.com/kjellmf/dot2tex";
pkgs/development/python-modules/dot2tex/path.patchnew file+104
@@ -0,0 +1,104 @@
1+diff --git a/dot2tex/dotparsing.py b/dot2tex/dotparsing.py
2+index 391b5dc..6dc77a3 100644
3+--- a/dot2tex/dotparsing.py
4++++ b/dot2tex/dotparsing.py
5+@@ -180,18 +180,8 @@ def __find_executables(path):
6+ def find_graphviz():
7+ """Locate Graphviz's executables in the system.
8+
9+- Tries three methods:
10+-
11+- First: Windows Registry (Windows only)
12+- This requires Mark Hammond's pywin32 is installed.
13+-
14+- Secondly: Search the path
15+- It will look for 'dot', 'twopi' and 'neato' in all the directories
16+- specified in the PATH environment variable.
17+-
18+- Thirdly: Default install location (Windows only)
19+- It will look for 'dot', 'twopi' and 'neato' in the default install
20+- location under the "Program Files" directory.
21++ It will look for 'dot', 'twopi' and 'neato' in
22++ @graphviz@/bin.
23+
24+ It will return a dictionary containing the program names as keys
25+ and their paths as values.
26+@@ -199,75 +189,9 @@ def find_graphviz():
27+ If this fails, it returns None.
28+ """
29+
30+- # Method 1 (Windows only)
31+- #
32+- if os.sys.platform == 'win32':
33+- try:
34+- import win32api, win32con
35+-
36+- # Get the GraphViz install path from the registry
37+- #
38+- hkey = win32api.RegOpenKeyEx(win32con.HKEY_LOCAL_MACHINE,
39+- "SOFTWARE\AT&T Research Labs\Graphviz", 0, win32con.KEY_QUERY_VALUE)
40+-
41+- path = win32api.RegQueryValueEx(hkey, "InstallPath")[0]
42+- win32api.RegCloseKey(hkey)
43+-
44+- # Now append the "bin" subdirectory:
45+- #
46+- path = os.path.join(path, "bin")
47+- progs = __find_executables(path)
48+- if progs is not None:
49+- # print("Used Windows registry")
50+- return progs
51+-
52+- except ImportError:
53+- # Print a messaged suggesting they install these?
54+- #
55+- log.debug('The win32api is not installed')
56+- pass
57+- except:
58+- log.debug('Failed to access the registry key')
59+-
60+- # Method 2 (Linux, Windows etc)
61+- #
62+- if 'PATH' in os.environ:
63+- for path in os.environ['PATH'].split(os.pathsep):
64+- progs = __find_executables(path)
65+- if progs is not None:
66+- return progs
67+-
68+- # Method 3 (Windows only)
69+- #
70+- if os.sys.platform == 'win32':
71+- # Try and work out the equivalent of "C:\Program Files" on this
72+- # machine (might be on drive D:, or in a different language)
73+- #
74+- if 'PROGRAMFILES' in os.environ:
75+- # Note, we could also use the win32api to get this
76+- # information, but win32api may not be installed.
77+-
78+- path = os.path.join(os.environ['PROGRAMFILES'], 'ATT', 'GraphViz', 'bin')
79+-
80+- else:
81+- # Just in case, try the default...
82+- path = r"C:\Program Files\att\Graphviz\bin"
83+-
84+- progs = __find_executables(path)
85+-
86+- if progs is not None:
87+- # print("Used default install location")
88+- return progs
89+-
90+- for path in (
91+- '/usr/bin', '/usr/local/bin',
92+- '/opt/local/bin',
93+- '/opt/bin', '/sw/bin', '/usr/share',
94+- '/Applications/Graphviz.app/Contents/MacOS/'):
95+- progs = __find_executables(path)
96+- if progs is not None:
97+- # print("Used path")
98+- return progs
99++ progs = __find_executables('@graphviz@/bin')
100++ if progs is not None:
101++ return progs
102+
103+ # Failed to find GraphViz
104+ #
pkgs/development/python-modules/dot2tex/test.patchnew file+12
@@ -0,0 +1,12 @@
1+diff --git a/tests/test_dot2tex.py b/tests/test_dot2tex.py
2+index 74b01ed..7be9aba 100644
3+--- a/tests/test_dot2tex.py
4++++ b/tests/test_dot2tex.py
5+@@ -147,6 +147,7 @@ class NeedsQuotesTests(unittest.TestCase):
6+
7+ class MultipleStatements(unittest.TestCase):
8+ # https://github.com/kjellmf/dot2tex/issues/5
9++ @unittest.skip('fails upstream')
10+ def test_semicolon(self):
11+ """Test for issue 5"""
12+ testgraph1 = """
pkgs/development/python-modules/fake-useragent/default.nixnew file+22
@@ -0,0 +1,22 @@
1+{ stdenv, fetchPypi, buildPythonPackage, six, pytest }:
2+
3+buildPythonPackage rec {
4+ pname = "fake-useragent";
5+ version = "0.1.11";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "0dfz3bpmjmaxlhda6hfgsac7afb65pljibi8zkp9gc0ffn5rj161";
10+ };
11+
12+ propagatedBuildInputs = [ six ];
13+
14+ checkInputs = [ pytest ];
15+
16+ meta = with stdenv.lib; {
17+ description = "Up to date simple useragent faker with real world database";
18+ homepage = "https://github.com/hellysmile/fake-useragent";
19+ license = licenses.asl20;
20+ maintainers = with maintainers; [ evanjs ];
21+ };
22+}
pkgs/development/python-modules/libevdev/default.nixnew file+21
@@ -0,0 +1,21 @@
1+{ stdenv, buildPythonPackage, isPy27, fetchPypi }:
2+
3+buildPythonPackage rec {
4+ pname = "libevdev";
5+ version = "0.7";
6+ disabled = isPy27;
7+
8+ src = fetchPypi {
9+ inherit pname version;
10+ sha256 = "10gwj08kn2rs4waq7807mq34cbavgkpg8fpir8mvnba601b8q4r4";
11+ };
12+
13+ doCheck = false;
14+
15+ meta = with stdenv.lib; {
16+ description = "Python wrapper around the libevdev C library";
17+ homepage = "https://gitlab.freedesktop.org/libevdev/python-libevdev";
18+ license = licenses.mit;
19+ maintainers = with maintainers; [ nickhu ];
20+ };
21+}
pkgs/development/python-modules/pynput/default.nixnew file+25
@@ -0,0 +1,25 @@
1+{ stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib }:
2+
3+buildPythonPackage rec {
4+ pname = "pynput";
5+ version = "1.6.8";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "16h4wn7f54rw30jrya7rmqkx3f51pxn8cplid95v880md8yqdhb8";
10+ };
11+
12+ nativeBuildInputs = [ sphinx ];
13+
14+ propagatedBuildInputs = [ setuptools-lint xlib ];
15+
16+ doCheck = false;
17+
18+ meta = with stdenv.lib; {
19+ description = "A library to control and monitor input devices";
20+ homepage = "https://github.com/moses-palmer/pynput";
21+ license = licenses.lgpl3;
22+ maintainers = with maintainers; [ nickhu ];
23+ };
24+}
25+
pkgs/development/python-modules/scrapy-deltafetch/default.nixnew file+22
@@ -0,0 +1,22 @@
1+{ stdenv, fetchPypi, buildPythonPackage, pytest, scrapy, bsddb3 }:
2+
3+buildPythonPackage rec {
4+ pname = "scrapy-deltafetch";
5+ version = "1.2.1";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "1m511psddvlapg492ny36l8rzy7z4i39yx6a1agxzfz6s9b83fq8";
10+ };
11+
12+ propagatedBuildInputs = [ bsddb3 scrapy ];
13+
14+ checkInputs = [ pytest ];
15+
16+ meta = with stdenv.lib; {
17+ description = "Scrapy spider middleware to ignore requests to pages containing items seen in previous crawls";
18+ homepage = "https://github.com/scrapy-plugins/scrapy-deltafetch";
19+ license = licenses.bsd3;
20+ maintainers = with maintainers; [ evanjs ];
21+ };
22+}
pkgs/development/python-modules/scrapy-fake-useragent/default.nixnew file+21
@@ -0,0 +1,21 @@
1+{ stdenv, fetchPypi, buildPythonPackage, pytest, fake-useragent, scrapy }:
2+
3+buildPythonPackage rec {
4+ pname = "scrapy-fake-useragent";
5+ version = "1.2.0";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "02mayk804vdl15wjpx7jcjkc4zgrra4izf6iv00mcxq4fd4ck03l";
10+ };
11+
12+ propagatedBuildInputs = [ fake-useragent ];
13+
14+ checkInputs = [ pytest scrapy ];
15+
16+ meta = with stdenv.lib; {
17+ description = "Random User-Agent middleware based on fake-useragent";
18+ homepage = "https://github.com/alecxe/scrapy-fake-useragent";
19+ license = licenses.bsd3;
20+ };
21+}
pkgs/development/python-modules/scrapy-splash/default.nixnew file+20
@@ -0,0 +1,20 @@
1+{ stdenv, fetchPypi, buildPythonPackage, pytest, hypothesis, scrapy }:
2+
3+buildPythonPackage rec {
4+ pname = "scrapy-splash";
5+ version = "0.7.2";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "1dg7csdza2hzqskd9b9gx0v3saqsch4f0fwdp0a3p0822aqqi488";
10+ };
11+
12+ checkInputs = [ pytest hypothesis scrapy ];
13+
14+ meta = with stdenv.lib; {
15+ description = "Scrapy+Splash for JavaScript integration";
16+ homepage = "https://github.com/scrapy-plugins/scrapy-splash";
17+ license = licenses.bsd3;
18+ maintainers = with maintainers; [ evanjs ];
19+ };
20+}
pkgs/development/python-modules/screeninfo/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ stdenv, buildPythonApplication, fetchPypi, isPy36, dataclasses, libX11, libXinerama, libXrandr }:
2+
3+buildPythonApplication rec {
4+ pname = "screeninfo";
5+ version = "0.6.5";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "0vcw54crdgmbzwlrfg80kd1a8p9i10yks8k0szzi0k5q80zhp8xz";
10+ };
11+
12+ # dataclasses is a compatibility shim for python 3.6 ONLY
13+ patchPhase = if isPy36 then "" else ''
14+ substituteInPlace setup.py \
15+ --replace "\"dataclasses\"," ""
16+ '' + ''
17+ substituteInPlace screeninfo/enumerators/xinerama.py \
18+ --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \
19+ --replace "load_library(\"Xinerama\")" "ctypes.cdll.LoadLibrary(\"${libXinerama}/lib/libXinerama.so\")"
20+ substituteInPlace screeninfo/enumerators/xrandr.py \
21+ --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \
22+ --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")"
23+ '';
24+
25+ propagatedBuildInputs = stdenv.lib.optional isPy36 dataclasses;
26+
27+ buildInputs = [ libX11 libXinerama libXrandr];
28+
29+ meta = with stdenv.lib; {
30+ description = "Fetch location and size of physical screens";
31+ homepage = "https://github.com/rr-/screeninfo";
32+ license = licenses.mit;
33+ maintainers = [ maintainers.nickhu ];
34+ };
35+}
pkgs/development/python-modules/setuptools-lint/default.nixnew file+21
@@ -0,0 +1,21 @@
1+{ stdenv, buildPythonPackage, fetchPypi, pylint }:
2+
3+buildPythonPackage rec {
4+ pname = "setuptools-lint";
5+ version = "0.6.0";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "16a1ac5n7k7sx15cnk03gw3fmslab3a7m74dc45rgpldgiff3577";
10+ };
11+
12+ propagatedBuildInputs = [ pylint ];
13+
14+ meta = with stdenv.lib; {
15+ description = "Package to expose pylint as a lint command into setup.py";
16+ homepage = "https://github.com/johnnoone/setuptools-pylint";
17+ license = licenses.bsdOriginal;
18+ maintainers = with maintainers; [ nickhu ];
19+ };
20+}
21+
pkgs/development/python-modules/somajo/default.nix+2−2
@@ -2,14 +2,14 @@
22
33buildPythonPackage rec {
44 pname = "SoMaJo";
5− version = "2.0.5";
5+ version = "2.0.6";
66 disabled = !isPy3k;
77
88 src = fetchFromGitHub {
99 owner = "tsproisl";
1010 repo = pname;
1111 rev = "v${version}";
12− sha256 = "01zvmqilnndh2b257z7bhcc7av5vhjm1g8gmdiiw15gcd2xfmqjs";
12+ sha256 = "08nicj3nj6pi6djli26gf0kf3s2da9ysn1cpkyw7j88v8vav0p7s";
1313 };
1414
1515 propagatedBuildInputs = [ regex ];
pkgs/development/tools/analysis/flow/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "flow";
5− version = "0.126.1";
5+ version = "0.127.0";
66
77 src = fetchFromGitHub {
88 owner = "facebook";
99 repo = "flow";
1010 rev = "refs/tags/v${version}";
11− sha256 = "1acmhyhbl4s2c907nj8jwgg9fjjrfr306vagwkcx2lza4clb2aan";
11+ sha256 = "0daacbb4il3mm8fkbk5qlpvzp3pmrqagq2hr1gsjaf8vnmissvvm";
1212 };
1313
1414 installPhase = ''
pkgs/development/tools/cloudfoundry-cli/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 pname = "cloudfoundry-cli";
5− version = "6.46.1";
5+ version = "6.51.0";
66
77 goPackagePath = "code.cloudfoundry.org/cli";
88
@@ -12,7 +12,7 @@ buildGoPackage rec {
1212 owner = "cloudfoundry";
1313 repo = "cli";
1414 rev = "v${version}";
15− sha256 = "0dqrkimwhw016icgyf4cyipzy6vdz5jgickm33xxd9018dh3ibwq";
15+ sha256 = "189cqng7y12knqm4n1bfajbc2lx027rwb44wddmj5iya27i7fv8f";
1616 };
1717
1818 nativeBuildInputs = [ installShellFiles ];
pkgs/development/tools/continuous-integration/buildkite-cli/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ lib, buildGoModule, fetchFromGitHub }:
2+
3+buildGoModule rec {
4+ pname = "buildkite-cli";
5+ version = "1.1.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "buildkite";
9+ repo = "cli";
10+ rev = "v${version}";
11+ sha256 = "05hz59qzadkk4ji5icv5sxih31pnn0abnmiwcyfa2mr3l5jaqjnd";
12+ };
13+
14+ vendorSha256 = "0jxh3yhh0sdvaykhinxngpipk369hw8z1y3g2z4c1115m5rjp2bb";
15+
16+ subPackages = [ "cmd/bk" ];
17+
18+ buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];
19+
20+ meta = with lib; {
21+ description = "A command line interface for Buildkite";
22+ homepage = "https://github.com/buildkite/cli";
23+ license = licenses.mit;
24+ maintainers = with maintainers; [ groodt ];
25+ };
26+}
pkgs/development/tools/continuous-integration/fly/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "fly";
5− version = "6.1.0";
5+ version = "6.3.0";
66
77 src = fetchFromGitHub {
88 owner = "concourse";
99 repo = "concourse";
1010 rev = "v${version}";
11− sha256 = "14sm3xwhm6pfln18i9f9dyj7s2wcri43rxj4s1cja7nwqr5sqb3x";
11+ sha256 = "006qkg661hzbc2gpcnpxm09bp1kbb98y0bgdr49bjlnapcmdgr1b";
1212 };
1313
14− vendorSha256 = "1c099sn5rrvj805va1lyjlbv7i2g1z5bxyaisv5l9365z0lv1cwm";
14+ vendorSha256 = "03az7l9rf2syw837zliny82xhkqlad16z0vfcg5h21m3bhz6v6jy";
1515
1616 subPackages = [ "fly" ];
1717
pkgs/development/tools/dapper/default.nix+2−2
@@ -5,7 +5,7 @@
55
66buildGoPackage rec {
77 pname = "dapper";
8− version = "0.4.1";
8+ version = "0.5.1";
99
1010 goPackagePath = "github.com/rancher/dapper";
1111
@@ -13,7 +13,7 @@ buildGoPackage rec {
1313 owner = "rancher";
1414 repo = "dapper";
1515 rev = "v${version}";
16− sha256 = "03rmkmlvhmfwcln5v1rqww1kirxm0d1p58h6pj8f5fnhk9spb162";
16+ sha256 = "0sf56ii4sn2wdq5kiyl02sgvq0lvynzgiq8v5wrkkabj5107fiqw";
1717 };
1818 patchPhase = ''
1919 substituteInPlace main.go --replace 0.0.0 ${version}
pkgs/development/tools/doctl/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoModule rec {
44 pname = "doctl";
5− version = "1.45.0";
5+ version = "1.45.1";
66
77 vendorSha256 = null;
88
@@ -30,7 +30,7 @@ buildGoModule rec {
3030 owner = "digitalocean";
3131 repo = "doctl";
3232 rev = "v${version}";
33− sha256 = "1wnrvswysms8p26d8hnxpimx12bhi3sa9k4kwd2dbxg74569gq6d";
33+ sha256 = "1zzdjpbag23kr6j3c7zkgqaavlna1q792qhs6s234vxm85zmwh4j";
3434 };
3535
3636 meta = with lib; {
pkgs/development/tools/lazygit/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 pname = "lazygit";
5− version = "0.20.3";
5+ version = "0.20.4";
66
77 goPackagePath = "github.com/jesseduffield/lazygit";
88
@@ -12,7 +12,7 @@ buildGoPackage rec {
1212 owner = "jesseduffield";
1313 repo = pname;
1414 rev = "v${version}";
15− sha256 = "1p05lfm74g28ci5575vr22q5db50h19fcvc3lzddp0vyiw570isl";
15+ sha256 = "134f04ybzgghm7ghyxair111aflmkjrbfj0bkxfp1w0a3jm6sfsk";
1616 };
1717
1818 meta = with stdenv.lib; {
pkgs/development/tools/misc/circleci-cli/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "circleci-cli";
5− version = "0.1.7868";
5+ version = "0.1.7971";
66
77 src = fetchFromGitHub {
88 owner = "CircleCI-Public";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "1a9gnqrkvifrwr8wpv5f6zv8xs8myzbzlhn5w72xxzh2gxdaflwg";
11+ sha256 = "0nrmdql3h9jnfgmp8898c9v07f5h5r9dvabaqhk98r6a77g3rr98";
1212 };
1313
1414 vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9";
pkgs/development/tools/misc/pkgconf/default.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "pkgconf";
5− version = "1.7.0";
5+ version = "1.7.3";
66
77 nativeBuildInputs = [ removeReferencesTo ];
88
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 src = fetchurl {
1414 url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz";
15− sha256 = "0sb1a2lgiqaninv5s3zq09ilrkpsamcl68dyhqyz7yi9vsgb0vhy";
15+ sha256 = "1h7rf5cch0cbxp8nmjkkf272zrz2jgpqpr8a58ww75pn3jjswimq";
1616 };
1717
1818 # Debian has outputs like these too:
pkgs/development/tools/ocaml/merlin/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildDunePackage rec {
44 pname = "merlin";
5− version = "3.3.4";
5+ version = "3.3.6";
66
77 minimumOCamlVersion = "4.02.1";
88
99 src = fetchurl {
1010 url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
11− sha256 = "12wxric6n3rmsn0w16xm8vjd8p5aw24cj76zw2x87qfwwgmy1kdd";
11+ sha256 = "1360cm0jkn2v2y5p3yzdyw9661a1vpddcibkbfblmk95qafx4civ";
1212 };
1313
1414 buildInputs = [ yojson ];
pkgs/development/web/cypress/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "cypress";
5− version = "4.5.0";
5+ version = "4.8.0";
66
77 src = fetchzip {
88 url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
9− sha256 = "0pr9b36s63xplmyjgjdifw5pgas7bxwbnsckjix7djyln0j5ja3q";
9+ sha256 = "0wivvh3fhyhxx9f6vp0kgqkjj4957hj0b15r2igbxnyqvahwxgx7";
1010 };
1111
1212 # don't remove runtime deps
pkgs/misc/vim-plugins/generated.nix+165−165
@@ -65,12 +65,12 @@ let
6565
6666 ale = buildVimPluginFrom2Nix {
6767 pname = "ale";
68− version = "2020-05-22";
68+ version = "2020-06-11";
6969 src = fetchFromGitHub {
7070 owner = "dense-analysis";
7171 repo = "ale";
72− rev = "7265ceb6d050d1a4642741d248f11e4f2abd37e1";
73− sha256 = "172ip0wbrmrwxhv5nvpgb0g982w9smyzlwg16gphrjiwnxllj1w7";
72+ rev = "1428c7b29e50af56f53ee1d587679d97a027dd72";
73+ sha256 = "0zhrgfsk7fvs8wabgdp5ps73ggsghsw19cnjvlbw4cnib6p9176a";
7474 };
7575 meta.homepage = "https://github.com/dense-analysis/ale/";
7676 };
@@ -269,12 +269,12 @@ let
269269
270270 calendar-vim = buildVimPluginFrom2Nix {
271271 pname = "calendar-vim";
272− version = "2020-05-24";
272+ version = "2020-06-09";
273273 src = fetchFromGitHub {
274274 owner = "itchyny";
275275 repo = "calendar.vim";
276− rev = "b2e7a69945c2b452598a1d4fa25d8fc94aa8b02c";
277− sha256 = "03fx03pdw4bwqyd4jyk0ixb5fhv900x0lg615ig0i4qg9nqjnc8n";
276+ rev = "932648c890d27b3a1f0e5f5f63e4564384dfdb63";
277+ sha256 = "1p1lrxk45qphpmnkszhaks7li0h3y3biif9427n6mjckl860g5c7";
278278 };
279279 meta.homepage = "https://github.com/itchyny/calendar.vim/";
280280 };
@@ -401,36 +401,36 @@ let
401401
402402 coc-fzf = buildVimPluginFrom2Nix {
403403 pname = "coc-fzf";
404− version = "2020-06-02";
404+ version = "2020-06-13";
405405 src = fetchFromGitHub {
406406 owner = "antoinemadec";
407407 repo = "coc-fzf";
408− rev = "8c89226acc29fe2695e8f86355c04ce1587f0fda";
409− sha256 = "04616lzpch9r5cj6nh4dw4b666iyi314n95mi62n5qcaibr6r85s";
408+ rev = "2c98c9f34718f5f639bfaae1c193fbe39749f7fc";
409+ sha256 = "126yqr53y4y30p4sp7942nic6lql6lfx0a1wb0psrrvrc8ccbbpp";
410410 };
411411 meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
412412 };
413413
414414 coc-git = buildVimPluginFrom2Nix {
415415 pname = "coc-git";
416− version = "2020-05-12";
416+ version = "2020-06-11";
417417 src = fetchFromGitHub {
418418 owner = "neoclide";
419419 repo = "coc-git";
420− rev = "b45372104d2234612f89658570887c55e6efea83";
421− sha256 = "1p7ah0dr31h0pllx00ms46fd5pmkp604zlkk08z40w54hzhr5qhh";
420+ rev = "bbddf4a9447848cdd18a693268bffcc0fe523c08";
421+ sha256 = "11c5rnlf45wz0slvl0gcqcdc9xb859pxy44xynfbbsl0ii1l8zc1";
422422 };
423423 meta.homepage = "https://github.com/neoclide/coc-git/";
424424 };
425425
426426 coc-go = buildVimPluginFrom2Nix {
427427 pname = "coc-go";
428− version = "2020-05-25";
428+ version = "2020-06-10";
429429 src = fetchFromGitHub {
430430 owner = "josa42";
431431 repo = "coc-go";
432− rev = "d9756fd65dc1d6740e797fa22d3f6f4fdb2b00d5";
433− sha256 = "14qc9ny12y52rbxn0gcwh6cpqc2zpwgb4jlla5p72w9pfh9gfh6z";
432+ rev = "38b0b30355f85a7952a2e6602fdb1cdf9141a501";
433+ sha256 = "0wmdfcglvixfqahjg3lc5q7y36wk6lzczr5nhnwixh9cis1nybx6";
434434 };
435435 meta.homepage = "https://github.com/josa42/coc-go/";
436436 };
@@ -521,12 +521,12 @@ let
521521
522522 coc-metals = buildVimPluginFrom2Nix {
523523 pname = "coc-metals";
524− version = "2020-06-01";
524+ version = "2020-06-12";
525525 src = fetchFromGitHub {
526526 owner = "ckipp01";
527527 repo = "coc-metals";
528− rev = "0286d7f11647dca4a63d84fe4101dbabc7731c04";
529− sha256 = "068aqynvzsnrz2dh68zdy40h342nfrf8kvv9234qdr91mhbvrxv4";
528+ rev = "b6ed6dad8c9f57e2ee84b60c0cf69c88c5ccf3bc";
529+ sha256 = "0abvls1vxyzxzsrlmm5javahsxxslgli43b1ffbrk7cz8cbhgdsy";
530530 };
531531 meta.homepage = "https://github.com/ckipp01/coc-metals/";
532532 };
@@ -605,12 +605,12 @@ let
605605
606606 coc-rust-analyzer = buildVimPluginFrom2Nix {
607607 pname = "coc-rust-analyzer";
608− version = "2020-06-04";
608+ version = "2020-06-11";
609609 src = fetchFromGitHub {
610610 owner = "fannheyward";
611611 repo = "coc-rust-analyzer";
612− rev = "acd5e7fca38dbc8ad8bfe9f187f1f4e6ee64ea88";
613− sha256 = "14qyszmyzykibdkdv38cypc8gmhaz0301prirjbpf2gijryk922b";
612+ rev = "a2e98801bcbe88d100f2fcb23087ba61203ad101";
613+ sha256 = "0a2a6pjvbb29syhh796z3gfrgjx4vpkbjirsgzdfb12icigbjdz7";
614614 };
615615 meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/";
616616 };
@@ -629,12 +629,12 @@ let
629629
630630 coc-snippets = buildVimPluginFrom2Nix {
631631 pname = "coc-snippets";
632− version = "2020-05-20";
632+ version = "2020-06-10";
633633 src = fetchFromGitHub {
634634 owner = "neoclide";
635635 repo = "coc-snippets";
636− rev = "f5e7a3575a04ee9cacd659380d0d0118fa4bb5cd";
637− sha256 = "0zrllqqdgf1ckzgaxhk7459cbkv7x1vkfgwsvilcjspxaww1s1bv";
636+ rev = "a36f36afe7094562756202d1bb88c1f80597393e";
637+ sha256 = "117idj29gk8psj27zmwazanwxf4br08mlkcpnkxyw6blm5aibzpp";
638638 };
639639 meta.homepage = "https://github.com/neoclide/coc-snippets/";
640640 };
@@ -785,12 +785,12 @@ let
785785
786786 coc-nvim = buildVimPluginFrom2Nix {
787787 pname = "coc-nvim";
788− version = "2020-06-04";
788+ version = "2020-06-13";
789789 src = fetchFromGitHub {
790790 owner = "neoclide";
791791 repo = "coc.nvim";
792− rev = "d992e129997d9bda225a4e59ed5e5a57fca1896a";
793− sha256 = "0f4vsg2fbwn4jpfj8lv8ib8i8adzvr9inw4q861w87zssk65bi8g";
792+ rev = "d66250193333f786b0706d4f1aebbd3e17505c43";
793+ sha256 = "0k4f0xf9h6v5xhvkzklg233x6y15bn22yg07g3nkgh10b8mpspbs";
794794 };
795795 meta.homepage = "https://github.com/neoclide/coc.nvim/";
796796 };
@@ -1014,12 +1014,12 @@ let
10141014
10151015 defx-nvim = buildVimPluginFrom2Nix {
10161016 pname = "defx-nvim";
1017− version = "2020-05-30";
1017+ version = "2020-06-09";
10181018 src = fetchFromGitHub {
10191019 owner = "Shougo";
10201020 repo = "defx.nvim";
1021− rev = "5d8133aba89acaab3b532b15eed8e6cba77b1cd2";
1022− sha256 = "1gw73cybp1qxgnqfa6hn6g2ky30canhmrchf550kp5j8nflqa887";
1021+ rev = "bc2a3fcbe9db21623dcc7c2d5c4c1b1289283dfc";
1022+ sha256 = "00gyrfhz7mf93swqzi4n459vbk9rpcqsc9qfzgnv38myh800s2ih";
10231023 };
10241024 meta.homepage = "https://github.com/Shougo/defx.nvim/";
10251025 };
@@ -1062,12 +1062,12 @@ let
10621062
10631063 denite-nvim = buildVimPluginFrom2Nix {
10641064 pname = "denite-nvim";
1065− version = "2020-06-01";
1065+ version = "2020-06-11";
10661066 src = fetchFromGitHub {
10671067 owner = "Shougo";
10681068 repo = "denite.nvim";
1069− rev = "7c971aa2e40853b21f7967788e9ea3baa4e97ab2";
1070− sha256 = "04v3v14g7nnmc6rhz5vpppqgkk8z67am4nc6k8jwbrv61sq1ga6b";
1069+ rev = "6139d4cd2d6944be8b713766f92f521eaa056c18";
1070+ sha256 = "0v64fj9jjq51h2cr1haih4ac4kffvzp6g0gli2vs4vjcbjbcil5r";
10711071 };
10721072 meta.homepage = "https://github.com/Shougo/denite.nvim/";
10731073 };
@@ -1209,12 +1209,12 @@ let
12091209
12101210 deoplete-lsp = buildVimPluginFrom2Nix {
12111211 pname = "deoplete-lsp";
1212− version = "2020-05-30";
1212+ version = "2020-06-11";
12131213 src = fetchFromGitHub {
12141214 owner = "Shougo";
12151215 repo = "deoplete-lsp";
1216− rev = "2994bf57fed476a5b9878e842b14b5b5c5b22211";
1217− sha256 = "0y22nay6qkn0sl74hlhhri3hjw5r3fwmmxby3j9q0avszlmq7352";
1216+ rev = "64a8663e529686fc43390942672ff2b33beda0e3";
1217+ sha256 = "1z8axvcrzip4bgmnn62p3q7rr3y7avkf7l4k2r266bkxwgsmh50k";
12181218 };
12191219 meta.homepage = "https://github.com/Shougo/deoplete-lsp/";
12201220 };
@@ -1293,12 +1293,12 @@ let
12931293
12941294 deoplete-nvim = buildVimPluginFrom2Nix {
12951295 pname = "deoplete-nvim";
1296− version = "2020-06-02";
1296+ version = "2020-06-11";
12971297 src = fetchFromGitHub {
12981298 owner = "Shougo";
12991299 repo = "deoplete.nvim";
1300− rev = "921688d72168e436c82f3d413a5de7d78369a0c7";
1301− sha256 = "01wpq4majnhh4lxmai0ix5dqvfxrbdsj2pic785x3kaqn4all31w";
1300+ rev = "e04bfc18b604c54ebc319d2eebf8fe3a830a9212";
1301+ sha256 = "01bf55zbw2v2qzbpk0jm5j4dhq8rs78m2pbljsnl2772vll4iv38";
13021302 };
13031303 meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
13041304 };
@@ -1341,12 +1341,12 @@ let
13411341
13421342 echodoc-vim = buildVimPluginFrom2Nix {
13431343 pname = "echodoc-vim";
1344− version = "2020-04-08";
1344+ version = "2020-06-08";
13451345 src = fetchFromGitHub {
13461346 owner = "Shougo";
13471347 repo = "echodoc.vim";
1348− rev = "31533d9c6c2723dfb4cf5691c83f330a3a0ccddd";
1349− sha256 = "1ygm4g90zv009iqv8k8n4930a7gpij5jxbz7dqq2dfyj4jn37rkf";
1348+ rev = "4719626bfd477f1189dd9992614ff452d3ea3caf";
1349+ sha256 = "0bpaav7yf06wlzfiyx6iylxan8a9hici041pnmlw7kgf176h6w7b";
13501350 };
13511351 meta.homepage = "https://github.com/Shougo/echodoc.vim/";
13521352 };
@@ -1548,12 +1548,12 @@ let
15481548
15491549 fzf-vim = buildVimPluginFrom2Nix {
15501550 pname = "fzf-vim";
1551− version = "2020-06-01";
1551+ version = "2020-06-07";
15521552 src = fetchFromGitHub {
15531553 owner = "junegunn";
15541554 repo = "fzf.vim";
1555− rev = "5aa5977d744d1183806079d307f023b0c5ceaaef";
1556− sha256 = "0b7lgdr66q99dfc73iwgb11pd4b465qmslfzqypsp8jamckk1jii";
1555+ rev = "8f1e73b598d27d78dfb5843be19a73b6a3b222b1";
1556+ sha256 = "0zdimx6q2fivimdvh0cnm6w718vjxj0abv67869ijh1d4mfrmvyf";
15571557 };
15581558 meta.homepage = "https://github.com/junegunn/fzf.vim/";
15591559 };
@@ -1572,24 +1572,24 @@ let
15721572
15731573 gentoo-syntax = buildVimPluginFrom2Nix {
15741574 pname = "gentoo-syntax";
1575− version = "2020-06-04";
1575+ version = "2020-06-05";
15761576 src = fetchFromGitHub {
15771577 owner = "gentoo";
15781578 repo = "gentoo-syntax";
1579− rev = "632d0a72c83cd0ccf7f40cb64470dc84f51bdce2";
1580− sha256 = "0q5cj2zpcdxmwm8dcj0nbyffjs1a075fgqbang4s0ikangbhx586";
1579+ rev = "47b6900c425614d4ba22223c13a23920f0618d9f";
1580+ sha256 = "0agswv1r5nxbnw0nddhw9vqvrfsvsgh18nwrg83c01sj97075qmv";
15811581 };
15821582 meta.homepage = "https://github.com/gentoo/gentoo-syntax/";
15831583 };
15841584
15851585 ghcid = buildVimPluginFrom2Nix {
15861586 pname = "ghcid";
1587− version = "2020-05-17";
1587+ version = "2020-06-06";
15881588 src = fetchFromGitHub {
15891589 owner = "ndmitchell";
15901590 repo = "ghcid";
1591− rev = "64f693f6581c3acdee71897eaba7c4e793eaa946";
1592− sha256 = "194njs7nfdmpnv1bkadamvicp735834kq0ijha5s41i492hb589i";
1591+ rev = "bddd18ffabbdb10ca1fadf25e7d7d1201470f444";
1592+ sha256 = "1sxh3zdrwajz0nabqbzg24sxlc8kwiqrwh4mvrwavwyh7xr29jxd";
15931593 };
15941594 meta.homepage = "https://github.com/ndmitchell/ghcid/";
15951595 };
@@ -1632,12 +1632,12 @@ let
16321632
16331633 goyo-vim = buildVimPluginFrom2Nix {
16341634 pname = "goyo-vim";
1635− version = "2019-06-13";
1635+ version = "2020-06-08";
16361636 src = fetchFromGitHub {
16371637 owner = "junegunn";
16381638 repo = "goyo.vim";
1639− rev = "6b6ed2734084fdbb6315357ddcaecf9c8e6f143d";
1640− sha256 = "1ywlz1hn54kxyp5q0angriaarimq7ys7m6sk6l4x8jr1g2yh0afz";
1639+ rev = "3e129198bba7d6b50406902002ad7d213a6cccaa";
1640+ sha256 = "1b2wsxbg27nmwxrncwddkl2ck8hbiqdqi821vl9d1fl5nx042y2b";
16411641 };
16421642 meta.homepage = "https://github.com/junegunn/goyo.vim/";
16431643 };
@@ -1897,12 +1897,12 @@ let
18971897
18981898 Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
18991899 pname = "Jenkinsfile-vim-syntax";
1900− version = "2019-12-31";
1900+ version = "2020-06-05";
19011901 src = fetchFromGitHub {
19021902 owner = "martinda";
19031903 repo = "Jenkinsfile-vim-syntax";
1904− rev = "164b457d87b65c6ca9e5998b69c6cd24248f62ac";
1905− sha256 = "14s26hlsdqys7br84l9wiyvhcy17s6966mhgr9n6sdqmhz6lc4nm";
1904+ rev = "a701341879c6db93f5dffa37f4589eef3c4ded85";
1905+ sha256 = "0nm3lf37l1g8lpa4yz1va0s6vw0vw99zghy3dzq933j0kqmspgvp";
19061906 };
19071907 meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/";
19081908 };
@@ -1921,12 +1921,12 @@ let
19211921
19221922 julia-vim = buildVimPluginFrom2Nix {
19231923 pname = "julia-vim";
1924− version = "2020-05-21";
1924+ version = "2020-06-06";
19251925 src = fetchFromGitHub {
19261926 owner = "JuliaEditorSupport";
19271927 repo = "julia-vim";
1928− rev = "2d0b6e4018d6cc01b96ab326ff6495876200866d";
1929− sha256 = "1ijmxxw63mraa5afddahfvwbh9acrf11q7g6hf32k6923rfccrnq";
1928+ rev = "f0fab9a2df5223815f7dc46f44f69566aa9e51d1";
1929+ sha256 = "145wxlv5rifk93lvai17625r1c94lnbi8rnda0vidr0dhhgcl7v7";
19301930 };
19311931 meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
19321932 };
@@ -2029,12 +2029,12 @@ let
20292029
20302030 lf-vim = buildVimPluginFrom2Nix {
20312031 pname = "lf-vim";
2032− version = "2020-05-12";
2032+ version = "2020-06-11";
20332033 src = fetchFromGitHub {
20342034 owner = "ptzz";
20352035 repo = "lf.vim";
2036− rev = "8dbdb135f3704790f9e66a141d2785d4b65c238d";
2037− sha256 = "0phfqg6ax79vsz1sy6pvjflz1929x58k7nifiqki9bzp2m6knls9";
2036+ rev = "8eef4095f0ca4ec37b6877b7b01047146e987c6b";
2037+ sha256 = "17clfc8shmv485r6anpkkcq88x6n2pm54ir1pjy852spzykycika";
20382038 };
20392039 meta.homepage = "https://github.com/ptzz/lf.vim/";
20402040 };
@@ -2245,12 +2245,12 @@ let
22452245
22462246 neco-ghc = buildVimPluginFrom2Nix {
22472247 pname = "neco-ghc";
2248− version = "2018-05-13";
2248+ version = "2020-06-06";
22492249 src = fetchFromGitHub {
22502250 owner = "eagletmt";
22512251 repo = "neco-ghc";
2252− rev = "682869aca5dd0bde71a09ba952acb59c543adf7d";
2253− sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h";
2252+ rev = "b4ea02c537975a5a2bf00cb5f24cd784b2b6f5ad";
2253+ sha256 = "13la3slqkljn7y8y9p8ic3majnvjf7pnrwr16cdpacklmz733x1f";
22542254 };
22552255 meta.homepage = "https://github.com/eagletmt/neco-ghc/";
22562256 };
@@ -2317,12 +2317,12 @@ let
23172317
23182318 neoformat = buildVimPluginFrom2Nix {
23192319 pname = "neoformat";
2320− version = "2020-05-17";
2320+ version = "2020-06-12";
23212321 src = fetchFromGitHub {
23222322 owner = "sbdchd";
23232323 repo = "neoformat";
2324− rev = "a3561bf2032a162bc9f53d96fa4e5a2ada98854c";
2325− sha256 = "15lsxwf4f1mg5h716zikwv1hbb0i41d24hrvyrqhwqlnqbwizlbi";
2324+ rev = "1cee66fe6219f8cc698eb244ba4001bdad1d09cb";
2325+ sha256 = "0w5hw5qc5n0i2hal91nilmxazskixv6c1rcszgqar4dfh951kazy";
23262326 };
23272327 meta.homepage = "https://github.com/sbdchd/neoformat/";
23282328 };
@@ -2377,12 +2377,12 @@ let
23772377
23782378 neosnippet-vim = buildVimPluginFrom2Nix {
23792379 pname = "neosnippet-vim";
2380− version = "2020-05-12";
2380+ version = "2020-06-13";
23812381 src = fetchFromGitHub {
23822382 owner = "Shougo";
23832383 repo = "neosnippet.vim";
2384− rev = "70f855d93c4bc727873c42111432660cf6929cdc";
2385− sha256 = "1gh7vh3qc9k8xhpmcvhdn5nfff81y7hkfky0mgs75a97mkd8qhnz";
2384+ rev = "a52edf794bae0174a682131333c891717633994b";
2385+ sha256 = "1k3ncjlikdbsjk33fi14y88yqywrpzdfz8kwzjfxjlidbzzlzk0w";
23862386 };
23872387 meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
23882388 };
@@ -2449,12 +2449,12 @@ let
24492449
24502450 nerdcommenter = buildVimPluginFrom2Nix {
24512451 pname = "nerdcommenter";
2452− version = "2020-02-19";
2452+ version = "2020-06-08";
24532453 src = fetchFromGitHub {
24542454 owner = "preservim";
24552455 repo = "nerdcommenter";
2456− rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8";
2457− sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs";
2456+ rev = "fade3d4b26f5a0d58f256a06ba7b0a04d9fb4f3b";
2457+ sha256 = "1vb5n4g5x3hpnc013gjf8frxxdrcq1zdcm3mpx90b0cjxi252cn3";
24582458 };
24592459 meta.homepage = "https://github.com/preservim/nerdcommenter/";
24602460 };
@@ -2569,12 +2569,12 @@ let
25692569
25702570 nvim-lsp = buildVimPluginFrom2Nix {
25712571 pname = "nvim-lsp";
2572− version = "2020-06-02";
2572+ version = "2020-06-13";
25732573 src = fetchFromGitHub {
25742574 owner = "neovim";
25752575 repo = "nvim-lsp";
2576− rev = "a7fdf268b1c51f6395900e437060728701aa8b77";
2577− sha256 = "04v1g4sa6dccaffrlkmyh410ppza5zlrnrapf9c3sfj6bmsr4jd3";
2576+ rev = "9ec118cdc7ce6442bf8beba903ab395b2f60190f";
2577+ sha256 = "1idam76jwvs82c2384y4az4rqp5cg29qhic12fnpy8m74b3rqla8";
25782578 };
25792579 meta.homepage = "https://github.com/neovim/nvim-lsp/";
25802580 };
@@ -2617,12 +2617,12 @@ let
26172617
26182618 onehalf = buildVimPluginFrom2Nix {
26192619 pname = "onehalf";
2620− version = "2020-05-06";
2620+ version = "2020-06-11";
26212621 src = fetchFromGitHub {
26222622 owner = "sonph";
26232623 repo = "onehalf";
2624− rev = "970abdf26b399100cbb59c6b6e693c4ff877c59d";
2625− sha256 = "1v34n0cz7jkx0wlbl6kv693qgifs0frcw4mv32ll36pmqfyb4m0h";
2624+ rev = "3aa42a39ed3cddde0c53976a700b81b8a7067890";
2625+ sha256 = "0x01c7930hlzvjac3r2wbkdha8j6mmhyk7nwgdazh1z4sxqjyj1l";
26262626 };
26272627 meta.homepage = "https://github.com/sonph/onehalf/";
26282628 };
@@ -2965,12 +2965,12 @@ let
29652965
29662966 rust-vim = buildVimPluginFrom2Nix {
29672967 pname = "rust-vim";
2968− version = "2020-05-13";
2968+ version = "2020-06-11";
29692969 src = fetchFromGitHub {
29702970 owner = "rust-lang";
29712971 repo = "rust.vim";
2972− rev = "953b10061f595496b35aec84b75c413ee5751a23";
2973− sha256 = "1abacayriz439lj4r3s1x92pp3wwxqav3kqsanxq9k6f6p2b2fyb";
2972+ rev = "0d8ce07aaa3b95e61bf319b25bb3b1a4ecc780c2";
2973+ sha256 = "0bwj60zvafv5z61yy66ab6ng1ilnj20k3xnxl6myzvfn70rsp5yd";
29742974 };
29752975 meta.homepage = "https://github.com/rust-lang/rust.vim/";
29762976 };
@@ -3169,12 +3169,12 @@ let
31693169
31703170 splitjoin-vim = buildVimPluginFrom2Nix {
31713171 pname = "splitjoin-vim";
3172− version = "2020-05-16";
3172+ version = "2020-06-11";
31733173 src = fetchFromGitHub {
31743174 owner = "AndrewRadev";
31753175 repo = "splitjoin.vim";
3176− rev = "99d12007112b63b8e3fd0fcf435471ac63ccf030";
3177− sha256 = "1mar7v4sp3zbvbczs54n8zj17bh042g0384ichwvqkamfcfxgdid";
3176+ rev = "03dc38772d59e78de3d87b27438fecab70dd6688";
3177+ sha256 = "0xn972gppr87lx37p01x1ikh2nwn56szhgnikw1v269vnysic15m";
31783178 fetchSubmodules = true;
31793179 };
31803180 meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -3278,12 +3278,12 @@ let
32783278
32793279 tagbar = buildVimPluginFrom2Nix {
32803280 pname = "tagbar";
3281− version = "2020-05-30";
3281+ version = "2020-06-11";
32823282 src = fetchFromGitHub {
32833283 owner = "majutsushi";
32843284 repo = "tagbar";
3285− rev = "a36880be2217814b7034f05eb0f402e8183befc9";
3286− sha256 = "16rj8pv8b9knbxi2967h96kgwp4r631kmpxdy74xsf938z4cya0j";
3285+ rev = "56399f446c64d187c106e112afa4d97985508eba";
3286+ sha256 = "1bmfv09lxwq9b8hp4v2avmd979178lm60xxf5g0qiifrr4ym2gqk";
32873287 };
32883288 meta.homepage = "https://github.com/majutsushi/tagbar/";
32893289 };
@@ -3483,12 +3483,12 @@ let
34833483
34843484 unicode-vim = buildVimPluginFrom2Nix {
34853485 pname = "unicode-vim";
3486− version = "2020-04-20";
3486+ version = "2020-06-09";
34873487 src = fetchFromGitHub {
34883488 owner = "chrisbra";
34893489 repo = "unicode.vim";
3490− rev = "ce061819e4304a9ff2f82779e12e5a30363ab47c";
3491− sha256 = "0k9gmf2rdvnlfqqhjlk206wimlh5di3smmrr9cgz0djq5pd3r5jz";
3490+ rev = "76e95c6f8c863f5079cd103b18990684bb02d525";
3491+ sha256 = "0v3w117bimd74r9i209hgqy75x83hdd3za26l8g729w56kqgq5r8";
34923492 };
34933493 meta.homepage = "https://github.com/chrisbra/unicode.vim/";
34943494 };
@@ -3543,12 +3543,12 @@ let
35433543
35443544 verilog_systemverilog-vim = buildVimPluginFrom2Nix {
35453545 pname = "verilog_systemverilog-vim";
3546− version = "2020-05-24";
3546+ version = "2020-06-12";
35473547 src = fetchFromGitHub {
35483548 owner = "vhda";
35493549 repo = "verilog_systemverilog.vim";
3550− rev = "e2449daa3272a6d5ad33e433cca3208bf68607a7";
3551− sha256 = "16w1nskfxsfs9dhk1yxmk16i5vjg0wq8l3fsqwa0904rh5wnakjn";
3550+ rev = "c37bcf010fcb73599d690d8da6ac966dac02a07e";
3551+ sha256 = "1f4kicgr7wv0dprvr91wi4lmk0d9bb9f4wcng4rfkq1cdwfkqdw4";
35523552 };
35533553 meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/";
35543554 };
@@ -3807,12 +3807,12 @@ let
38073807
38083808 vim-airline = buildVimPluginFrom2Nix {
38093809 pname = "vim-airline";
3810− version = "2020-05-31";
3810+ version = "2020-06-11";
38113811 src = fetchFromGitHub {
38123812 owner = "vim-airline";
38133813 repo = "vim-airline";
3814− rev = "d221dc531298f467a6901861b0360741c2a387b0";
3815− sha256 = "0w4lwpynn5cj9si3apyfmxb8x8hv0acggsyfvmhpi41638sz2310";
3814+ rev = "ee85ed4c673b859cf8c3626a6669b8e3cd2392fa";
3815+ sha256 = "1wayink1n9l590kfi28xp37kw186g7j0dr5kgfr7xz8mk2g0wg0k";
38163816 };
38173817 meta.homepage = "https://github.com/vim-airline/vim-airline/";
38183818 };
@@ -3843,12 +3843,12 @@ let
38433843
38443844 vim-anzu = buildVimPluginFrom2Nix {
38453845 pname = "vim-anzu";
3846− version = "2018-02-28";
3846+ version = "2020-06-10";
38473847 src = fetchFromGitHub {
38483848 owner = "osyo-manga";
38493849 repo = "vim-anzu";
3850− rev = "45b60d37cb9de90f6c89f7ddeacb7ae430ebcae2";
3851− sha256 = "1p5lh4xsv9xsl8kx0h1bg6iy0if4a69hvairq69p50ffka83pv00";
3850+ rev = "1b95ec384487e559f0ee70e0f46c33683ff533ac";
3851+ sha256 = "0q6s9bb1yv7ir2al4gv69vv4c8m09j1ax47qbhchgz23iwka3vmz";
38523852 };
38533853 meta.homepage = "https://github.com/osyo-manga/vim-anzu/";
38543854 };
@@ -4023,12 +4023,12 @@ let
40234023
40244024 vim-codefmt = buildVimPluginFrom2Nix {
40254025 pname = "vim-codefmt";
4026− version = "2020-06-02";
4026+ version = "2020-06-08";
40274027 src = fetchFromGitHub {
40284028 owner = "google";
40294029 repo = "vim-codefmt";
4030− rev = "e083709f482332e5ff765f4d7b7901d51ddc9ef4";
4031− sha256 = "0d46h4jx01mib4wyj60qx4r34y201gaj1vpkb48pkw9qlsaqs31i";
4030+ rev = "90335990808167d910671a625f3ee9de9aac1058";
4031+ sha256 = "1rq0ivynsq35h5kpzpd963bgkbx9lb26wlxrb2l8xha0zzzsmhpz";
40324032 };
40334033 meta.homepage = "https://github.com/google/vim-codefmt/";
40344034 };
@@ -4215,12 +4215,12 @@ let
42154215
42164216 vim-devicons = buildVimPluginFrom2Nix {
42174217 pname = "vim-devicons";
4218− version = "2020-05-30";
4218+ version = "2020-06-12";
42194219 src = fetchFromGitHub {
42204220 owner = "ryanoasis";
42214221 repo = "vim-devicons";
4222− rev = "15b532ebd4455d9d099e9ccebab09915e0562754";
4223− sha256 = "0cfiwdaj43fx2gq7916i98iyn3ky79d359ylgpznczn88k37s1wi";
4222+ rev = "84ec4562c21882dfe80b779cd645c607ec9d9727";
4223+ sha256 = "1nv7aivnrxa91b2ylxzfiss46r9m2qf13v8wlhav85mgd51nhj99";
42244224 };
42254225 meta.homepage = "https://github.com/ryanoasis/vim-devicons/";
42264226 };
@@ -4371,12 +4371,12 @@ let
43714371
43724372 vim-elm-syntax = buildVimPluginFrom2Nix {
43734373 pname = "vim-elm-syntax";
4374− version = "2020-01-25";
4374+ version = "2020-06-10";
43754375 src = fetchFromGitHub {
43764376 owner = "andys8";
43774377 repo = "vim-elm-syntax";
4378− rev = "846a5929bff5795256fbca96707e451dbc755e36";
4379− sha256 = "05jkx4dbkb646wy0igqpwc55iamm0a030dswhirg6nyl3x6qzgym";
4378+ rev = "68cd8988fe9eaa190052fadaee0fea2c21338d4c";
4379+ sha256 = "0yhvx8k83xfzmgy10r9mz0rjagbyzx5rrmn8123vw49ncksvw49q";
43804380 };
43814381 meta.homepage = "https://github.com/andys8/vim-elm-syntax/";
43824382 };
@@ -4455,12 +4455,12 @@ let
44554455
44564456 vim-fireplace = buildVimPluginFrom2Nix {
44574457 pname = "vim-fireplace";
4458− version = "2020-04-18";
4458+ version = "2020-06-08";
44594459 src = fetchFromGitHub {
44604460 owner = "tpope";
44614461 repo = "vim-fireplace";
4462− rev = "6c968f26f0bd3dd04b18fad8761e0e9e1220a3da";
4463− sha256 = "1x74j3gghfmqh1mxswzhb6d0zdll735r5lrgn4g3z580y15h37w5";
4462+ rev = "15fcf3db308ce34a12c1e41a88178c7cccea0d96";
4463+ sha256 = "148qjhln1v4cv15idsn36n82g0g7bjq2vhf0il9a6djwycf374kb";
44644464 };
44654465 meta.homepage = "https://github.com/tpope/vim-fireplace/";
44664466 };
@@ -4611,12 +4611,12 @@ let
46114611
46124612 vim-gitgutter = buildVimPluginFrom2Nix {
46134613 pname = "vim-gitgutter";
4614− version = "2020-05-29";
4614+ version = "2020-06-10";
46154615 src = fetchFromGitHub {
46164616 owner = "airblade";
46174617 repo = "vim-gitgutter";
4618− rev = "9784226ba766662d298554a5c66fd938497f2233";
4619− sha256 = "19f28c3wasgck78xqdygsyiwv17qqh69nkn9n1gajcbmbr55lhzn";
4618+ rev = "e31e9bb35f7346caab4fcf972d44449bdfd3230a";
4619+ sha256 = "1mmasjz0d6nyjjrlgwiz9kd420l16q90mhscwz3i65xw0zqlmcgj";
46204620 };
46214621 meta.homepage = "https://github.com/airblade/vim-gitgutter/";
46224622 };
@@ -4647,12 +4647,12 @@ let
46474647
46484648 vim-go = buildVimPluginFrom2Nix {
46494649 pname = "vim-go";
4650− version = "2020-05-31";
4650+ version = "2020-06-09";
46514651 src = fetchFromGitHub {
46524652 owner = "fatih";
46534653 repo = "vim-go";
4654− rev = "8e72eef0b35839db0a028a37bd28debc20c1201b";
4655− sha256 = "0rpay08m3q0syvw9ks45b3cvggghi1350h7dp87bx24jd3dqvdvf";
4654+ rev = "354774cd7aea891cf553c34d79582be3346c1615";
4655+ sha256 = "0pqmm6s50vxs9788f6avgwrdp1vi5mv3lzrxi2nxqdxvrcxngk93";
46564656 };
46574657 meta.homepage = "https://github.com/fatih/vim-go/";
46584658 };
@@ -4887,12 +4887,12 @@ let
48874887
48884888 vim-illuminate = buildVimPluginFrom2Nix {
48894889 pname = "vim-illuminate";
4890− version = "2020-02-21";
4890+ version = "2020-06-09";
48914891 src = fetchFromGitHub {
48924892 owner = "RRethy";
48934893 repo = "vim-illuminate";
4894− rev = "80dafb9b0e7b9f4ce7c843d4104f455c8c5b1f42";
4895− sha256 = "1yijaj1dqfmw4dsdmgj01sxizyraisxwjqh2hhbq93pdln4lm51f";
4894+ rev = "0778289e391c419f7a3af9de8229f798ee292013";
4895+ sha256 = "1l5s5f4fw96w437rdf85lym7g75hnz8sb2fdj9hygyg0sp42r0cf";
48964896 };
48974897 meta.homepage = "https://github.com/RRethy/vim-illuminate/";
48984898 };
@@ -5044,12 +5044,12 @@ let
50445044
50455045 vim-jsdoc = buildVimPluginFrom2Nix {
50465046 pname = "vim-jsdoc";
5047− version = "2020-05-16";
5047+ version = "2020-06-09";
50485048 src = fetchFromGitHub {
50495049 owner = "heavenshell";
50505050 repo = "vim-jsdoc";
5051− rev = "5e8eac9d8e38c273cc05c359730a2a74a1578f2b";
5052− sha256 = "0biyf2vzvnqzzdykq0agf1hzs2ynbbly4fxfwrfablznbdgsm0pz";
5051+ rev = "3b88595805ac7c0499dc05bc8aa5cc7909c6f5b7";
5052+ sha256 = "04yjjcfmaby466krqzmvwg0cb2ydri6pj49x48z15h4s9ac47p66";
50535053 };
50545054 meta.homepage = "https://github.com/heavenshell/vim-jsdoc/";
50555055 };
@@ -5164,12 +5164,12 @@ let
51645164
51655165 vim-ledger = buildVimPluginFrom2Nix {
51665166 pname = "vim-ledger";
5167− version = "2020-05-25";
5167+ version = "2020-06-08";
51685168 src = fetchFromGitHub {
51695169 owner = "ledger";
51705170 repo = "vim-ledger";
5171− rev = "b3e6f3dfaa922cda7771a4db20d3ae0267e08133";
5172− sha256 = "1jx814sqs0n0mrdi2lrh6xa3d2cmgyc78176gd5c1n8k5q7qkp40";
5171+ rev = "d5f2af4883351aa437ca1c3157d21917dc2bb1b0";
5172+ sha256 = "0bdyhbablays384gssfdfavkxcrwcj89y8vn5kdk11xs0r78b5wr";
51735173 };
51745174 meta.homepage = "https://github.com/ledger/vim-ledger/";
51755175 };
@@ -5224,24 +5224,24 @@ let
52245224
52255225 vim-lsc = buildVimPluginFrom2Nix {
52265226 pname = "vim-lsc";
5227− version = "2020-06-02";
5227+ version = "2020-06-10";
52285228 src = fetchFromGitHub {
52295229 owner = "natebosch";
52305230 repo = "vim-lsc";
5231− rev = "baa44d450043cc020e1d6f0609d0e081bbcc6f9e";
5232− sha256 = "07m2wqich31pxp9jgh3fzjqqdm7vdjh8rjf67d4l6kkf13dw89yh";
5231+ rev = "b34ad0fdd1223e5c1c39d23c01f13954ca2ad500";
5232+ sha256 = "1zqk0zimq2qyqhhfb5693zkcxz16vyrd7k2wd488avqi1jbhiffc";
52335233 };
52345234 meta.homepage = "https://github.com/natebosch/vim-lsc/";
52355235 };
52365236
52375237 vim-maktaba = buildVimPluginFrom2Nix {
52385238 pname = "vim-maktaba";
5239− version = "2020-05-29";
5239+ version = "2020-06-13";
52405240 src = fetchFromGitHub {
52415241 owner = "google";
52425242 repo = "vim-maktaba";
5243− rev = "2636a0fabaae80e3bebdb3c571220aebf875dfcf";
5244− sha256 = "1vcc8gaikbgdq1k4f3jdjrmlwad1z44g3biifgqyp0sgd7bjd9lp";
5243+ rev = "5c49c44be62e595d3d1d81a15259cd1bfc722825";
5244+ sha256 = "0nr7hbwpwzzzxinpjfdlaia3ys6vrw10i3wbjhr41iga6gkg6w2v";
52455245 };
52465246 meta.homepage = "https://github.com/google/vim-maktaba/";
52475247 };
@@ -5644,12 +5644,12 @@ let
56445644
56455645 vim-plug = buildVimPluginFrom2Nix {
56465646 pname = "vim-plug";
5647− version = "2020-06-03";
5647+ version = "2020-06-08";
56485648 src = fetchFromGitHub {
56495649 owner = "junegunn";
56505650 repo = "vim-plug";
5651− rev = "6583b990321f03500505dc43a3f62cbbc7369862";
5652− sha256 = "1k9y119xwb84fgsyyp1npjh5z1wlbbm1922n411h70cfa4928rfh";
5651+ rev = "01aab60adef47c6606aa68c8783f5b994fda9fc4";
5652+ sha256 = "1x5m98k20ncvhz6sngzxwhh74s2ll3d119p1g0di4vr59rkx8szq";
56535653 };
56545654 meta.homepage = "https://github.com/junegunn/vim-plug/";
56555655 };
@@ -5668,12 +5668,12 @@ let
56685668
56695669 vim-polyglot = buildVimPluginFrom2Nix {
56705670 pname = "vim-polyglot";
5671− version = "2020-06-01";
5671+ version = "2020-06-13";
56725672 src = fetchFromGitHub {
56735673 owner = "sheerun";
56745674 repo = "vim-polyglot";
5675− rev = "5b3866302755da9e5a917ca42a38a4a03fb5f3e5";
5676− sha256 = "0v6ll98j44hgmczhl6cp4rw734x582iz7942cw5jmbp7wg83nz88";
5675+ rev = "a86c0179ebc99b15d403e3f1d4a4cfff83b47de8";
5676+ sha256 = "0bsq2nvzxb6j0zn6c9hvrsz47ahcp3iki5acz4l1y841xgd880zm";
56775677 };
56785678 meta.homepage = "https://github.com/sheerun/vim-polyglot/";
56795679 };
@@ -5992,12 +5992,12 @@ let
59925992
59935993 vim-signify = buildVimPluginFrom2Nix {
59945994 pname = "vim-signify";
5995− version = "2020-05-18";
5995+ version = "2020-06-08";
59965996 src = fetchFromGitHub {
59975997 owner = "mhinz";
59985998 repo = "vim-signify";
5999− rev = "dfa1e55fe1c7f309f8cce4db0243f14f6edb2d4c";
6000− sha256 = "0p1hnjwhqmrczwns7h8gsmdl95yxcb6sqw59xshz7ji0b80h45mf";
5999+ rev = "c3d450eb5f5e76d99d23b10493d4e08c5bb1ae71";
6000+ sha256 = "0ms0c36zsqqpxrq4mx9k5viblcapw9kpjm9cdrs8fnldlz6i0yhh";
60016001 };
60026002 meta.homepage = "https://github.com/mhinz/vim-signify/";
60036003 };
@@ -6148,12 +6148,12 @@ let
61486148
61496149 vim-spirv = buildVimPluginFrom2Nix {
61506150 pname = "vim-spirv";
6151− version = "2019-11-20";
6151+ version = "2020-06-12";
61526152 src = fetchFromGitHub {
61536153 owner = "kbenzie";
61546154 repo = "vim-spirv";
6155− rev = "e71404f92990aa4718925ade568427c0d8631469";
6156− sha256 = "0aimpcz6vvrkcfgsj0xp12xdy1l83n387rsy74dzk23a220d59na";
6155+ rev = "9b005a0569fa5e18f71fcccbacda227c1cef7eaa";
6156+ sha256 = "0qby4bfjav2xijh732l7d2jli0adnv6cc8kcalbh5315vi4mpnfk";
61576157 };
61586158 meta.homepage = "https://github.com/kbenzie/vim-spirv/";
61596159 };
@@ -6292,12 +6292,12 @@ let
62926292
62936293 vim-test = buildVimPluginFrom2Nix {
62946294 pname = "vim-test";
6295− version = "2020-06-03";
6295+ version = "2020-06-08";
62966296 src = fetchFromGitHub {
62976297 owner = "vim-test";
62986298 repo = "vim-test";
6299− rev = "e819de903fe10fdcbb3714f3e96bafd918e4d117";
6300− sha256 = "05jh89rgd4p6mkryv5dm83jhxfmg1k77rk4zq35i8dy8i6cvi41z";
6299+ rev = "2f185e0e5b0e7344c1e391045dc33a2e7a41d8eb";
6300+ sha256 = "1djl6phjc7vzhwbaxsc70mqp1f83iz99bcfyghphs9fhgdg46jiz";
63016301 };
63026302 meta.homepage = "https://github.com/vim-test/vim-test/";
63036303 };
@@ -6532,12 +6532,12 @@ let
65326532
65336533 vim-visual-multi = buildVimPluginFrom2Nix {
65346534 pname = "vim-visual-multi";
6535− version = "2020-05-30";
6535+ version = "2020-06-08";
65366536 src = fetchFromGitHub {
65376537 owner = "mg979";
65386538 repo = "vim-visual-multi";
6539− rev = "40991d51a6a3b22d56eefe9f6145602dfe1d494b";
6540− sha256 = "0kawg12w7ssk58lv6ppv85c75x4af7dbkw9ngx7n91y1f1wkinjj";
6539+ rev = "f972b5357af0e5c9b840f8e82eceb313891ef8b2";
6540+ sha256 = "0ngvl4ikd45d1nhfpnpp003mfwx9mv5ywgk9mi5fjn2bc9a2y4l7";
65416541 };
65426542 meta.homepage = "https://github.com/mg979/vim-visual-multi/";
65436543 };
@@ -6592,12 +6592,12 @@ let
65926592
65936593 vim-which-key = buildVimPluginFrom2Nix {
65946594 pname = "vim-which-key";
6595− version = "2020-05-25";
6595+ version = "2020-06-10";
65966596 src = fetchFromGitHub {
65976597 owner = "liuchengxu";
65986598 repo = "vim-which-key";
6599− rev = "786dceaab0987e164dcee125b8ff6111851df625";
6600− sha256 = "01afdf37fqz6i9g9371yh0ymv9lsw81z52vcpnwyysbj8n7qswwc";
6599+ rev = "dffbb044f7974bf4615960689a3ff64e63daeab3";
6600+ sha256 = "0ggnz2bz6mh9i38cgpkf87j27bhr8klk9a4ws57rkwfz3qppd4lj";
66016601 };
66026602 meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
66036603 };
@@ -6784,12 +6784,12 @@ let
67846784
67856785 vimtex = buildVimPluginFrom2Nix {
67866786 pname = "vimtex";
6787− version = "2020-06-02";
6787+ version = "2020-06-09";
67886788 src = fetchFromGitHub {
67896789 owner = "lervag";
67906790 repo = "vimtex";
6791− rev = "7ef9c50aaf110debb54a8b1f4bafcb34ec86a623";
6792− sha256 = "1i9phcxb29x14n202971vflqlwd9y2wa74v8aic4xhvqb5rli8as";
6791+ rev = "49bc335fffa40a7b7b84b6110b57ebcbaaf019ea";
6792+ sha256 = "06zdj0pgr6d8vddx87rk36lb00nngydl367g06zi8jkx4673rzz8";
67936793 };
67946794 meta.homepage = "https://github.com/lervag/vimtex/";
67956795 };
@@ -6832,12 +6832,12 @@ let
68326832
68336833 vista-vim = buildVimPluginFrom2Nix {
68346834 pname = "vista-vim";
6835− version = "2020-05-23";
6835+ version = "2020-06-06";
68366836 src = fetchFromGitHub {
68376837 owner = "liuchengxu";
68386838 repo = "vista.vim";
6839− rev = "dab956b05534359fd4e498b45e518f63f097ae9c";
6840− sha256 = "1wf7plybcrrdx459f0g2rzzl9drik7w264y0i1jxf43y7nlm138n";
6839+ rev = "bfd70f620d30dc756d8ae57056b7a67a3fbbff22";
6840+ sha256 = "1a60qbswwdl58pqg6d9llj4l96h9vz7vp99s7ji0zjg8vzzklyxm";
68416841 };
68426842 meta.homepage = "https://github.com/liuchengxu/vista.vim/";
68436843 };
@@ -6965,12 +6965,12 @@ let
69656965
69666966 YouCompleteMe = buildVimPluginFrom2Nix {
69676967 pname = "YouCompleteMe";
6968− version = "2020-05-25";
6968+ version = "2020-06-12";
69696969 src = fetchFromGitHub {
69706970 owner = "ycm-core";
69716971 repo = "YouCompleteMe";
6972− rev = "27362f850ceca80e5369f46512fdd3ba042de4d7";
6973− sha256 = "1gm8z7rshn2ffc3hdwif2910ckbz01x6aysp0yk8nfmqb7iacnjc";
6972+ rev = "8bc02ee4877bfe07ed92cc4d471c353f1ab84ef6";
6973+ sha256 = "1m1qhyqax7pdrsw9zdwy64d8rg5hcvmbyl8fqmbhz22lxdg5bvzv";
69746974 fetchSubmodules = true;
69756975 };
69766976 meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
pkgs/os-specific/darwin/yabai/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "yabai";
5− version = "3.1.2";
5+ version = "3.2.0";
66
77 src = fetchFromGitHub {
88 owner = "koekeishiya";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "01vkx8nqds4f7nnzml4qf976xm89w6psxbpswkn98r5k03zfa8r0";
11+ sha256 = "1iq5p4k6klffglxfhmzc2jvlilwn0w97vb5v4b91spiyp39nqcfw";
1212 };
1313
1414 buildInputs = [ Carbon Cocoa ScriptingBridge ];
pkgs/os-specific/linux/fscrypt/default.nix+2−2
@@ -4,13 +4,13 @@
44
55buildGoModule rec {
66 pname = "fscrypt";
7− version = "0.2.8";
7+ version = "0.2.9";
88
99 src = fetchFromGitHub {
1010 owner = "google";
1111 repo = "fscrypt";
1212 rev = "v${version}";
13− sha256 = "0433f9kx43842ic8dydxhz8plyyrrxvqqwg7kd5ghn599ix28avy";
13+ sha256 = "020hhdarbn3bwlc2j2g89868v8nfx8562z1a778ihpvvsa4ykr31";
1414 };
1515
1616 postPatch = ''
pkgs/os-specific/linux/fuse/default.nix+2−2
@@ -11,7 +11,7 @@ in {
1111 };
1212
1313 fuse_3 = mkFuse {
14− version = "3.9.1";
15− sha256Hash = "1i3f4h3vnjxls8hdi6w2n2ksrgbs7brbzj65rvxginyxicykh857";
14+ version = "3.9.2";
15+ sha256Hash = "10xsbly7rv895c9zv4fqmnrxbdc0kd1qhlk75x4m9cv95f93k843";
1616 };
1717}
pkgs/os-specific/linux/kernel/hardened/patches.json+12−12
@@ -1,22 +1,22 @@
11{
22 "4.14": {
3− "name": "linux-hardened-4.14.183.a.patch",
4− "sha256": "0k9dg37q3hcm13iyw662indwy23aylc03ldqfn7613c7ymqmbzj7",
5− "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.183.a/linux-hardened-4.14.183.a.patch"
3+ "name": "linux-hardened-4.14.184.a.patch",
4+ "sha256": "1g12kz6ikdwp6b7000pfy3myga90mvxyl04b9267fk88jwih6yhk",
5+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.184.a/linux-hardened-4.14.184.a.patch"
66 },
77 "4.19": {
8− "name": "linux-hardened-4.19.127.a.patch",
9− "sha256": "00nfcs5yn2a70an3ygzzv4s3qa3hf7pni4ad70aw87vyvrqlyx3k",
10− "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.127.a/linux-hardened-4.19.127.a.patch"
8+ "name": "linux-hardened-4.19.128.a.patch",
9+ "sha256": "19ayzx9rf4j31ypavxwamd290lm95wmi7v165avxslahnx6pdsxs",
10+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.128.a/linux-hardened-4.19.128.a.patch"
1111 },
1212 "5.4": {
13− "name": "linux-hardened-5.4.45.a.patch",
14− "sha256": "0gihrcxqg3hax20xhvna4lmgsivari6wwsyqz09w34v8p1fhd5nx",
15− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.45.a/linux-hardened-5.4.45.a.patch"
13+ "name": "linux-hardened-5.4.46.a.patch",
14+ "sha256": "0f2d53na7g6dhiba2ym09lm4fp3hwm6kw6mpm5jk46jmb6j7iwk5",
15+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.46.a/linux-hardened-5.4.46.a.patch"
1616 },
1717 "5.6": {
18− "name": "linux-hardened-5.6.17.a.patch",
19− "sha256": "0nci30k7xh56b6454cd0hkpvpkfqb98cqdpvjaamlnmiphz4sk1f",
20− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.17.a/linux-hardened-5.6.17.a.patch"
18+ "name": "linux-hardened-5.6.18.a.patch",
19+ "sha256": "0idvgjg7kji4w3341acfqywi0qqn3pvxcmiz70cd7inhlqaqrw63",
20+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.18.a/linux-hardened-5.6.18.a.patch"
2121 }
2222}
pkgs/tools/misc/chezmoi/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "chezmoi";
5− version = "1.8.1";
5+ version = "1.8.2";
66
77 src = fetchFromGitHub {
88 owner = "twpayne";
99 repo = "chezmoi";
1010 rev = "v${version}";
11− sha256 = "1b8y0wq3myhvjdnwl0i4x85iil7i7kmsjajvbw1a47afm83jkbaw";
11+ sha256 = "0s2a0q3lgrdz7w69sacn23k4dybw6wrk63xxnylj88wss7mqnpj8";
1212 };
1313
14− vendorSha256 = "1za47n08iamhfl4ky928rixgadflmz86vnmnwbczd167bdndh5rq";
14+ vendorSha256 = "0hpjvpai2i9jn8hlxhx4pvvawjh6lfmlz7ffi320pp7vanzqhch1";
1515
1616 buildFlagsArray = [
1717 "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs"
pkgs/tools/misc/diffoscope/default.nix+10−4
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man
1+{ lib, stdenv, fetchurl, fetchpatch, runCommand, makeWrapper, python3Packages, docutils, help2man
22, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
33, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg_4, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
44, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R
@@ -16,11 +16,11 @@ let
1616in
1717python3Packages.buildPythonApplication rec {
1818 pname = "diffoscope";
19− version = "146";
19+ version = "147";
2020
2121 src = fetchurl {
2222 url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
23− sha256 = "1iy4f05ws7qsd5p7hadc1979l77543pwi2c5zx1yr5zc674kwb3y";
23+ sha256 = "1pichn3l10401cqk08zrys2ya9b6cjznk7ra28awnmvlg6l1cypj";
2424 };
2525
2626 outputs = [ "out" "man" ];
@@ -28,6 +28,12 @@ python3Packages.buildPythonApplication rec {
2828 patches = [
2929 ./ignore_links.patch
3030 ./skip-failing-test.patch
31+
32+ # Fix for CBFS comparator
33+ (fetchpatch {
34+ url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/39ec527371c469d61e4afc04b3ee6ae3563f7b4c.patch";
35+ sha256 = "1mzdcbxg3ad5ynpf79phvif5hzckmhf7vzd82l1sffhlqxh0v4h3";
36+ })
3137 ];
3238
3339 postPatch = ''
@@ -82,7 +88,7 @@ python3Packages.buildPythonApplication rec {
8288 '';
8389 homepage = "https://diffoscope.org/";
8490 license = licenses.gpl3Plus;
85− maintainers = with maintainers; [ dezgeg ma27 ];
91+ maintainers = with maintainers; [ dezgeg ma27 danielfullmer ];
8692 platforms = platforms.unix;
8793 };
8894}
pkgs/tools/misc/hexyl/default.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "hexyl";
5− version = "0.7.0";
5+ version = "0.8.0";
66
77 src = fetchFromGitHub {
88 owner = "sharkdp";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "0blq81zpmzldngk9ymcg56syspjp1g1ziap4z69idv05mfkf6sp3";
11+ sha256 = "0aj2sysl0spf5zlcd5kfzlw97w7dzf9x93pv0d1v9blnbd1rz7lm";
1212 };
1313
14− cargoSha256 = "09kccd1brcbvzimm05dyybwrkganqxdkjrvzgcf1l93xs1z2h94b";
14+ cargoSha256 = "1am9vs7l2wzgwqakrsl27x1y7jpn9xaqa4kr48wwqzka401h6j4m";
1515
1616 meta = with stdenv.lib; {
1717 changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}";
pkgs/tools/misc/lazydocker/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoPackage rec {
44 pname = "lazydocker";
5− version = "0.8";
5+ version = "0.9";
66
77 src = fetchFromGitHub {
88 owner = "jesseduffield";
99 repo = "lazydocker";
1010 rev = "v${version}";
11− sha256 = "02x03nmkbj0133bziaqmqlh3x515w3n01iqvg7q6b55r7nan7hv7";
11+ sha256 = "08j2qp632fdmswnb92wxa9lhnal4mrmq6gmxaxngnxiqgkfx37zy";
1212 };
1313
1414 goPackagePath = "github.com/jesseduffield/lazydocker";
pkgs/tools/misc/pistol/default.nix+3−3
@@ -6,16 +6,16 @@
66
77buildGoModule rec {
88 pname = "pistol";
9− version = "0.1.1";
9+ version = "0.1.2";
1010
1111 src = fetchFromGitHub {
1212 owner = "doronbehar";
1313 repo = pname;
1414 rev = "v${version}";
15− sha256 = "1d9c1bhidh781dis4427wramfrla4avqw9y2bmpjp81cqq3nc27d";
15+ sha256 = "1ar8c7s8ihcwrwfspmqw7cb5560wkbdc5qyvddkx8lj03cjhcslj";
1616 };
1717
18− vendorSha256 = "1f780vhxw0brvnr8hhah4sf6ms8spar29rqmy1kcqf9m75n94g56";
18+ vendorSha256 = "1mhxb72fzpa2n88i9h154aci346dgcs2njznkjxchivz28crbqr8";
1919
2020 subPackages = [ "cmd/pistol" ];
2121
pkgs/tools/misc/ttwatch/default.nix+8−6
@@ -1,19 +1,21 @@
1−{ stdenv, fetchFromGitHub, cmake, perl, openssl, curl, libusb1
1+{ stdenv, fetchFromGitHub
2+, cmake, perl, pkgconfig
3+, openssl, curl, libusb1, protobufc
24, enableUnsafe ? false }:
35
46stdenv.mkDerivation {
57 pname = "ttwatch";
6− version = "2018-12-04";
8+ version = "2020-02-05";
79
810 src = fetchFromGitHub {
911 owner = "ryanbinns";
1012 repo = "ttwatch";
11− rev = "eeb4e19bf7ca7ca2cee7f5fbeb483b27198d86a1";
12− sha256 = "18384apdkq35120cgmda686d293354aibwcq2hwhvvjmnq49fnzr";
13+ rev = "bfdf1372515574e1fb3871dc1039f8d8a5dbdada";
14+ sha256 = "07nd4dbkchxy8js1h1f6pzn63pls2afww97wyiiw6zid43mpqyg4";
1315 };
1416
15− nativeBuildInputs = [ cmake perl ];
16− buildInputs = [ openssl curl libusb1 ];
17+ nativeBuildInputs = [ cmake perl pkgconfig ];
18+ buildInputs = [ openssl curl libusb1 protobufc ];
1719
1820 cmakeFlags = stdenv.lib.optional enableUnsafe [ "-Dunsafe=on" ];
1921
pkgs/tools/networking/amass/default.nix+3−3
@@ -5,16 +5,16 @@
55
66buildGoModule rec {
77 pname = "amass";
8− version = "3.6.2";
8+ version = "3.7.2";
99
1010 src = fetchFromGitHub {
1111 owner = "OWASP";
1212 repo = "Amass";
1313 rev = "v${version}";
14− sha256 = "1ih681790sp0lqfbsl153dpr5vzxp1jjza28pajrqjzs7zyjmkgs";
14+ sha256 = "1acjqpa9xg9ji2mzxag57yq589cdq3rh78a8vz8wnkkkp7b8why8";
1515 };
1616
17− vendorSha256 = "1f8za3z5pv1pznbd91fk5j4y8qg93qk5zvnchjl7inyirciawdf6";
17+ vendorSha256 = "1s8g0qqg3m6hdvc5v3s86l3ba5grmyhx0lf2ymi39k5dpcg8l19s";
1818
1919 outputs = [ "out" "wordlists" ];
2020
pkgs/tools/networking/cassowary/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "cassowary";
5− version = "0.7.0";
5+ version = "0.11.0";
66
77 src = fetchFromGitHub {
88 owner = "rogerwelin";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "0p5vcs25h5nj36dm9yjmdjymcq0zldm3zlqfppxcjx862h48k8zj";
11+ sha256 = "161wzcdq7kpny6fzxsqk2ivnah0xwmh2knv37jn0x18lclga1k9s";
1212 };
1313
14− vendorSha256 = "1m5jaqf5jrib415k0i7w6rf5bjjwfn572wk94jwfpwjcbbvh8fck";
14+ vendorSha256 = "1qgilmkai9isbbg4pzqic6i8v5z8cay0ilw1gb69z4a6f2q4zhkp";
1515
1616 buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
1717
pkgs/tools/networking/findomain/default.nix+3−3
@@ -9,16 +9,16 @@
99
1010rustPlatform.buildRustPackage rec {
1111 pname = "findomain";
12− version = "1.5.0";
12+ version = "1.7.0";
1313
1414 src = fetchFromGitHub {
1515 owner = "Edu4rdSHL";
1616 repo = pname;
1717 rev = version;
18− sha256 = "1w3parmk3836v5ghn3cgcxyk0alk05r5ljl3j1fpnly5xvl131rd";
18+ sha256 = "1q8yxl4y8f787a0q87gxgj1p9lgzhhfk3fgysq9xj8yfvwm8abji";
1919 };
2020
21− cargoSha256 = "1cs076cgkzjan6y78a3bhriv2q2s83hp5vzhkjwz4dqn83r6b8hx";
21+ cargoSha256 = "02d538j13v3f1dc99vpzhby42ps7lig000idwdsxa1mwkjxrf2z2";
2222
2323 nativeBuildInputs = [ installShellFiles perl ];
2424 buildInputs = lib.optional stdenv.isDarwin Security;
pkgs/tools/package-management/nix-universal-prefetch/default.nix+2−2
@@ -6,13 +6,13 @@
66# No gems used, so mkDerivation is fine.
77stdenv.mkDerivation rec {
88 pname = "nix-universal-prefetch";
9− version = "0.2.0";
9+ version = "0.3.0";
1010
1111 src = fetchFromGitHub {
1212 owner = "samueldr";
1313 repo = "nix-universal-prefetch";
1414 rev = "v${version}";
15− sha256 = "1id9iaibrm2d3fa9dkcxnb3sd0j1vh502181gdd199a1cfsmzh1i";
15+ sha256 = "1nmxp6846ip2x3mibys3ymgi0813g18p9szqnsciiib3dbis4kwf";
1616 };
1717
1818 installPhase = ''
pkgs/tools/security/bundler-audit/Gemfile.lock+3−3
@@ -1,10 +1,10 @@
11GEM
22 remote: https://rubygems.org/
33 specs:
4− bundler-audit (0.6.1)
4+ bundler-audit (0.7.0.1)
55 bundler (>= 1.2.0, < 3)
6− thor (~> 0.18)
7− thor (0.20.3)
6+ thor (>= 0.18, < 2)
7+ thor (1.0.1)
88
99PLATFORMS
1010 ruby
pkgs/tools/security/bundler-audit/default.nix+1
@@ -21,6 +21,7 @@ bundlerEnv rec {
2121 - Does not require a network connection.
2222 '';
2323 homepage = "https://github.com/rubysec/bundler-audit";
24+ changelog = "https://github.com/rubysec/bundler-audit/blob/v${version}/ChangeLog.md";
2425 license = licenses.gpl3Plus;
2526 maintainers = with maintainers; [ primeos nicknovitski ];
2627 platforms = platforms.unix;
pkgs/tools/security/bundler-audit/gemset.nix+8−4
@@ -1,19 +1,23 @@
11{
22 bundler-audit = {
33 dependencies = ["thor"];
4+ groups = ["default"];
5+ platforms = [];
46 source = {
57 remotes = ["https://rubygems.org"];
6− sha256 = "0pm22xpn3xyymsainixnrk8v3l3xi9bzwkjkspx00cfzp84xvxbq";
8+ sha256 = "04l9rs56rlvihbr2ybkrigjajgd3swa98lxvmdl8iylj1g5m7n0j";
79 type = "gem";
810 };
9− version = "0.6.1";
11+ version = "0.7.0.1";
1012 };
1113 thor = {
14+ groups = ["default"];
15+ platforms = [];
1216 source = {
1317 remotes = ["https://rubygems.org"];
14− sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
18+ sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
1519 type = "gem";
1620 };
17− version = "0.20.3";
21+ version = "1.0.1";
1822 };
1923}
pkgs/tools/security/keybase/default.nix+2−2
@@ -6,7 +6,7 @@
66
77buildGoPackage rec {
88 pname = "keybase";
9− version = "5.4.2";
9+ version = "5.5.1";
1010
1111 goPackagePath = "github.com/keybase/client";
1212 subPackages = [ "go/kbnm" "go/keybase" ];
@@ -17,7 +17,7 @@ buildGoPackage rec {
1717 owner = "keybase";
1818 repo = "client";
1919 rev = "v${version}";
20− sha256 = "08lw5aw962f75xi42bwbgba94hiql2n2jnsxrkx84czi0ijs1wlr";
20+ sha256 = "03y69zmzbnfay173xkbzvnhh8zjjd2rfnqmpgr0wvh1psn7mgpsh";
2121 };
2222
2323 patches = [
pkgs/tools/security/saml2aws/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "saml2aws";
5− version = "2.25.0";
5+ version = "2.26.1";
66
77 src = fetchFromGitHub {
88 owner = "Versent";
99 repo = "saml2aws";
1010 rev = "v${version}";
11− sha256 = "12aidylamrq4rvy2cfdz669lr1p20yqrshigcc5x1hrlhh9y64xc";
11+ sha256 = "09b217x10mn3y244rwym0fcqr4ly6n83wnykb77488kn960b0pqb";
1212 };
1313
1414 hid = fetchFromGitHub {
pkgs/tools/system/gotop/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "gotop";
5− version = "3.5.3";
5+ version = "4.0.1";
66
77 src = fetchFromGitHub {
88 owner = "xxxserxxx";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "0m1a5bdqjgsm9fy3d2c6r4nil013cizqyqf19k6r4p9bq8rajnzp";
11+ sha256 = "10qfzmq1wdgpvv319khzicalix1x4fqava0wry3bzz84k5c9dabs";
1212 };
1313
14− vendorSha256 = "1pxp0a1hldkdmh174adhq8q0wyz005g7wm8yxknchvp7krxi9r0v";
14+ vendorSha256 = "1crphp41bfivfmfp3cl7pjca3ypds6mr3847msd4wvfq4g6imk55";
1515
1616 meta = with stdenv.lib; {
1717 description = "A terminal based graphical activity monitor inspired by gtop and vtop";
pkgs/tools/system/inxi/default.nix+2−2
@@ -22,13 +22,13 @@ let
2222 ++ recommendedDisplayInformationPrograms;
2323in stdenv.mkDerivation rec {
2424 pname = "inxi";
25− version = "3.1.01-1";
25+ version = "3.1.03-1";
2626
2727 src = fetchFromGitHub {
2828 owner = "smxi";
2929 repo = "inxi";
3030 rev = version;
31− sha256 = "0r204w0r06ibdr4dck7yw2nmvj7xq68bjr7xwwiy7liqdml0n0yc";
31+ sha256 = "0539hvlq021wxhbwzdp7qliiq1jgw60mxlwrwx0z2x8qi1zqdzg6";
3232 };
3333
3434 buildInputs = [ perl makeWrapper ];
pkgs/tools/text/highlight/default.nix+2−2
@@ -5,13 +5,13 @@ with stdenv.lib;
55let
66 self = stdenv.mkDerivation rec {
77 pname = "highlight";
8− version = "3.56";
8+ version = "3.57";
99
1010 src = fetchFromGitLab {
1111 owner = "saalen";
1212 repo = "highlight";
1313 rev = "v${version}";
14− sha256 = "1pilx58dg96zm0yx7i6k92vibwpvpj8ir39f2akrsyjgijnv3sx4";
14+ sha256 = "1xrk7c7akjiwh3wh9bll0qh4g0kqvbzjz9ancpadnk0k7bqi0kxf";
1515 };
1616
1717 enableParallelBuilding = true;
pkgs/tools/typesetting/scdoc/default.nix+3−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "scdoc";
5− version = "1.10.1";
5+ version = "1.11.0";
66
77 src = fetchurl {
88 url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz";
9− sha256 = "13x7g1r56bshvfmlvapvz35ywnbgsh337kywb5kcv8nc6b3j3q40";
9+ sha256 = "17cjh3lcfppyl2mzpanylla93gdgdv5spc8jldshvayzizhfghwa";
1010 };
1111
1212 postPatch = ''
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
2424 C99.
2525 '';
2626 homepage = "https://git.sr.ht/~sircmpwn/scdoc";
27+ changelog = "https://git.sr.ht/~sircmpwn/scdoc/refs/${version}";
2728 license = licenses.mit;
2829 platforms = platforms.unix;
2930 maintainers = with maintainers; [ primeos ];
pkgs/tools/video/rav1e/default.nix+9−23
@@ -1,31 +1,17 @@
1−{ rustPlatform, fetchFromGitHub, fetchurl, stdenv, lib, nasm }:
1+{ rustPlatform, fetchFromGitHub, lib, nasm }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "rav1e";
5− version = "0.3.2";
5+ version = "0.3.3";
66
7− src = stdenv.mkDerivation rec {
8− name = "${pname}-${version}-source";
9−
10− src = fetchFromGitHub {
11− owner = "xiph";
12− repo = "rav1e";
13− rev = "v${version}";
14− sha256 = "0qqw397yfglwj9kg45imhx1p5bb0nsx2gkaxj4lcc9i1hav6ia43";
15− };
16− cargoLock = fetchurl {
17− url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock";
18− sha256 = "1kdr3q97vq3mip1h7iv2iy9qzlgb69y6nwjzbw9nfi7dl7ip6q3l";
19− };
20−
21− installPhase = ''
22− mkdir -p $out
23− cp -R ./* $out/
24− cp ${cargoLock} $out/Cargo.lock
25− '';
7+ src = fetchFromGitHub {
8+ owner = "xiph";
9+ repo = "rav1e";
10+ rev = "v${version}";
11+ sha256 = "0a9dryag4x35a2c45qiq1j5xk9ydcpw1g6kici85d2yrc2z3hwrx";
2612 };
2713
28− cargoSha256 = "03zsvavk7wskz843qxwwcymhclarcp6nfxwa1mwna3nmzvlm1hwb";
14+ cargoSha256 = "1xaincrmpicp0skf9788w5631x1hxvifvq06hh5ribdz79zclzx3";
2915
3016 nativeBuildInputs = [ nasm ];
3117
@@ -37,7 +23,7 @@ rustPlatform.buildRustPackage rec {
3723 libaom (the reference encoder) is too slow.
3824 Features: https://github.com/xiph/rav1e#features
3925 '';
40− inherit (src.src.meta) homepage;
26+ inherit (src.meta) homepage;
4127 changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}";
4228 license = licenses.bsd2;
4329 maintainers = [ maintainers.primeos ];
pkgs/top-level/aliases.nix+1
@@ -154,6 +154,7 @@ mapAliases ({
154154 fuseki = apache-jena-fuseki; # added 2018-04-25
155155 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15
156156 fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19
157+ g4py = python3Packages.geant4; # added 2020-06-06
157158 gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
158159 gdb-multitarget = gdb; # added 2017-11-13
159160 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
pkgs/top-level/all-packages.nix+9−5
@@ -2172,6 +2172,8 @@ in
21722172
21732173 rmapi = callPackage ../applications/misc/remarkable/rmapi { };
21742174
2175+ remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { };
2176+
21752177 scour = with python3Packages; toPythonApplication scour;
21762178
21772179 s2png = callPackage ../tools/graphics/s2png { };
@@ -10143,6 +10145,8 @@ in
1014310145 buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)";
1014410146 buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent { };
1014510147
10148+ buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { };
10149+
1014610150 libbpf = callPackage ../os-specific/linux/libbpf { };
1014710151
1014810152 bpftool = callPackage ../os-specific/linux/bpftool { };
@@ -10379,7 +10383,7 @@ in
1037910383
1038010384 dolt = callPackage ../servers/sql/dolt { };
1038110385
10382− dot2tex = pythonPackages.dot2tex;
10386+ dot2tex = with python3.pkgs; toPythonApplication dot2tex;
1038310387
1038410388 doxygen = callPackage ../development/tools/documentation/doxygen {
1038510389 qt4 = null;
@@ -13078,7 +13082,7 @@ in
1307813082
1307913083 liblastfmSF = callPackage ../development/libraries/liblastfmSF { };
1308013084
13081− liblastfm = callPackage ../development/libraries/liblastfm { };
13085+ liblastfm = libsForQt5.callPackage ../development/libraries/liblastfm { };
1308213086
1308313087 liblcf = callPackage ../development/libraries/liblcf { };
1308413088
@@ -16259,8 +16263,9 @@ in
1625916263 libtool = darwin.cctools;
1626016264 };
1626116265
16266+ # Fails to compile with boost >= 1.72
1626216267 rippled = callPackage ../servers/rippled {
16263− boost = boost17x;
16268+ boost = boost171;
1626416269 };
1626516270
1626616271 rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix {
@@ -20202,6 +20207,7 @@ in
2020220207 swaybg = callPackage ../applications/window-managers/sway/bg.nix { };
2020320208 swayidle = callPackage ../applications/window-managers/sway/idle.nix { };
2020420209 swaylock = callPackage ../applications/window-managers/sway/lock.nix { };
20210+ sway-contrib = recurseIntoAttrs (callPackages ../applications/window-managers/sway/contrib.nix { });
2020520211
2020620212 swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { };
2020720213
@@ -25418,8 +25424,6 @@ in
2541825424
2541925425 cernlib = callPackage ../development/libraries/physics/cernlib { };
2542025426
25421− g4py = callPackage ../development/libraries/physics/geant4/g4py { };
25422−
2542325427 hepmc2 = callPackage ../development/libraries/physics/hepmc2 { };
2542425428
2542525429 hepmc3 = callPackage ../development/libraries/physics/hepmc3 {
pkgs/top-level/python-packages.nix+24−1
@@ -1256,6 +1256,8 @@ in {
12561256
12571257 pynisher = callPackage ../development/python-modules/pynisher { };
12581258
1259+ pynput = callPackage ../development/python-modules/pynput { };
1260+
12591261 pyparser = callPackage ../development/python-modules/pyparser { };
12601262
12611263 pyres = callPackage ../development/python-modules/pyres { };
@@ -2622,6 +2624,8 @@ in {
26222624
26232625 libais = callPackage ../development/python-modules/libais { };
26242626
2627+ libevdev = callPackage ../development/python-modules/libevdev { };
2628+
26252629 libfdt = toPythonModule (pkgs.dtc.override {
26262630 inherit python;
26272631 pythonSupport = true;
@@ -2808,6 +2812,8 @@ in {
28082812
28092813 fake_factory = callPackage ../development/python-modules/fake_factory { };
28102814
2815+ fake-useragent = callPackage ../development/python-modules/fake-useragent { };
2816+
28112817 factory_boy = callPackage ../development/python-modules/factory_boy { };
28122818
28132819 Fabric = callPackage ../development/python-modules/Fabric { };
@@ -3452,6 +3458,8 @@ in {
34523458
34533459 samplerate = callPackage ../development/python-modules/samplerate { };
34543460
3461+ screeninfo = callPackage ../development/python-modules/screeninfo { };
3462+
34553463 ssdeep = callPackage ../development/python-modules/ssdeep { };
34563464
34573465 ssdp = callPackage ../development/python-modules/ssdp { };
@@ -3474,6 +3482,8 @@ in {
34743482
34753483 setuptools-git = callPackage ../development/python-modules/setuptools-git { };
34763484
3485+ setuptools-lint = callPackage ../development/python-modules/setuptools-lint { };
3486+
34773487 sievelib = callPackage ../development/python-modules/sievelib { };
34783488
34793489 watchdog = callPackage ../development/python-modules/watchdog { };
@@ -3894,6 +3904,11 @@ in {
38943904
38953905 gdrivefs = callPackage ../development/python-modules/gdrivefs { };
38963906
3907+ geant4 = disabledIf (!isPy3k) (toPythonModule (pkgs.geant4.override {
3908+ enablePython = true;
3909+ python3 = python;
3910+ }));
3911+
38973912 genshi = callPackage ../development/python-modules/genshi { };
38983913
38993914 gentools = callPackage ../development/python-modules/gentools { };
@@ -6788,7 +6803,9 @@ in {
67886803
67896804 jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { };
67906805
6791− dot2tex = callPackage ../development/python-modules/dot2tex { };
6806+ dot2tex = callPackage ../development/python-modules/dot2tex {
6807+ inherit (pkgs) graphviz;
6808+ };
67926809
67936810 poezio = callPackage ../applications/networking/instant-messengers/poezio {
67946811 inherit (pkgs) pkgconfig;
@@ -6900,6 +6917,12 @@ in {
69006917
69016918 scrapy = callPackage ../development/python-modules/scrapy { };
69026919
6920+ scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { };
6921+
6922+ scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { };
6923+
6924+ scrapy-splash = callPackage ../development/python-modules/scrapy-splash { };
6925+
69036926 pandocfilters = callPackage ../development/python-modules/pandocfilters { };
69046927
69056928 pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { };
pkgs/top-level/release-lib.nix+1−1
@@ -145,7 +145,7 @@ rec {
145145 let res = builtins.tryEval (
146146 if isDerivation value then
147147 value.meta.hydraPlatforms
148− or (supportedMatches (value.meta.platforms or [ "x86_64-linux" ]))
148+ or (value.meta.platforms or [ "x86_64-linux" ])
149149 else if value.recurseForDerivations or false || value.recurseForRelease or false then
150150 packagePlatforms value
151151 else