mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge master into staging-next
This commit is contained in:
commit
8020f53c68
39 changed files with 559 additions and 192 deletions
|
@ -37,7 +37,7 @@ in {
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
description = ''
|
description = ''
|
||||||
Configuration for CoreRAD, see <link xlink:href="https://github.com/mdlayher/corerad/blob/master/internal/config/default.toml"/>
|
Configuration for CoreRAD, see <link xlink:href="https://github.com/mdlayher/corerad/blob/main/internal/config/reference.toml"/>
|
||||||
for supported values. Ignored if configFile is set.
|
for supported values. Ignored if configFile is set.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
@ -21,7 +21,15 @@ let
|
||||||
))
|
))
|
||||||
else throw (traceSeq v "services.unbound.settings: unexpected type");
|
else throw (traceSeq v "services.unbound.settings: unexpected type");
|
||||||
|
|
||||||
confFile = pkgs.writeText "unbound.conf" (concatStringsSep "\n" ((mapAttrsToList (toConf "") cfg.settings) ++ [""]));
|
confNoServer = concatStringsSep "\n" ((mapAttrsToList (toConf "") (builtins.removeAttrs cfg.settings [ "server" ])) ++ [""]);
|
||||||
|
confServer = concatStringsSep "\n" (mapAttrsToList (toConf " ") (builtins.removeAttrs cfg.settings.server [ "define-tag" ]));
|
||||||
|
|
||||||
|
confFile = pkgs.writeText "unbound.conf" ''
|
||||||
|
server:
|
||||||
|
${optionalString (cfg.settings.server.define-tag != "") (toOption " " "define-tag" cfg.settings.server.define-tag)}
|
||||||
|
${confServer}
|
||||||
|
${confNoServer}
|
||||||
|
'';
|
||||||
|
|
||||||
rootTrustAnchorFile = "${cfg.stateDir}/root.key";
|
rootTrustAnchorFile = "${cfg.stateDir}/root.key";
|
||||||
|
|
||||||
|
@ -170,6 +178,7 @@ in {
|
||||||
# prevent race conditions on system startup when interfaces are not yet
|
# prevent race conditions on system startup when interfaces are not yet
|
||||||
# configured
|
# configured
|
||||||
ip-freebind = mkDefault true;
|
ip-freebind = mkDefault true;
|
||||||
|
define-tag = mkDefault "";
|
||||||
};
|
};
|
||||||
remote-control = {
|
remote-control = {
|
||||||
control-enable = mkDefault false;
|
control-enable = mkDefault false;
|
||||||
|
|
|
@ -7,10 +7,15 @@ let
|
||||||
|
|
||||||
# FIXME consider using LoadCredential as soon as it actually works.
|
# FIXME consider using LoadCredential as soon as it actually works.
|
||||||
envSecrets = ''
|
envSecrets = ''
|
||||||
export ADMIN_USER_PWD="$(<${cfg.adminUser.passwordFile})"
|
ADMIN_USER_PWD="$(<${cfg.adminUser.passwordFile})"
|
||||||
export SECRET_KEY_BASE="$(<${cfg.server.secretKeybaseFile})"
|
export ADMIN_USER_PWD # separate export to make `set -e` work
|
||||||
|
|
||||||
|
SECRET_KEY_BASE="$(<${cfg.server.secretKeybaseFile})"
|
||||||
|
export SECRET_KEY_BASE # separate export to make `set -e` work
|
||||||
|
|
||||||
${optionalString (cfg.mail.smtp.passwordFile != null) ''
|
${optionalString (cfg.mail.smtp.passwordFile != null) ''
|
||||||
export SMTP_USER_PWD="$(<${cfg.mail.smtp.passwordFile})"
|
SMTP_USER_PWD="$(<${cfg.mail.smtp.passwordFile})"
|
||||||
|
export SMTP_USER_PWD # separate export to make `set -e` work
|
||||||
''}
|
''}
|
||||||
'';
|
'';
|
||||||
in {
|
in {
|
||||||
|
@ -102,6 +107,11 @@ in {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
description = ''
|
description = ''
|
||||||
Public URL where plausible is available.
|
Public URL where plausible is available.
|
||||||
|
|
||||||
|
Note that <literal>/path</literal> components are currently ignored:
|
||||||
|
<link xlink:href="https://github.com/plausible/analytics/issues/1182">
|
||||||
|
https://github.com/plausible/analytics/issues/1182
|
||||||
|
</link>.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -228,6 +238,7 @@ in {
|
||||||
WorkingDirectory = "/var/lib/plausible";
|
WorkingDirectory = "/var/lib/plausible";
|
||||||
StateDirectory = "plausible";
|
StateDirectory = "plausible";
|
||||||
ExecStartPre = "@${pkgs.writeShellScript "plausible-setup" ''
|
ExecStartPre = "@${pkgs.writeShellScript "plausible-setup" ''
|
||||||
|
set -eu -o pipefail
|
||||||
${envSecrets}
|
${envSecrets}
|
||||||
${pkgs.plausible}/createdb.sh
|
${pkgs.plausible}/createdb.sh
|
||||||
${pkgs.plausible}/migrate.sh
|
${pkgs.plausible}/migrate.sh
|
||||||
|
@ -238,6 +249,7 @@ in {
|
||||||
''}
|
''}
|
||||||
''} plausible-setup";
|
''} plausible-setup";
|
||||||
ExecStart = "@${pkgs.writeShellScript "plausible" ''
|
ExecStart = "@${pkgs.writeShellScript "plausible" ''
|
||||||
|
set -eu -o pipefail
|
||||||
${envSecrets}
|
${envSecrets}
|
||||||
plausible start
|
plausible start
|
||||||
''} plausible";
|
''} plausible";
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
, autoPatchelfHook
|
, autoPatchelfHook
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, flac
|
, flac
|
||||||
|
, gcc11
|
||||||
, lib
|
, lib
|
||||||
, libmicrohttpd
|
, libmicrohttpd
|
||||||
, llvmPackages_10
|
, llvmPackages_10
|
||||||
|
@ -17,13 +18,11 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "hqplayer-desktop";
|
pname = "hqplayer-desktop";
|
||||||
version = "4.12.1-35";
|
version = "4.12.2-36";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
# FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs
|
url = "https://www.signalyst.eu/bins/hqplayer/fc34/hqplayer4desktop-${version}.fc34.x86_64.rpm";
|
||||||
# c.f. https://github.com/NixOS/nixpkgs/pull/111616
|
sha256 = "sha256-ng0Tkx6CSnzTxuunStaBhUYjxUmzx31ZaOY2gBWnH6Q=";
|
||||||
url = "https://www.signalyst.eu/bins/hqplayer/fc33/hqplayer4desktop-${version}.fc33.x86_64.rpm";
|
|
||||||
sha256 = "sha256-DLnZNX+uAan9dhPLMvINeXsIn3Yv2CgsvyTcX0hbEK8=";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
unpackPhase = ''
|
unpackPhase = ''
|
||||||
|
@ -35,11 +34,12 @@ mkDerivation rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
alsa-lib
|
alsa-lib
|
||||||
flac
|
flac
|
||||||
|
gcc11.cc.lib
|
||||||
libmicrohttpd
|
libmicrohttpd
|
||||||
llvmPackages_10.openmp
|
llvmPackages_10.openmp
|
||||||
qtquickcontrols2
|
|
||||||
qtcharts
|
qtcharts
|
||||||
qtdeclarative
|
qtdeclarative
|
||||||
|
qtquickcontrols2
|
||||||
qtwebengine
|
qtwebengine
|
||||||
qtwebview
|
qtwebview
|
||||||
wavpack
|
wavpack
|
||||||
|
|
|
@ -2,10 +2,10 @@ let
|
||||||
pkgs = import ../../../../.. { };
|
pkgs = import ../../../../.. { };
|
||||||
|
|
||||||
src = pkgs.fetchgit {
|
src = pkgs.fetchgit {
|
||||||
url = "https://github.com/ttuegel/emacs2nix.git";
|
url = "https://github.com/nix-community/emacs2nix.git";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
rev = "860da04ca91cbb69c9b881a54248d16bdaaf9923";
|
rev = "703b144eeb490e87133c777f82e198b4e515c312";
|
||||||
sha256 = "1r3xmyk9rfgx7ln69dk8mgbnh3awcalm3r1c5ia2shlsrymvv1df";
|
sha256 = "sha256-YBbRh/Cb8u9+Pn6/Bc0atI6knKVjr8jiTGgFkD2FNGI=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
|
|
|
@ -0,0 +1,93 @@
|
||||||
|
{ callPackage }:
|
||||||
|
{
|
||||||
|
caml = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||||
|
elpaBuild {
|
||||||
|
pname = "caml";
|
||||||
|
ename = "caml";
|
||||||
|
version = "4.7.1";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://elpa.nongnu.org/nongnu/caml-4.7.1.tar";
|
||||||
|
sha256 = "1bv2fscy7zg7r1hyg4rpvh3991vmhy4zid7bv1qbhxa95m9c49j3";
|
||||||
|
};
|
||||||
|
packageRequires = [];
|
||||||
|
meta = {
|
||||||
|
homepage = "https://elpa.gnu.org/packages/caml.html";
|
||||||
|
license = lib.licenses.free;
|
||||||
|
};
|
||||||
|
}) {};
|
||||||
|
markdown-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||||
|
elpaBuild {
|
||||||
|
pname = "markdown-mode";
|
||||||
|
ename = "markdown-mode";
|
||||||
|
version = "2.4";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.4.tar";
|
||||||
|
sha256 = "002nvc2p7jzznr743znbml3vj8a3kvdd89rlbi28f5ha14g2567z";
|
||||||
|
};
|
||||||
|
packageRequires = [ emacs ];
|
||||||
|
meta = {
|
||||||
|
homepage = "https://elpa.gnu.org/packages/markdown-mode.html";
|
||||||
|
license = lib.licenses.free;
|
||||||
|
};
|
||||||
|
}) {};
|
||||||
|
org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
|
||||||
|
elpaBuild {
|
||||||
|
pname = "org-contrib";
|
||||||
|
ename = "org-contrib";
|
||||||
|
version = "0.1";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://elpa.nongnu.org/nongnu/org-contrib-0.1.tar";
|
||||||
|
sha256 = "07hzywvgj11wd21dw4lbkvqv32da03407f9qynlzgg1qa7wknm2k";
|
||||||
|
};
|
||||||
|
packageRequires = [ emacs org ];
|
||||||
|
meta = {
|
||||||
|
homepage = "https://elpa.gnu.org/packages/org-contrib.html";
|
||||||
|
license = lib.licenses.free;
|
||||||
|
};
|
||||||
|
}) {};
|
||||||
|
request = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||||
|
elpaBuild {
|
||||||
|
pname = "request";
|
||||||
|
ename = "request";
|
||||||
|
version = "0.3.3";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://elpa.nongnu.org/nongnu/request-0.3.3.tar";
|
||||||
|
sha256 = "168yy902bcjfdaahsbzhzb4wgqbw1mq1lfwdjh66fpzqs75c5q00";
|
||||||
|
};
|
||||||
|
packageRequires = [ emacs ];
|
||||||
|
meta = {
|
||||||
|
homepage = "https://elpa.gnu.org/packages/request.html";
|
||||||
|
license = lib.licenses.free;
|
||||||
|
};
|
||||||
|
}) {};
|
||||||
|
sly = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||||
|
elpaBuild {
|
||||||
|
pname = "sly";
|
||||||
|
ename = "sly";
|
||||||
|
version = "1.0.43";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://elpa.nongnu.org/nongnu/sly-1.0.43.tar";
|
||||||
|
sha256 = "0qgji539qwk7lv9g1k11w0i2nn7n7nk456gwa0bh556mcqz2ndr8";
|
||||||
|
};
|
||||||
|
packageRequires = [ emacs ];
|
||||||
|
meta = {
|
||||||
|
homepage = "https://elpa.gnu.org/packages/sly.html";
|
||||||
|
license = lib.licenses.free;
|
||||||
|
};
|
||||||
|
}) {};
|
||||||
|
tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }:
|
||||||
|
elpaBuild {
|
||||||
|
pname = "tuareg";
|
||||||
|
ename = "tuareg";
|
||||||
|
version = "2.3.0";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://elpa.nongnu.org/nongnu/tuareg-2.3.0.tar";
|
||||||
|
sha256 = "0a24q64yk4bbgsvm56j1y68zs9yi25qyl83xydx3ff75sk27f1yb";
|
||||||
|
};
|
||||||
|
packageRequires = [ caml emacs ];
|
||||||
|
meta = {
|
||||||
|
homepage = "https://elpa.gnu.org/packages/tuareg.html";
|
||||||
|
license = lib.licenses.free;
|
||||||
|
};
|
||||||
|
}) {};
|
||||||
|
}
|
|
@ -0,0 +1,32 @@
|
||||||
|
/*
|
||||||
|
|
||||||
|
# Updating
|
||||||
|
|
||||||
|
To update the list of packages from nongnu (ELPA),
|
||||||
|
|
||||||
|
1. Run `./update-nongnu`.
|
||||||
|
2. Check for evaluation errors: `nix-instantiate ../../../../.. -A emacs.pkgs.nongnuPackages`.
|
||||||
|
3. Run `git commit -m "org-packages $(date -Idate)" -- nongnu-generated.nix`
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
{ lib }:
|
||||||
|
|
||||||
|
self: let
|
||||||
|
|
||||||
|
generateNongnu = lib.makeOverridable ({
|
||||||
|
generated ? ./nongnu-generated.nix
|
||||||
|
}: let
|
||||||
|
|
||||||
|
imported = import generated {
|
||||||
|
inherit (self) callPackage;
|
||||||
|
};
|
||||||
|
|
||||||
|
super = imported;
|
||||||
|
|
||||||
|
overrides = {
|
||||||
|
};
|
||||||
|
|
||||||
|
in super // overrides);
|
||||||
|
|
||||||
|
in generateNongnu { }
|
4
pkgs/applications/editors/emacs/elisp-packages/update-nongnu
Executable file
4
pkgs/applications/editors/emacs/elisp-packages/update-nongnu
Executable file
|
@ -0,0 +1,4 @@
|
||||||
|
#! /usr/bin/env nix-shell
|
||||||
|
#! nix-shell --show-trace ./emacs2nix.nix -i bash
|
||||||
|
|
||||||
|
exec nongnu-packages.sh --names $EMACS2NIX/names.nix -o nongnu-generated.nix
|
46
pkgs/applications/misc/mnamer/default.nix
Normal file
46
pkgs/applications/misc/mnamer/default.nix
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
{ python3Packages, fetchFromGitHub, lib }:
|
||||||
|
|
||||||
|
python3Packages.buildPythonApplication rec {
|
||||||
|
pname = "mnamer";
|
||||||
|
version = "2.5.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "jkwill87";
|
||||||
|
repo = "mnamer";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "1frrvfhp85fh82yw9yb6n61by8qp1v7f3c0f623njxk1afawhccd";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = with python3Packages; [
|
||||||
|
babelfish
|
||||||
|
requests
|
||||||
|
appdirs
|
||||||
|
teletype
|
||||||
|
requests-cache
|
||||||
|
guessit
|
||||||
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# requires specific old versions of dependencies which have been updated in nixpkgs
|
||||||
|
./remove_requirements.patch
|
||||||
|
|
||||||
|
# author reads a private property that changed between versions
|
||||||
|
./update_hack.patch
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [ python3Packages.pytestCheckHook ];
|
||||||
|
|
||||||
|
# disable test that fail (networking, etc)
|
||||||
|
disabledTests = [
|
||||||
|
"network"
|
||||||
|
"e2e"
|
||||||
|
"test_utils.py"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/jkwill87/mnamer";
|
||||||
|
description = "An intelligent and highly configurable media organization utility";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ urlordjames ];
|
||||||
|
};
|
||||||
|
}
|
21
pkgs/applications/misc/mnamer/remove_requirements.patch
Normal file
21
pkgs/applications/misc/mnamer/remove_requirements.patch
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
diff --git a/setup.py b/setup.py
|
||||||
|
index 245c1dd..fdc17ab 100755
|
||||||
|
--- a/setup.py
|
||||||
|
+++ b/setup.py
|
||||||
|
@@ -7,16 +7,12 @@ from mnamer.__version__ import VERSION
|
||||||
|
with open("readme.md", "r", encoding="utf8") as fp:
|
||||||
|
LONG_DESCRIPTION = fp.read()
|
||||||
|
|
||||||
|
-with open("requirements.txt", "r", encoding="utf8") as fp:
|
||||||
|
- REQUIREMENTS = fp.read().splitlines()
|
||||||
|
-
|
||||||
|
setup(
|
||||||
|
author="Jessy Williams",
|
||||||
|
author_email="jessy@jessywilliams.com",
|
||||||
|
description="A media file organiser",
|
||||||
|
entry_points={"console_scripts": ["mnamer=mnamer.__main__:main"]},
|
||||||
|
include_package_data=True,
|
||||||
|
- install_requires=REQUIREMENTS,
|
||||||
|
license="MIT",
|
||||||
|
long_description=LONG_DESCRIPTION,
|
||||||
|
long_description_content_type="text/markdown",
|
13
pkgs/applications/misc/mnamer/update_hack.patch
Normal file
13
pkgs/applications/misc/mnamer/update_hack.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/mnamer/utils.py b/mnamer/utils.py
|
||||||
|
index 636b596..e52bd37 100644
|
||||||
|
--- a/mnamer/utils.py
|
||||||
|
+++ b/mnamer/utils.py
|
||||||
|
@@ -280,7 +280,7 @@ def request_json(
|
||||||
|
"like Gecko) Chrome/79.0.3945.88 Safari/537.36"
|
||||||
|
)
|
||||||
|
|
||||||
|
- initial_cache_state = session._is_cache_disabled # yes, i'm a bad person
|
||||||
|
+ initial_cache_state = session._disabled # yes, i'm a bad person
|
||||||
|
try:
|
||||||
|
session._is_cache_disabled = not cache
|
||||||
|
response = session.request(
|
|
@ -17,10 +17,10 @@ in
|
||||||
mkFranzDerivation' rec {
|
mkFranzDerivation' rec {
|
||||||
pname = "ferdi";
|
pname = "ferdi";
|
||||||
name = "Ferdi";
|
name = "Ferdi";
|
||||||
version = "5.6.0-beta.6";
|
version = "5.6.0";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
|
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
|
||||||
sha256 = "sha256-Q1HSAEVcaxFyOq7oWqa6AJJpsBKRxbsKb9ydyK/gH/A=";
|
sha256 = "sha256-yaAYNQAvbtArw9qAtbTDD11a9nH2OQEPE8QLg1E79Yc=";
|
||||||
};
|
};
|
||||||
extraBuildInputs = [ xorg.libxshmfence ];
|
extraBuildInputs = [ xorg.libxshmfence ];
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -13,13 +13,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "kdeltachat";
|
pname = "kdeltachat";
|
||||||
version = "unstable-2021-07-04";
|
version = "unstable-2021-07-17";
|
||||||
|
|
||||||
src = fetchFromSourcehut {
|
src = fetchFromSourcehut {
|
||||||
owner = "~link2xt";
|
owner = "~link2xt";
|
||||||
repo = "kdeltachat";
|
repo = "kdeltachat";
|
||||||
rev = "5d3cddc47773b49d4a801d031c1de96c38617908";
|
rev = "9e5fe2dc856795d0d3d8b6a3adf3fdd3015d9158";
|
||||||
sha256 = "1sah27pvdkilnyj41xf4awri9ya14gxayr99qksllz92ywd9lxad";
|
sha256 = "12arcrnpacq2fbjbzs6a9yz6lfsj2dkga9chpld1ran3v6by58z9";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
let
|
let
|
||||||
major = "11";
|
major = "11";
|
||||||
minor = "0";
|
minor = "0";
|
||||||
update = "11";
|
update = "12";
|
||||||
build = "9";
|
build = "7";
|
||||||
|
|
||||||
openjdk = stdenv.mkDerivation rec {
|
openjdk = stdenv.mkDerivation rec {
|
||||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||||
|
@ -22,7 +22,7 @@ let
|
||||||
owner = "openjdk";
|
owner = "openjdk";
|
||||||
repo = "jdk${major}u";
|
repo = "jdk${major}u";
|
||||||
rev = "jdk-${version}";
|
rev = "jdk-${version}";
|
||||||
sha256 = "0jncsj424340xjfwv6sx5hy9sas80qa3ymkx0ng3by3z01y5rgfx";
|
sha256 = "0s8g6gj5vhm7hbp05cqaxasjrkwr41fm634qim8q6slklm4pkkli";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config autoconf unzip ];
|
nativeBuildInputs = [ pkg-config autoconf unzip ];
|
||||||
|
|
|
@ -3,11 +3,11 @@ let
|
||||||
s = # Generated upstream information
|
s = # Generated upstream information
|
||||||
rec {
|
rec {
|
||||||
baseName="libmwaw";
|
baseName="libmwaw";
|
||||||
version="0.3.19";
|
version="0.3.20";
|
||||||
name="${baseName}-${version}";
|
name="${baseName}-${version}";
|
||||||
hash="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8=";
|
hash="sha256-FMOLBiFPJ3zNFFDiLm4yZIlVAY12lYlrxWAWV0jIzSE=";
|
||||||
url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.19/libmwaw-0.3.19.tar.xz";
|
url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.20/libmwaw-0.3.20.tar.xz";
|
||||||
sha256="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8=";
|
sha256="sha256-FMOLBiFPJ3zNFFDiLm4yZIlVAY12lYlrxWAWV0jIzSE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
|
@ -1,11 +1,23 @@
|
||||||
{ lib, buildPythonPackage, fetchPypi, latexcodec, pyyaml }:
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, latexcodec
|
||||||
|
, pyyaml
|
||||||
|
, setuptools
|
||||||
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "0.24.0";
|
version = "0.24.0";
|
||||||
pname = "pybtex";
|
pname = "pybtex";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
propagatedBuildInputs = [ latexcodec pyyaml ];
|
pythonImportsCheck = [ "pybtex" ];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
latexcodec
|
||||||
|
pyyaml
|
||||||
|
setuptools
|
||||||
|
];
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit version pname;
|
inherit version pname;
|
||||||
|
|
|
@ -77,12 +77,12 @@ final: prev:
|
||||||
|
|
||||||
ale = buildVimPluginFrom2Nix {
|
ale = buildVimPluginFrom2Nix {
|
||||||
pname = "ale";
|
pname = "ale";
|
||||||
version = "2021-07-17";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dense-analysis";
|
owner = "dense-analysis";
|
||||||
repo = "ale";
|
repo = "ale";
|
||||||
rev = "f83a1f70d542ac885b72d1161140d6d999e2d7b2";
|
rev = "5ad4fdd583116ec253aaf43e2d457cd3e3aa5587";
|
||||||
sha256 = "0mx9g2j32hbpg5gyxn4apkfm28myzpasj4w7dpq6p61c90hwhgq4";
|
sha256 = "178c60ckgkr4ivgi1b21f1cndx9d64spydc8z75gcyz3r6lcbrmm";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/dense-analysis/ale/";
|
meta.homepage = "https://github.com/dense-analysis/ale/";
|
||||||
};
|
};
|
||||||
|
@ -425,12 +425,12 @@ final: prev:
|
||||||
|
|
||||||
chadtree = buildVimPluginFrom2Nix {
|
chadtree = buildVimPluginFrom2Nix {
|
||||||
pname = "chadtree";
|
pname = "chadtree";
|
||||||
version = "2021-07-19";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ms-jpq";
|
owner = "ms-jpq";
|
||||||
repo = "chadtree";
|
repo = "chadtree";
|
||||||
rev = "7ae9ada3866e05a25be1899dfb68fa2dc17f5466";
|
rev = "f768ee24fd8b8b3ee6751361b9ac09f7c8f381d8";
|
||||||
sha256 = "0plydss60in6zsgjrgrsvxgkz59bmn89ngm015prqp1w8izlwc82";
|
sha256 = "1rdfjz2l2v1hzsp8pfiv0c7kbmf7221a90pak7w7mncaabrzlnxr";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||||
};
|
};
|
||||||
|
@ -533,12 +533,12 @@ final: prev:
|
||||||
|
|
||||||
coc-lua = buildVimPluginFrom2Nix {
|
coc-lua = buildVimPluginFrom2Nix {
|
||||||
pname = "coc-lua";
|
pname = "coc-lua";
|
||||||
version = "2021-07-17";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "josa42";
|
owner = "josa42";
|
||||||
repo = "coc-lua";
|
repo = "coc-lua";
|
||||||
rev = "75b97dfdd641d530b86dee603308aea0079736e9";
|
rev = "d3ddb34d124c2fce9afa56342e67732a267d6b42";
|
||||||
sha256 = "1rmlz74ssf9mpg4fbxinrmxnqcb4p37wi4pz96d6niiii0vj71b2";
|
sha256 = "1px4fny0m272jl4vvhhv317j4wh5kfb89rdlrrpqwg8dl2si24rq";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/josa42/coc-lua/";
|
meta.homepage = "https://github.com/josa42/coc-lua/";
|
||||||
};
|
};
|
||||||
|
@ -569,12 +569,12 @@ final: prev:
|
||||||
|
|
||||||
coc-nvim = buildVimPluginFrom2Nix {
|
coc-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "coc-nvim";
|
pname = "coc-nvim";
|
||||||
version = "2021-07-16";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "neoclide";
|
owner = "neoclide";
|
||||||
repo = "coc.nvim";
|
repo = "coc.nvim";
|
||||||
rev = "9c3c84735c9bcfd62507d6e2a137f90b1ddaa98a";
|
rev = "576f3c972aa9c4458d3dbac2794bd8643ae16e4a";
|
||||||
sha256 = "0g479ffpiqz15wwam4vwi8x0w7hbdnk2dxcwzryaf1cqnn6ip6in";
|
sha256 = "09cndvz8dcasn35bclhqc4i72dw93sczivvfi0zw9ncgsdl22r6g";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -690,12 +690,12 @@ final: prev:
|
||||||
|
|
||||||
compe-tmux = buildVimPluginFrom2Nix {
|
compe-tmux = buildVimPluginFrom2Nix {
|
||||||
pname = "compe-tmux";
|
pname = "compe-tmux";
|
||||||
version = "2021-07-16";
|
version = "2021-07-19";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "andersevenrud";
|
owner = "andersevenrud";
|
||||||
repo = "compe-tmux";
|
repo = "compe-tmux";
|
||||||
rev = "fcb7c80bc6b3df11d5c0d8cde4f12aa9d3653cdd";
|
rev = "82d2139de0279a20a70da61320042adf31b94798";
|
||||||
sha256 = "18v1g8l11caqlag3d55vvn1v7k99600jzlzzmp6bv5pmi4lmhq0g";
|
sha256 = "06dyrknc6gap8ybsjai4ndr4cdhzkwz1hnxilz9ffcbplzwldhs5";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/andersevenrud/compe-tmux/";
|
meta.homepage = "https://github.com/andersevenrud/compe-tmux/";
|
||||||
};
|
};
|
||||||
|
@ -822,12 +822,12 @@ final: prev:
|
||||||
|
|
||||||
Coqtail = buildVimPluginFrom2Nix {
|
Coqtail = buildVimPluginFrom2Nix {
|
||||||
pname = "Coqtail";
|
pname = "Coqtail";
|
||||||
version = "2021-07-19";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "whonore";
|
owner = "whonore";
|
||||||
repo = "Coqtail";
|
repo = "Coqtail";
|
||||||
rev = "9c1aa175762884812b9f3c3436ef6e26639b9589";
|
rev = "2cad943df739c1fcf4d923854ae642fde38b477f";
|
||||||
sha256 = "1xhbnad098a6h3vf05rkha7qpj4nb4jaxjcnll91wzvf4lngq4p0";
|
sha256 = "1j761zpa41p9hmh4bxapaqjvxx9d3nhcf2bifsibcjghcxblj1xb";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/whonore/Coqtail/";
|
meta.homepage = "https://github.com/whonore/Coqtail/";
|
||||||
};
|
};
|
||||||
|
@ -1400,12 +1400,12 @@ final: prev:
|
||||||
|
|
||||||
editorconfig-vim = buildVimPluginFrom2Nix {
|
editorconfig-vim = buildVimPluginFrom2Nix {
|
||||||
pname = "editorconfig-vim";
|
pname = "editorconfig-vim";
|
||||||
version = "2021-04-04";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "editorconfig";
|
owner = "editorconfig";
|
||||||
repo = "editorconfig-vim";
|
repo = "editorconfig-vim";
|
||||||
rev = "f305bc77faef4b418aee65682d7d147f64cfd5a9";
|
rev = "1c4f781f2439469e5342217131886260c9445fc6";
|
||||||
sha256 = "1yr8jni3z9sf348d8zw532vj4s1ww62yfslfcdgkgwhba1l2vy53";
|
sha256 = "0m39if0n4kijqzxk91r1a1fnyhr2p4b9nx1yzvwzkj21snysi4w8";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
|
meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
|
||||||
|
@ -1619,12 +1619,12 @@ final: prev:
|
||||||
|
|
||||||
floating-nvim = buildVimPluginFrom2Nix {
|
floating-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "floating-nvim";
|
pname = "floating-nvim";
|
||||||
version = "2021-05-08";
|
version = "2021-07-19";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fhill2";
|
owner = "fhill2";
|
||||||
repo = "floating.nvim";
|
repo = "floating.nvim";
|
||||||
rev = "c47af010aa8e88758995858f0ed2771a99cd3e98";
|
rev = "11e75c2a201b9d73f03bd3c2db1fc94021c231eb";
|
||||||
sha256 = "0cvs6c903bq4jk4l197vvdrk8q85rl7z7iy7cvd5m4k7yd937r50";
|
sha256 = "172ak3macqmkz4jvic1xcnfpp6wafq33afyvcx4za170qh30sydj";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/fhill2/floating.nvim/";
|
meta.homepage = "https://github.com/fhill2/floating.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -1859,12 +1859,12 @@ final: prev:
|
||||||
|
|
||||||
gitsigns-nvim = buildVimPluginFrom2Nix {
|
gitsigns-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "gitsigns-nvim";
|
pname = "gitsigns-nvim";
|
||||||
version = "2021-07-19";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lewis6991";
|
owner = "lewis6991";
|
||||||
repo = "gitsigns.nvim";
|
repo = "gitsigns.nvim";
|
||||||
rev = "66638c929c61f950246f3d292b6157a9596241de";
|
rev = "c3b63ec2ffedc7e7199265852eab13ec8c02b6e0";
|
||||||
sha256 = "1wqspsx83sy2qmmg0idi7j66swm23hnhxx630j114vh6a70vai00";
|
sha256 = "1l8yilf0fqi16lrgpp8i8irq3fb1a73j17gvhff7m6fyzilwahjj";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -2436,12 +2436,12 @@ final: prev:
|
||||||
|
|
||||||
lazygit-nvim = buildVimPluginFrom2Nix {
|
lazygit-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "lazygit-nvim";
|
pname = "lazygit-nvim";
|
||||||
version = "2021-07-14";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kdheepak";
|
owner = "kdheepak";
|
||||||
repo = "lazygit.nvim";
|
repo = "lazygit.nvim";
|
||||||
rev = "3dc36a82276d4ff88badadf3dfdcc34b57d0e0fd";
|
rev = "c1840692c17b6994bb3b96b33e48040d0cb2da99";
|
||||||
sha256 = "18sl35wi7zq2y4y4bny5pz160m584c8mli1b6vjvr84gvjmyg7sv";
|
sha256 = "07mwa2bbny73s60as5s1schk4zhk6m6rv26ljbcl14mx45z9m8r8";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
|
meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -2724,12 +2724,12 @@ final: prev:
|
||||||
|
|
||||||
luasnip = buildVimPluginFrom2Nix {
|
luasnip = buildVimPluginFrom2Nix {
|
||||||
pname = "luasnip";
|
pname = "luasnip";
|
||||||
version = "2021-07-12";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "l3mon4d3";
|
owner = "l3mon4d3";
|
||||||
repo = "luasnip";
|
repo = "luasnip";
|
||||||
rev = "d7638d0a72686ca3e0e2ff019aae8cb9073d7980";
|
rev = "d4ddebdb4f4bc44e731e808d794bd8c429dc9e07";
|
||||||
sha256 = "0fsd4azmmjjqqm6sb492bp02fvddalklmbyn1a07xql35fj5cq89";
|
sha256 = "01lsxak9hl2shhhzqjypdjpkasrppn6v8xlzxi28c7973c5jn629";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
|
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
|
||||||
};
|
};
|
||||||
|
@ -2820,12 +2820,12 @@ final: prev:
|
||||||
|
|
||||||
minimap-vim = buildVimPluginFrom2Nix {
|
minimap-vim = buildVimPluginFrom2Nix {
|
||||||
pname = "minimap-vim";
|
pname = "minimap-vim";
|
||||||
version = "2021-07-16";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "wfxr";
|
owner = "wfxr";
|
||||||
repo = "minimap.vim";
|
repo = "minimap.vim";
|
||||||
rev = "2d61b880aba6e4e0b730303e0e980bf0afd73961";
|
rev = "d389e2b0c67f5cedd5ec5edfe53afc847f8daf61";
|
||||||
sha256 = "01az8gkhhvndnrjavk7jzi5wy03ybca97cbxpdimx2wpvxly484j";
|
sha256 = "180grx6317ic6ip98awvqnfjc4zkzqh91rglls5pvwcq1w5m5vwb";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/wfxr/minimap.vim/";
|
meta.homepage = "https://github.com/wfxr/minimap.vim/";
|
||||||
};
|
};
|
||||||
|
@ -3132,12 +3132,12 @@ final: prev:
|
||||||
|
|
||||||
neoformat = buildVimPluginFrom2Nix {
|
neoformat = buildVimPluginFrom2Nix {
|
||||||
pname = "neoformat";
|
pname = "neoformat";
|
||||||
version = "2021-06-30";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sbdchd";
|
owner = "sbdchd";
|
||||||
repo = "neoformat";
|
repo = "neoformat";
|
||||||
rev = "3fdfd45119be64945e635bf2406fdb0430cb85df";
|
rev = "f9fa0e31f9e5c7aaa2ea2091ca64b28d84d485c0";
|
||||||
sha256 = "1sd45xvvw4wgmzixlmaq6j0kvv25l561678q24l23swh77x617r4";
|
sha256 = "1bv75ijvs63r88nghjk5ljjz06r6xbp3923r3c17p1d3ks2qsfxa";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/sbdchd/neoformat/";
|
meta.homepage = "https://github.com/sbdchd/neoformat/";
|
||||||
};
|
};
|
||||||
|
@ -3408,12 +3408,12 @@ final: prev:
|
||||||
|
|
||||||
nord-nvim = buildVimPluginFrom2Nix {
|
nord-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "nord-nvim";
|
pname = "nord-nvim";
|
||||||
version = "2021-07-17";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "shaunsingh";
|
owner = "shaunsingh";
|
||||||
repo = "nord.nvim";
|
repo = "nord.nvim";
|
||||||
rev = "02a07af329b9cb42187a2dd74aef8563f5957bfc";
|
rev = "994cb6b4efa481ac1a64aa3ac5c9e8cfea806783";
|
||||||
sha256 = "10yzlv3433dfdm5n1q8r4yzwx0h73nd81w60fqkfx4cl4l7l9085";
|
sha256 = "1wssns3iwgfkf73vgln4msv8l5gw724wyalqzv8w8ckhf68dbz4j";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
|
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -3444,12 +3444,12 @@ final: prev:
|
||||||
|
|
||||||
null-ls-nvim = buildVimPluginFrom2Nix {
|
null-ls-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "null-ls-nvim";
|
pname = "null-ls-nvim";
|
||||||
version = "2021-07-14";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jose-elias-alvarez";
|
owner = "jose-elias-alvarez";
|
||||||
repo = "null-ls.nvim";
|
repo = "null-ls.nvim";
|
||||||
rev = "56d4b76203d2b442353e25c247f49fa5ca70f42e";
|
rev = "fa50b4ce297599dc22b1b4bb8550eff4d791f9e4";
|
||||||
sha256 = "0kmgln5ra2lpdvj9866a11l9h04zc1dmvxcw8gbra6f72ars3jwr";
|
sha256 = "0fhp6qxwykb1hz4xgaj4sq1h1qlfdr855fyaigw171nz0p7ki7ws";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -3540,12 +3540,12 @@ final: prev:
|
||||||
|
|
||||||
nvim-bufferline-lua = buildVimPluginFrom2Nix {
|
nvim-bufferline-lua = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-bufferline-lua";
|
pname = "nvim-bufferline-lua";
|
||||||
version = "2021-07-17";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "akinsho";
|
owner = "akinsho";
|
||||||
repo = "nvim-bufferline.lua";
|
repo = "nvim-bufferline.lua";
|
||||||
rev = "b90cbdef2d7eab5fa8b3693bb321305e4455f329";
|
rev = "47fc74b5b3aafd2e3028c69ab96cb215c5f6c8bc";
|
||||||
sha256 = "16n168z9gdy0p0yljpx3lv958ix1369qgqc65pjs9ib5sij03q2s";
|
sha256 = "0mr0dh8picgd8ghm9gvgyg08cihr4k1x8l2brfahpnxha6aghx58";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
|
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
|
||||||
};
|
};
|
||||||
|
@ -3600,12 +3600,12 @@ final: prev:
|
||||||
|
|
||||||
nvim-dap = buildVimPluginFrom2Nix {
|
nvim-dap = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-dap";
|
pname = "nvim-dap";
|
||||||
version = "2021-07-14";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mfussenegger";
|
owner = "mfussenegger";
|
||||||
repo = "nvim-dap";
|
repo = "nvim-dap";
|
||||||
rev = "344b6f0b581dd72e40bbbb78b4f147e5003e0ce6";
|
rev = "e3e23d257c9a36e3d189d6b57e6c6b7e91bfa14f";
|
||||||
sha256 = "1xdcdwjqk2r2cg47gxld2c06yfnbpj6nnm2j5nskqa3nbyrpf27c";
|
sha256 = "09rk3s6swwng78cpj1f2rlww2vkqai9sx72sqihk09sc16prp6cc";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
|
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
|
||||||
};
|
};
|
||||||
|
@ -3648,12 +3648,12 @@ final: prev:
|
||||||
|
|
||||||
nvim-highlite = buildVimPluginFrom2Nix {
|
nvim-highlite = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-highlite";
|
pname = "nvim-highlite";
|
||||||
version = "2021-07-06";
|
version = "2021-07-19";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Iron-E";
|
owner = "Iron-E";
|
||||||
repo = "nvim-highlite";
|
repo = "nvim-highlite";
|
||||||
rev = "85c931fa18cb9a7c54b0a6bde54924741bdb296c";
|
rev = "8e1d114f3d855653bc71fba9e5a22a05d3a1b1a2";
|
||||||
sha256 = "0fw59qgfaskwv8k8pjq1xb8b4k55rgr04311xma4arki9gjrv128";
|
sha256 = "1dm6rwx3w8hbgg20ay4bcdd3c87bqpqvl64zfc673p81m76b3s86";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
|
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
|
||||||
};
|
};
|
||||||
|
@ -3708,12 +3708,12 @@ final: prev:
|
||||||
|
|
||||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-lspconfig";
|
pname = "nvim-lspconfig";
|
||||||
version = "2021-07-18";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "neovim";
|
owner = "neovim";
|
||||||
repo = "nvim-lspconfig";
|
repo = "nvim-lspconfig";
|
||||||
rev = "38e0003d0c40d506e9e46ff55978b78220a76b71";
|
rev = "4f72377143fc0961391fb0e42e751b9f677fca4e";
|
||||||
sha256 = "0r3zicx8gkj5jd0kxs1i5inxpi9jmg3nwb0km4xcj55fb3x2vbky";
|
sha256 = "1w9gjnv98gv8jwkkw1x5jsnc8366w1jcllipxlrij97z6hspqc8m";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||||
};
|
};
|
||||||
|
@ -3756,12 +3756,12 @@ final: prev:
|
||||||
|
|
||||||
nvim-scrollview = buildVimPluginFrom2Nix {
|
nvim-scrollview = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-scrollview";
|
pname = "nvim-scrollview";
|
||||||
version = "2021-07-07";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dstein64";
|
owner = "dstein64";
|
||||||
repo = "nvim-scrollview";
|
repo = "nvim-scrollview";
|
||||||
rev = "2216837c0178dc81cca3d47aff9699ac1b2aec8e";
|
rev = "b7ca5298fd75700cc74b122654241f5ed24ecf96";
|
||||||
sha256 = "0n1p7abd08k28c30pzk51vm1j3wghyjxbw0c8j0jwxiyzaf3p865";
|
sha256 = "0pywghia4hv9pa8g1irmqc1qrbvbhhibazx8z6kcqrrmsb3026g5";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
|
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
|
||||||
};
|
};
|
||||||
|
@ -3780,11 +3780,11 @@ final: prev:
|
||||||
|
|
||||||
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
|
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-toggleterm-lua";
|
pname = "nvim-toggleterm-lua";
|
||||||
version = "2021-07-12";
|
version = "2021-07-19";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "akinsho";
|
owner = "akinsho";
|
||||||
repo = "nvim-toggleterm.lua";
|
repo = "nvim-toggleterm.lua";
|
||||||
rev = "96af0fa98252ab3543ff1464c6452930f242c615";
|
rev = "0e11e0322c1730559cb74f728300de2912bf9a61";
|
||||||
sha256 = "10r9zqmkhh3bpjhjhrr24vssy5wazd4499sxsyqsr6p9bb1mkhqh";
|
sha256 = "10r9zqmkhh3bpjhjhrr24vssy5wazd4499sxsyqsr6p9bb1mkhqh";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
|
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
|
||||||
|
@ -3792,24 +3792,24 @@ final: prev:
|
||||||
|
|
||||||
nvim-tree-lua = buildVimPluginFrom2Nix {
|
nvim-tree-lua = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-tree-lua";
|
pname = "nvim-tree-lua";
|
||||||
version = "2021-07-10";
|
version = "2021-07-19";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kyazdani42";
|
owner = "kyazdani42";
|
||||||
repo = "nvim-tree.lua";
|
repo = "nvim-tree.lua";
|
||||||
rev = "f178c8c8c5cb994326578a24d3296dde6f2e9bd3";
|
rev = "d3e76b81e5b169af192dea4da0bd6f64faad2c36";
|
||||||
sha256 = "1xdakhjsjfx7y3dqi99ldgwmh69jyyvisqainlkiz63g0nsy81ay";
|
sha256 = "0hw50yyikndx1260a50j6izjsa4m709r7v3qzrpwz482d7fq700j";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
|
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
|
||||||
};
|
};
|
||||||
|
|
||||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-treesitter";
|
pname = "nvim-treesitter";
|
||||||
version = "2021-07-19";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nvim-treesitter";
|
owner = "nvim-treesitter";
|
||||||
repo = "nvim-treesitter";
|
repo = "nvim-treesitter";
|
||||||
rev = "17cf76de8a16c1e459fbe916491f258371837a8d";
|
rev = "e473630fe0872cb0ed97cd7085e724aa58bc1c84";
|
||||||
sha256 = "1fzm655q6xw3qqpvzx36wj5v9js1jiwb8295cccdc65irg8r6zfw";
|
sha256 = "1l6cv9znpwnk4hmg3vh8gy26s8hvlbg03wmd7snjwxcpfyj6vi84";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||||
};
|
};
|
||||||
|
@ -3852,12 +3852,12 @@ final: prev:
|
||||||
|
|
||||||
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
|
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-treesitter-textobjects";
|
pname = "nvim-treesitter-textobjects";
|
||||||
version = "2021-07-08";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nvim-treesitter";
|
owner = "nvim-treesitter";
|
||||||
repo = "nvim-treesitter-textobjects";
|
repo = "nvim-treesitter-textobjects";
|
||||||
rev = "379bc8f48256c07139241e1c7a70f22dd4344c4f";
|
rev = "7f36db566c66998e04ea569723174c42d8190903";
|
||||||
sha256 = "0bmy6rzmh3jfqd567wiavwfm9j2dpb0asmcgkyvj5j5qy2xfmi5l";
|
sha256 = "1j2vjlfrvvvxzqq2z6z9mdlanq8q8zhfhffbrygv1zgrp6izhhkx";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
|
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
|
||||||
};
|
};
|
||||||
|
@ -4465,12 +4465,12 @@ final: prev:
|
||||||
|
|
||||||
rust-tools-nvim = buildVimPluginFrom2Nix {
|
rust-tools-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "rust-tools-nvim";
|
pname = "rust-tools-nvim";
|
||||||
version = "2021-07-17";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "simrat39";
|
owner = "simrat39";
|
||||||
repo = "rust-tools.nvim";
|
repo = "rust-tools.nvim";
|
||||||
rev = "a22eec84aaa5b31b5c708eed24a5c09f21ca46c0";
|
rev = "11f232c7a82c3fd5d34654c6b02abae4f56ac5e6";
|
||||||
sha256 = "14lwhdbpjrq2xyy9kfihjasvqg83bb13fl0r7aw95hngayx69l7k";
|
sha256 = "1xyrf6s8szd1lpz70ng1whhysjvnn7pxi80knyrjrkqzkqpimiac";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
|
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -4815,24 +4815,24 @@ final: prev:
|
||||||
|
|
||||||
sql-nvim = buildVimPluginFrom2Nix {
|
sql-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "sql-nvim";
|
pname = "sql-nvim";
|
||||||
version = "2021-07-17";
|
version = "2021-07-19";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tami5";
|
owner = "tami5";
|
||||||
repo = "sql.nvim";
|
repo = "sql.nvim";
|
||||||
rev = "76277236829ca77dd41d285c794ab8878129e3f8";
|
rev = "9983108bc9941af842d3b847b60564d180fc8e4b";
|
||||||
sha256 = "1vqxn02xy8j7ij4zm7x55zzch1bl8k6313l06mb60zxvw77i5a81";
|
sha256 = "1f1f1v107w61b86pdrs9qvchyg286nif31c5cp3yx6rq22fynbgd";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/tami5/sql.nvim/";
|
meta.homepage = "https://github.com/tami5/sql.nvim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
srcery-vim = buildVimPluginFrom2Nix {
|
srcery-vim = buildVimPluginFrom2Nix {
|
||||||
pname = "srcery-vim";
|
pname = "srcery-vim";
|
||||||
version = "2021-07-19";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "srcery-colors";
|
owner = "srcery-colors";
|
||||||
repo = "srcery-vim";
|
repo = "srcery-vim";
|
||||||
rev = "b2780ad5078c24519ba1e6ae3a1b3bd2218870cc";
|
rev = "d313ed0f8f39a7fd09da65c4f02191368680387f";
|
||||||
sha256 = "1r0v4l9rvb3w42fnj1fmcfvy04gyp0lv3mis7jl716r8kvbaqwpj";
|
sha256 = "1z9r2x58g212jy2sl981s7f8pj2nbqfgjbfi471yqafbxlynfzdw";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
|
meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
|
||||||
};
|
};
|
||||||
|
@ -4863,12 +4863,12 @@ final: prev:
|
||||||
|
|
||||||
suda-vim = buildVimPluginFrom2Nix {
|
suda-vim = buildVimPluginFrom2Nix {
|
||||||
pname = "suda-vim";
|
pname = "suda-vim";
|
||||||
version = "2021-02-20";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lambdalisue";
|
owner = "lambdalisue";
|
||||||
repo = "suda.vim";
|
repo = "suda.vim";
|
||||||
rev = "fbb138f5090c3db4dabeba15326397a09df6b73b";
|
rev = "bfafa2722178bdb8898e014a7e95b60d497960d9";
|
||||||
sha256 = "01kys8q3gycxqf760ydq1k8wq20brjvl1gxpl8j87jvnyx87kmnf";
|
sha256 = "1cjj6d6zkd2b9hv77saz8p7xcw06rj0svdhycc4df8bcdrvvmi39";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/lambdalisue/suda.vim/";
|
meta.homepage = "https://github.com/lambdalisue/suda.vim/";
|
||||||
};
|
};
|
||||||
|
@ -4921,6 +4921,18 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/keith/swift.vim/";
|
meta.homepage = "https://github.com/keith/swift.vim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
symbols-outline-nvim = buildVimPluginFrom2Nix {
|
||||||
|
pname = "symbols-outline-nvim";
|
||||||
|
version = "2021-07-21";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "simrat39";
|
||||||
|
repo = "symbols-outline.nvim";
|
||||||
|
rev = "7414f30365a342e1d89072d474a35913643b6eec";
|
||||||
|
sha256 = "19c9dv8dc72nnb1dx7wdraihpzf5b42wwq3c9vn0na8k1xy26h8y";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/simrat39/symbols-outline.nvim";
|
||||||
|
};
|
||||||
|
|
||||||
syntastic = buildVimPluginFrom2Nix {
|
syntastic = buildVimPluginFrom2Nix {
|
||||||
pname = "syntastic";
|
pname = "syntastic";
|
||||||
version = "2021-07-19";
|
version = "2021-07-19";
|
||||||
|
@ -5141,12 +5153,12 @@ final: prev:
|
||||||
|
|
||||||
telescope-nvim = buildVimPluginFrom2Nix {
|
telescope-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "telescope-nvim";
|
pname = "telescope-nvim";
|
||||||
version = "2021-07-19";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nvim-telescope";
|
owner = "nvim-telescope";
|
||||||
repo = "telescope.nvim";
|
repo = "telescope.nvim";
|
||||||
rev = "46e03a935f1d080a9bd856d5a8acfcc093cd1461";
|
rev = "664690029fdb302bee8d3f27a458383e8477add7";
|
||||||
sha256 = "14ra8p9alnmvzry3iw3ghyk7nx44dh0qm82lvg6wfg5bhw1hpnnj";
|
sha256 = "1aaq9lmfxxxpirkbj3py76qnyfd1qhsq9msfw689zgzjqahk7zhz";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -5262,24 +5274,24 @@ final: prev:
|
||||||
|
|
||||||
tokyonight-nvim = buildVimPluginFrom2Nix {
|
tokyonight-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "tokyonight-nvim";
|
pname = "tokyonight-nvim";
|
||||||
version = "2021-07-09";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "folke";
|
owner = "folke";
|
||||||
repo = "tokyonight.nvim";
|
repo = "tokyonight.nvim";
|
||||||
rev = "e3ad6032a7e2c54dd7500335b43c7d353a19ede9";
|
rev = "0ee0bcf14d8c7c70081a0e9967c211121c4300c7";
|
||||||
sha256 = "1slb67kirb0jfgjsw09dhimmxagsk2aii6w461y1w8nj3fkl6p28";
|
sha256 = "0rkw544dzgyp76ag3zrh8d3n0mri5c0cjpy8mvbfpgyj87w18m8d";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
|
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
traces-vim = buildVimPluginFrom2Nix {
|
traces-vim = buildVimPluginFrom2Nix {
|
||||||
pname = "traces-vim";
|
pname = "traces-vim";
|
||||||
version = "2021-07-18";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "markonm";
|
owner = "markonm";
|
||||||
repo = "traces.vim";
|
repo = "traces.vim";
|
||||||
rev = "360361b093d21531c0781c5c4a61a1e6cb3edfac";
|
rev = "896f2bed6b982ce5ca2c5bd454b8eb8af312e5a1";
|
||||||
sha256 = "052kbzx2rqpw5mhh6w1zcj5il642w1a2wi6w4nbcw7scj4gq85pd";
|
sha256 = "1pwlw8gq0vd8zc3xqmp8r2s2wka9m9i85w08av59rmwnizk6vkza";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/markonm/traces.vim/";
|
meta.homepage = "https://github.com/markonm/traces.vim/";
|
||||||
};
|
};
|
||||||
|
@ -6018,12 +6030,12 @@ final: prev:
|
||||||
|
|
||||||
vim-clap = buildVimPluginFrom2Nix {
|
vim-clap = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-clap";
|
pname = "vim-clap";
|
||||||
version = "2021-07-19";
|
version = "2021-07-21";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "liuchengxu";
|
owner = "liuchengxu";
|
||||||
repo = "vim-clap";
|
repo = "vim-clap";
|
||||||
rev = "3aa42d211ebae7471e8f9926aaeef5a1df475f2f";
|
rev = "2e287bd7e73198408d73b7183e3019a3aff6c19b";
|
||||||
sha256 = "0f1adjn9x5jv541yzgqf67v9613xvkxzgc5bmkgqrfxn2l5j3vjn";
|
sha256 = "1n1hipxim9d1shh9ch414yy15vdr8yc5ppgk7msv6zzgsw10qyaw";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
|
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
|
||||||
};
|
};
|
||||||
|
@ -7616,12 +7628,12 @@ final: prev:
|
||||||
|
|
||||||
vim-lsp = buildVimPluginFrom2Nix {
|
vim-lsp = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-lsp";
|
pname = "vim-lsp";
|
||||||
version = "2021-06-16";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "prabirshrestha";
|
owner = "prabirshrestha";
|
||||||
repo = "vim-lsp";
|
repo = "vim-lsp";
|
||||||
rev = "fb0a72306e1fc42c1ce8909aa1e420ddfccf6fbf";
|
rev = "7ba553effb021293c9ff5176b91e76da71797825";
|
||||||
sha256 = "0dzy7cvpmzvx6z5pifzj4y7biln5gcn4iic35ha58ixwgwcw784m";
|
sha256 = "1phfqzn94m2j7g10aifh12a4gyyrhqnj1vn2bpdp29lpm1n179yg";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
|
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
|
||||||
};
|
};
|
||||||
|
@ -8299,6 +8311,18 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/haya14busa/vim-poweryank/";
|
meta.homepage = "https://github.com/haya14busa/vim-poweryank/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vim-prettier = buildVimPluginFrom2Nix {
|
||||||
|
pname = "vim-prettier";
|
||||||
|
version = "2021-07-21";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "prettier";
|
||||||
|
repo = "vim-prettier";
|
||||||
|
rev = "0e61e4a5b55d2740aa118db91a6671dcb11307e8";
|
||||||
|
sha256 = "0d83lx6kfpsi3d4q9wz8zwsgdn0vn16psqyngml6wspjyibh6pnf";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/prettier/vim-prettier";
|
||||||
|
};
|
||||||
|
|
||||||
vim-prettyprint = buildVimPluginFrom2Nix {
|
vim-prettyprint = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-prettyprint";
|
pname = "vim-prettyprint";
|
||||||
version = "2016-07-16";
|
version = "2016-07-16";
|
||||||
|
@ -8397,12 +8421,12 @@ final: prev:
|
||||||
|
|
||||||
vim-qf = buildVimPluginFrom2Nix {
|
vim-qf = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-qf";
|
pname = "vim-qf";
|
||||||
version = "2021-06-08";
|
version = "2021-07-20";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "romainl";
|
owner = "romainl";
|
||||||
repo = "vim-qf";
|
repo = "vim-qf";
|
||||||
rev = "4fe7e33a514874692d6897edd1acaaa46d9fb646";
|
rev = "65f115c350934517382ae45198a74232a9069c2a";
|
||||||
sha256 = "054p9f3a3yljng3r51asgyq2ifmmrr35ws5f8dv8ssmby2f7an1l";
|
sha256 = "0pylxkmhcanks59imah3q2xyn8lp5735xm17p13yx9vx90779nwp";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/romainl/vim-qf/";
|
meta.homepage = "https://github.com/romainl/vim-qf/";
|
||||||
};
|
};
|
||||||
|
@ -9729,6 +9753,18 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/preservim/vimux/";
|
meta.homepage = "https://github.com/preservim/vimux/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vimway-lsp-diag-nvim = buildVimPluginFrom2Nix {
|
||||||
|
pname = "vimway-lsp-diag-nvim";
|
||||||
|
version = "2021-07-21";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "onsails";
|
||||||
|
repo = "vimway-lsp-diag.nvim";
|
||||||
|
rev = "dee2f59a45f72fb2ba0dd29cb06ed5357097ee07";
|
||||||
|
sha256 = "16da94g367sb07d1xn55cvyi48zjgjv2c1p7mzabpidm9c7r99pm";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/onsails/vimway-lsp-diag.nvim/";
|
||||||
|
};
|
||||||
|
|
||||||
vimwiki = buildVimPluginFrom2Nix {
|
vimwiki = buildVimPluginFrom2Nix {
|
||||||
pname = "vimwiki";
|
pname = "vimwiki";
|
||||||
version = "2020-05-26";
|
version = "2020-05-26";
|
||||||
|
|
|
@ -635,7 +635,7 @@ self: super: {
|
||||||
libiconv
|
libiconv
|
||||||
];
|
];
|
||||||
|
|
||||||
cargoSha256 = "sha256-D54R7LK4CH5S7x0g+3K1EJ4b10P7wRAIkHYwCOFJtfg=";
|
cargoSha256 = "046c5w47isnz5l23kpk8zkbw312yp5dz9wq9dc2kmpklai71fc1a";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
|
|
|
@ -506,6 +506,7 @@ Olical/aniseed
|
||||||
Olical/conjure
|
Olical/conjure
|
||||||
olimorris/onedark.nvim
|
olimorris/onedark.nvim
|
||||||
onsails/lspkind-nvim
|
onsails/lspkind-nvim
|
||||||
|
onsails/vimway-lsp-diag.nvim
|
||||||
OrangeT/vim-csharp
|
OrangeT/vim-csharp
|
||||||
osyo-manga/shabadou.vim
|
osyo-manga/shabadou.vim
|
||||||
osyo-manga/vim-anzu
|
osyo-manga/vim-anzu
|
||||||
|
@ -537,6 +538,7 @@ preservim/tagbar
|
||||||
preservim/vim-pencil
|
preservim/vim-pencil
|
||||||
preservim/vim-wordy
|
preservim/vim-wordy
|
||||||
preservim/vimux
|
preservim/vimux
|
||||||
|
prettier/vim-prettier
|
||||||
psliwka/vim-smoothie
|
psliwka/vim-smoothie
|
||||||
ptzz/lf.vim
|
ptzz/lf.vim
|
||||||
puremourning/vimspector
|
puremourning/vimspector
|
||||||
|
@ -628,6 +630,7 @@ sickill/vim-pasta
|
||||||
SidOfc/mkdx
|
SidOfc/mkdx
|
||||||
simnalamburt/vim-mundo
|
simnalamburt/vim-mundo
|
||||||
simrat39/rust-tools.nvim
|
simrat39/rust-tools.nvim
|
||||||
|
simrat39/symbols-outline.nvim
|
||||||
sindrets/diffview.nvim@main
|
sindrets/diffview.nvim@main
|
||||||
SirVer/ultisnips
|
SirVer/ultisnips
|
||||||
sjl/gundo.vim
|
sjl/gundo.vim
|
||||||
|
|
|
@ -403,8 +403,8 @@ let
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "gitlens";
|
name = "gitlens";
|
||||||
publisher = "eamodio";
|
publisher = "eamodio";
|
||||||
version = "11.5.1";
|
version = "11.6.0";
|
||||||
sha256 = "sha256-Ic7eT8WX2GDYIj/aTu1d4m+fgPtXe4YQx04G0awbwnM=";
|
sha256 = "sha256-JxCNE/IL/v94xWmhebsRZo1Gw+nSSpDgZ41ZGongGVI=";
|
||||||
};
|
};
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
|
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "5.13.1";
|
version = "5.13.4";
|
||||||
suffix = "xanmod1-cacule";
|
suffix = "xanmod1-cacule";
|
||||||
in
|
in
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
|
@ -12,7 +12,7 @@ buildLinux (args // rec {
|
||||||
owner = "xanmod";
|
owner = "xanmod";
|
||||||
repo = "linux";
|
repo = "linux";
|
||||||
rev = modDirVersion;
|
rev = modDirVersion;
|
||||||
sha256 = "sha256-QC2BgsbytpKQs7TyuXt4aan8hUwd43pHj2ApYXv0HAA=";
|
sha256 = "sha256-jSV5dL6myB4WeokYBwoBtQaOfLaUgvseYtReyjLGOhU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
structuredExtraConfig = with lib.kernel; {
|
structuredExtraConfig = with lib.kernel; {
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
, cairo
|
, cairo
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, flac
|
, flac
|
||||||
|
, gcc11
|
||||||
, gnome
|
, gnome
|
||||||
, gssdp
|
, gssdp
|
||||||
, gupnp
|
, gupnp
|
||||||
|
@ -16,13 +17,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "hqplayerd";
|
pname = "hqplayerd";
|
||||||
version = "4.24.1-62";
|
version = "4.24.2-63";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
# FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs
|
url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm";
|
||||||
# c.f. https://github.com/NixOS/nixpkgs/pull/111616
|
sha256 = "sha256-6JUgHDO+S73n/IVQhkmC0Nw4GQVzTLtiBbz/wZiflRg=";
|
||||||
url = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.rpm";
|
|
||||||
sha256 = "sha256-lnejPkw6X3wRtjXTsdipEy6yZCEsDARhLPnySIltHXs=";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
unpackPhase = ''
|
unpackPhase = ''
|
||||||
|
@ -35,6 +34,7 @@ stdenv.mkDerivation rec {
|
||||||
alsa-lib
|
alsa-lib
|
||||||
cairo
|
cairo
|
||||||
flac
|
flac
|
||||||
|
gcc11.cc.lib
|
||||||
gnome.rygel
|
gnome.rygel
|
||||||
gssdp
|
gssdp
|
||||||
gupnp
|
gupnp
|
||||||
|
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
# misc service support files
|
# misc service support files
|
||||||
mkdir -p $out/var/lib/hqplayerd
|
mkdir -p $out/var/lib/hqplayerd
|
||||||
cp -r ./var/hqplayer/web $out/var/lib/hqplayerd
|
cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
, lib
|
, lib
|
||||||
, fakeroot
|
, fakeroot
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, fetchpatch
|
|
||||||
, libfaketime
|
, libfaketime
|
||||||
, substituteAll
|
, substituteAll
|
||||||
## runtime dependencies
|
## runtime dependencies
|
||||||
|
@ -70,11 +69,7 @@ stdenv.mkDerivation {
|
||||||
};
|
};
|
||||||
patches = [
|
patches = [
|
||||||
# adjust configure check to work with libtiff > 4.1
|
# adjust configure check to work with libtiff > 4.1
|
||||||
(fetchpatch {
|
./libtiff-4.patch
|
||||||
name = "libtiff-4.2.patch";
|
|
||||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch?id=82e3eefd5447f36e5bb00068a54b91d8c891ccf6";
|
|
||||||
sha256 = "0hhf4wpgj842gz4nxq8s55vnzmciqkyjjaaxdpqawns2746vx0sw";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
# Note that `configure` (and maybe `faxsetup`) are looking
|
# Note that `configure` (and maybe `faxsetup`) are looking
|
||||||
# for a couple of standard binaries in the `PATH` and
|
# for a couple of standard binaries in the `PATH` and
|
||||||
|
|
12
pkgs/servers/hylafaxplus/libtiff-4.patch
Normal file
12
pkgs/servers/hylafaxplus/libtiff-4.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
https://bugs.gentoo.org/706154
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -2583,7 +2583,7 @@ EOF
|
||||||
|
echo '#define TIFFSTRIPBYTECOUNTS uint32'
|
||||||
|
echo '#define TIFFVERSION TIFF_VERSION'
|
||||||
|
echo '#define TIFFHEADER TIFFHeader';;
|
||||||
|
- 4.[01]) tiff_runlen_t="uint32"
|
||||||
|
+ 4.[0-9]) tiff_runlen_t="uint32"
|
||||||
|
tiff_offset_t="uint64"
|
||||||
|
echo '#define TIFFSTRIPBYTECOUNTS uint64'
|
||||||
|
echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
|
|
@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ dpkg ];
|
nativeBuildInputs = [ dpkg ];
|
||||||
|
|
||||||
phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ];
|
|
||||||
|
|
||||||
unpackPhase = ''
|
unpackPhase = ''
|
||||||
dpkg-deb -R $src .
|
dpkg-deb -R $src .
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -26,12 +26,15 @@ let
|
||||||
mixFodDeps = beamPackages.fetchMixDeps {
|
mixFodDeps = beamPackages.fetchMixDeps {
|
||||||
pname = "${pname}-deps";
|
pname = "${pname}-deps";
|
||||||
inherit src version;
|
inherit src version;
|
||||||
sha256 = "18h3hs69nw06msvs3nnymf6p94qd3x1f4d2zawqriy9fr5fz7zx6";
|
sha256 = "1x0if0ifk272vcqjlgf097pxsw13bhwy8vs0b89l0bssx1bzygsi";
|
||||||
|
|
||||||
# We need ecto 3.6 as this version checks whether the database exists before
|
# We need ecto 3.6 as this version checks whether the database exists before
|
||||||
# trying to create it. The creation attempt would always require super-user privileges
|
# trying to create it. The creation attempt would always require super-user privileges
|
||||||
# and since 3.6 this isn't the case anymore.
|
# and since 3.6 this isn't the case anymore.
|
||||||
patches = [ ./ecto_sql-fix.patch ];
|
patches = [
|
||||||
|
./ecto_sql-fix.patch
|
||||||
|
./plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
yarnDeps = mkYarnModules {
|
yarnDeps = mkYarnModules {
|
||||||
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
From 127a77882879e5cdf32d908ee3b1b6cbdc9e482e Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
|
||||||
|
Date: Wed, 14 Jul 2021 01:20:29 +0200
|
||||||
|
Subject: [PATCH] Bump `clickhouse_ecto` dependency to be compatible with ecto
|
||||||
|
3.6
|
||||||
|
|
||||||
|
---
|
||||||
|
mix.lock | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/mix.lock b/mix.lock
|
||||||
|
index ecae8ac..d42af1e 100644
|
||||||
|
--- a/mix.lock
|
||||||
|
+++ b/mix.lock
|
||||||
|
@@ -12,7 +12,7 @@
|
||||||
|
"bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"},
|
||||||
|
"cachex": {:hex, :cachex, "3.3.0", "6f2ebb8f27491fe39121bd207c78badc499214d76c695658b19d6079beeca5c2", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "d90e5ee1dde14cef33f6b187af4335b88748b72b30c038969176cd4e6ccc31a1"},
|
||||||
|
"certifi": {:hex, :certifi, "2.6.1", "dbab8e5e155a0763eea978c913ca280a6b544bfa115633fa20249c3d396d9493", [:rebar3], [], "hexpm", "524c97b4991b3849dd5c17a631223896272c6b0af446778ba4675a1dff53bb7e"},
|
||||||
|
- "clickhouse_ecto": {:git, "https://github.com/plausible/clickhouse_ecto.git", "b30ccc93a4101a25ff0bba92113e18d8a9a8b28e", []},
|
||||||
|
+ "clickhouse_ecto": {:git, "https://github.com/plausible/clickhouse_ecto.git", "1969f14ecef7c357b2bd8bdc3e566234269de58c", []},
|
||||||
|
"clickhousex": {:git, "https://github.com/plausible/clickhousex", "0832dd4b1af1f0eba1d1018c231bf0d8d281f031", []},
|
||||||
|
"combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
|
||||||
|
"comeonin": {:hex, :comeonin, "5.3.2", "5c2f893d05c56ae3f5e24c1b983c2d5dfb88c6d979c9287a76a7feb1e1d8d646", [:mix], [], "hexpm", "d0993402844c49539aeadb3fe46a3c9bd190f1ecf86b6f9ebd71957534c95f04"},
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
|
@ -52,8 +52,6 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
makeFlags = [ "deps" ];
|
makeFlags = [ "deps" ];
|
||||||
|
|
||||||
phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];
|
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
for i in deps/*; do
|
for i in deps/*; do
|
||||||
( cd $i
|
( cd $i
|
||||||
|
|
27
pkgs/tools/archivers/lha/default.nix
Normal file
27
pkgs/tools/archivers/lha/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
{stdenv, lib, fetchFromGitHub, autoreconfHook}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
pname = "lha";
|
||||||
|
version = "unstable-2021-01-07";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "jca02266";
|
||||||
|
repo = "lha";
|
||||||
|
rev = "03475355bc6311f7f816ea9a88fb34a0029d975b";
|
||||||
|
sha256 = "18w2x0g5yq89yxkxh1fmb05lz4hw7a3b4jmkk95gvh11mwbbr5lm";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "LHa is an archiver and compressor using the LZSS and Huffman encoding compression algorithms";
|
||||||
|
platforms = platforms.unix;
|
||||||
|
maintainers = [ maintainers.sander ];
|
||||||
|
# Some of the original LhA code has been rewritten and the current author
|
||||||
|
# considers adopting a "true" free and open source license for it.
|
||||||
|
# However, old code is still covered by the original LHa license, which is
|
||||||
|
# not a free software license (it has additional requirements on commercial
|
||||||
|
# use).
|
||||||
|
license = licenses.unfree;
|
||||||
|
};
|
||||||
|
}
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
with python3.pkgs; buildPythonPackage rec {
|
with python3.pkgs; buildPythonPackage rec {
|
||||||
pname = "esphome-dashboard";
|
pname = "esphome-dashboard";
|
||||||
version = "20210623.0";
|
version = "20210719.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "0fc6xgi1naydm3wgk5lljnf6zggzdk6558cpyqlriw031gqnab77";
|
sha256 = "sha256-gUZut9FsFHZ0zcTg+QDIdsM3EMvNFBawgBnt/Ia1BIc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# no tests
|
# no tests
|
||||||
|
|
|
@ -16,13 +16,13 @@ let
|
||||||
in
|
in
|
||||||
with python.pkgs; buildPythonApplication rec {
|
with python.pkgs; buildPythonApplication rec {
|
||||||
pname = "esphome";
|
pname = "esphome";
|
||||||
version = "1.19.4";
|
version = "1.20.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "029ykjk24h21b0s0gha6kv9pvgallin6marzkb2vfbvr3icsmbz2";
|
sha256 = "sha256-saLcTiWqpxnE+li9ojfrEAh/vjB1c3K4kQzkrBJW3t4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -36,12 +36,6 @@ with python.pkgs; buildPythonApplication rec {
|
||||||
|
|
||||||
# drop coverage testing
|
# drop coverage testing
|
||||||
sed -i '/--cov/d' pytest.ini
|
sed -i '/--cov/d' pytest.ini
|
||||||
|
|
||||||
# migrate use of hypothesis internals to be compatible with hypothesis>=5.32.1
|
|
||||||
# https://github.com/esphome/issues/issues/2021
|
|
||||||
substituteInPlace tests/unit_tests/strategies.py --replace \
|
|
||||||
"@st.defines_strategy_with_reusable_values" \
|
|
||||||
"@st.defines_strategy(force_reusable_values=True)"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Remove esptool and platformio from requirements
|
# Remove esptool and platformio from requirements
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "system-config-printer";
|
pname = "system-config-printer";
|
||||||
version = "1.5.12";
|
version = "1.5.15";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "openPrinting";
|
owner = "openPrinting";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = "v${version}";
|
||||||
sha256 = "1a812jsd9pb02jbz9bq16qj5j6k2kw44g7s1xdqqkg7061rd7mwf";
|
sha256 = "0a3v8fp1dfb5cwwpadc3f6mv608b5yrrqd8ddkmnrngizqwlswsc";
|
||||||
};
|
};
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
|
@ -26,17 +26,6 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./detect_serverbindir.patch
|
./detect_serverbindir.patch
|
||||||
|
|
||||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958104
|
|
||||||
# (Fixes will be included in next upstream release.)
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/OpenPrinting/system-config-printer/commit/cf9903466c1a2d18a701f3b5e8c7e03483e1244d.patch";
|
|
||||||
sha256 = "03gpav618w50q90m2kdkgwclc7fv17m493fgjd633zfavb5kqr3n";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/OpenPrinting/system-config-printer/commit/b9289dfe105bdb502f183f0afe7a115ecae5f2af.patch";
|
|
||||||
sha256 = "12w47hy3ly4phh8jcqxvdnd5sgbnbp8dnscjd7d5y2i43kxj7b23";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -55,6 +44,10 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ];
|
pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ];
|
||||||
|
|
||||||
|
preConfigure = ''
|
||||||
|
intltoolize --copy --force --automake
|
||||||
|
'';
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-udev-rules"
|
"--with-udev-rules"
|
||||||
"--with-udevdir=${placeholder "out"}/etc/udev"
|
"--with-udevdir=${placeholder "out"}/etc/udev"
|
||||||
|
|
25
pkgs/tools/networking/cdpr/default.nix
Normal file
25
pkgs/tools/networking/cdpr/default.nix
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
{ lib, stdenv, fetchurl, libpcap }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "cdpr";
|
||||||
|
version = "2.4";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tgz";
|
||||||
|
sha256 = "1idyvyafkk0ifcbi7mc65b60qia6hpsdb6s66j4ggqp7if6vblrj";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ libpcap ];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
install -Dm755 cdpr $out/bin/cdpr
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Cisco Discovery Protocol Reporter";
|
||||||
|
homepage = "http://cdpr.sourceforge.net/";
|
||||||
|
license = licenses.gpl2Plus;
|
||||||
|
platforms = platforms.unix;
|
||||||
|
maintainers = [ maintainers.sgo ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,18 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "minio-client";
|
pname = "minio-client";
|
||||||
version = "2021-03-23T05-46-11Z";
|
version = "2021-06-13T17-48-22Z";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "minio";
|
owner = "minio";
|
||||||
repo = "mc";
|
repo = "mc";
|
||||||
rev = "RELEASE.${version}";
|
rev = "RELEASE.${version}";
|
||||||
sha256 = "sha256-AtE9Zy8tRvcE+gYc0pqJDEFnXL4jSbJ4b6l3ZOe69Y4=";
|
sha256 = "sha256-u0WO7KSalDqlRwbN3b74FOb632fIGPZ2F0T8qLrvt+U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-cIr8d5jz4EfBFuOBZG4Kz20wSXy1Cni77V+JR6vLHwQ=";
|
vendorSha256 = "sha256-BadW8AKHcrkCS3sXR7bqdgNhRYkfXIQOteMxIbiLvwg=";
|
||||||
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
@ -23,10 +21,15 @@ buildGoModule rec {
|
||||||
sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go
|
sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
doInstallCheck = true;
|
||||||
|
installCheckPhase = ''
|
||||||
|
$out/bin/mc --version | grep ${version} > /dev/null
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/minio/mc";
|
homepage = "https://github.com/minio/mc";
|
||||||
description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage";
|
description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage";
|
||||||
maintainers = with maintainers; [ eelco bachp ];
|
maintainers = with maintainers; [ bachp eelco superherointj ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, stdenv, fetchgit
|
{ lib, stdenv, fetchgit
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, nettools, gawk, systemd, openresolv, coreutils, gnugrep
|
, nettools, gawk, systemd, openresolv, coreutils, gnugrep, iproute2
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
@ -28,7 +28,7 @@ stdenv.mkDerivation {
|
||||||
--replace "/usr/bin/resolvectl" "${systemd}/bin/resolvectl"
|
--replace "/usr/bin/resolvectl" "${systemd}/bin/resolvectl"
|
||||||
'' + ''
|
'' + ''
|
||||||
wrapProgram $out/bin/vpnc-script \
|
wrapProgram $out/bin/vpnc-script \
|
||||||
--prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv ])}"
|
--prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv iproute2 ])}"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gdu";
|
pname = "gdu";
|
||||||
version = "5.2.0";
|
version = "5.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dundee";
|
owner = "dundee";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-PByW1wj9B6aJhYZYPT1uUDUDVtZHGYC2ingvxdr8Gbc=";
|
sha256 = "sha256-hf5jTEAN5oOPg2PaAlYjIDMYcwXkaFAqPtWTwZV98N0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-9W1K01PJ+tRLSJ0L7NGHXT5w5oHmlBkT8kwnOLOzSCc=";
|
vendorSha256 = "sha256-9W1K01PJ+tRLSJ0L7NGHXT5w5oHmlBkT8kwnOLOzSCc=";
|
||||||
|
|
|
@ -3599,6 +3599,8 @@ in
|
||||||
|
|
||||||
cdimgtools = callPackage ../tools/cd-dvd/cdimgtools { };
|
cdimgtools = callPackage ../tools/cd-dvd/cdimgtools { };
|
||||||
|
|
||||||
|
cdpr = callPackage ../tools/networking/cdpr { };
|
||||||
|
|
||||||
cdrdao = callPackage ../tools/cd-dvd/cdrdao { };
|
cdrdao = callPackage ../tools/cd-dvd/cdrdao { };
|
||||||
|
|
||||||
cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
|
cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
|
||||||
|
@ -6355,6 +6357,8 @@ in
|
||||||
|
|
||||||
lf = callPackage ../tools/misc/lf {};
|
lf = callPackage ../tools/misc/lf {};
|
||||||
|
|
||||||
|
lha = callPackage ../tools/archivers/lha { };
|
||||||
|
|
||||||
lhasa = callPackage ../tools/compression/lhasa {};
|
lhasa = callPackage ../tools/compression/lhasa {};
|
||||||
|
|
||||||
libcpuid = callPackage ../tools/misc/libcpuid { };
|
libcpuid = callPackage ../tools/misc/libcpuid { };
|
||||||
|
@ -25668,6 +25672,8 @@ in
|
||||||
|
|
||||||
mmtc = callPackage ../applications/audio/mmtc { };
|
mmtc = callPackage ../applications/audio/mmtc { };
|
||||||
|
|
||||||
|
mnamer = callPackage ../applications/misc/mnamer { };
|
||||||
|
|
||||||
moc = callPackage ../applications/audio/moc { };
|
moc = callPackage ../applications/audio/moc { };
|
||||||
|
|
||||||
mod-distortion = callPackage ../applications/audio/mod-distortion { };
|
mod-distortion = callPackage ../applications/audio/mod-distortion { };
|
||||||
|
|
|
@ -285,24 +285,24 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
|
||||||
outputFiles = [ "*" ];
|
outputFiles = [ "*" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
Nuget = buildDotnetPackage {
|
Nuget = buildDotnetPackage rec {
|
||||||
baseName = "Nuget";
|
baseName = "Nuget";
|
||||||
version = "4.9.1";
|
version = "5.6.0.6489";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mono";
|
owner = "mono";
|
||||||
repo = "nuget-binary";
|
repo = "linux-packaging-nuget";
|
||||||
rev = "7871fa26914593fdb2f2500df1196df7b8aecb1c";
|
rev = "upstream/${version}.bin";
|
||||||
sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
|
sha256 = "sha256-71vjM7a+F0DNTY+dML3UBSkrVyXv/k5rdl7iXBKSpNM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# configurePhase breaks the binary and results in
|
# configurePhase breaks the binary and results in
|
||||||
# `File does not contain a valid CIL image.`
|
# `File does not contain a valid CIL image.`
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
dontPlacateNuget = true;
|
||||||
|
|
||||||
outputFiles = [ "*" ];
|
outputFiles = [ "*" ];
|
||||||
dllFiles = [ "NuGet*.dll" ];
|
|
||||||
exeFiles = [ "nuget.exe" ];
|
exeFiles = [ "nuget.exe" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,10 @@ let
|
||||||
inherit lib;
|
inherit lib;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
mkNongnuPackages = { lib }: import ../applications/editors/emacs/elisp-packages/nongnu-packages.nix {
|
||||||
|
inherit lib;
|
||||||
|
};
|
||||||
|
|
||||||
# Contains both melpa stable & unstable
|
# Contains both melpa stable & unstable
|
||||||
melpaGeneric = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/melpa-packages.nix {
|
melpaGeneric = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/melpa-packages.nix {
|
||||||
inherit lib pkgs;
|
inherit lib pkgs;
|
||||||
|
@ -53,12 +57,14 @@ in makeScope pkgs'.newScope (self: makeOverridable ({
|
||||||
pkgs ? pkgs'
|
pkgs ? pkgs'
|
||||||
, lib ? pkgs.lib
|
, lib ? pkgs.lib
|
||||||
, elpaPackages ? mkElpaPackages { inherit pkgs lib; } self
|
, elpaPackages ? mkElpaPackages { inherit pkgs lib; } self
|
||||||
|
, nongnuPackages ? mkNongnuPackages { inherit lib; } self
|
||||||
, melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self
|
, melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self
|
||||||
, melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self
|
, melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self
|
||||||
, orgPackages ? mkOrgPackages { inherit lib; } self
|
, orgPackages ? mkOrgPackages { inherit lib; } self
|
||||||
, manualPackages ? mkManualPackages { inherit pkgs lib; } self
|
, manualPackages ? mkManualPackages { inherit pkgs lib; } self
|
||||||
}: ({}
|
}: ({}
|
||||||
// elpaPackages // { inherit elpaPackages; }
|
// elpaPackages // { inherit elpaPackages; }
|
||||||
|
// nongnuPackages // { inherit nongnuPackages; }
|
||||||
// melpaStablePackages // { inherit melpaStablePackages; }
|
// melpaStablePackages // { inherit melpaStablePackages; }
|
||||||
// melpaPackages // { inherit melpaPackages; }
|
// melpaPackages // { inherit melpaPackages; }
|
||||||
// orgPackages // { inherit orgPackages; }
|
// orgPackages // { inherit orgPackages; }
|
||||||
|
|
Loading…
Reference in a new issue