Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
834e04c474
55 changed files with 811 additions and 278 deletions
2
.github/workflows/editorconfig.yml
vendored
2
.github/workflows/editorconfig.yml
vendored
|
|
@ -2,8 +2,6 @@ name: "Checking EditorConfig"
|
|||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
|
||||
jobs:
|
||||
tests:
|
||||
|
|
|
|||
|
|
@ -9267,4 +9267,10 @@
|
|||
github = "deifactor";
|
||||
githubId = 30192992;
|
||||
};
|
||||
fzakaria = {
|
||||
name = "Farid Zakaria";
|
||||
email = "farid.m.zakaria@gmail.com";
|
||||
github = "fzakaria";
|
||||
githubId = 605070;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,6 +59,16 @@ with lib.maintainers; {
|
|||
scope = "Maintain GNOME desktop environment and platform.";
|
||||
};
|
||||
|
||||
jitsi = {
|
||||
members = [
|
||||
mmilata
|
||||
petabyteboy
|
||||
prusnak
|
||||
ryantm
|
||||
];
|
||||
scope = "Maintain Jitsi.";
|
||||
};
|
||||
|
||||
matrix = {
|
||||
members = [
|
||||
ma27
|
||||
|
|
|
|||
|
|
@ -135,6 +135,11 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];
|
|||
The various documented workarounds to use steam have been converted to a module. <varname>programs.steam.enable</varname> enables steam, controller support and the workarounds.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Support for built-in LCDs in various pieces of Logitech hardware (keyboards and USB speakers). <varname>hardware.logitech.lcd.enable</varname> enables support for all hardware supported by the g15daemon project.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
|
|
@ -548,7 +553,7 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
|
|||
<para>
|
||||
The <literal>bitcoind</literal> module has changed to multi-instance, using submodules.
|
||||
Therefore, it is now mandatory to name each instance.
|
||||
To use this new multi-instance config with an existing bitcoind data directory and user,
|
||||
To use this new multi-instance config with an existing bitcoind data directory and user,
|
||||
you have to adjust the original config, e.g.:
|
||||
<programlisting>
|
||||
services.bitcoind = {
|
||||
|
|
@ -588,6 +593,31 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
|
|||
When updating Graylog from a version before 3.3.3 make sure to check the Graylog <link xlink:href="https://www.graylog.org/post/announcing-graylog-v3-3-3">release info</link> for information on how to avoid the issue.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>dokuwiki</literal> module has changed to multi-instance, using submodules.
|
||||
Therefore, it is now mandatory to name each instance. Moreover, forcing SSL by default has been dropped, so
|
||||
<literal>nginx.forceSSL</literal> and <literal>nginx.enableACME</literal> are no longer set to <literal>true</literal>.
|
||||
To continue using your service with the original SSL settings, you have to adjust the original config, e.g.:
|
||||
<programlisting>
|
||||
services.dokuwiki = {
|
||||
enable = true;
|
||||
...
|
||||
};
|
||||
</programlisting>
|
||||
To something similar:
|
||||
<programlisting>
|
||||
services.dokuwiki."mywiki" = {
|
||||
enable = true;
|
||||
nginx = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
};
|
||||
...
|
||||
};
|
||||
</programlisting>
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,24 +5,92 @@ with lib;
|
|||
let
|
||||
cfg = config.hardware.logitech;
|
||||
|
||||
in {
|
||||
options.hardware.logitech = {
|
||||
enable = mkEnableOption "Logitech Devices";
|
||||
vendor = "046d";
|
||||
|
||||
enableGraphical = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Enable graphical support applications.";
|
||||
daemon = "g15daemon";
|
||||
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "hardware" "logitech" "enable" ] [ "hardware" "logitech" "wireless" "enable" ])
|
||||
(mkRenamedOptionModule [ "hardware" "logitech" "enableGraphical" ] [ "hardware" "logitech" "wireless" "enableGraphical" ])
|
||||
];
|
||||
|
||||
options.hardware.logitech = {
|
||||
|
||||
lcd = {
|
||||
enable = mkEnableOption "Logitech LCD Devices";
|
||||
|
||||
startWhenNeeded = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Only run the service when an actual supported device is plugged.
|
||||
'';
|
||||
};
|
||||
|
||||
devices = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ "0a07" "c222" "c225" "c227" "c251" ];
|
||||
description = ''
|
||||
List of USB device ids supported by g15daemon.
|
||||
</para>
|
||||
<para>
|
||||
You most likely do not need to change this.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
wireless = {
|
||||
enable = mkEnableOption "Logitech Wireless Devices";
|
||||
|
||||
enableGraphical = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Enable graphical support applications.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
pkgs.ltunify
|
||||
] ++ lib.optional cfg.enableGraphical pkgs.solaar;
|
||||
config = lib.mkIf (cfg.wireless.enable || cfg.lcd.enable) {
|
||||
environment.systemPackages = []
|
||||
++ lib.optional cfg.wireless.enable pkgs.ltunify
|
||||
++ lib.optional cfg.wireless.enableGraphical pkgs.solaar;
|
||||
|
||||
# ltunifi and solaar both provide udev rules but the most up-to-date have been split
|
||||
# out into a dedicated derivation
|
||||
services.udev.packages = with pkgs; [ logitech-udev-rules ];
|
||||
services.udev = {
|
||||
# ltunifi and solaar both provide udev rules but the most up-to-date have been split
|
||||
# out into a dedicated derivation
|
||||
|
||||
packages = []
|
||||
++ lib.optional cfg.wireless.enable pkgs.logitech-udev-rules
|
||||
++ lib.optional cfg.lcd.enable pkgs.g15daemon;
|
||||
|
||||
extraRules = ''
|
||||
# nixos: hardware.logitech.lcd
|
||||
'' + lib.concatMapStringsSep "\n" (
|
||||
dev:
|
||||
''ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="${vendor}", ATTRS{idProduct}=="${dev}", TAG+="systemd", ENV{SYSTEMD_WANTS}+="${daemon}.service"''
|
||||
) cfg.lcd.devices;
|
||||
};
|
||||
|
||||
systemd.services."${daemon}" = lib.mkIf cfg.lcd.enable {
|
||||
description = "Logitech LCD Support Daemon";
|
||||
documentation = [ "man:g15daemon(1)" ];
|
||||
wantedBy = lib.mkIf (! cfg.lcd.startWhenNeeded) "multi-user.target";
|
||||
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
ExecStart = "${pkgs.g15daemon}/bin/g15daemon";
|
||||
# we patch it to write to /run/g15daemon/g15daemon.pid instead of
|
||||
# /run/g15daemon.pid so systemd will do the cleanup for us.
|
||||
PIDFile = "/run/${daemon}/g15daemon.pid";
|
||||
PrivateTmp = true;
|
||||
PrivateNetwork = true;
|
||||
ProtectHome = "tmpfs";
|
||||
ProtectSystem = "full"; # strict doesn't work
|
||||
RuntimeDirectory = daemon;
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -269,4 +269,7 @@ in
|
|||
users.groups = mapAttrs' (instanceName: cfg: (
|
||||
nameValuePair "${cfg.group}" { })) eachBlockbook;
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ maintainers."1000101" ];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -148,5 +148,5 @@ in
|
|||
mkDefault "${pkgs.jicofo}/etc/jitsi/jicofo/logging.properties-journal";
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ ];
|
||||
meta.maintainers = lib.teams.jitsi.members;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -272,5 +272,5 @@ in
|
|||
}];
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ ];
|
||||
meta.maintainers = lib.teams.jitsi.members;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -106,7 +106,9 @@ in
|
|||
Restart = "always";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ maintainers."1000101" ];
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
|
||||
inherit (lib) mkEnableOption mkForce mkIf mkMerge mkOption optionalAttrs recursiveUpdate types;
|
||||
inherit (lib) mkEnableOption mkForce mkIf mkMerge mkOption optionalAttrs recursiveUpdate types maintainers;
|
||||
inherit (lib) concatMapStringsSep flatten mapAttrs mapAttrs' mapAttrsToList nameValuePair concatMapStringSep;
|
||||
|
||||
eachSite = config.services.dokuwiki;
|
||||
|
|
@ -249,22 +249,19 @@ let
|
|||
nginx = mkOption {
|
||||
type = types.submodule (
|
||||
recursiveUpdate
|
||||
(import ../web-servers/nginx/vhost-options.nix { inherit config lib; })
|
||||
{
|
||||
# Enable encryption by default,
|
||||
options.forceSSL.default = true;
|
||||
options.enableACME.default = true;
|
||||
}
|
||||
(import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {}
|
||||
);
|
||||
default = {forceSSL = true; enableACME = true;};
|
||||
default = {};
|
||||
example = {
|
||||
serverAliases = [
|
||||
"wiki.\${config.networking.domain}"
|
||||
];
|
||||
enableACME = false;
|
||||
# To enable encryption and let let's encrypt take care of certificate
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
};
|
||||
description = ''
|
||||
With this option, you can customize the nginx virtualHost which already has sensible defaults for DokuWiki.
|
||||
With this option, you can customize the nginx virtualHost settings.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
@ -276,7 +273,7 @@ in
|
|||
services.dokuwiki = mkOption {
|
||||
type = types.attrsOf (types.submodule siteOpts);
|
||||
default = {};
|
||||
description = "Sepcification of one or more dokuwiki sites to service.";
|
||||
description = "Sepcification of one or more dokuwiki sites to serve.";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -385,4 +382,7 @@ in
|
|||
isSystemUser = true;
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ maintainers."1000101" ];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -329,5 +329,5 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ ];
|
||||
meta.maintainers = lib.teams.jitsi.members;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,18 +39,10 @@ in {
|
|||
services.dokuwiki."site1.local" = {
|
||||
aclUse = false;
|
||||
superUser = "admin";
|
||||
nginx = {
|
||||
forceSSL = false;
|
||||
enableACME = false;
|
||||
};
|
||||
};
|
||||
services.dokuwiki."site2.local" = {
|
||||
aclUse = true;
|
||||
usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php";
|
||||
superUser = "admin";
|
||||
nginx = {
|
||||
forceSSL = false;
|
||||
enableACME = false;
|
||||
};
|
||||
templates = [ template-bootstrap3 ];
|
||||
plugins = [ plugin-icalevents ];
|
||||
};
|
||||
|
|
@ -70,6 +62,15 @@ in {
|
|||
machine.wait_for_open_port(80)
|
||||
|
||||
machine.succeed("curl -sSfL http://site1.local/ | grep 'DokuWiki'")
|
||||
machine.fail("curl -sSfL 'http://site1.local/doku.php?do=login' | grep 'Login'")
|
||||
|
||||
machine.succeed("curl -sSfL http://site2.local/ | grep 'DokuWiki'")
|
||||
machine.succeed("curl -sSfL 'http://site2.local/doku.php?do=login' | grep 'Login'")
|
||||
|
||||
machine.succeed(
|
||||
"echo 'admin:$2y$10$ijdBQMzSVV20SrKtCna8gue36vnsbVm2wItAXvdm876sshI4uwy6S:Admin:admin@example.test:user' >> /var/lib/dokuwiki/site2.local/users.auth.php",
|
||||
"curl -sSfL -d 'u=admin&p=password' --cookie-jar cjar 'http://site2.local/doku.php?do=login'",
|
||||
"curl -sSfL --cookie cjar --cookie-jar cjar 'http://site2.local/doku.php?do=login' | grep 'Logged in as: <bdi>Admin</bdi>'",
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "jitsi-meet";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ mmilata ];
|
||||
meta = with pkgs.stdenv.lib; {
|
||||
maintainers = teams.jitsi.members;
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
|
|
|||
|
|
@ -1,18 +1,36 @@
|
|||
{ stdenv, fetchurl, pkgconfig, libsidplayfp }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, pkgconfig
|
||||
, libsidplayfp
|
||||
, alsaSupport ? stdenv.hostPlatform.isLinux
|
||||
, alsaLib
|
||||
, pulseSupport ? stdenv.hostPlatform.isLinux
|
||||
, libpulseaudio
|
||||
}:
|
||||
|
||||
assert alsaSupport -> alsaLib != null;
|
||||
assert pulseSupport -> libpulseaudio != null;
|
||||
let
|
||||
inherit (lib) optional;
|
||||
inherit (lib.versions) majorMinor;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4.4";
|
||||
pname = "sidplayfp";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${pname}-${version}.tar.gz";
|
||||
sha256 = "0arsrg3f0fsinal22qjmj3r6500bcbgqnx26fsz049ldl716kz1m";
|
||||
url = "mirror://sourceforge/sidplay-residfp/sidplayfp/${majorMinor version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1s2dfs9z1hwarpfzawg11wax9nh0zcqx4cafwq7iysckyg4scz4k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig ]
|
||||
++ optional alsaSupport alsaLib
|
||||
++ optional pulseSupport libpulseaudio;
|
||||
|
||||
buildInputs = [ libsidplayfp ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "A SID player using libsidplayfp";
|
||||
homepage = "https://sourceforge.net/projects/sidplay-residfp/";
|
||||
license = with licenses; [ gpl2Plus ];
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ with stdenv.lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kakoune-unwrapped";
|
||||
version = "2020.01.16";
|
||||
version = "2020.08.04";
|
||||
src = fetchFromGitHub {
|
||||
repo = "kakoune";
|
||||
owner = "mawww";
|
||||
rev = "v${version}";
|
||||
sha256 = "16v6z1nzj54j19fraxhb18jdby4zfs1br91gxpg9s2s4nsk0km0b";
|
||||
sha256 = "1cgkis8bywy5k8k6j4i3prikpmhh1p6zyklliyxbc89mj64kvx4s";
|
||||
};
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ ncurses asciidoc docbook_xsl libxslt ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbeaver-ce";
|
||||
version = "7.1.3";
|
||||
version = "7.1.4";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "dbeaver";
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "0i8f0rhs11wwx3cy37y9rv61rd451gg138zl8rndri1hdgsz148b";
|
||||
sha256 = "0a11hjwngm9i05wjx3qavf1zmlaz13dvhqm54ci4d27qrczywcyr";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gallery_dl";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "14a8skaxc4xn2hm8ahp8lzrmwh1f3lbcibvhpprqr3szd6i2p0pf";
|
||||
sha256 = "0lyy48za81vfw4a5l7fsczsv889dk829nby941xvswp3scclpvfy";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Jitsi Meet desktop application powered by Electron";
|
||||
homepage = "https://github.com/jitsi/jitsi-meet-electron";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
maintainers = teams.jitsi.members;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Open Source Video Calls and Chat";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [];
|
||||
maintainers = teams.jitsi.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ let
|
|||
else "");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "1.34.4"; # Please backport all updates to the stable channel.
|
||||
version = "1.34.5"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
|
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "0250ys1lvfl417n8z9w3z6vqflzdlg0sff8l7wbzhv87nnc9kzg9";
|
||||
sha256 = "1s8nksrkfivsf9r460ifxsf8l7bnc1zix5yj39kvnx0mbync8lg1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ let
|
|||
pname = "slack";
|
||||
version = {
|
||||
x86_64-darwin = "4.8.0";
|
||||
x86_64-linux = "4.7.0";
|
||||
x86_64-linux = "4.8.0";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
src = let
|
||||
|
|
@ -53,7 +53,7 @@ let
|
|||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb";
|
||||
sha256 = "1nwyl70caaz9k0hccfpkjli0jjc6m9zbjb3nf4bwmykpbxbzr9w3";
|
||||
sha256 = "0q8qpz5nwhps7y5gq1bl8hjw7vsk789srrv39hzc7jrl8f1bxzk0";
|
||||
};
|
||||
}.${system} or throwSystem;
|
||||
|
||||
|
|
|
|||
28
pkgs/applications/networking/p2p/gnunet-gtk/default.nix
Normal file
28
pkgs/applications/networking/p2p/gnunet-gtk/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchgit, pkgconfig
|
||||
, autoreconfHook, wrapGAppsHook
|
||||
, libgcrypt, libextractor, libxml2
|
||||
, gnome3, gnunet, gnutls, gtk3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnunet-gtk";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.gnunet.org/gnunet-gtk.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ccasng1b4bj0kqhbfhiv0j1gnc4v2ka5f7wxvka3iwp90g7rax6";
|
||||
};
|
||||
|
||||
nativeBuildInputs= [ autoreconfHook wrapGAppsHook pkgconfig ];
|
||||
buildInputs = [ libgcrypt libextractor libxml2 gnunet gnome3.glade gnutls gtk3 ];
|
||||
|
||||
patchPhase = "patchShebangs pixmaps/icon-theme-installer";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "GNUnet GTK User Interface";
|
||||
homepage = "https://git.gnunet.org/gnunet-gtk.git";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ pstn ];
|
||||
platforms = platforms.gnu ++ platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnunet";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
|
||||
sha256 = "0zhz3dd4mr6k7wlcxw2xclq8p8l4ia5nlg78dylyz6lbz96h2lsm";
|
||||
sha256 = "1mwcy7fj1rpd39w7j7k3jdwlil5s889b2qlhfdggqmhigl28na5c";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
73
pkgs/applications/office/gtg/default.nix
Normal file
73
pkgs/applications/office/gtg/default.nix
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, python3Packages
|
||||
, pkgconfig
|
||||
, ninja
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
, itstool
|
||||
, gettext
|
||||
, pango
|
||||
, gdk-pixbuf
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gtg";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getting-things-gnome";
|
||||
repo = "gtg";
|
||||
rev = "6623731f301c1b9c7b727e009f4a6462ad381c68";
|
||||
sha256 = "14gxgg4nl0ki3dn913041jpyfhxsj90fkd55z6mmpyklhr8mwss1";
|
||||
};
|
||||
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
wrapGAppsHook
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
itstool
|
||||
gettext
|
||||
pango
|
||||
gdk-pixbuf
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pycairo
|
||||
pygobject3
|
||||
lxml
|
||||
dbus-python
|
||||
gst-python
|
||||
liblarch
|
||||
pyxdg # can probably be removed after next release
|
||||
];
|
||||
|
||||
format = "other";
|
||||
strictDeps = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "
|
||||
Getting Things GNOME! (GTG) is a personal tasks and TODO-list items organizer for the GNOME desktop environment and inspired by the ''Getting Things Done'' (GTD) methodology.
|
||||
";
|
||||
longDescription = "
|
||||
GTG is designed with flexibility, adaptability, and ease of use in mind so it can be used as more than just GTD software.
|
||||
GTG is intended to help you track everything you need to do and need to know, from small tasks to large projects.
|
||||
";
|
||||
homepage = "https://wiki.gnome.org/Apps/GTG";
|
||||
downloadPage = "https://github.com/getting-things-gnome/gtg/releases";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ oyren ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +1,21 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "1.052";
|
||||
version = "1.054";
|
||||
in
|
||||
fetchzip {
|
||||
name = "recursive-${version}";
|
||||
|
||||
url = "https://github.com/arrowtype/recursive/releases/download/${version}/Recursive-Beta_${version}.zip";
|
||||
url = "https://github.com/arrowtype/recursive/releases/download/${version}/ArrowType-Recursive-${version}.zip";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
||||
unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
|
||||
unzip -j $downloadedFile \*.otf -x __MACOSX/\* -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile \*.ttf -x __MACOSX/\* -d $out/share/fonts/truetype
|
||||
unzip -j $downloadedFile \*.woff2 -x __MACOSX/\* -d $out/share/fonts/woff2
|
||||
'';
|
||||
|
||||
sha256 = "1kam7wcn0rg89gw52pn174sz0r9lc2kjdz88l0jg20gwa3bjbpc6";
|
||||
sha256 = "12ld0w7x5lyvymrnqzfj74a3m6knv7i1795bvnpyljmxxkacscnl";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://recursive.design/";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, makeWrapper, jre, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.23.0-RC1";
|
||||
version = "0.26.0-RC1";
|
||||
pname = "dotty-bare";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz";
|
||||
sha256 = "0c64dw2qp8mhgsll8viqaiy34wq1ablkbc4bi813a1r4nqg57sv0";
|
||||
sha256 = "16njy9f0lk7q5x5w1k4yqy644005w4cxhq20r8i2qslhxjndz66f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ncurses.dev ] ;
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
let
|
||||
# The version number here is whatever is reported by the RUBY_VERSION string
|
||||
rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
|
||||
rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" "";
|
||||
jruby = stdenv.mkDerivation rec {
|
||||
pname = "jruby";
|
||||
|
||||
version = "9.2.12.0";
|
||||
version = "9.2.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
|
||||
sha256 = "013c1q1n525y9ghp369z1jayivm9bw8c1x0g5lz7479hqhj62zrh";
|
||||
sha256 = "0n5glz6xm3skrfihzn3g5awdxpjsqn2k8k46gv449rk2l50w5a3k";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
|
@ -46,11 +46,12 @@ jruby = stdenv.mkDerivation rec {
|
|||
libPath = "lib/${rubyEngine}/${rubyVersion.libDir}";
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Ruby interpreter written in Java";
|
||||
homepage = "http://jruby.org/";
|
||||
license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = with licenses; [ cpl10 gpl2 lgpl21 ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.fzakaria ];
|
||||
};
|
||||
};
|
||||
in jruby.overrideAttrs (oldAttrs: {
|
||||
|
|
|
|||
|
|
@ -1,34 +1,41 @@
|
|||
{ stdenv, fetchurl, pkgconfig
|
||||
, docSupport ? true, doxygen ? null, graphviz ? null }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, pkgconfig
|
||||
, docSupport ? true
|
||||
, doxygen ? null
|
||||
, graphviz ? null
|
||||
}:
|
||||
|
||||
assert docSupport -> doxygen != null && graphviz != null;
|
||||
|
||||
let
|
||||
inherit (lib) optionals optionalString;
|
||||
inherit (lib.versions) majorMinor;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsidplayfp";
|
||||
major = "1";
|
||||
minor = "8";
|
||||
level = "7";
|
||||
version = "${major}.${minor}.${level}";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${pname}-${version}.tar.gz";
|
||||
sha256 = "14k1sbdcbhykwfcadq5lbpnm9xp2r7vs7fyi84h72g89y8pjg0da";
|
||||
url = "mirror://sourceforge/sidplay-residfp/${pname}/${majorMinor version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0d866czmnmhnhb2j37rlrdphjdi2b75kak9barm9xqwg2z0nmmhz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ]
|
||||
++ stdenv.lib.optionals docSupport [ doxygen graphviz ];
|
||||
++ optionals docSupport [ doxygen graphviz ];
|
||||
|
||||
installTargets = [ "install" ]
|
||||
++ stdenv.lib.optionals docSupport [ "doc" ];
|
||||
++ optionals docSupport [ "doc" ];
|
||||
|
||||
outputs = [ "out" ] ++ stdenv.lib.optionals docSupport [ "doc" ];
|
||||
outputs = [ "out" ]
|
||||
++ optionals docSupport [ "doc" ];
|
||||
|
||||
postInstall = stdenv.lib.optionalString docSupport ''
|
||||
postInstall = optionalString docSupport ''
|
||||
mkdir -p $doc/share/doc/libsidplayfp
|
||||
mv docs/html $doc/share/doc/libsidplayfp/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "A library to play Commodore 64 music derived from libsidplay2";
|
||||
homepage = "https://sourceforge.net/projects/sidplay-residfp/";
|
||||
license = with licenses; [ gpl2Plus ];
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ let
|
|||
# Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details:
|
||||
# https://github.com/matthewbauer/undmg/issues/4
|
||||
year = if stdenvNoCC.isDarwin then "2019" else "2020";
|
||||
spot = if stdenvNoCC.isDarwin then "3" else "1";
|
||||
rel = if stdenvNoCC.isDarwin then "199" else "217";
|
||||
spot = if stdenvNoCC.isDarwin then "3" else "2";
|
||||
rel = if stdenvNoCC.isDarwin then "199" else "254";
|
||||
|
||||
rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}";
|
||||
|
||||
|
|
@ -42,8 +42,8 @@ in stdenvNoCC.mkDerivation {
|
|||
})
|
||||
else
|
||||
(fetchurl {
|
||||
url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16533/l_mkl_${version}.tgz";
|
||||
sha256 = "0v86hrqg15mbc78m9qk8dbkaaq3mlwashgbf9n79kxpl1gilnah8";
|
||||
url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16849/l_mkl_${version}.tgz";
|
||||
sha256 = "08q2q5rary7fxlrk09kpw0vl7mkk2smmklib44a6qainmxks407d";
|
||||
});
|
||||
|
||||
nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin
|
||||
|
|
|
|||
25
pkgs/development/ocaml-modules/mustache/default.nix
Normal file
25
pkgs/development/ocaml-modules/mustache/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub, ezjsonm, menhir, ounit }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mustache";
|
||||
version = "3.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rgrinberg";
|
||||
repo = "ocaml-mustache";
|
||||
rev = "v${version}";
|
||||
sha256 = "19v8rk8d8lkfm2rmhdawfgadji6wa267ir5dprh4w9l1sfj8a1py";
|
||||
};
|
||||
|
||||
buildInputs = [ ezjsonm ];
|
||||
propagatedBuildInputs = [ menhir ];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ ounit ];
|
||||
|
||||
meta = {
|
||||
description = "Mustache logic-less templates in OCaml";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
inherit (src.meta) homepage;
|
||||
};
|
||||
}
|
||||
|
|
@ -19,6 +19,10 @@ buildPythonPackage rec {
|
|||
sha256 = "0s94m17yph1gq9f2svipb3bbwbw1s4j3zf2xkg5h91006v8286r6";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace alot/settings/manager.py --replace /usr/share "$out/share"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optional withManpage sphinx;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
36
pkgs/development/python-modules/brother/default.nix
Normal file
36
pkgs/development/python-modules/brother/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
|
||||
, pysnmp
|
||||
, asynctest, pytestcov, pytestrunner, pytest-asyncio, pytest-trio, pytest-tornasync }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "brother";
|
||||
version = "0.1.14";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bieniu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "11pkr30bxrzgbz6bi42dyhav6qhr7rz9fb6a13297g7wa77jn4r4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pysnmp
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
asynctest
|
||||
pytestcov
|
||||
pytestrunner
|
||||
pytest-asyncio
|
||||
pytest-trio
|
||||
pytest-tornasync
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP.";
|
||||
homepage = "https://github.com/bieniu/brother";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
48
pkgs/development/python-modules/liblarch/default.nix
Normal file
48
pkgs/development/python-modules/liblarch/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, python
|
||||
, pygobject3
|
||||
, xvfb_run
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.0.1";
|
||||
pname = "liblarch";
|
||||
disabled = pythonOlder "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getting-things-gnome";
|
||||
repo = "liblarch";
|
||||
rev = "v${version}";
|
||||
sha256 = "0xv2mfvyzipbny3iz8vll77wsqxfwh28xj6bj1ff0l452waph45m";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
gobject-introspection # for setup hook
|
||||
gtk3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pygobject3
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \
|
||||
${python.interpreter} nix_run_setup test
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A python library built to easily handle data structure such are lists, trees and acyclic graphs";
|
||||
homepage = "https://github.com/getting-things-gnome/liblarch";
|
||||
downloadPage = "https://github.com/getting-things-gnome/liblarch/releases";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ oyren ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
38
pkgs/development/python-modules/pytest-tornasync/default.nix
Normal file
38
pkgs/development/python-modules/pytest-tornasync/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
|
||||
, pytest, tornado }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-tornasync";
|
||||
version = "0.6.0.post2";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eukaryote";
|
||||
repo = pname;
|
||||
# upstream does not keep git tags in sync with pypy releases
|
||||
# https://github.com/eukaryote/pytest-tornasync/issues/9
|
||||
rev = "c5f013f1f727f1ca1fcf8cc748bba7f4a2d79e56";
|
||||
sha256 = "04cg1cfrr55dbi8nljkpcsc103i5c6p0nr46vjr0bnxgkxx03x36";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pytest
|
||||
tornado
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
tornado
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest test
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "py.test plugin for testing Python 3.5+ Tornado code";
|
||||
homepage = "https://github.com/eukaryote/pytest-tornasync";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
39
pkgs/development/python-modules/pytest-trio/default.nix
Normal file
39
pkgs/development/python-modules/pytest-trio/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
|
||||
, trio, async_generator, hypothesis, outcome, pytest, pytestcov }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-trio";
|
||||
version = "0.6.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-trio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09v2031yxm8ryhq12205ldcck76n3wwqhjjsgfmn6dxfiqb0vbw9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
trio
|
||||
async_generator
|
||||
outcome
|
||||
pytest
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestcov
|
||||
hypothesis
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pytest plugin for trio";
|
||||
homepage = "https://github.com/python-trio/pytest-trio";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,27 +2,29 @@
|
|||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, scipy
|
||||
, matplotlib
|
||||
, pandas
|
||||
, astropy
|
||||
, parfive
|
||||
, pythonOlder
|
||||
, sqlalchemy
|
||||
, scikitimage
|
||||
, glymur
|
||||
|
||||
, asdf
|
||||
, astropy
|
||||
, astropy-helpers
|
||||
, beautifulsoup4
|
||||
, drms
|
||||
, python-dateutil
|
||||
, zeep
|
||||
, tqdm
|
||||
, asdf
|
||||
, astropy-helpers
|
||||
, glymur
|
||||
, hypothesis
|
||||
, matplotlib
|
||||
, numpy
|
||||
, pandas
|
||||
, parfive
|
||||
, pytest-astropy
|
||||
, pytestcov
|
||||
, pytest-mock
|
||||
, pytestcov
|
||||
, python-dateutil
|
||||
, scikitimage
|
||||
, scipy
|
||||
, sqlalchemy
|
||||
, towncrier
|
||||
, tqdm
|
||||
, zeep
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -47,6 +49,7 @@ buildPythonPackage rec {
|
|||
parfive
|
||||
sqlalchemy
|
||||
scikitimage
|
||||
towncrier
|
||||
glymur
|
||||
beautifulsoup4
|
||||
drms
|
||||
|
|
|
|||
40
pkgs/development/python-modules/towncrier/default.nix
Normal file
40
pkgs/development/python-modules/towncrier/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy27
|
||||
, click
|
||||
, click-default-group
|
||||
, incremental
|
||||
, jinja2
|
||||
, pytestCheckHook
|
||||
, toml
|
||||
, twisted
|
||||
, git # shells out to git
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "towncrier";
|
||||
version = "19.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "15l1gb0hhi9pf3mhhb9vpc93w6w3hrih2ljmzbkgfb3dwqd1l9a8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
click-default-group
|
||||
incremental
|
||||
jinja2
|
||||
toml
|
||||
];
|
||||
|
||||
# zope.interface collision
|
||||
doCheck = !isPy27;
|
||||
checkInputs = [ git twisted pytestCheckHook ];
|
||||
pythonImportsCheck = [ "towncrier" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Utility to produce useful, summarised news files";
|
||||
homepage = "https://github.com/twisted/towncrier/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "reviewdog";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "05y8683f0r8bf8gn5miiwqkfz550s2c9kmvz0a1g7y99r9n6kzjk";
|
||||
sha256 = "1xi5dfdy66qa6xvy60fk2lmp9gxyi0nfkyvybcazn8mrd99hfh6l";
|
||||
};
|
||||
|
||||
vendorSha256 = "0cxi01jxg89lsk91dv782746i8g9ksanx8igmgafq9vq25lld7yg";
|
||||
|
|
|
|||
|
|
@ -65,12 +65,12 @@ let
|
|||
|
||||
ale = buildVimPluginFrom2Nix {
|
||||
pname = "ale";
|
||||
version = "2020-07-30";
|
||||
version = "2020-08-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dense-analysis";
|
||||
repo = "ale";
|
||||
rev = "e03e24c091c601a821379d259191583b39bcf23e";
|
||||
sha256 = "1pwshkvwwidnqkxirrixhkldx0pry1rrhplc9nl73h7qy2qmllq4";
|
||||
rev = "316c7c7372ad6f34e439944713655ccff2123f40";
|
||||
sha256 = "1qrj9zyb9y03ki0ivj4agjg2wn5jbymy39icxg33xp8bjf2wra5m";
|
||||
};
|
||||
meta.homepage = "https://github.com/dense-analysis/ale/";
|
||||
};
|
||||
|
|
@ -269,12 +269,12 @@ let
|
|||
|
||||
calendar-vim = buildVimPluginFrom2Nix {
|
||||
pname = "calendar-vim";
|
||||
version = "2020-07-20";
|
||||
version = "2020-08-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "itchyny";
|
||||
repo = "calendar.vim";
|
||||
rev = "0f4a877a901cc04c226cdf1aad98948fb6ee47b8";
|
||||
sha256 = "06kjsmjk8vg7gamg1647injw7a5m12571hjwvvfsamjvdbfhr3nm";
|
||||
rev = "bc736aa8c7aa0cc8a66c1294695f73a3fd9d6931";
|
||||
sha256 = "0zb6f0xsrdxjg7fn3iz76gs5md0qnz359zq8l6zkgf3sqjy1gcag";
|
||||
};
|
||||
meta.homepage = "https://github.com/itchyny/calendar.vim/";
|
||||
};
|
||||
|
|
@ -401,12 +401,12 @@ let
|
|||
|
||||
coc-fzf = buildVimPluginFrom2Nix {
|
||||
pname = "coc-fzf";
|
||||
version = "2020-07-30";
|
||||
version = "2020-08-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "antoinemadec";
|
||||
repo = "coc-fzf";
|
||||
rev = "7657fba23cacc7e05168e70e8e6ccfafd437fdce";
|
||||
sha256 = "1zzmhc70yf8nc7jkq5414rs5sd9cafxcgpqw9xbpkbhawjx4hknj";
|
||||
rev = "ca077f82959f34cb2859c6202736f00b747cd210";
|
||||
sha256 = "0alq3sr00j50zha2cf3dak5vx92dhspx5cb61x48ql8y83cqpfb3";
|
||||
};
|
||||
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
|
||||
};
|
||||
|
|
@ -605,12 +605,12 @@ let
|
|||
|
||||
coc-rust-analyzer = buildVimPluginFrom2Nix {
|
||||
pname = "coc-rust-analyzer";
|
||||
version = "2020-07-29";
|
||||
version = "2020-08-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fannheyward";
|
||||
repo = "coc-rust-analyzer";
|
||||
rev = "23d5b46ff6e459d246d6f194ab3df97f5db2f41d";
|
||||
sha256 = "1gvm61jfnyk8mmsncknmnb9mhkz52fl8gnisj856x9phn8fq5cf9";
|
||||
rev = "96a5021780df3fe03ecec32aa412df81ba5fb1ec";
|
||||
sha256 = "0rkh5dj4hjh1kq1z651m5vf16mcil1d3hv5nqnyyrrj6x9m6y0zz";
|
||||
};
|
||||
meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/";
|
||||
};
|
||||
|
|
@ -653,12 +653,12 @@ let
|
|||
|
||||
coc-spell-checker = buildVimPluginFrom2Nix {
|
||||
pname = "coc-spell-checker";
|
||||
version = "2020-05-15";
|
||||
version = "2020-08-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "iamcco";
|
||||
repo = "coc-spell-checker";
|
||||
rev = "bc9802c667aac992fab2f47b0da096c28dca0dfd";
|
||||
sha256 = "1fsjf07w0z9l2zra46krpg1d6qxg51niz9zmxas66si90qb2j3d7";
|
||||
rev = "c1fe3de47f6ba93d4c44b514e530517c19a75880";
|
||||
sha256 = "1yvcbfrd5lxgmxbvphpbzcw8ni6zjqmg2flkrvnz59b9rmafn8dg";
|
||||
};
|
||||
meta.homepage = "https://github.com/iamcco/coc-spell-checker/";
|
||||
};
|
||||
|
|
@ -846,12 +846,12 @@ let
|
|||
|
||||
completion-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "completion-nvim";
|
||||
version = "2020-07-29";
|
||||
version = "2020-08-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lua";
|
||||
repo = "completion-nvim";
|
||||
rev = "b3d8cd0ce39bc646d8edb2d0d16dafc60de659dd";
|
||||
sha256 = "0l1vpiy4lanwfq9jjxw2j1j2z9cj7rzdpks098y0w09ri28vkldx";
|
||||
rev = "b354c7fcfadac3170db696d47d8e7edb478ba4f0";
|
||||
sha256 = "0fhn6r6w7slvd24akm27ylf9fmdi0rgcv86c0zl53kzc1pkz4a01";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-lua/completion-nvim/";
|
||||
};
|
||||
|
|
@ -882,12 +882,12 @@ let
|
|||
|
||||
conjure = buildVimPluginFrom2Nix {
|
||||
pname = "conjure";
|
||||
version = "2020-07-23";
|
||||
version = "2020-08-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Olical";
|
||||
repo = "conjure";
|
||||
rev = "7a657308f3e985ddc47d3f3ab383b4eaa4c24e16";
|
||||
sha256 = "1z2z13vkp881q561cdggycng0m89m13f658z0qrn0cbxlyid7aai";
|
||||
rev = "d9d514db3ef7fcf36bacc402aba511663a73bfbc";
|
||||
sha256 = "0pb4ysv1nhgccb5plgidv0mj9vrxl95vzsvy5771bmaqiw3srnxf";
|
||||
};
|
||||
meta.homepage = "https://github.com/Olical/conjure/";
|
||||
};
|
||||
|
|
@ -918,12 +918,12 @@ let
|
|||
|
||||
cpsm = buildVimPluginFrom2Nix {
|
||||
pname = "cpsm";
|
||||
version = "2018-09-08";
|
||||
version = "2020-08-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nixprime";
|
||||
repo = "cpsm";
|
||||
rev = "900023c56dfdd200841d5c2f2f7000f332d2614f";
|
||||
sha256 = "1p1ry11f39fcz32i3b3p0p8n99qrnvrx4d7p0123123dj7wbxk3p";
|
||||
rev = "42cfb0f83083b33640619c208341629bff67bd8a";
|
||||
sha256 = "0wcq442wj73ra0agflljjkhcwlma7r703l7l9hn7zd8wfb4iv48s";
|
||||
};
|
||||
meta.homepage = "https://github.com/nixprime/cpsm/";
|
||||
};
|
||||
|
|
@ -1026,12 +1026,12 @@ let
|
|||
|
||||
defx-icons = buildVimPluginFrom2Nix {
|
||||
pname = "defx-icons";
|
||||
version = "2020-07-25";
|
||||
version = "2020-08-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kristijanhusak";
|
||||
repo = "defx-icons";
|
||||
rev = "e150053498e6583ec95513e44ceb122209a86831";
|
||||
sha256 = "1yw44ima60jq05p0m0mpxsybr53655w98kg2d6srsqswd8ivcapl";
|
||||
rev = "8a8feea660488c70defd5706229cacd69fb34642";
|
||||
sha256 = "175bi9aj8sg83r4yvfbvcd7kwjrb3b791ifi8zw4i7l9x2z0nnlm";
|
||||
};
|
||||
meta.homepage = "https://github.com/kristijanhusak/defx-icons/";
|
||||
};
|
||||
|
|
@ -1086,12 +1086,12 @@ let
|
|||
|
||||
denite-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "denite-nvim";
|
||||
version = "2020-07-29";
|
||||
version = "2020-08-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "denite.nvim";
|
||||
rev = "ee43e5b08009072b46a17905d2ccfcb15f79224d";
|
||||
sha256 = "1vqzi9rxlb5flgy0yc4lh9q0fvhl3b1a4xi1dganz46wnwyv2r24";
|
||||
rev = "7df7851826a1e8417a9b242d4ce3bd09ae1c6298";
|
||||
sha256 = "1rf5qir9ybk1l7bb63xkprssa8jpsiap26yn6k3xy2drfvbrlika";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/denite.nvim/";
|
||||
};
|
||||
|
|
@ -1655,12 +1655,12 @@ let
|
|||
|
||||
git-messenger-vim = buildVimPluginFrom2Nix {
|
||||
pname = "git-messenger-vim";
|
||||
version = "2020-07-30";
|
||||
version = "2020-08-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhysd";
|
||||
repo = "git-messenger.vim";
|
||||
rev = "dd9bef92c6e51ec1e26dfca46f81fe3b6b997a51";
|
||||
sha256 = "07whrk46v2f10pb4xjz9g5iz43vr8q8mibcnns52qxgp0wg7iid6";
|
||||
rev = "2069a081cb83aab8ed5e275a97aa178a30cf47a0";
|
||||
sha256 = "1xj95c2hhlalf2zjp2qh414dr50cp3gly8zk4bsk82v65rdwcqv1";
|
||||
};
|
||||
meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
|
||||
};
|
||||
|
|
@ -1689,6 +1689,18 @@ let
|
|||
meta.homepage = "https://github.com/gregsexton/gitv/";
|
||||
};
|
||||
|
||||
golden-ratio = buildVimPluginFrom2Nix {
|
||||
pname = "golden-ratio";
|
||||
version = "2020-04-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "roman";
|
||||
repo = "golden-ratio";
|
||||
rev = "8313b6d6723c9e77ef1d3760af2cdd244e8db043";
|
||||
sha256 = "03nm1wr0qsrirg4z4171f4nygnqgb6w06ldr6rbbz4a1f7j8j654";
|
||||
};
|
||||
meta.homepage = "https://github.com/roman/golden-ratio/";
|
||||
};
|
||||
|
||||
gotests-vim = buildVimPluginFrom2Nix {
|
||||
pname = "gotests-vim";
|
||||
version = "2019-04-10";
|
||||
|
|
@ -2004,12 +2016,12 @@ let
|
|||
|
||||
julia-vim = buildVimPluginFrom2Nix {
|
||||
pname = "julia-vim";
|
||||
version = "2020-07-24";
|
||||
version = "2020-07-31";
|
||||
src = fetchFromGitHub {
|
||||
owner = "JuliaEditorSupport";
|
||||
repo = "julia-vim";
|
||||
rev = "55de0682851c1065f67665a205b19d707d2e0d3b";
|
||||
sha256 = "1b2pib00nz21582lm1km1wqdl0dazv7bg3jdgqy17n3pd6bsi11l";
|
||||
rev = "ead61b0ff9e26365a977280298b22bad40c9fba5";
|
||||
sha256 = "05p5kxkdh4y1s8532d1d8zilq9hy098bwx3lyrsqpxj0n2kr2q0d";
|
||||
};
|
||||
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
|
||||
};
|
||||
|
|
@ -2100,12 +2112,12 @@ let
|
|||
|
||||
lexima-vim = buildVimPluginFrom2Nix {
|
||||
pname = "lexima-vim";
|
||||
version = "2020-07-28";
|
||||
version = "2020-07-31";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cohama";
|
||||
repo = "lexima.vim";
|
||||
rev = "a0c465054ab1965353c8c3946955b3c15592d098";
|
||||
sha256 = "1vyps74zx4iy3lalxpfhrlm8h56zwd7cdnsaqza00l6m1ayj0w3r";
|
||||
rev = "89bf4dc13539131a29cf938074b3f1ce9d000bfd";
|
||||
sha256 = "19b73r3v4i64kiijihzqlbj6bf6jd1w90qc7d3lg95iwlaczd8v0";
|
||||
};
|
||||
meta.homepage = "https://github.com/cohama/lexima.vim/";
|
||||
};
|
||||
|
|
@ -2160,12 +2172,12 @@ let
|
|||
|
||||
lightline-bufferline = buildVimPluginFrom2Nix {
|
||||
pname = "lightline-bufferline";
|
||||
version = "2020-07-01";
|
||||
version = "2020-08-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mengelbrecht";
|
||||
repo = "lightline-bufferline";
|
||||
rev = "77eb9c67d3d7cc14f11d68e865e3540fcc56fdbe";
|
||||
sha256 = "1c1aznfs297846f0w6f67sx4fdk9pxxalayfz1dcwabbfq785g6p";
|
||||
rev = "deac5994a0bf6795b743d444dde11a407416ddc7";
|
||||
sha256 = "0y6cill4pwck6ajm55br2prhgj928yb94dq2wxxsrk6xw2mn0y79";
|
||||
};
|
||||
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
|
||||
};
|
||||
|
|
@ -2520,12 +2532,12 @@ let
|
|||
|
||||
neoformat = buildVimPluginFrom2Nix {
|
||||
pname = "neoformat";
|
||||
version = "2020-07-26";
|
||||
version = "2020-08-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sbdchd";
|
||||
repo = "neoformat";
|
||||
rev = "751baf4c8e16ffb800a179a229950036cf08ce61";
|
||||
sha256 = "1rljhh48bzx84n3411awsdjzw859li0gkrkmvbg72vwsyq73bpxk";
|
||||
rev = "2721992fa64b0c26031f514f7cce4f6b1399427f";
|
||||
sha256 = "0fp6r5zw3hn0wg6fhk1f90qcmamnxx18rwjx173d7rqap375pfgg";
|
||||
};
|
||||
meta.homepage = "https://github.com/sbdchd/neoformat/";
|
||||
};
|
||||
|
|
@ -2580,12 +2592,12 @@ let
|
|||
|
||||
neosnippet-vim = buildVimPluginFrom2Nix {
|
||||
pname = "neosnippet-vim";
|
||||
version = "2020-07-10";
|
||||
version = "2020-08-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "neosnippet.vim";
|
||||
rev = "16cddad16ba27fb1205d601c97d499be7d408b68";
|
||||
sha256 = "0j459nxzdrx5mcgzyf9hai8zbn2mbdnilsn3vz4rg68ccngjlz68";
|
||||
rev = "b4c470b7e720fa061ac118a09420bc2da16610bd";
|
||||
sha256 = "1d27rhyd5db0vd72gi6dl34g4axsz66d0l0fgw5g6grawlpf8w6l";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
|
||||
};
|
||||
|
|
@ -2688,12 +2700,12 @@ let
|
|||
|
||||
neuron-vim = buildVimPluginFrom2Nix {
|
||||
pname = "neuron-vim";
|
||||
version = "2020-07-29";
|
||||
version = "2020-07-31";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihsanturk";
|
||||
repo = "neuron.vim";
|
||||
rev = "b7b208934c6a5d2949168a80d6ffcc67b53995a3";
|
||||
sha256 = "01favdpjba3d4fd9a1ypiv0vfv2dmb21z43baj5kl69nfpzva794";
|
||||
rev = "9a1077044a5421a50d59ef271613cde05c5dd98d";
|
||||
sha256 = "1wp0mj2ji6kxfbw1vk055rbyrmgrb0jglgi24rbj22ba24hgxv8y";
|
||||
};
|
||||
meta.homepage = "https://github.com/ihsanturk/neuron.vim/";
|
||||
};
|
||||
|
|
@ -2808,12 +2820,12 @@ let
|
|||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2020-07-29";
|
||||
version = "2020-08-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "5202b7b0986b2a4be8b14e02010fd7390575d775";
|
||||
sha256 = "1fya0fxpas21i38x93gjhr7p6jy78gzajsxs11xmc2r5xcj0n9q8";
|
||||
rev = "124ff3bf5680e746dc4d504f67a1b437fcb50365";
|
||||
sha256 = "1y41w6asd7hf0nx0h48556w8hchiqgfvskdp1z0fdcgjcimpp805";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
|
@ -3048,12 +3060,12 @@ let
|
|||
|
||||
quick-scope = buildVimPluginFrom2Nix {
|
||||
pname = "quick-scope";
|
||||
version = "2020-06-18";
|
||||
version = "2020-07-31";
|
||||
src = fetchFromGitHub {
|
||||
owner = "unblevable";
|
||||
repo = "quick-scope";
|
||||
rev = "03f047175fc3bd3ed9828ccec48b646bc53ab204";
|
||||
sha256 = "11wh5jy7b1ncqbgc0nmip38zhz9halglaa3bw9da4qk5fp6xr1a4";
|
||||
rev = "64a5e6f9791e75f4d87b176d5c11f31041aa4169";
|
||||
sha256 = "1b1s8jmfip40s9m466c78jczp22dq2brbsnmdaz7gc1fgxyb5858";
|
||||
};
|
||||
meta.homepage = "https://github.com/unblevable/quick-scope/";
|
||||
};
|
||||
|
|
@ -3331,6 +3343,7 @@ let
|
|||
rev = "4e9d9a3deb2060e2e79fede1c213f13ac7866eb5";
|
||||
sha256 = "0vpfn2zivk8cf2l841jbd78zl1vzdw1wjf9p0dm6pgr84kj9pkx4";
|
||||
};
|
||||
meta.homepage = "https://github.com/lotabout/skim.vim/";
|
||||
};
|
||||
|
||||
sky-color-clock-vim = buildVimPluginFrom2Nix {
|
||||
|
|
@ -3552,12 +3565,12 @@ let
|
|||
|
||||
tagbar = buildVimPluginFrom2Nix {
|
||||
pname = "tagbar";
|
||||
version = "2020-07-30";
|
||||
version = "2020-08-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "majutsushi";
|
||||
repo = "tagbar";
|
||||
rev = "3fe9d8e13b7a9e82ae612c8a12b35a3c6653e9da";
|
||||
sha256 = "0s4s20x5a2nb35fcvs4mbr5vql8diwc8bmbi6qa7vq2clvkf6smg";
|
||||
rev = "a5090717dd8862be0a47a96731c6120ace544fe1";
|
||||
sha256 = "1iz26xj3mrshj0n6gpqa9xbk0i3lr0383bqdrq0yk0lp32ys5gh0";
|
||||
};
|
||||
meta.homepage = "https://github.com/majutsushi/tagbar/";
|
||||
};
|
||||
|
|
@ -4081,12 +4094,12 @@ let
|
|||
|
||||
vim-airline = buildVimPluginFrom2Nix {
|
||||
pname = "vim-airline";
|
||||
version = "2020-07-28";
|
||||
version = "2020-08-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-airline";
|
||||
repo = "vim-airline";
|
||||
rev = "2a027e992d44e47ea3f176692fe948d3145eab54";
|
||||
sha256 = "0k427xhwdjljy716w06kgdkkrfygv3hw7r0j8l8yvymasq1lz6hn";
|
||||
rev = "ffa44b832767674ab536a737668f3358fab4d5ea";
|
||||
sha256 = "081rl70ya1qrnqkq1za1zpvngpjhpr69vdbpj7r8qlma29wq2pf5";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-airline/vim-airline/";
|
||||
};
|
||||
|
|
@ -4249,12 +4262,12 @@ let
|
|||
|
||||
vim-bufkill = buildVimPluginFrom2Nix {
|
||||
pname = "vim-bufkill";
|
||||
version = "2020-04-29";
|
||||
version = "2020-08-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "qpkorr";
|
||||
repo = "vim-bufkill";
|
||||
rev = "1bcdcb4a03a6ac1de06bc84b7f94ca08f4485f42";
|
||||
sha256 = "0j3r63j2vs0lm1vnfzwcwqbahncnqq46wmaf1rp8i9l8skqm20px";
|
||||
rev = "2bd6d7e791668ea52bb26be2639406fcf617271f";
|
||||
sha256 = "1cvma03bg9psil67kg1x90lny7a31ljz5shybcl1jrfpzsybcqvg";
|
||||
};
|
||||
meta.homepage = "https://github.com/qpkorr/vim-bufkill/";
|
||||
};
|
||||
|
|
@ -4705,12 +4718,12 @@ let
|
|||
|
||||
vim-eunuch = buildVimPluginFrom2Nix {
|
||||
pname = "vim-eunuch";
|
||||
version = "2020-01-16";
|
||||
version = "2020-08-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-eunuch";
|
||||
rev = "33e875b31c8b811a0a47908884a5e2339106bbe8";
|
||||
sha256 = "1xadb22kd40swmww0qxmmkcpcq6viy8l167pjck5q32hfngll5d3";
|
||||
rev = "36c5974a74b202ade1eb40dabd134afb2fdfdbe0";
|
||||
sha256 = "123ck8c9icl70g19zkjm33vaip9ky09zc9z7c2np554q2kncjppm";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-eunuch/";
|
||||
};
|
||||
|
|
@ -4825,12 +4838,12 @@ let
|
|||
|
||||
vim-floaterm = buildVimPluginFrom2Nix {
|
||||
pname = "vim-floaterm";
|
||||
version = "2020-07-30";
|
||||
version = "2020-07-31";
|
||||
src = fetchFromGitHub {
|
||||
owner = "voldikss";
|
||||
repo = "vim-floaterm";
|
||||
rev = "66d05edf291e9f9ce1003fad849c5d6a46c029ac";
|
||||
sha256 = "1dsfn41fhpjc1aznd0g4b70adkqmp1ww47107g1f9w6hbwgcy4cj";
|
||||
rev = "44fbe6dc6da4c6255b92d0a013f66261c7d9695b";
|
||||
sha256 = "1m3arkknpbb8c1ylcrnpjqlwym8am43qxhivkqymi7d93hcsrshc";
|
||||
};
|
||||
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
|
||||
};
|
||||
|
|
@ -4873,12 +4886,12 @@ let
|
|||
|
||||
vim-fugitive = buildVimPluginFrom2Nix {
|
||||
pname = "vim-fugitive";
|
||||
version = "2020-07-27";
|
||||
version = "2020-07-31";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-fugitive";
|
||||
rev = "9b6a24b13166feee0cc83e2cc40e2ddb31bcc2a1";
|
||||
sha256 = "0rs1v863d5kxz2mn6xgkj06jsjdlrbfp0srp2z52qrc4pqlxkf81";
|
||||
rev = "260182c65cae653ac20e6a69ba8cc6124e7ba6c2";
|
||||
sha256 = "14dmar7d9qajjk2vy223mw7gwdcz548lcj5jg8pg7j4cyc6ffbyp";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-fugitive/";
|
||||
};
|
||||
|
|
@ -6002,12 +6015,12 @@ let
|
|||
|
||||
vim-plug = buildVimPluginFrom2Nix {
|
||||
pname = "vim-plug";
|
||||
version = "2020-07-20";
|
||||
version = "2020-08-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "junegunn";
|
||||
repo = "vim-plug";
|
||||
rev = "b2133cf2ec935c55de0c3a306a6b7dc3546226da";
|
||||
sha256 = "09xmrbbbchpfqliddi24yn4b63akxidscvjzwi01ilb0s9xnxz24";
|
||||
rev = "457bebcd30cbfca8b34b0d308f882b7b605714fc";
|
||||
sha256 = "18yj35qh3xqpjv1dd78m1wj7hkma3rv8qnfsnamhzafjwnf013sa";
|
||||
};
|
||||
meta.homepage = "https://github.com/junegunn/vim-plug/";
|
||||
};
|
||||
|
|
@ -6086,12 +6099,12 @@ let
|
|||
|
||||
vim-ps1 = buildVimPluginFrom2Nix {
|
||||
pname = "vim-ps1";
|
||||
version = "2020-06-03";
|
||||
version = "2020-07-31";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PProvost";
|
||||
repo = "vim-ps1";
|
||||
rev = "9d52746c3f879aa1aca4deb46edd63823d76d89d";
|
||||
sha256 = "1yx1rnpln0lxvf6pbdn8yyxiyhi7rfl8wl94kd8djk51h5lhq1n3";
|
||||
rev = "21d8d9a9db864f230a2d12d5076351daf20d7a44";
|
||||
sha256 = "0s6mi1mzlk40sfdqghdsv709fs89hf9d6iqaw3arzs9lmin2i4ka";
|
||||
};
|
||||
meta.homepage = "https://github.com/PProvost/vim-ps1/";
|
||||
};
|
||||
|
|
@ -6168,6 +6181,18 @@ let
|
|||
meta.homepage = "https://github.com/racer-rust/vim-racer/";
|
||||
};
|
||||
|
||||
vim-rails = buildVimPluginFrom2Nix {
|
||||
pname = "vim-rails";
|
||||
version = "2020-06-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-rails";
|
||||
rev = "187742a3c18d93e6968f024d7db0f4fc5548408e";
|
||||
sha256 = "132rvyn5pwg5xkm6q64k33vm6q9hfpng0wq25387l8l8a7hvj3az";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-rails/";
|
||||
};
|
||||
|
||||
vim-repeat = buildVimPluginFrom2Nix {
|
||||
pname = "vim-repeat";
|
||||
version = "2019-11-13";
|
||||
|
|
@ -6218,12 +6243,12 @@ let
|
|||
|
||||
vim-ruby = buildVimPluginFrom2Nix {
|
||||
pname = "vim-ruby";
|
||||
version = "2020-07-25";
|
||||
version = "2020-08-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-ruby";
|
||||
repo = "vim-ruby";
|
||||
rev = "3e4a8c5bfa3631516cc2b79672fe958455bfb098";
|
||||
sha256 = "0ai3yjfzb8jnc132q8543zn7w37lhbss3s21pmsfza7lx1vp088h";
|
||||
rev = "fe2e520c62dfe10b9bc192b6c2651ef0519b1070";
|
||||
sha256 = "1xh6h5wg242mzqshka5m3693r25www46p29cr92yi995a2izm2fw";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-ruby/vim-ruby/";
|
||||
};
|
||||
|
|
@ -6446,12 +6471,12 @@ let
|
|||
|
||||
vim-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "vim-snippets";
|
||||
version = "2020-07-27";
|
||||
version = "2020-08-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "honza";
|
||||
repo = "vim-snippets";
|
||||
rev = "ab824142634fb0e9dc8a455356a15730f48361f0";
|
||||
sha256 = "1fvr03a46x3nq8cafxqb95a97c5x0cynvcz8hw8x0j8gml6x86bz";
|
||||
rev = "2a273f1914489b5f199b68607e5e37c0025a9c35";
|
||||
sha256 = "05yxh3hjya35pp4hgyq6i3nxnb2nl12lzv2mmzp046qzsg3b6yiq";
|
||||
};
|
||||
meta.homepage = "https://github.com/honza/vim-snippets/";
|
||||
};
|
||||
|
|
@ -6602,12 +6627,12 @@ let
|
|||
|
||||
vim-table-mode = buildVimPluginFrom2Nix {
|
||||
pname = "vim-table-mode";
|
||||
version = "2020-07-27";
|
||||
version = "2020-08-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhruvasagar";
|
||||
repo = "vim-table-mode";
|
||||
rev = "5c489b57e8bc34f2a4bf58c28fadbb021dcc1a4f";
|
||||
sha256 = "0na5xbmggvrvs5wv9m5nfs1kkdvgm36zmbvmymmcf8kfqv5dxh5p";
|
||||
rev = "88cb2e44b60f4fa7d2e242c43ee90c5f6079e82c";
|
||||
sha256 = "1ny17d30pk8z96zr8qh9g04n57ix4pjm3sg0a80b2qq82anxkmvs";
|
||||
};
|
||||
meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/";
|
||||
};
|
||||
|
|
@ -6663,12 +6688,12 @@ let
|
|||
|
||||
vim-test = buildVimPluginFrom2Nix {
|
||||
pname = "vim-test";
|
||||
version = "2020-07-25";
|
||||
version = "2020-08-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-test";
|
||||
repo = "vim-test";
|
||||
rev = "260b4f0ccbca78aff50b9d0ba0945ce92e07e1d6";
|
||||
sha256 = "084ivslydffayz9f1vglb9fnds4yakj6anrnvbwcyj27kcg1s7c5";
|
||||
rev = "007972e224a995018f76f5f71c61d2c0b75e265e";
|
||||
sha256 = "0370wx3p96v0p4cngm28x12djwl9mwz2kxaanj9svzg3nph19c1x";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-test/vim-test/";
|
||||
};
|
||||
|
|
@ -6915,12 +6940,12 @@ let
|
|||
|
||||
vim-visual-multi = buildVimPluginFrom2Nix {
|
||||
pname = "vim-visual-multi";
|
||||
version = "2020-07-30";
|
||||
version = "2020-08-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mg979";
|
||||
repo = "vim-visual-multi";
|
||||
rev = "a1dca9d03a5f235363c0d0dea5818dc320b649d6";
|
||||
sha256 = "0wh00hv1hwvbzqqws1xr4hv5c9llxkqbq2fbkprvizix1s6jvm7q";
|
||||
rev = "cb994375fcbf032adfef6d31d8fcfa59bab381c8";
|
||||
sha256 = "0lm9wcbkwr91b85gdf5qa9f3svdyn97j6xpl7nqa7jzcvdhdfz5c";
|
||||
};
|
||||
meta.homepage = "https://github.com/mg979/vim-visual-multi/";
|
||||
};
|
||||
|
|
@ -6939,12 +6964,12 @@ let
|
|||
|
||||
vim-vsnip = buildVimPluginFrom2Nix {
|
||||
pname = "vim-vsnip";
|
||||
version = "2020-07-28";
|
||||
version = "2020-08-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "vim-vsnip";
|
||||
rev = "fa8586f6f9ccff07cbe68642b51c95740c25019e";
|
||||
sha256 = "02ki9jdjvan2vnbk2r6fdj3q80q7a8iw5ymm10348qjyhwf7m0q1";
|
||||
rev = "2762e090c540ab07dc00e57cfe578337f11ab0df";
|
||||
sha256 = "1ckfi2a6sp3n3b6hnk4qjvv411ij349qlj3cyx3b2l8vfg0qmwyw";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
|
||||
};
|
||||
|
|
@ -7191,12 +7216,12 @@ let
|
|||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2020-07-30";
|
||||
version = "2020-08-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "bcd722ccfaf736154b583b59852c3488d8eb22d5";
|
||||
sha256 = "0zvddfqyc2r14xbv77nxbx3lvhfcqb7ylbyjip86kz7i8aj984lx";
|
||||
rev = "4c9c05fdbda05ed242e58dd9c9582d8722146ed5";
|
||||
sha256 = "1my1vfffzn0pmba9ziyfwxs39pj4yrwsy3spxyhzi118drldkqnc";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
|
@ -7239,12 +7264,12 @@ let
|
|||
|
||||
vista-vim = buildVimPluginFrom2Nix {
|
||||
pname = "vista-vim";
|
||||
version = "2020-07-17";
|
||||
version = "2020-08-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "liuchengxu";
|
||||
repo = "vista.vim";
|
||||
rev = "de344a69ee01eef8a905660cd793173698fa62dd";
|
||||
sha256 = "1ngh9nal0p0xgd9xzsalirdc59kqxssx8dax97jcasmxqrp8wf8h";
|
||||
rev = "7eabcd619528be9d26f20a1400cecc8e94d7e556";
|
||||
sha256 = "01ikhpz0rw1zyg748cqj6sgil29gha2q157dsirfg0f7xjrqlz5q";
|
||||
};
|
||||
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -436,6 +436,7 @@ rhysd/vim-grammarous
|
|||
rhysd/vim-operator-surround
|
||||
rodjek/vim-puppet
|
||||
romainl/vim-cool
|
||||
roman/golden-ratio
|
||||
ron89/thesaurus_query.vim
|
||||
roxma/nvim-cm-racer
|
||||
roxma/nvim-completion-manager
|
||||
|
|
@ -527,6 +528,7 @@ tpope/vim-liquid
|
|||
tpope/vim-obsession
|
||||
tpope/vim-pathogen
|
||||
tpope/vim-projectionist
|
||||
tpope/vim-rails
|
||||
tpope/vim-repeat
|
||||
tpope/vim-rhubarb
|
||||
tpope/vim-rsi
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.8";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
extraMeta.branch = versions.majorMinor version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1xgibkwb1yfl6qdlbxyagai0qc1pk5ark7giz1512hh6ma353xz7";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dnsdist";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2";
|
||||
sha256 = "1h0x5xd13j8xxrrinb7d55851m6n9w0r15wx9m3c50dk7qngldm3";
|
||||
sha256 = "0n3vy84kczvbwbzmr1d2c9lh3im77gz83wczj0im4zs91kpw81rc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig protobuf ];
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@
|
|||
"bond" = ps: with ps; [ ]; # missing inputs: bond-home
|
||||
"braviatv" = ps: with ps; [ bravia-tv];
|
||||
"broadlink" = ps: with ps; [ broadlink];
|
||||
"brother" = ps: with ps; [ ]; # missing inputs: brother
|
||||
"brother" = ps: with ps; [ brother];
|
||||
"brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan
|
||||
"browser" = ps: with ps; [ ];
|
||||
"brunt" = ps: with ps; [ ]; # missing inputs: brunt
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
homepage = "https://github.com/jitsi/jicofo";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = teams.jitsi.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
homepage = "https://github.com/jitsi/jitsi-videobridge";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = teams.jitsi.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://github.com/jitsi/jitsi-meet";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = teams.jitsi.members;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@ let
|
|||
in
|
||||
buildGoPackage rec {
|
||||
pname = "lxd";
|
||||
version = "4.3";
|
||||
version = "4.4";
|
||||
|
||||
goPackagePath = "github.com/lxc/lxd";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "07yakpnh1qf1jdb8ry0pmzh74skyc86xbz45jd02cbba13k1x2dn";
|
||||
sha256 = "0fk42spz57nfmwy6xn02nnlkq01111x03psjq003k2785ah4xk1h";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,9 +12,16 @@
|
|||
, Security
|
||||
}:
|
||||
|
||||
(rustPlatform.buildRustPackage rec {
|
||||
let
|
||||
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
|
||||
version = "1.2";
|
||||
gitRev = "43a260c221d5dac4a44fd82271736c8444474eec";
|
||||
sha256 = "0g6zq27dpr8bdan5xrqchybpbqwnhhc7x8sxbfygigbqd3xv9i6n";
|
||||
cargoSha256 = "1zmlp14v7av0znmjyy2aq83lc74503p6r0l11l9iw7s3xad8rda4";
|
||||
|
||||
in (rustPlatform.buildRustPackage rec {
|
||||
pname = "lorri";
|
||||
version = "1.1.1";
|
||||
inherit version;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Your project's nix-env";
|
||||
|
|
@ -26,13 +33,11 @@
|
|||
src = fetchFromGitHub {
|
||||
owner = "target";
|
||||
repo = pname;
|
||||
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
|
||||
# ALSO don’t forget to update the cargoSha256!
|
||||
rev = "05ea21170a18800e83b3dcf1e3d347f83a9fa992";
|
||||
sha256 = "1lgig5q1anmmmc1i1qnbx8rd8mqvm5csgnlaxlj4l4rxjmgiv06n";
|
||||
rev = gitRev;
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
cargoSha256 = "16asbpq47f3zcv4j9rzqx9v1317qz7xjr7dxd019vpr88zyk4fi1";
|
||||
inherit cargoSha256;
|
||||
doCheck = false;
|
||||
|
||||
BUILD_REV_COUNT = src.revCount or 1;
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "isync";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz";
|
||||
sha256 = "01g8hk9gisz67204k8ad7w7i3zp9vg2c68lscld44bwiii1d21li";
|
||||
sha256 = "10n8ykag0q3ws6fc15xqyg3v980v5nq3kzpablly2rh2z7vkn8gj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config perl ];
|
||||
|
|
|
|||
|
|
@ -1,14 +1,25 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
# memstream — POSIX memory streams for BSD
|
||||
memstream = fetchurl {
|
||||
url = "https://piumarta.com/software/memstream/memstream-0.1.tar.gz";
|
||||
sha256 = "0kvdb897g7nyviaz72arbqijk2g2wa61cmi3l5yh48rzr49r3a3a";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hyx-0.1.5";
|
||||
pname = "hyx";
|
||||
version = "2020-06-09";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://yx7.cc/code/hyx/${name}.tar.xz";
|
||||
sha256 = "0gd8fbdyw12jwffa5dgcql4ry22xbdhqdds1qwzk1rkcrkgnc1mg";
|
||||
url = "https://yx7.cc/code/hyx/hyx-${lib.replaceStrings [ "-" ] [ "." ] version}.tar.xz";
|
||||
sha256 = "1x8dmll93hrnj24kn5knpwj36y6r1v2ygwynpjwrg2hwd4c1a8hi";
|
||||
};
|
||||
|
||||
patches = [ ./no-wall-by-default.patch ];
|
||||
postUnpack = lib.optionalString stdenv.isDarwin ''
|
||||
tar --strip=1 -C $sourceRoot -xf ${memstream} --wildcards "memstream-0.1/memstream.[hc]"
|
||||
'';
|
||||
|
||||
patches = lib.optional stdenv.isDarwin ./memstream.patch;
|
||||
|
||||
installPhase = ''
|
||||
install -vD hyx $out/bin/hyx
|
||||
|
|
@ -19,6 +30,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://yx7.cc/code/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
platforms = platforms.linux;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
31
pkgs/tools/text/hyx/memstream.patch
Normal file
31
pkgs/tools/text/hyx/memstream.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
diff -Naur hyx-2020.06.09.org/Makefile hyx-2020.06.09/Makefile
|
||||
--- hyx-2020.06.09.org/Makefile 2020-06-09 15:19:50.000000000 +0300
|
||||
+++ hyx-2020.06.09/Makefile 2020-07-22 11:46:40.000000000 +0300
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
all: CFLAGS ?= -O2 -Wl,-s \
|
||||
- -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all
|
||||
+ -D_FORTIFY_SOURCE=2 -fstack-protector-all
|
||||
all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG
|
||||
all: hyx
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
hyx: *.h *.c
|
||||
$(CC) \
|
||||
$(CFLAGS) \
|
||||
- hyx.c common.c blob.c history.c view.c input.c \
|
||||
+ hyx.c common.c blob.c history.c view.c input.c memstream.c \
|
||||
-o hyx
|
||||
|
||||
clean:
|
||||
diff -Naur hyx-2020.06.09.org/view.c hyx-2020.06.09/view.c
|
||||
--- hyx-2020.06.09.org/view.c 2020-06-09 15:19:50.000000000 +0300
|
||||
+++ hyx-2020.06.09/view.c 2020-07-22 11:49:09.000000000 +0300
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "view.h"
|
||||
#include "input.h"
|
||||
#include "ansi.h"
|
||||
+#include "memstream.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- hyx-0.1.5.org/Makefile 2018-06-02 17:14:37.000000000 +0100
|
||||
+++ hyx-0.1.5/Makefile 2018-11-10 09:25:49.569961762 +0000
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
all: CFLAGS ?= -O2 -Wl,-s \
|
||||
-Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all
|
||||
-all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG
|
||||
+all: CFLAGS += -std=c99 -DNDEBUG
|
||||
all: hyx
|
||||
|
||||
debug: CFLAGS ?= -O0 -g \
|
||||
|
|
@ -1998,6 +1998,8 @@ in
|
|||
|
||||
gthree = callPackage ../development/libraries/gthree { };
|
||||
|
||||
gtg = callPackage ../applications/office/gtg { };
|
||||
|
||||
gti = callPackage ../tools/misc/gti { };
|
||||
|
||||
hdate = callPackage ../applications/misc/hdate { };
|
||||
|
|
@ -17292,14 +17294,6 @@ in
|
|||
];
|
||||
};
|
||||
|
||||
linux_5_8 = callPackage ../os-specific/linux/kernel/linux-5.8.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.export_kernel_fpu_functions."5.3"
|
||||
];
|
||||
};
|
||||
|
||||
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
|
|
@ -17515,7 +17509,7 @@ in
|
|||
|
||||
# Update this when adding the newest kernel major version!
|
||||
# And update linux_latest_for_hardened below if the patches are already available
|
||||
linuxPackages_latest = linuxPackages_5_8;
|
||||
linuxPackages_latest = linuxPackages_5_7;
|
||||
linux_latest = linuxPackages_latest.kernel;
|
||||
|
||||
# Build the kernel modules for the some of the kernels.
|
||||
|
|
@ -17530,7 +17524,6 @@ in
|
|||
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
|
||||
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
|
||||
linuxPackages_5_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_7);
|
||||
linuxPackages_5_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_8);
|
||||
|
||||
# When adding to this list:
|
||||
# - Update linuxPackages_latest to the latest version
|
||||
|
|
@ -20352,6 +20345,8 @@ in
|
|||
|
||||
gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { });
|
||||
|
||||
gnunet-gtk = callPackage ../applications/networking/p2p/gnunet-gtk { };
|
||||
|
||||
gocr = callPackage ../applications/graphics/gocr { };
|
||||
|
||||
gobby5 = callPackage ../applications/editors/gobby { };
|
||||
|
|
|
|||
|
|
@ -569,6 +569,8 @@ let
|
|||
|
||||
mtime = callPackage ../development/ocaml-modules/mtime { };
|
||||
|
||||
mustache = callPackage ../development/ocaml-modules/mustache { };
|
||||
|
||||
nocrypto = callPackage ../development/ocaml-modules/nocrypto { };
|
||||
|
||||
notty = callPackage ../development/ocaml-modules/notty { };
|
||||
|
|
|
|||
|
|
@ -543,6 +543,8 @@ in {
|
|||
|
||||
breezy = callPackage ../development/python-modules/breezy { };
|
||||
|
||||
brother = callPackage ../development/python-modules/brother { };
|
||||
|
||||
build = callPackage ../development/python-modules/build { };
|
||||
|
||||
ciso8601 = callPackage ../development/python-modules/ciso8601 { };
|
||||
|
|
@ -1420,6 +1422,10 @@ in {
|
|||
|
||||
pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
|
||||
|
||||
pytest-tornasync = callPackage ../development/python-modules/pytest-tornasync { };
|
||||
|
||||
pytest-trio = callPackage ../development/python-modules/pytest-trio { };
|
||||
|
||||
pytest-twisted = callPackage ../development/python-modules/pytest-twisted { };
|
||||
|
||||
pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { };
|
||||
|
|
@ -1553,6 +1559,10 @@ in {
|
|||
tokenizers = disabledIf (!isPy3k)
|
||||
(toPythonModule (callPackage ../development/python-modules/tokenizers { }));
|
||||
|
||||
towncrier = callPackage ../development/python-modules/towncrier {
|
||||
inherit (pkgs) git;
|
||||
};
|
||||
|
||||
transformers = callPackage ../development/python-modules/transformers { };
|
||||
|
||||
transforms3d = callPackage ../development/python-modules/transforms3d { };
|
||||
|
|
@ -3605,6 +3615,8 @@ in {
|
|||
|
||||
rotate-backups = callPackage ../tools/backup/rotate-backups { };
|
||||
|
||||
liblarch = callPackage ../development/python-modules/liblarch { };
|
||||
|
||||
librosa = callPackage ../development/python-modules/librosa { };
|
||||
|
||||
samplerate = callPackage ../development/python-modules/samplerate { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue