nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-26 05:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-20 00:05:26 +00:00 committed by GitHub
commit 38296d89d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
68 changed files with 914 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
doc/languages-frameworks/vim.section.md
View File

@ -120,7 +120,7 @@ After that you can install your special grafted `myVim` or `myNeovim` packages.
If one of your favourite plugins isn't packaged, you can package it yourself:
```
```nix
{ config, pkgs, ... }:
let
@ -154,6 +154,33 @@ in
}
```
### Specificities for some plugins
#### Tree sitter
By default `nvim-treesitter` encourages you to download, compile and install
the required tree-sitter grammars at run time with `:TSInstall`. This works
poorly on NixOS. Instead, to install the `nvim-treesitter` plugins with a set
of precompiled grammars, you can use `nvim-treesitter.withPlugins` function:
```nix
(pkgs.neovim.override {
configure = {
packages.myPlugins = with pkgs.vimPlugins; {
start = [
(nvim-treesitter.withPlugins (
plugins: with plugins; [
tree-sitter-nix
tree-sitter-python
]
))
];
};
};
})
```
To enable all grammars packaged in nixpkgs, use `(pkgs.vimPlugins.nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars))`.
## Managing plugins with vim-plug {#managing-plugins-with-vim-plug}
To use [vim-plug](https://github.com/junegunn/vim-plug) to manage your Vim

10
flake.nix
View File

@ -49,12 +49,18 @@
})).config;
moduleDeclarationFile =
(builtins.unsafeGetAttrPos "modules" args).file;
let
# Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't
# mean that the evaluator always keeps track of its position. If there
# are too many levels of indirection, the position gets lost at some point.
intermediatePos = builtins.unsafeGetAttrPos "modules" args;
in
if intermediatePos == null then null else intermediatePos.file;
# Add the invoking file as error message location for modules
# that don't have their own locations; presumably inline modules.
addModuleDeclarationFile =
m: {
m: if moduleDeclarationFile == null then m else {
_file = moduleDeclarationFile;
imports = [ m ];
};

13
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View File

@ -92,6 +92,13 @@
<link linkend="opt-snapraid.enable">snapraid</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/hockeypuck/hockeypuck">Hockeypuck</link>,
a OpenPGP Key Server. Available as
<link linkend="opt-services.hockeypuck.enable">services.hockeypuck</link>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-incompatibilities">
@ -510,6 +517,12 @@
changelog</link>.
</para>
</listitem>
<listitem>
<para>
The <literal>isabelle</literal> package has been upgraded from
2020 to 2021
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-notable-changes">

4
nixos/doc/manual/release-notes/rl-2111.section.md
View File

@ -28,6 +28,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [snapraid](https://www.snapraid.it/), a backup program for disk arrays.
Available as [snapraid](#opt-snapraid.enable).
- [Hockeypuck](https://github.com/hockeypuck/hockeypuck), a OpenPGP Key Server. Available as [services.hockeypuck](#opt-services.hockeypuck.enable).
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
@ -128,6 +130,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `icingaweb2` was upgraded to a new release which requires a manual database upgrade, see [upstream changelog](https://github.com/Icinga/icingaweb2/releases/tag/v2.9.0).
- The `isabelle` package has been upgraded from 2020 to 2021
## Other Notable Changes {#sec-release-21.11-notable-changes}
- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.

1
nixos/modules/module-list.nix
View File

@ -886,6 +886,7 @@
./services/security/fprot.nix
./services/security/haka.nix
./services/security/haveged.nix
./services/security/hockeypuck.nix
./services/security/hologram-server.nix
./services/security/hologram-agent.nix
./services/security/munge.nix

24
nixos/modules/services/cluster/k3s/default.nix
View File

@ -67,6 +67,12 @@ in
default = false;
description = "Only run the server. This option only makes sense for a server.";
};
configPath = mkOption {
type = types.nullOr types.path;
default = null;
description = "File path containing the k3s YAML config. This is useful when the config is generated (for example on boot).";
};
};
# implementation
@ -74,12 +80,12 @@ in
config = mkIf cfg.enable {
assertions = [
{
assertion = cfg.role == "agent" -> cfg.serverAddr != "";
message = "serverAddr should be set if role is 'agent'";
assertion = cfg.role == "agent" -> (cfg.configPath != null || cfg.serverAddr != "");
message = "serverAddr or configPath (with 'server' key) should be set if role is 'agent'";
}
{
assertion = cfg.role == "agent" -> cfg.token != "" || cfg.tokenFile != null;
message = "token or tokenFile should be set if role is 'agent'";
assertion = cfg.role == "agent" -> cfg.configPath != null || cfg.tokenFile != null || cfg.token != "";
message = "token or tokenFile or configPath (with 'token' or 'token-file' keys) should be set if role is 'agent'";
}
];
@ -115,12 +121,10 @@ in
"${cfg.package}/bin/k3s ${cfg.role}"
] ++ (optional cfg.docker "--docker")
++ (optional cfg.disableAgent "--disable-agent")
++ (optional (cfg.role == "agent") "--server ${cfg.serverAddr} ${
if cfg.tokenFile != null then
"--token-file ${cfg.tokenFile}"
else
"--token ${cfg.token}"
}")
++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}")
++ (optional (cfg.token != "") "--token ${cfg.token}")
++ (optional (cfg.tokenFile != null) "--token-file ${cfg.tokenFile}")
++ (optional (cfg.configPath != null) "--config ${cfg.configPath}")
++ [ cfg.extraFlags ]
);
};

74
nixos/modules/services/misc/klipper.nix
View File

@ -2,7 +2,6 @@
with lib;
let
cfg = config.services.klipper;
package = pkgs.klipper;
format = pkgs.formats.ini { mkKeyValue = generators.mkKeyValueDefault {} ":"; };
in
{
@ -11,12 +10,51 @@ in
services.klipper = {
enable = mkEnableOption "Klipper, the 3D printer firmware";
package = mkOption {
type = types.package;
default = pkgs.klipper;
description = "The Klipper package.";
};
inputTTY = mkOption {
type = types.path;
default = "/run/klipper/tty";
description = "Path of the virtual printer symlink to create.";
};
apiSocket = mkOption {
type = types.nullOr types.path;
default = null;
example = "/run/klipper/api";
description = "Path of the API socket to create.";
};
octoprintIntegration = mkOption {
type = types.bool;
default = false;
description = "Allows Octoprint to control Klipper.";
};
user = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
User account under which Klipper runs.
If null is specified (default), a temporary user will be created by systemd.
'';
};
group = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Group account under which Klipper runs.
If null is specified (default), a temporary user will be created by systemd.
'';
};
settings = mkOption {
type = format.type;
default = { };
@ -30,26 +68,40 @@ in
##### implementation
config = mkIf cfg.enable {
assertions = [{
assertion = cfg.octoprintIntegration -> config.services.octoprint.enable;
message = "Option klipper.octoprintIntegration requires Octoprint to be enabled on this system. Please enable services.octoprint to use it.";
}];
assertions = [
{
assertion = cfg.octoprintIntegration -> config.services.octoprint.enable;
message = "Option klipper.octoprintIntegration requires Octoprint to be enabled on this system. Please enable services.octoprint to use it.";
}
{
assertion = cfg.user != null -> cfg.group != null;
message = "Option klipper.group is not set when a user is specified.";
}
];
environment.etc."klipper.cfg".source = format.generate "klipper.cfg" cfg.settings;
systemd.services.klipper = {
services.klipper = mkIf cfg.octoprintIntegration {
user = config.services.octoprint.user;
group = config.services.octoprint.group;
};
systemd.services.klipper = let
klippyArgs = "--input-tty=${cfg.inputTTY}"
+ optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}";
in {
description = "Klipper 3D Printer Firmware";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${package}/lib/klipper/klippy.py --input-tty=/run/klipper/tty /etc/klipper.cfg";
ExecStart = "${cfg.package}/lib/klipper/klippy.py ${klippyArgs} /etc/klipper.cfg";
RuntimeDirectory = "klipper";
SupplementaryGroups = [ "dialout" ];
WorkingDirectory = "${package}/lib";
} // (if cfg.octoprintIntegration then {
Group = config.services.octoprint.group;
User = config.services.octoprint.user;
WorkingDirectory = "${cfg.package}/lib";
} // (if cfg.user != null then {
Group = cfg.group;
User = cfg.user;
} else {
DynamicUser = true;
User = "klipper";

104
nixos/modules/services/security/hockeypuck.nix Normal file
View File

@ -0,0 +1,104 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.hockeypuck;
settingsFormat = pkgs.formats.toml { };
in {
meta.maintainers = with lib.maintainers; [ etu ];
options.services.hockeypuck = {
enable = lib.mkEnableOption "Hockeypuck OpenPGP Key Server";
port = lib.mkOption {
default = 11371;
type = lib.types.port;
description = "HKP port to listen on.";
};
settings = lib.mkOption {
type = settingsFormat.type;
default = { };
example = lib.literalExample ''
{
hockeypuck = {
loglevel = "INFO";
logfile = "/var/log/hockeypuck/hockeypuck.log";
indexTemplate = "''${pkgs.hockeypuck-web}/share/templates/index.html.tmpl";
vindexTemplate = "''${pkgs.hockeypuck-web}/share/templates/index.html.tmpl";
statsTemplate = "''${pkgs.hockeypuck-web}/share/templates/stats.html.tmpl";
webroot = "''${pkgs.hockeypuck-web}/share/webroot";
hkp.bind = ":''${toString cfg.port}";
openpgp.db = {
driver = "postgres-jsonb";
dsn = "database=hockeypuck host=/var/run/postgresql sslmode=disable";
};
};
}
'';
description = ''
Configuration file for hockeypuck, here you can override
certain settings (<literal>loglevel</literal> and
<literal>openpgp.db.dsn</literal>) by just setting those values.
For other settings you need to use lib.mkForce to override them.
This service doesn't provision or enable postgres on your
system, it rather assumes that you enable postgres and create
the database yourself.
Example:
<literal>
services.postgresql = {
enable = true;
ensureDatabases = [ "hockeypuck" ];
ensureUsers = [{
name = "hockeypuck";
ensurePermissions."DATABASE hockeypuck" = "ALL PRIVILEGES";
}];
};
</literal>
'';
};
};
config = lib.mkIf cfg.enable {
services.hockeypuck.settings.hockeypuck = {
loglevel = lib.mkDefault "INFO";
logfile = "/var/log/hockeypuck/hockeypuck.log";
indexTemplate = "${pkgs.hockeypuck-web}/share/templates/index.html.tmpl";
vindexTemplate = "${pkgs.hockeypuck-web}/share/templates/index.html.tmpl";
statsTemplate = "${pkgs.hockeypuck-web}/share/templates/stats.html.tmpl";
webroot = "${pkgs.hockeypuck-web}/share/webroot";
hkp.bind = ":${toString cfg.port}";
openpgp.db = {
driver = "postgres-jsonb";
dsn = lib.mkDefault "database=hockeypuck host=/var/run/postgresql sslmode=disable";
};
};
users.users.hockeypuck = {
isSystemUser = true;
description = "Hockeypuck user";
};
systemd.services.hockeypuck = {
description = "Hockeypuck OpenPGP Key Server";
after = [ "network.target" "postgresql.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
WorkingDirectory = "/var/lib/hockeypuck";
User = "hockeypuck";
ExecStart = "${pkgs.hockeypuck}/bin/hockeypuck -config ${settingsFormat.generate "config.toml" cfg.settings}";
Restart = "always";
RestartSec = "5s";
LogsDirectory = "hockeypuck";
LogsDirectoryMode = "0755";
StateDirectory = "hockeypuck";
};
};
};
}

10
nixos/modules/services/ttys/getty.nix
View File

@ -6,7 +6,7 @@ let
cfg = config.services.getty;
baseArgs = [
"--login-program" "${pkgs.shadow}/bin/login"
"--login-program" "${cfg.loginProgram}"
] ++ optionals (cfg.autologinUser != null) [
"--autologin" cfg.autologinUser
] ++ optionals (cfg.loginOptions != null) [
@ -39,6 +39,14 @@ in
'';
};
loginProgram = mkOption {
type = types.path;
default = "${pkgs.shadow}/bin/login";
description = ''
Path to the login binary executed by agetty.
'';
};
loginOptions = mkOption {
type = types.nullOr types.str;
default = null;

1
nixos/tests/all-tests.nix
View File

@ -174,6 +174,7 @@ in
hitch = handleTest ./hitch {};
hledger-web = handleTest ./hledger-web.nix {};
hocker-fetchdocker = handleTest ./hocker-fetchdocker {};
hockeypuck = handleTest ./hockeypuck.nix { };
home-assistant = handleTest ./home-assistant.nix {};
hostname = handleTest ./hostname.nix {};
hound = handleTest ./hound.nix {};

63
nixos/tests/hockeypuck.nix Normal file
View File

@ -0,0 +1,63 @@
import ./make-test-python.nix ({ lib, pkgs, ... }:
let
gpgKeyring = (pkgs.runCommandNoCC "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } ''
mkdir -p $out
export GNUPGHOME=$out
cat > foo <<EOF
%echo Generating a basic OpenPGP key
%no-protection
Key-Type: DSA
Key-Length: 1024
Subkey-Type: ELG-E
Subkey-Length: 1024
Name-Real: Foo Example
Name-Email: foo@example.org
Expire-Date: 0
# Do a commit here, so that we can later print "done"
%commit
%echo done
EOF
gpg --batch --generate-key foo
rm $out/S.gpg-agent $out/S.gpg-agent.*
'');
in {
name = "hockeypuck";
meta.maintainers = with lib.maintainers; [ etu ];
machine = { ... }: {
# Used for test
environment.systemPackages = [ pkgs.gnupg ];
services.hockeypuck.enable = true;
services.postgresql = {
enable = true;
ensureDatabases = [ "hockeypuck" ];
ensureUsers = [{
name = "hockeypuck";
ensurePermissions."DATABASE hockeypuck" = "ALL PRIVILEGES";
}];
};
};
testScript = ''
machine.wait_for_unit("hockeypuck.service")
machine.wait_for_open_port(11371)
response = machine.succeed("curl -vvv -s http://127.0.0.1:11371/")
assert "<title>OpenPGP Keyserver</title>" in response, "HTML title not found"
# Copy the keyring
machine.succeed("cp -R ${gpgKeyring} /tmp/GNUPGHOME")
# Extract our GPG key id
keyId = machine.succeed("GNUPGHOME=/tmp/GNUPGHOME gpg --list-keys | grep dsa1024 --after-context=1 | grep -v dsa1024").strip()
# Send the key to our local keyserver
machine.succeed("GNUPGHOME=/tmp/GNUPGHOME gpg --keyserver hkp://127.0.0.1:11371 --send-keys " + keyId)
# Recieve the key from our local keyserver to a separate directory
machine.succeed("GNUPGHOME=$(mktemp -d) gpg --keyserver hkp://127.0.0.1:11371 --recv-keys " + keyId)
'';
})

4
pkgs/applications/audio/csound/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
# When updating, please check if https://github.com/csound/csound/issues/1078
# has been fixed in the new version so we can use the normal fluidsynth
# version and remove fluidsynth 1.x from nixpkgs again.
version = "6.15.0";
version = "6.16.0";
hardeningDisable = [ "format" ];
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "csound";
repo = "csound";
rev = version;
sha256 = "1vld6v55jxvv3ddr21kh41s4cdkhnm5wpffvd097zqrqh1aq08r0";
sha256 = "sha256-1+P2W8auc34sNJdKHUcilOBCK+Is9GHnM+J+M4oNR3U=";
};
cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp

4
pkgs/applications/blockchains/dogecoin.nix
View File

@ -7,13 +7,13 @@
with lib;
stdenv.mkDerivation rec {
name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version;
version = "1.14.2";
version = "1.14.3";
src = fetchFromGitHub {
owner = "dogecoin";
repo = "dogecoin";
rev = "v${version}";
sha256 = "1gw46q63mjzwvb17ck6p1bap2xpdrap08szw2kjhasa3yvd5swyy";
sha256 = "sha256-kozUnIislQDtgjeesYHKu4sB1j9juqaWvyax+Lb/0pc=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

6
pkgs/applications/blockchains/go-ethereum.nix
View File

@ -9,17 +9,17 @@ let
in buildGoModule rec {
pname = "go-ethereum";
version = "1.10.4";
version = "1.10.5";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "sha256-DRlIiO3iXUsQnmOf5T9uk3560tVbS+Hrs8QtVkmllAI=";
sha256 = "sha256:1226picbgnph71fk2y0n1hyfrh6m8sh54kgn3pmikydnw176k9j1";
};
runVend = true;
vendorSha256 = "sha256-a/vY9iyqSM9QPs7lGFF6E7e2cMjIerVkNf5KwiWdyr0=";
vendorSha256 = "sha256:1nf2gamamlgr2sl5ibib5wai1pipj66xhbhnb4s4480j5pbv9a76";
doCheck = false;

4
pkgs/applications/misc/heimer/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "heimer";
version = "2.5.0";
version = "2.6.0";
src = fetchFromGitHub {
owner = "juzzlin";
repo = pname;
rev = version;
sha256 = "sha256-CY7n9eq/FtQ6srZ9L31nJi0b9rOQq60kNOY3iTFws/E=";
sha256 = "sha256-VSj6bSb92XMsfvDH+cey2GXLnJajUBaCqLMgkv2fnSo=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/applications/misc/joplin-desktop/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "joplin-desktop";
version = "1.8.5";
version = "2.1.9";
name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system;
@ -16,8 +16,8 @@ let
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
sha256 = {
x86_64-linux = "11csbr72i5kac2bk7wpa877lay2z1n58s0yildkfnjy552ihdxny";
x86_64-darwin = "1n0ni3ixml99ag83bcn5wg6f0kldjhwkkddd9km37ykr8vxxl952";
x86_64-linux = "1s7zydi90yzafii42m3aaf3niqlmdy2m494j2b3yrz2j26njj4q9";
x86_64-darwin = "1pvl08yhcrnrvdybfmkigaidhfrrg42bb6rzv96zyq9w4k0l0lm8";
}.${system} or throwSystem;
};

18
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -1,8 +1,8 @@
{ mkDerivation, lib, fetchFromGitHub, callPackage
{ mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo
, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash
, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
, tl-expected, hunspell, glibmm, webkitgtk
, tl-expected, hunspell, glibmm, webkitgtk, jemalloc
, libtgvoip, rnnoise, abseil-cpp, extra-cmake-modules
# Transitive dependencies:
, pcre, xorg, util-linux, libselinux, libsepol, epoxy
@ -23,7 +23,7 @@ let
tg_owt = callPackage ./tg_owt.nix {};
in mkDerivation rec {
pname = "telegram-desktop";
version = "2.8.4";
version = "2.8.11";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
@ -32,9 +32,17 @@ in mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-IN3GQgdNM66/GxKa5EGKB/LIkgBxS8Y4mkPBaSEphmw=";
sha256 = "020ycgb77vx7rza590i3csrvq1zgm15rvpxqqcp0xkb4yh71i3hb";
};
patches = [(fetchpatch {
# ref: https://github.com/desktop-app/lib_webview/pull/9
url = "https://github.com/desktop-app/lib_webview/commit/75e924934eee8624020befbef1f3cb5b865d3b86.patch";
sha256 = "sha256-rN4FVK4KT+xNf9IVdcpbxMqT0+t3SINJPRRQPyMiDP0=";
stripLen = 1;
extraPrefix = "Telegram/lib_webview/";
})];
postPatch = ''
substituteInPlace Telegram/CMakeLists.txt \
--replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"'
@ -49,7 +57,7 @@ in mkDerivation rec {
buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash
ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3
tl-expected hunspell glibmm webkitgtk
tl-expected hunspell glibmm webkitgtk jemalloc
libtgvoip rnnoise abseil-cpp extra-cmake-modules
tg_owt
# Transitive dependencies:

16
pkgs/applications/science/logic/boolector/default.nix
View File

@ -1,26 +1,18 @@
{ stdenv, fetchFromGitHub, fetchpatch, lib, python3
{ stdenv, fetchFromGitHub, lib, python3
, cmake, lingeling, btor2tools, gtest, gmp
}:
stdenv.mkDerivation rec {
pname = "boolector";
version = "3.2.1";
version = "3.2.2";
src = fetchFromGitHub {
owner = "boolector";
repo = "boolector";
rev = "refs/tags/${version}";
sha256 = "0jkmaw678njqgkflzj9g374yk1mci8yqvsxkrqzlifn6bwhwb7ci";
rev = version;
sha256 = "1smcy6yp8wvnw2brgnv5bf40v87k4v4fbdbrhi7987vja632k50z";
};
# excludes development artifacts from install, will be included in next release
patches = [
(fetchpatch {
url = "https://github.com/Boolector/boolector/commit/4d240436e34e65096671099766344dd9126145b1.patch";
sha256 = "1girsbvlhkkl1hldl2gsjynwc3m92jskn798qhx0ydg6whrfgcgw";
})
];
postPatch = ''
sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1
'';

27
pkgs/applications/science/logic/isabelle/default.nix
View File

@ -1,20 +1,20 @@
{ lib, stdenv, fetchurl, perl, perlPackages, makeWrapper, nettools, java, polyml, z3, rlwrap }:
{ lib, stdenv, fetchurl, perl, perlPackages, makeWrapper, nettools, java, polyml, z3, rlwrap, makeDesktopItem }:
# nettools needed for hostname
stdenv.mkDerivation rec {
pname = "isabelle";
version = "2020";
version = "2021";
dirname = "Isabelle${version}";
src = if stdenv.isDarwin
then fetchurl {
url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz";
sha256 = "1sfr5filsaqj93g5y4p9n8g5652dhr4whj25x4lifdxr2pp560xx";
sha256 = "1c2qm2ksmpyxyccyyn4lyj2wqj5m74nz2i0c5abrd1hj45zcnh1m";
}
else fetchurl {
url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
sha256 = "1bibabhlsvf6qsjjkgxcpq3cvl1z7r8yfcgqbhbvsiv69n3gyfk3";
sha256 = "1isgc9w4q95638dcag9gxz1kmf97pkin3jz1dm2lhd64b2k12y2x";
};
nativeBuildInputs = [ makeWrapper ];
@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
ISABELLE_JDK_HOME=${java}
EOF
sed -i -e 's/naproche_server : bool = true/naproche_server : bool = false/' contrib/naproche-*/etc/options
echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings
for comp in contrib/jdk* contrib/polyml-* contrib/z3-*; do
@ -66,9 +68,26 @@ stdenv.mkDerivation rec {
cd $out/$dirname
bin/isabelle install $out/bin
# icon
mkdir -p "$out/share/icons/hicolor/isabelle/apps"
cp "$out/Isabelle${version}/lib/icons/isabelle.xpm" "$out/share/icons/hicolor/isabelle/apps/"
# desktop item
mkdir -p "$out/share"
cp -r "${desktopItem}/share/applications" "$out/share/applications"
wrapProgram $out/$dirname/src/HOL/Tools/ATP/scripts/remote_atp --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.LWP ]}
'';
desktopItem = makeDesktopItem {
name = "isabelle";
exec = "isabelle jedit";
icon = "isabelle";
desktopName = "Isabelle";
comment = meta.description;
categories = "Education;Science;Math;";
};
meta = with lib; {
description = "A generic proof assistant";

20
pkgs/applications/science/misc/simgrid/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, cmake, perl, python3, boost, valgrind
{ lib, stdenv, fetchFromGitLab, fetchpatch, cmake, perl, python3, boost, valgrind
# Optional requirements
# Lua 5.3 needed and not available now
#, luaSupport ? false, lua5
@ -18,17 +18,26 @@ in
stdenv.mkDerivation rec {
pname = "simgrid";
version = "3.27";
version = "3.28";
src = fetchFromGitLab {
domain = "framagit.org";
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "13nwsyk030fhl3srhpc28j5s6594z0m38606f4ygc4qhv9wxw011";
sha256 = "0vylwgd4i89bvhbgfay0wq953324dwfmmr8jp9b4vvlc9m0017r9";
};
nativeBuildInputs = [ cmake perl python3 boost valgrind ]
patches = [
(fetchpatch {
name = "fix-smpi-dirs-absolute.patch";
url = "https://framagit.org/simgrid/simgrid/-/commit/71f01e667577be1076646eb841e0a57bd5388545.patch";
sha256 = "0x3y324b6269687zfy43ilc48bwrs4nb7svh2mpg88lrz53rky15";
})
];
propagatedBuildInputs = [ boost ];
nativeBuildInputs = [ cmake perl python3 valgrind ]
++ optionals fortranSupport [ gfortran ]
++ optionals buildJavaBindings [ openjdk ]
++ optionals buildDocumentation [ transfig ghostscript doxygen ]
@ -90,6 +99,9 @@ stdenv.mkDerivation rec {
cat <<EOW >CTestCustom.cmake
SET(CTEST_CUSTOM_TESTS_IGNORE smpi-replay-multiple)
EOW
# make sure tests are built in parallel (this can be long otherwise)
make tests -j $NIX_BUILD_CORES
'';
meta = {

4
pkgs/applications/terminal-emulators/foot/default.nix
View File

@ -27,7 +27,7 @@
}:
let
version = "1.8.1";
version = "1.8.2";
# build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result
@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";
sha256 = "0yrz7n0wls8g8w7ja934icwxmng3sxh70x87qmzc9c9cb1wyd989";
sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h";
};
depsBuildBuild = [

6
pkgs/applications/window-managers/sway/bg.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "swaybg";
version = "1.0";
version = "1.1";
src = fetchFromGitHub {
owner = "swaywm";
repo = "swaybg";
rev = version;
sha256 = "1lmqz5bmig90gq2m7lwf02d2g7z4hzf8fhqz78c8vk92c6p4xwbc";
rev = "v${version}";
sha256 = "17508q9wsw6c1lsxlcbxj74z2naqhwi5c7lkbq24m4lk8qmy0576";
};
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];

4
pkgs/data/icons/kora-icon-theme/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kora-icon-theme";
version = "1.4.3";
version = "1.4.4";
src = fetchFromGitHub {
owner = "bikass";
repo = "kora";
rev = "v${version}";
sha256 = "sha256-tSkTwhhugvDTzzcxIln1xq3ZY6boHJR0LRGy20ONO5U=";
sha256 = "sha256-79C/M5WXQswA1xuA6pwVSRlDtQC9+EzkwSEV3SdPzBc=";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome/core/evince/default.nix
View File

@ -44,13 +44,13 @@
stdenv.mkDerivation rec {
pname = "evince";
version = "40.2";
version = "40.4";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "D/fseTdqipesTNJ00y6ATH4jbvLS1dP2Rt5uuIKmPHc=";
sha256 = "M0IFAODgYPF4pDUGMZfULa57Z+OcxDepZRCjPd9+lfs=";
};
postPatch = ''

4
pkgs/desktops/gnome/core/gnome-initial-setup/default.nix
View File

@ -35,11 +35,11 @@
stdenv.mkDerivation rec {
pname = "gnome-initial-setup";
version = "40.2";
version = "40.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "O9cUg/YMDY9yQ5E7kmJe8Vx3iS/uP5MifqXw+XsMWqs=";
sha256 = "5QP9HUiFL112qr9iLR7ymWs4TYjaMf0WoQ1RPwmpDdc=";
};
patches = [

4
pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
View File

@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extensions";
version = "40.2";
version = "40.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "qFGN1Mg6eE+o05pe1gC/gdY3oY7r5ZDjticYPgv5FPg=";
sha256 = "nfh/qVNSAf68o9UI/b97rQFxz3ony2ZN1OPB+WxO0Es=";
};
patches = [

4
pkgs/desktops/gnome/extensions/arcmenu/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-arcmenu";
version = "10";
version = "12";
src = fetchFromGitLab {
owner = "arcmenu";
repo = "ArcMenu";
rev = "v${version}";
sha256 = "04kn3gnjz1wakp0pyiwm0alf0pwsralhis36miif9i6l5iv6a394";
sha256 = "sha256-R1OUDf/YMyMlxwXM9rNsrasPumHEoYhJK0evnYGeIkA=";
};
patches = [

4
pkgs/desktops/gnustep/back/default.nix
View File

@ -10,11 +10,11 @@
gsmakeDerivation rec {
pname = "gnustep-back";
version = "0.28.0";
version = "0.29.0";
src = fetchzip {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz";
sha256 = "1nkmk7qli2ld6gw9h4kqa199i8q2m9x9d46idxh1k0rb41kf3i2c";
sha256 = "sha256-4n2SC68G0dpSz9nqCL5Kz76nyoRxWcRTWDwZsnMoHSM=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/development/compilers/polyml/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "polyml";
version = "5.8.1";
version = "5.8.2";
prePatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace configure.ac --replace stdc++ c++
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "polyml";
repo = "polyml";
rev = "v${version}";
sha256 = "0gcx2fjiwsiazlyfhm7zlrd563blc4fy9w2mspib9divbavaxin6";
sha256 = "0vvla816g9rk9aa75gq63rb7bf6yla27p8wh1s1ycgq2in2zk0py";
};
meta = with lib; {

4
pkgs/development/interpreters/trealla/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "trealla";
version = "1.8.74";
version = "1.9.37";
src = fetchFromGitHub {
owner = "infradig";
repo = "trealla";
rev = "v${version}";
sha256 = "sha256-pg9SfEFUTuyAnhP+Q1vR/QImZuLuRb8NpaOiCEcTFj8=";
sha256 = "sha256-0cj4FGaYKIKCgWwRyLUw1DcvNnioQPOtqZhSvWSaojU=";
};
postPatch = ''

4
pkgs/development/libraries/libmodulemd/default.nix
View File

@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "libmodulemd";
version = "2.12.1";
version = "2.13.0";
outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ];
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "fedora-modularity";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-Relj14uG+dp9r5xWEbw/eAmlUJJ/kRwlPclcWGQxoJg=";
sha256 = "sha256-hg/it3pHUnEYsmKcLzQKcZNthHZZwdXBjzTlOS1Losk=";
};
patches = [

6
pkgs/development/libraries/libtgvoip/default.nix
View File

@ -7,13 +7,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "libtgvoip";
version = "unstable-2021-01-01";
version = "unstable-2021-07-13";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "libtgvoip";
rev = "13a5fcb16b04472d808ce122abd695dbf5d206cd";
sha256 = "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd";
rev = "f321e7c8cc086bac6ae06fa0934aac7d9833a310";
sha256 = "1gk5nsqhbnn1cdh83b70qr3d3v2c1bncylvgn77vvj8vnyjlmnfq";
};
# To fix the build without external webrtc:

6
pkgs/development/libraries/libwebsockets/default.nix
View File

@ -26,6 +26,9 @@ let
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";
postInstall = "rm -rf ${placeholder "out"}/share/libwebsockets-test-server";
disallowedReferences = [ stdenv.cc.cc ]; # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o
meta = with lib; {
description = "Light, portable C library for websockets";
longDescription = ''
@ -42,8 +45,7 @@ let
};
};
in
rec {
in {
libwebsockets_3_1 = generic {
sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl";
version = "3.1.0";

12
pkgs/development/libraries/totem-pl-parser/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome }:
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome, glib }:
stdenv.mkDerivation rec {
pname = "totem-pl-parser";
@ -16,8 +16,14 @@ stdenv.mkDerivation rec {
};
};
nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection ];
buildInputs = [ libxml2 ];
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config gettext glib gobject-introspection ];
buildInputs = [ libxml2 glib ];
mesonFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-Dintrospection=false"
];
meta = with lib; {
homepage = "https://wiki.gnome.org/Apps/Videos";

18
pkgs/development/ocaml-modules/hacl-star/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib, buildDunePackage, hacl-star-raw, zarith, cppo }:
buildDunePackage {
pname = "hacl-star";
inherit (hacl-star-raw) version src meta doCheck minimalOCamlVersion;
useDune2 = true;
propagatedBuildInputs = [
hacl-star-raw
zarith
];
buildInputs = [
cppo
];
}

51
pkgs/development/ocaml-modules/hacl-star/raw.nix Normal file
View File

@ -0,0 +1,51 @@
{ lib, which, stdenv, fetchzip, ocaml, findlib, hacl-star, ctypes, cppo }:
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-hacl-star-raw";
version = "0.3.2";
src = fetchzip {
url = "https://github.com/project-everest/hacl-star/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz";
sha256 = "1wp27vf0g43ggs7cv85hpa62jjvzkwzzg5rfznbwac6j6yr17zc7";
stripRoot = false;
};
sourceRoot = "./source/raw";
minimalOCamlVersion = "4.05";
postPatch = ''
patchShebangs ./
'';
preInstall = ''
mkdir -p $OCAMLFIND_DESTDIR/stublibs
'';
installTargets = "install-hacl-star-raw";
dontAddPrefix = true;
buildInputs = [
which
ocaml
findlib
];
propagatedBuildInputs = [
ctypes
];
checkInputs = [
cppo
];
doCheck = true;
meta = {
description = "Auto-generated low-level OCaml bindings for EverCrypt/HACL*";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.ulrikstrid ];
platforms = ocaml.meta.platforms;
};
}

28
pkgs/development/ocaml-modules/ringo/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, fetchFromGitLab, buildDunePackage }:
buildDunePackage rec {
pname = "ringo";
version = "0.5";
src = fetchFromGitLab {
owner = "nomadic-labs";
repo = "ringo";
rev = "v${version}";
sha256 = "1zwha0ycv3rm3qnw7nkg2m08ibx39yxnx5fan4lnn82b0pdasjag";
};
minimalOCamlVersion = "4.05";
useDune2 = true;
doCheck = true;
# If we just run the test as is it will try to test ringo-lwt
checkPhase = "dune build @test/runtest";
meta = {
description = "Caches (bounded-size key-value stores) and other bounded-size stores";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}

17
pkgs/development/ocaml-modules/ringo/lwt.nix Normal file
View File

@ -0,0 +1,17 @@
{ lib, buildDunePackage, ringo, lwt }:
buildDunePackage {
pname = "ringo-lwt";
inherit (ringo) version src doCheck useDune2;
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [
ringo
lwt
];
meta = ringo.meta // {
description = "Lwt-wrappers for Ringo caches";
};
}

4
pkgs/development/python-modules/apache-airflow/default.nix
View File

@ -65,13 +65,13 @@
}:
let
version = "2.1.1rc1";
version = "2.1.2";
airflow-src = fetchFromGitHub rec {
owner = "apache";
repo = "airflow";
rev = version;
sha256 = "1vzzmcfgqni9rkf7ggh8mswnm3ffwaishcz1ysrwx0a96ilhm9q2";
sha256 = "sha256-Q0l2c1tuxcoE65zgdxnv/j1TIoQzaNoEFCYHvqN+Bzk=";
};
# airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.

6
pkgs/development/python-modules/hcloud/default.nix
View File

@ -8,15 +8,17 @@
, isort
, mock
, pytest
, isPy27
}:
buildPythonPackage rec {
pname = "hcloud";
version = "1.12.0";
version = "1.13.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "1fka4m3kbz52pksrjw3v42k611x5kl06dxrc7p5rb64jg6gayjfl";
sha256 = "0f84nwr3ddzivlnswwmhvm3lgq9fy3n7nryy93xqpk5nxcd1ybpn";
};
propagatedBuildInputs = [ future requests python-dateutil ];

6
pkgs/development/python-modules/rtoml/default.nix
View File

@ -9,20 +9,20 @@
buildPythonPackage rec {
pname = "rtoml";
version = "0.6.1";
version = "0.7";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "samuelcolvin";
repo = pname;
rev = "v${version}";
sha256 = "07bf30if1wmbqjp5n4ib43n6frx8ybyxc9fndxncq7aylkrhd7hy";
sha256 = "sha256-h4vY63pDkrMHt2X244FssLxHsphsfjNd6gnVFUeZZTY=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "1q082sdac5vm4l3b45rfjp4vppp9y9qhagdjqqfdz8gdhm1k8yyy";
sha256 = "05fwcs6w023ihw3gyihzbnfwjaqy40d6h0z2yas4kqkkvz9x4f8j";
};
nativeBuildInputs = with rustPlatform; [

36
pkgs/development/python-modules/tomli/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, pytestCheckHook
, python-dateutil
}:
buildPythonPackage rec {
pname = "tomli";
version = "1.0.4";
format = "pyproject";
src = fetchFromGitHub {
owner = "hukkin";
repo = pname;
rev = version;
sha256 = "sha256-ld0PsYnxVH3RbLG/NpvLDj9UhAe+QgwCQVXgGgqh8kE=";
};
nativeBuildInputs = [ flit-core ];
checkInputs = [
pytestCheckHook
python-dateutil
];
pythonImportsCheck = [ "tomli" ];
meta = with lib; {
description = "A Python library for parsing TOML, fully compatible with TOML v1.0.0";
homepage = "https://github.com/hukkin/tomli";
license = licenses.mit;
maintainers = with maintainers; [ veehaitch ];
};
}

4
pkgs/development/python-modules/uncertainties/default.nix
View File

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "uncertainties";
version = "3.1.5";
version = "3.1.6";
src = fetchPypi {
inherit pname version;
sha256 = "00z9xl40czmqk0vmxjvmjvwb41r893l4dad7nj1nh6blw3kw28li";
sha256 = "0b9y0v73ih142bygi66dxqx17j2x4dfvl7xnhmafj9yjmymbakbw";
};
propagatedBuildInputs = [ future ];

4
pkgs/development/tools/bazelisk/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "bazelisk";
version = "1.10.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-G2cHKhgsv1fj7eKbADER3R2uXp9DnKevboE7vnO5pDE=";
sha256 = "sha256-MpAYJSDAbyh4aGW+hRrny5+bXZ96cNcUhqJkgY8bdD8=";
};
vendorSha256 = "sha256-5qpeAD4VFsR8iJlRiNTncOdq39lq3MU6gSLu3G/BcPU=";

20
pkgs/games/openrct2/default.nix
View File

@ -5,13 +5,13 @@
}:
let
version = "0.3.3";
version = "0.3.4";
openrct2-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "OpenRCT2";
rev = "v${version}";
sha256 = "01nanpbz5ycdhkyd46fjfvj18sw729l4vk7xg12600f9rjngjk76";
sha256 = "051dm7bw3l8qnppk5b7xvavl29xfadqn8aa18q49qdy5mjy6qgk4";
};
objects-src = fetchFromGitHub {
@ -29,8 +29,8 @@ let
};
in
stdenv.mkDerivation {
inherit version;
pname = "openrct2";
inherit version;
src = openrct2-src;
@ -58,22 +58,22 @@ stdenv.mkDerivation {
zlib
];
postUnpack = ''
cp -r ${objects-src} $sourceRoot/data/object
cp -r ${title-sequences-src} $sourceRoot/data/sequence
'';
cmakeFlags = [
"-DDOWNLOAD_OBJECTS=OFF"
"-DDOWNLOAD_TITLE_SEQUENCES=OFF"
];
postUnpack = ''
cp -r ${objects-src} $sourceRoot/data/object
cp -r ${title-sequences-src} $sourceRoot/data/sequence
'';
preFixup = "ln -s $out/share/openrct2 $out/bin/data";
meta = with lib; {
description = "An open source re-implementation of RollerCoaster Tycoon 2 (original game required)";
description = "Open source re-implementation of RollerCoaster Tycoon 2 (original game required)";
homepage = "https://openrct2.io/";
license = licenses.gpl3;
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ oxzi ];
};

4
pkgs/games/the-powder-toy/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "the-powder-toy";
version = "96.0.348";
version = "96.1.349";
src = fetchFromGitHub {
owner = "The-Powder-Toy";
repo = "The-Powder-Toy";
rev = "v${version}";
sha256 = "sha256-PAnjNeqGJPW7TeoIsaOnuOb1loyKs8pjBseKoD0CvQU=";
sha256 = "sha256-MSN81kPaH8cWZO+QEOlMUQQghs1kn8CpsKA5SUC/RX8=";
};
nativeBuildInputs = [ meson ninja pkg-config python3 ];

208
pkgs/misc/vim-plugins/generated.nix
View File

@ -101,12 +101,12 @@ final: prev:
aniseed = buildVimPluginFrom2Nix {
pname = "aniseed";
version = "2021-05-31";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "Olical";
repo = "aniseed";
rev = "4ca3d418eebc0da452b7defc18970c83f7de5070";
sha256 = "0ax3hfwppbkm7haxvsllac6r4zk2ys9rrj7sj4p3ayl1w8v3n8nq";
rev = "c15c4e49d6ecb7ad7252902bb1b4310ba161617a";
sha256 = "13pnlx4rqjc51vrq9d8kyjjxb2apw3y6j2xh68ii746klinjpjy5";
};
meta.homepage = "https://github.com/Olical/aniseed/";
};
@ -425,12 +425,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-07-17";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "fa78312b378a7d3a6cb1222d1df05c28238f888b";
sha256 = "05j42c3h374hyqqb5m7dddyh4sn08cw64nji3fnv3rk63gm2r4if";
rev = "7ae9ada3866e05a25be1899dfb68fa2dc17f5466";
sha256 = "0plydss60in6zsgjrgrsvxgkz59bmn89ngm015prqp1w8izlwc82";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -786,12 +786,12 @@ final: prev:
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
version = "2021-06-13";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
rev = "b55e4906a10db0f6917058aec6616075c4d06994";
sha256 = "0agmfahppcaxxn3kwfg9wx9ncdz51qixqh52xw6rddhpda5h7gfm";
rev = "c651b5af9e30b9d88290ca30b0374b064e1a278d";
sha256 = "1qycvbkr6axl5vcwwf5m6svag511p97h2xzcbh68arqa1kqx208l";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@ -822,12 +822,12 @@ final: prev:
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
version = "2021-06-30";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
rev = "7df02d1bf18324d81cbc32b98c05f5aa936afc17";
sha256 = "1vf2386xagiyh23kflcnckw5niy4xygns4pi3apq7kza05ca6861";
rev = "9c1aa175762884812b9f3c3436ef6e26639b9589";
sha256 = "1xhbnad098a6h3vf05rkha7qpj4nb4jaxjcnll91wzvf4lngq4p0";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@ -1316,12 +1316,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview-nvim";
version = "2021-07-04";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "1936824f5986c986befad5995e7bf87ba124d109";
sha256 = "16h82yn7g9jq2chdb4wjjvz6akb0r06wjjvqpj9xkp82rx55m4ix";
rev = "63d7052686732a910b7355761193fdb55a521cd3";
sha256 = "13r743m9x2mbi0qvfgv8vqfjgxnrmvic09ps484m39bxsbdywzvv";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -1388,12 +1388,12 @@ final: prev:
edge = buildVimPluginFrom2Nix {
pname = "edge";
version = "2021-07-12";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "edge";
rev = "0aad4037902271c8c85d00d02e77f79ec2141267";
sha256 = "0knxkcf8ndj6ggcj8jsfgcmm98pmshl1n05qrixkhgh4ilrisqr4";
rev = "8785d0c2737b6354c847a2ac2cd327a16e2087f2";
sha256 = "0nhf9vnsba7gm1yxnbj8lqd9d1ihdgpqrlyihlc815ayqzzs3h9b";
};
meta.homepage = "https://github.com/sainnhe/edge/";
};
@ -1859,12 +1859,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
version = "2021-07-16";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "f29e8a461e05881c69953b41784a1aeb4b70a422";
sha256 = "1nda02nd9v17yv6fawidg8c3haijysb9zc04sjy0v708h2nw8qhj";
rev = "66638c929c61f950246f3d292b6157a9596241de";
sha256 = "1wqspsx83sy2qmmg0idi7j66swm23hnhxx630j114vh6a70vai00";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -2195,12 +2195,12 @@ final: prev:
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline-nvim";
version = "2021-07-03";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
rev = "17a83ea765831cb0cc64f768b8c3f43479b90bbe";
sha256 = "155da638i4ff1wsy5600jgrqicykb27lxq9liag174nga6xazbn6";
rev = "0257caac96b28ec9efd80a00c13d31c469357f5b";
sha256 = "0r5c99xzsizqpk4h35lp3ip8lqang2vvg01vrv0bad3wqnjqq1d7";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@ -2676,12 +2676,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim";
version = "2021-07-17";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
rev = "29e685953d362c723c55417eea2b795b5bcc2ef5";
sha256 = "183511fy34sazpkaxcpr250id4zyxhs5mqws49b516sh0d875fjj";
rev = "78af1399d0e7a85152d4f75b9ce0c20286735d6e";
sha256 = "156wdb57vabz0syx84zlnn5v6wy7g02flq4r5caz9xwccdszwz33";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@ -3144,12 +3144,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2021-07-14";
version = "2021-07-18";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "bf148e2534097988e61ed334edaf31b67134369b";
sha256 = "157k4gbs0r92zwm41hh40gqxc9774g05ngan936ivnnfg5j9igsg";
rev = "ee83d4fa8ac946e5e0064e65a5276e1ea030ae28";
sha256 = "0mrydz0xl2yqgsp1nsz4p55mjhx7x7z7pahcq3y5mzzla687dnqg";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -3412,8 +3412,8 @@ final: prev:
src = fetchFromGitHub {
owner = "shaunsingh";
repo = "nord.nvim";
rev = "44ae0a84087135e23fb5a90c9726f8b161277652";
sha256 = "0zhv06arl7x3wx20r26v3vc1i4909h657syrqbyh5k93n1hmc21j";
rev = "02a07af329b9cb42187a2dd74aef8563f5957bfc";
sha256 = "10yzlv3433dfdm5n1q8r4yzwx0h73nd81w60fqkfx4cl4l7l9085";
};
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
};
@ -3492,12 +3492,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2021-07-14";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "e599e15f9400e6b587e3160d2dff83764cb4ab7d";
sha256 = "08mn2z6q94x8fwic9r0vhzw0y93sm9ww6z458bd9hsxibfjsklgc";
rev = "b0bbe8d9089cbb045fd15d217ac5a5ec0f4f5066";
sha256 = "173nkjfkqklg8zk4vs69c0avrw0v6hngj0szxj7xs3yh2wfnhqnh";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@ -3708,12 +3708,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-07-17";
version = "2021-07-18";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "1729b502fa00df2fdcbfa118b404b8b8a8a2d6a3";
sha256 = "1r4ajaxvf9kpfq42b81c08ixfqakiq8fibn89qar7sd4a7634dsg";
rev = "38e0003d0c40d506e9e46ff55978b78220a76b71";
sha256 = "0r3zicx8gkj5jd0kxs1i5inxpi9jmg3nwb0km4xcj55fb3x2vbky";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -3804,12 +3804,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-07-14";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "d779ee79f0426711f84b770bf6ff4afda4f41c1e";
sha256 = "0svnb4fsqsjhlqcikq0kgrwyrqfqplgvx93mhw1qhpmwfbgqn6vi";
rev = "17cf76de8a16c1e459fbe916491f258371837a8d";
sha256 = "1fzm655q6xw3qqpvzx36wj5v9js1jiwb8295cccdc65irg8r6zfw";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3864,12 +3864,12 @@ final: prev:
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
version = "2021-07-16";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
rev = "4887eb7526004e069bd8898041a714c7eaad72e7";
sha256 = "1abdjkiyyzgaw3lskjfb0lcilkp8qqlaqj8kyfmzf4w4mz9ijh4d";
rev = "038cda43f4b7e8819c230de2bbe943972ed2f37c";
sha256 = "0kdzfi5dm1lm1bzagf60c8dd1a3zz0x4qp28nns6nhiv7kljj3zy";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
@ -4694,12 +4694,12 @@ final: prev:
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
version = "2021-07-12";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
rev = "ef631befe2bea01c23f4f0d9685025ac15d51ace";
sha256 = "1hk1f1mbk37gcqhrwvn352q83qsf5nrgyrgghvkj8m91jgf4m31y";
rev = "9d8c57c2b0bf57082093bf1b162ac492206d35dd";
sha256 = "0ymgbcy8v7ang4ghlkr52wq86ydr4pma1vwvp78y5yhi4xmn82mn";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
@ -4827,12 +4827,12 @@ final: prev:
srcery-vim = buildVimPluginFrom2Nix {
pname = "srcery-vim";
version = "2021-06-01";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "srcery-colors";
repo = "srcery-vim";
rev = "93711180123b9ba6958bfc682d305ef0a1056fa5";
sha256 = "1i3hhihlvh5mkn1vl9f1baiz712h8lwp1hfi5arsb36picsmgbfd";
rev = "b2780ad5078c24519ba1e6ae3a1b3bd2218870cc";
sha256 = "1r0v4l9rvb3w42fnj1fmcfvy04gyp0lv3mis7jl716r8kvbaqwpj";
};
meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
};
@ -4923,12 +4923,12 @@ final: prev:
syntastic = buildVimPluginFrom2Nix {
pname = "syntastic";
version = "2021-07-01";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "vim-syntastic";
repo = "syntastic";
rev = "c89741ef310fd0a380ffb80b80e10f197afd6224";
sha256 = "0n691w9mcq0ks7wvj9mpmwhqnkcd11lhzf4fz6pkki8g5i7zhqrh";
rev = "7414f30365a342e1d89072d474a35913643b6eec";
sha256 = "19c9dv8dc72nnb1dx7wdraihpzf5b42wwq3c9vn0na8k1xy26h8y";
};
meta.homepage = "https://github.com/vim-syntastic/syntastic/";
};
@ -4958,6 +4958,18 @@ final: prev:
meta.homepage = "https://github.com/codota/tabnine-vim/";
};
taboo-vim = buildVimPluginFrom2Nix {
pname = "taboo-vim";
version = "2019-08-27";
src = fetchFromGitHub {
owner = "gcmt";
repo = "taboo.vim";
rev = "caf948187694d3f1374913d36f947b3f9fa1c22f";
sha256 = "06pizdnb3gr4pf5hrm3yfzkz99y9bi2vwqm85xknzgdvl1lisj99";
};
meta.homepage = "https://github.com/gcmt/taboo.vim/";
};
tabpagebuffer-vim = buildVimPluginFrom2Nix {
pname = "tabpagebuffer-vim";
version = "2014-09-30";
@ -5117,24 +5129,24 @@ final: prev:
telescope-z-nvim = buildVimPluginFrom2Nix {
pname = "telescope-z-nvim";
version = "2021-07-17";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-z.nvim";
rev = "27694fa19bc00cc24b436d671951f516a4a966a1";
sha256 = "0g12nfmv2hllw0ylsy362mp1gyaf4ldyiza3jg74c66xwi2jj8i9";
rev = "f5776dbd0c687af0862b2e4ee83c62c5f4a7271d";
sha256 = "08lcszv53d9mqhgdwkdygbnk5w0pyh0q6djxzqhnjb6qphibf3m6";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/";
};
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-07-17";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "5b597e7709eec08331ce71b45193117f6fb5626b";
sha256 = "1lwr3gayqj6h0ha749p5dfgihjlqydgaidcnblcvvj8vi10ick35";
rev = "46e03a935f1d080a9bd856d5a8acfcc093cd1461";
sha256 = "14ra8p9alnmvzry3iw3ghyk7nx44dh0qm82lvg6wfg5bhw1hpnnj";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -5262,12 +5274,12 @@ final: prev:
traces-vim = buildVimPluginFrom2Nix {
pname = "traces-vim";
version = "2021-06-16";
version = "2021-07-18";
src = fetchFromGitHub {
owner = "markonm";
repo = "traces.vim";
rev = "e36a2e45791ef9078de781a781fec70e160044b0";
sha256 = "1qndaqs38mgkl15n895nzjc98h2cy4gjgr3r72cpwhn9qmzhi5zc";
rev = "360361b093d21531c0781c5c4a61a1e6cb3edfac";
sha256 = "052kbzx2rqpw5mhh6w1zcj5il642w1a2wi6w4nbcw7scj4gq85pd";
};
meta.homepage = "https://github.com/markonm/traces.vim/";
};
@ -5706,12 +5718,12 @@ final: prev:
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2021-07-11";
version = "2021-07-18";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "4807a211cdfab3a5b5640111978ba301461c5ac1";
sha256 = "1lrx54cfd9x6dx3kfz6x6jwakmkisj5y55s156fchdf83hsm967n";
rev = "b861f9d2483a8b066f7b5b4dbae8990ff21455c5";
sha256 = "0rz7p95ks4ymdwz7aqahc782msdz70qx25807cwvqh1gc9x887vq";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@ -6006,12 +6018,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-07-16";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "ee390feaa3bc40de2afa32910ab09de287181146";
sha256 = "0q2bnmi6yz7i7lx8i59gzk39fqzjc3y325qjhhyyahwb2xsazzcz";
rev = "3aa42d211ebae7471e8f9926aaeef5a1df475f2f";
sha256 = "0f1adjn9x5jv541yzgqf67v9613xvkxzgc5bmkgqrfxn2l5j3vjn";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -6786,12 +6798,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2021-07-16";
version = "2021-07-17";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "58516a13c623e6b21be6fed1f6067eed67005949";
sha256 = "0gzdsp1gz1wpw8z47v3sr9b0ma41qnz0r4iiq0jr84srr3817zpl";
rev = "de6495ae846b2c5913fa85d5464c036c0acdfa34";
sha256 = "184cbh2jxwpp4zgvlfhs4qx1mr4vyq5vvv6lvk8lcng40dxfr9fg";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@ -7351,12 +7363,12 @@ final: prev:
vim-jinja = buildVimPluginFrom2Nix {
pname = "vim-jinja";
version = "2016-11-16";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "lepture";
repo = "vim-jinja";
rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6";
sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q";
rev = "2f0eeefe583ea477cb7605f972d57d7d5e55e13f";
sha256 = "0r8508h9s2bikmv3wvw4iaq3j8i5n564k7s06aqx9j79i16asn22";
};
meta.homepage = "https://github.com/lepture/vim-jinja/";
};
@ -7713,12 +7725,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2021-07-05";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "05f4962c64c5dcd720b8cf5f7af777de33f2fa43";
sha256 = "10nfiban4ihsix2zf4qp38mcdmlz3zb6n01n5wkgz9yga28y9jxm";
rev = "61802ad25f303dc37f575cbed9b902605353db49";
sha256 = "15c8y5rfsnmx4dm01advvax8flkibkg60lbs8x0xgyzfcqjzhl14";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@ -8035,6 +8047,18 @@ final: prev:
meta.homepage = "https://github.com/jceb/vim-orgmode/";
};
vim-ormolu = buildVimPluginFrom2Nix {
pname = "vim-ormolu";
version = "2020-11-25";
src = fetchFromGitHub {
owner = "sdiehl";
repo = "vim-ormolu";
rev = "edbeb0135692345b088182963e9b229fe2235ac0";
sha256 = "03srdix06dhz4b8g9akx448dw2rjbwj840xg7p9c5bq8kbmsjy8x";
};
meta.homepage = "https://github.com/sdiehl/vim-ormolu/";
};
vim-osc52 = buildVimPluginFrom2Nix {
pname = "vim-osc52";
version = "2020-09-19";
@ -8349,12 +8373,12 @@ final: prev:
vim-puppet = buildVimPluginFrom2Nix {
pname = "vim-puppet";
version = "2021-01-30";
version = "2021-07-18";
src = fetchFromGitHub {
owner = "rodjek";
repo = "vim-puppet";
rev = "b282072eb145c7719319bee1963c33ad876b0cea";
sha256 = "1m6zbyg5hh3rhwq36836ldwhgcsmh4bl0lz5g4nzpc2ch83crrn8";
rev = "7bb7586896b7afe6e6f26bcbaf70ad8517d98018";
sha256 = "1mqnawfpg23rwjp3zpz85s3dpspcl8zrh9dymv5p0pqbn27mlf5n";
};
meta.homepage = "https://github.com/rodjek/vim-puppet/";
};
@ -8505,12 +8529,12 @@ final: prev:
vim-ruby = buildVimPluginFrom2Nix {
pname = "vim-ruby";
version = "2021-07-07";
version = "2021-07-18";
src = fetchFromGitHub {
owner = "vim-ruby";
repo = "vim-ruby";
rev = "0f603a17435f6b25614e70449304d38216d0e6e3";
sha256 = "0dz4rmbifz5l03ch5rrnzb18j7kdwz1nkfz0lcvkwgxgjnrrhk15";
rev = "482e2cec5a742920eddf644f2f1efcb15f03967c";
sha256 = "18b3hhb1sfgip80dp7wicrsqs59narj49qlmpnfhsy29imsxzb72";
};
meta.homepage = "https://github.com/vim-ruby/vim-ruby/";
};
@ -9250,12 +9274,12 @@ final: prev:
vim-ultest = buildVimPluginFrom2Nix {
pname = "vim-ultest";
version = "2021-07-05";
version = "2021-07-18";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "vim-ultest";
rev = "43ec7b40a83fcde104d3e5e69a2c112f9dc52325";
sha256 = "1q2rcqllip1raay9nj2cacn6vsairrywg7yxh783zf13n9bmr5vb";
rev = "06f965a62c32906f220c37e7b758a275d6a992f6";
sha256 = "0zgpp6g29n1kb0qi6n84i1d540g0xhw5bzj8kp5xsh5wlvn9h4fk";
};
meta.homepage = "https://github.com/rcarriga/vim-ultest/";
};
@ -9478,12 +9502,12 @@ final: prev:
vim-xtabline = buildVimPluginFrom2Nix {
pname = "vim-xtabline";
version = "2021-06-10";
version = "2021-07-19";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-xtabline";
rev = "1dbf84a3095eff9bd0d1e49824dddac56c378ed9";
sha256 = "16qwp8kk3c2lzfnmzkzi71ilrcssga17kjiphskph5kl35igr16v";
rev = "e1be98dc050b8c5196e324cb4236e8c4b44483e6";
sha256 = "12gr0v2r91q75v1wfrskp330zlyibshngs11if9nlxpnhgz8f6dn";
};
meta.homepage = "https://github.com/mg979/vim-xtabline/";
};
@ -9683,12 +9707,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2021-07-15";
version = "2021-07-18";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "13fac7d1d820ee4d72196841800705f149af9868";
sha256 = "0k9325pdh5fscj8nhqwj36vdz6lvcgf14r7mmimc7g6i7bxxfpmb";
rev = "830659752b8914f6b4567a00448901246e4d1841";
sha256 = "1zdi1kblk03gwifpg1nanq4ppn9xw6af92l3li86ziw89bv3bad9";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};

2
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -161,6 +161,7 @@ fruit-in/vim-nong-theme
fsharp/vim-fsharp
fszymanski/deoplete-emoji
garbas/vim-snipmate
gcmt/taboo.vim
gcmt/wildfire.vim
gennaro-tedesco/nvim-peekup
gentoo/gentoo-syntax
@ -595,6 +596,7 @@ sakhnik/nvim-gdb
saltstack/salt-vim
samoshkin/vim-mergetool
sbdchd/neoformat
sdiehl/vim-ormolu
sebastianmarkow/deoplete-rust
SevereOverfl0w/deoplete-github
Shatur/neovim-ayu

2
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -179,7 +179,7 @@ let
};
}; # end of configfile derivation
kernel = (callPackage ./manual-config.nix {}) {
kernel = (callPackage ./manual-config.nix { inherit buildPackages; }) {
inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile;
config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; };

28
pkgs/os-specific/linux/xmm7360-pci/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, perl, bc, breakpointHook }:
stdenv.mkDerivation rec {
pname = "xmm7360-pci";
version = "unstable-2021-07-19";
src = fetchFromGitHub {
owner = "xmm7360";
repo = "xmm7360-pci";
rev = "7086b80bb609180b1b89fb478751e5e8414ab64f";
sha256 = "1wdb0phqg9rj9g9ycqdya0m7lx24kzjlh25yw0ifp898ddxrrr0c";
};
makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
nativeBuildInputs = kernel.moduleBuildDependencies;
INSTALL_MOD_PATH = placeholder "out";
installFlags = [ "DEPMOD=true" ];
meta = with lib; {
homepage = "https://github.com/xmm7360/xmm7360-pci";
description = "PCI driver for Fibocom L850-GL modem based on Intel XMM7360 modem";
downloadPage = "https://github.com/xmm7360/xmm7360-pci";
license = licenses.isc;
maintainers = with maintainers; [ flokli hexa ];
platforms = platforms.linux;
};
}

21
pkgs/servers/hockeypuck/server.nix Normal file
View File

@ -0,0 +1,21 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
let
sources = (import ./sources.nix) { inherit fetchFromGitHub; };
in
buildGoModule {
inherit (sources) pname version src;
modRoot = "src/hockeypuck/";
vendorSha256 = null;
doCheck = false; # Uses networking for tests
passthru.tests = nixosTests.hockeypuck;
meta = with lib; {
description = "OpenPGP Key Server";
homepage = "https://github.com/hockeypuck/hockeypuck";
license = licenses.agpl3Plus;
maintainers = [ maintainers.etu ];
};
}

16
pkgs/servers/hockeypuck/sources.nix Normal file
View File

@ -0,0 +1,16 @@
{ fetchFromGitHub }:
let
pname = "hockeypuck";
version = "2.1.0";
in
{
inherit version pname;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0da3ffbqck0dr7d89gy2yillp7g9a4ziyjlvrm8vgkkg2fs8dlb1";
};
}

28
pkgs/servers/hockeypuck/web.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, lib, fetchFromGitHub, nixosTests }:
let
sources = (import ./sources.nix) { inherit fetchFromGitHub; };
in
stdenv.mkDerivation {
pname = "${sources.pname}-web";
inherit (sources) version src;
dontBuild = true; # We should just copy the web templates
installPhase = ''
mkdir -p $out/share/
cp -vr contrib/webroot $out/share/
cp -vr contrib/templates $out/share/
'';
passthru.tests = nixosTests.hockeypuck;
meta = with lib; {
description = "OpenPGP Key Server web resources";
homepage = "https://github.com/hockeypuck/hockeypuck";
license = licenses.gpl3Plus;
maintainers = [ maintainers.etu ];
};
}

10
pkgs/servers/klipper/default.nix
View File

@ -5,14 +5,14 @@
, unstableGitUpdater
}:
stdenv.mkDerivation rec {
name = "klipper";
version = "unstable-2021-01-31";
pname = "klipper";
version = "unstable-2021-07-15";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
rev = "ef4d9c3abd30ae8a485020fd9ff2fb4529a143b3";
sha256 = "sha256-puAkSGL0DD0JUWejPdzr7zKIW2UP2soBBtgm2msUKzA=";
rev = "dafb74e3aba707db364ed773bb2135084ac0fffa";
sha256 = "sha256-wF5I8Mo89ohhysBRDMtkCDbCW9SKWrdYdbifmxCPJBc=";
};
# We have no LTO on i686 since commit 22284b0
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The Klipper 3D printer firmware";
homepage = "https://github.com/KevinOConnor/klipper";
maintainers = with maintainers; [ lovesegfault ];
maintainers = with maintainers; [ lovesegfault zhaofengli ];
platforms = platforms.linux;
license = licenses.gpl3Only;
};

4
pkgs/tools/admin/azure-cli/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
let
version = "2.26.0";
version = "2.26.1";
srcName = "azure-cli-${version}-src";
src = fetchFromGitHub {
@ -9,7 +9,7 @@ let
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
sha256 = "sha256-O5EL51RRxrp6D82p0Qbo59y/GAkBDhIkIdTxnagKgkY=";
sha256 = "sha256-AwchP0o3I2T37dLPNw51wldwYUmcRuWptyzrhOocEaQ=";
};
# put packages that needs to be overriden in the py package scope

33
pkgs/tools/backup/duplicity/default.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchurl
, fetchFromGitLab
, fetchpatch
, pythonPackages
, librsync
, ncftp
@ -17,11 +18,13 @@ let
in
pythonPackages.buildPythonApplication rec {
pname = "duplicity";
version = "0.8.17";
version = "0.8.20";
src = fetchurl {
url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz";
sha256 = "114rwkf9b3h4fcagrx013sb7krc4hafbwl9gawjph2wd9pkv2wx2";
src = fetchFromGitLab {
owner = "duplicity";
repo = "duplicity";
rev = "rel.${version}";
sha256 = "13ghra0myq6h6yx8qli55bh8dg91nf1hpd8l7d7xamgrw6b188sm";
};
patches = [
@ -31,6 +34,13 @@ pythonPackages.buildPythonApplication rec {
# Our Python infrastructure runs test in installCheckPhase so we need
# to make the testing code stop assuming it is run from the source directory.
./use-installed-scripts-in-test.patch
# https://gitlab.com/duplicity/duplicity/-/merge_requests/64
# remove on next release
(fetchpatch {
url = "https://gitlab.com/duplicity/duplicity/-/commit/5c229a9b42f67257c747fbc0022c698fec405bbc.patch";
sha256 = "05v931rnawfv11cyxj8gykmal8rj5vq2ksdysyr2mb4sl81mi7v0";
})
] ++ lib.optionals stdenv.isLinux [
# Broken on Linux in Nix' build environment
./linux-disable-timezone-test.patch
@ -38,6 +48,15 @@ pythonPackages.buildPythonApplication rec {
SETUPTOOLS_SCM_PRETEND_VERSION = version;
preConfigure = ''
# fix version displayed by duplicity --version
# see SourceCopy in setup.py
ls
for i in bin/*.1 duplicity/__init__.py; do
substituteInPlace "$i" --replace '$version' "${version}"
done
'';
nativeBuildInputs = [
makeWrapper
gettext
@ -50,7 +69,6 @@ pythonPackages.buildPythonApplication rec {
pythonPath = with pythonPackages; [
b2sdk
boto
boto3
cffi
cryptography
@ -102,6 +120,9 @@ pythonPackages.buildPythonApplication rec {
# Don't run developer-only checks (pep8, etc.).
export RUN_CODE_TESTS=0
# check version string
duplicity --version | grep ${version}
'' + lib.optionalString stdenv.isDarwin ''
# Work around the following error when running tests:
# > Max open files of 256 is too low, should be >= 1024.

10
pkgs/tools/backup/duplicity/gnutar-in-test.patch
View File

@ -1,9 +1,11 @@
diff --git a/testing/functional/test_restart.py b/testing/functional/test_restart.py
index 6d972c82..e8435fd5 100644
--- a/testing/functional/test_restart.py
+++ b/testing/functional/test_restart.py
@@ -323,14 +323,7 @@ class RestartTestWithoutEncryption(RestartTest):
@@ -350,14 +350,7 @@ class RestartTestWithoutEncryption(RestartTest):
https://launchpad.net/bugs/929067
"""
- if platform.system().startswith(u'Linux'):
- tarcmd = u"tar"
- elif platform.system().startswith(u'Darwin'):
@ -13,6 +15,6 @@
- else:
- raise Exception(u"Platform %s not supported by tar/gtar." % platform.platform())
+ tarcmd = u"tar"
# Intial normal backup
self.backup("full", "testfiles/blocktartest")
self.backup(u"full", u"{0}/testfiles/blocktartest".format(_runtest_dir))

14
pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch
View File

@ -1,10 +1,16 @@
commit f0142706c377b7c133753db57b5c4c90baa2de30
Author: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sun Jul 11 17:48:15 2021 +0200
diff --git a/testing/unit/test_statistics.py b/testing/unit/test_statistics.py
index 4be5000c..80545853 100644
--- a/testing/unit/test_statistics.py
+++ b/testing/unit/test_statistics.py
@@ -59,6 +59,7 @@ class StatsObjTest(UnitTestCase):
@@ -63,6 +63,7 @@ class StatsObjTest(UnitTestCase):
s1 = StatsDeltaProcess()
assert s1.get_stat('SourceFiles') == 0
assert s1.get_stat(u'SourceFiles') == 0
+ @unittest.skip("Broken on Linux in Nix' build environment")
def test_get_stats_string(self):
"""Test conversion of stat object into string"""
u"""Test conversion of stat object into string"""
s = StatsObj()

44
pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch
View File

@ -1,48 +1,62 @@
commit ccd4dd92cd37acce1da20966ad9e4e0c7bcf1709
Author: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sun Jul 11 12:00:00 2021 +0000
use installed duplicity when running tests
diff --git a/setup.py b/setup.py
index fa474f20..604a242a 100755
--- a/setup.py
+++ b/setup.py
@@ -92,10 +92,6 @@ class TestCommand(test):
@@ -205,10 +205,6 @@ class TestCommand(test):
except Exception:
pass
- os.environ[u'PATH'] = u"%s:%s" % (
- os.path.abspath(build_scripts_cmd.build_dir),
- os.environ.get(u'PATH'))
-
test.run(self)
def run_tests(self):
diff --git a/testing/functional/__init__.py b/testing/functional/__init__.py
index 4221576d..3cf44945 100644
--- a/testing/functional/__init__.py
+++ b/testing/functional/__init__.py
@@ -107,7 +107,7 @@ class FunctionalTestCase(DuplicityTestCase):
if basepython is not None:
cmd_list.extend([basepython])
@@ -111,7 +111,7 @@ class FunctionalTestCase(DuplicityTestCase):
run_coverage = os.environ.get(u'RUN_COVERAGE', None)
if run_coverage is not None:
cmd_list.extend([u"-m", u"coverage", u"run", u"--source=duplicity", u"-p"])
- cmd_list.extend([u"../bin/duplicity"])
- cmd_list.extend([u"{0}/bin/duplicity".format(_top_dir)])
+ cmd_list.extend([u"duplicity"])
cmd_list.extend(options)
cmd_list.extend([u"-v0"])
cmd_list.extend([u"--no-print-statistics"])
diff --git a/testing/functional/test_log.py b/testing/functional/test_log.py
index 9dfc86a6..b9cb55db 100644
--- a/testing/functional/test_log.py
+++ b/testing/functional/test_log.py
@@ -47,9 +47,9 @@ class LogTest(FunctionalTestCase):
@@ -49,9 +49,9 @@ class LogTest(FunctionalTestCase):
# Run actual duplicity command (will fail, because no arguments passed)
basepython = os.environ.get(u'TOXPYTHON', None)
if basepython is not None:
- os.system(u"{} ../bin/duplicity --log-file={} >/dev/null 2>&1".format(basepython, self.logfile))
+ os.system(u"{} duplicity --log-file={} >/dev/null 2>&1".format(basepython, self.logfile))
- os.system(u"{0} {1}/bin/duplicity --log-file={2} >/dev/null 2>&1".format(basepython, _top_dir, self.logfile))
+ os.system(u"{0} duplicity --log-file={1} >/dev/null 2>&1".format(basepython, self.logfile))
else:
- os.system(u"../bin/duplicity --log-file={} >/dev/null 2>&1".format(self.logfile))
+ os.system(u"duplicity --log-file={} >/dev/null 2>&1".format(self.logfile))
- os.system(u"{0}/bin/duplicity --log-file={1} >/dev/null 2>&1".format(_top_dir, self.logfile))
+ os.system(u"duplicity --log-file={0} >/dev/null 2>&1".format(self.logfile))
# The format of the file should be:
# """ERROR 2
diff --git a/testing/functional/test_rdiffdir.py b/testing/functional/test_rdiffdir.py
index 0cbfdb33..47acd029 100644
--- a/testing/functional/test_rdiffdir.py
+++ b/testing/functional/test_rdiffdir.py
@@ -42,7 +42,7 @@ class RdiffdirTest(FunctionalTestCase):
@@ -44,7 +44,7 @@ class RdiffdirTest(FunctionalTestCase):
basepython = os.environ.get(u'TOXPYTHON', None)
if basepython is not None:
cmd_list.extend([basepython])
- cmd_list.extend([u"../bin/rdiffdir"])
- cmd_list.extend([u"{0}/bin/rdiffdir".format(_top_dir)])
+ cmd_list.extend([u"rdiffdir"])
cmd_list.extend(argstring.split())
cmdline = u" ".join([u'"%s"' % x for x in cmd_list])

4
pkgs/tools/misc/birdfont/default.nix
View File

@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "birdfont";
version = "2.29.4";
version = "2.29.5";
src = fetchurl {
url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
sha256 = "sha256-caNY6PrsqBrYwC61MxNsf8B9E8it1Ls1d+hdbf8u+o8=";
sha256 = "sha256-eIqq4ehUB4lF89ikrHeN5Akq14nxYMxREZzPSVnv+nU=";
};
nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ];

4
pkgs/tools/misc/diffoscope/default.nix
View File

@ -16,11 +16,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "177";
version = "178";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-yTOaDhAKtMhQYxolALnuc7FuXoMUOhjmsabtS1FeW/Q=";
sha256 = "sha256-uJbTQshf7vRd6EyaaV0itJVrMc/6o+pPXhtUgrjFnzM=";
};
outputs = [ "out" "man" ];

10
pkgs/tools/misc/flameshot/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "flameshot";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "flameshot-org";
repo = "flameshot";
rev = "v${version}";
sha256 = "sha256-E5J61k1tVpbwlzYHbCY1rf9+GODcJRRAQwb0jR4s7BU=";
sha256 = "1m0mx8qhy9ycsqh5dj6c7mwwpbhqxlds31dqdxxk0krwl750smi2";
};
nativeBuildInputs = [ cmake qttools qtsvg ];
@ -17,8 +17,8 @@ mkDerivation rec {
meta = with lib; {
description = "Powerful yet simple to use screenshot software";
homepage = "https://github.com/flameshot-org/flameshot";
maintainers = [ maintainers.scode ];
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with maintainers; [ scode ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

6
pkgs/tools/misc/vector/default.nix
View File

@ -28,16 +28,16 @@
rustPlatform.buildRustPackage rec {
pname = "vector";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "timberio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wtihrR19jMJ7Kgvy6XBzOUrC/WKNVl2MVx4lWgXYlvg=";
sha256 = "sha256-8ZsZyV6zlMiNTVYPwqQi7F1OJ4hV33IqrrGkvUb8JaY=";
};
cargoSha256 = "sha256-VYIzAqh5Xxmn1koxhh+UDb2G3WS2UVXffuBY7h5Kr7A=";
cargoSha256 = "sha256-t6KeyBwIfCQTfaennFiFX3K+8unFOsduBP7nRbAo9wI=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];

15
pkgs/tools/package-management/nix-prefetch/default.nix
View File

@ -1,33 +1,25 @@
{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc
, docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk
, gnugrep, gnused, jq, nix, fetchpatch }:
, gnugrep, gnused, jq, nix }:
let
binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ];
in stdenv.mkDerivation rec {
pname = "nix-prefetch";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "msteen";
repo = "nix-prefetch";
rev = version;
sha256 = "11792677zyi06jw641xi9aywwgh9002b8406w6qids212c14va6n";
sha256 = "0bwv6x651gyq703pywrhb7lfby6xwnd1iwnrzzjihipn7x3v2hz9";
# the stat call has to be in a subshell or we get the current date
extraPostFetch = ''
echo $(stat -c %Y $out) > $out/.timestamp
'';
};
patches = [
# Fix input_type regex for macOS systems: https://github.com/msteen/nix-prefetch/pull/24
(fetchpatch {
url = "https://github.com/msteen/nix-prefetch/commit/08282891bdb108e886eaf39be2030ba1feda1cb1.patch";
sha256 = "1v6ask54ind6f3784pbncv0dfg6draaaicg0q46jfvp0lafms70x";
})
];
postPatch = ''
lib=$out/lib/${pname}
@ -78,5 +70,6 @@ in stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ msteen ];
inherit (src.meta) homepage;
platforms = platforms.all;
};
}

6
pkgs/tools/system/bottom/default.nix
View File

@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "bottom";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "ClementTsang";
repo = pname;
rev = version;
sha256 = "sha256-QCi6Oi5xk88ev2B4rlXwgR55qKZSUbIY/96t/jhJQ0Q=";
sha256 = "sha256-hXEaQL4jTd/MfEUVKUTs7oTRAffau1YA/IUUtD+V9KI=";
};
prePatch = ''
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
libiconv
];
cargoSha256 = "sha256-RJ7xIp9EBiBLSMAchr7XYhrTITNJy+Yfok//vZr3Z38=";
cargoSha256 = "sha256-aeR6fcIWkY4AWZy8tVotUAVRVSiO/0S0DU/A9/ATrF4=";
doCheck = false;

6
pkgs/top-level/all-packages.nix
View File

@ -5827,6 +5827,10 @@ in
lua = lua5;
});
hockeypuck = callPackage ../servers/hockeypuck/server.nix { };
hockeypuck-web = callPackage ../servers/hockeypuck/web.nix { };
holochain-go = callPackage ../servers/holochain-go { };
homesick = callPackage ../tools/misc/homesick { };
@ -21198,6 +21202,8 @@ in
x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };
xmm7360-pci = callPackage ../os-specific/linux/xmm7360-pci { };
xpadneo = callPackage ../os-specific/linux/xpadneo { };
zenpower = callPackage ../os-specific/linux/zenpower { };

6
pkgs/top-level/ocaml-packages.nix
View File

@ -417,6 +417,9 @@ let
hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { };
hacl-star = callPackage ../development/ocaml-modules/hacl-star { };
hacl-star-raw = callPackage ../development/ocaml-modules/hacl-star/raw.nix { };
herelib = callPackage ../development/ocaml-modules/herelib { };
hidapi = callPackage ../development/ocaml-modules/hidapi { };
@ -1179,6 +1182,9 @@ let
resto-directory = callPackage ../development/ocaml-modules/resto/directory.nix { };
resto-json = callPackage ../development/ocaml-modules/resto/json.nix { };
ringo = callPackage ../development/ocaml-modules/ringo { };
ringo-lwt = callPackage ../development/ocaml-modules/ringo/lwt.nix { };
rope = callPackage ../development/ocaml-modules/rope { };
routes = callPackage ../development/ocaml-modules/routes { };

2
pkgs/top-level/python-packages.nix
View File

@ -8689,6 +8689,8 @@ in {
toml = callPackage ../development/python-modules/toml { };
tomli = callPackage ../development/python-modules/tomli { };
tomlkit = callPackage ../development/python-modules/tomlkit { };
toolz = callPackage ../development/python-modules/toolz { };