Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-06-27 18:05:17 +00:00 committed by GitHub
commit c04f4806d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 2000 additions and 239 deletions

View file

@ -157,7 +157,7 @@ in
${dup} cleanup ${target} --force ${extra}
${lib.optionalString (cfg.cleanup.maxAge != null) "${dup} remove-older-than ${lib.escapeShellArg cfg.cleanup.maxAge} ${target} --force ${extra}"}
${lib.optionalString (cfg.cleanup.maxFull != null) "${dup} remove-all-but-n-full ${toString cfg.cleanup.maxFull} ${target} --force ${extra}"}
${lib.optionalString (cfg.cleanup.maxIncr != null) "${dup} remove-all-incr-but-n-full ${toString cfg.cleanup.maxIncr} ${target} --force ${extra}"}
${lib.optionalString (cfg.cleanup.maxIncr != null) "${dup} remove-all-inc-of-but-n-full ${toString cfg.cleanup.maxIncr} ${target} --force ${extra}"}
exec ${dup} ${if cfg.fullIfOlderThan == "always" then "full" else "incr"} ${lib.escapeShellArgs (
[ cfg.root cfg.targetUrl ]
++ concatMap (p: [ "--include" p ]) cfg.include

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "spotify-tui";
version = "0.23.0";
version = "0.24.0";
src = fetchFromGitHub {
owner = "Rigellute";
repo = "spotify-tui";
rev = "v${version}";
sha256 = "082y5m2vglzx9kdc2088zynz0njcnljnb0y170igmlsxq9wkrgg2";
sha256 = "1vi6b22ygi6nwydjwqirph9k18akbw81m3bci134nrbnrb30glla";
};
cargoSha256 = "1khn6fx13qlfpqwnw7ysgan5h4nrg2qnzn2p74vn7jic3mqc3sax";
cargoSha256 = "1l91xcgr3hcjaphns1hs0i8w1ynxqwx7rbgpl0i5xnyrkw0gn9lj";
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ];
buildInputs = [ ]

View file

@ -11,11 +11,11 @@ let
in
stdenv.mkDerivation rec {
pname = "jitsi-meet-electron";
version = "2.8.6";
version = "2.8.7";
src = fetchurl {
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
sha256 = "sha256-kLX8SZERlyNVSvszkV/fkQh/Z/Z20PAPJ9eug2oKlqI=";
sha256 = "sha256-2VjYXDTb+u3gVM4FPwFzwyUj3O1t7fHpOrNU5Z+Hq2E=";
name = "${pname}-${version}.AppImage";
};

View file

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, callPackage
{ mkDerivation, lib, fetchFromGitHub, callPackage
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo
, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
, dee, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
@ -23,12 +23,15 @@ let
tg_owt = callPackage ./tg_owt.nix {};
in mkDerivation rec {
pname = "telegram-desktop";
version = "2.8.0";
version = "2.8.1";
# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
sha256 = "0689bmdpsj8qmv9ih6ckay23mivhlps8c081qljb8wqplmf2c4ds";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "1wf9806al6mzyd8nr37cdk6q2r354acixdqyjchi4r58drm99yv0";
};
postPatch = ''

View file

@ -3,32 +3,21 @@
, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf
, xorg, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr
, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
, libXi
}:
stdenv.mkDerivation {
pname = "tg_owt";
version = "unstable-2021-06-17";
version = "unstable-2021-06-27";
src = fetchFromGitHub {
owner = "desktop-app";
repo = "tg_owt";
rev = "f03ef05abf665437649a4f71886db1343590e862";
sha256 = "0s6ajw52b95lcq4mn6lv8gj6lhv62bvwjh43w7az2k5pbm14v7vv";
rev = "91d836dc84a16584c6ac52b36c04c0de504d9c34";
sha256 = "1ir4svv5mijpzr0rmx65088iikck83vhcdqrpf9dnk6yp4j9v4v2";
fetchSubmodules = true;
};
patches = [
# Our libXtst seems broken:
# /nix/store/rd3swxwmzjgjvwhz8svyc8ghc0brq293-libXtst-1.2.3/include/X11/extensions/XTest.h:32:10: fatal error: X11/extensions/XInput.h: No such file or directory
(fetchpatch {
# Copy updated source files.
url = "https://github.com/desktop-app/tg_owt/commit/2c0fbe4d3d1c33d0cc9ff7c112b4db1963bea535.patch";
sha256 = "0apd6hfv3a1s3qy10kjwk4z8bg835cpk0ql9qxjnxf4gq183bhif";
revert = true;
includes = [ "src/modules/desktop_capture/linux/shared_x_display.cc" ];
})
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config cmake ninja yasm ];
@ -37,6 +26,7 @@ stdenv.mkDerivation {
libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf
xorg.libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr
glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire
libXi
];
cmakeFlags = [

View file

@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
#! nix-shell -i python3 -p python3 nix
#! nix-shell -i python3 -p python3 nix nix-prefetch-git
import fileinput
import json
@ -32,6 +32,13 @@ def get_commit_date(repo, sha):
return 'unstable-' + date
def nix_prefetch_git(url, rev):
"""Prefetches the requested Git revision (incl. submodules) of the given repository URL."""
print(f'nix-prefetch-git {url} {rev}')
out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev, '--fetch-submodules'])
return json.loads(out)['sha256']
def nix_prefetch_url(url, unpack=False):
"""Prefetches the content of the given URL."""
print(f'nix-prefetch-url {url}')
@ -57,11 +64,11 @@ def update_file(relpath, version, sha256, rev=None):
if __name__ == "__main__":
tdesktop_tag = github_api_request('repos/telegramdesktop/tdesktop/releases/latest')['tag_name']
tdesktop_version = tdesktop_tag.lstrip('v')
tdesktop_hash = nix_prefetch_url(f'https://github.com/telegramdesktop/tdesktop/releases/download/{tdesktop_tag}/tdesktop-{tdesktop_version}-full.tar.gz')
tdesktop_hash = nix_prefetch_git('https://github.com/telegramdesktop/tdesktop.git', tdesktop_tag)
update_file('default.nix', tdesktop_version, tdesktop_hash)
tg_owt_ref = github_api_request('repos/desktop-app/tg_owt/commits/master')['sha']
tg_owt_version = get_commit_date('desktop-app/tg_owt', tg_owt_ref)
tg_owt_hash = 'TODO'
tg_owt_hash = nix_prefetch_git('https://github.com/desktop-app/tg_owt.git', tg_owt_ref)
update_file('tg_owt.nix', tg_owt_version, tg_owt_hash, tg_owt_ref)
tg_owt_ref = github_api_request('repos/desktop-app/tg_owt/commits/master')['sha']
libtgvoip_ref = github_api_request(f'repos/telegramdesktop/tdesktop/contents/Telegram/ThirdParty/libtgvoip?ref={tdesktop_tag}')['sha']

View file

@ -1,24 +1,40 @@
{ spellChecking ? true
, lib, stdenv, fetchurl, pkg-config, gtk3, gtkspell3 ? null
, gmime2, gettext, intltool, itstool, libxml2, libnotify, gnutls
, makeWrapper, gnupg
, gnomeSupport ? true, libsecret, gcr
, lib
, stdenv
, fetchurl
, pkg-config
, gtk3
, gtkspell3
, gmime2
, gettext
, intltool
, itstool
, libxml2
, libnotify
, gnutls
, makeWrapper
, gnupg
, gnomeSupport ? true
, libsecret
, gcr
}:
assert spellChecking -> gtkspell3 != null;
let version = "0.146"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "pan";
inherit version;
version = "0.146";
src = fetchurl {
url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
url = "https://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55";
};
patches = [
# Take <glib.h>, <gmime.h>, "gtk-compat.h" out of extern "C"
./move-out-of-extern-c.diff
];
nativeBuildInputs = [ pkg-config gettext intltool itstool libxml2 makeWrapper ];
buildInputs = [ gtk3 gmime2 libnotify gnutls ]
++ lib.optional spellChecking gtkspell3
++ lib.optionals gnomeSupport [ libsecret gcr ];
@ -29,7 +45,7 @@ stdenv.mkDerivation {
"--with-gnutls"
"--enable-libnotify"
] ++ lib.optional spellChecking "--with-gtkspell"
++ lib.optional gnomeSupport "--enable-gkr";
++ lib.optional gnomeSupport "--enable-gkr";
postInstall = ''
wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin
@ -42,6 +58,6 @@ stdenv.mkDerivation {
homepage = "http://pan.rebelbase.com/";
maintainers = [ maintainers.eelco ];
platforms = platforms.linux;
license = with licenses; [ gpl2 fdl11 ];
license = with licenses; [ gpl2Only fdl11 ];
};
}

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep
{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep, fetchpatch
, enableX11 ? true}:
let inherit (ocamlPackages) ocaml lablgtk; in
@ -17,6 +17,16 @@ stdenv.mkDerivation (rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ocaml ncurses ];
patches = [
# Patch to fix build with ocaml 4.12. Remove in 2.51.4
# https://github.com/bcpierce00/unison/pull/481
(fetchpatch {
name = "fix-compile-with-ocaml-4.12.patch";
url = "https://github.com/bcpierce00/unison/commit/14b885316e0a4b41cb80fe3daef7950f88be5c8f.patch?full_index=1";
sha256 = "0j1rma1cwdsfql19zvzhfj2ys5c4lbhjcp6jrnck04xnckxxiy3d";
})
];
preBuild = (if enableX11 then ''
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml
'' else "") + ''

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "freetube";
version = "0.13.1";
version = "0.13.2";
src = fetchurl {
url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage";
sha256 = "sha256-DN78ASe29h7o6emCtN861arGqWKAWjjWKtsHs8jjROI=";
sha256 = "sha256:0rzx66nshzcrvvd9ky0wamvv5wb0xxlf3zi25xrxmh6haimqbrpv";
};
appimageContents = appimageTools.extractType2 {

View file

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d116619..a1366ce 100644
index f6d8fa3..5f0657d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,17 @@
@ -7,7 +7,7 @@ index d116619..a1366ce 100644
+ cmake_policy(SET CMP0048 NEW)
+endif (POLICY CMP0048)
+
project(move-transition VERSION 2.3.0)
project(move-transition VERSION 2.4.3)
set(PROJECT_FULL_NAME "Move Transition")
+include(FindLibobs.cmake)
@ -18,9 +18,8 @@ index d116619..a1366ce 100644
+ "${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api")
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h)
set(move-transition_HEADERS
@@ -34,4 +45,10 @@ target_link_libraries(move-transition
@@ -38,4 +49,10 @@ target_link_libraries(move-transition
libobs)
set_target_properties(move-transition PROPERTIES FOLDER "plugins/exeldro")

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "obs-move-transition";
version = "2.3.0";
version = "2.4.3";
src = fetchFromGitHub {
owner = "exeldro";
repo = "obs-move-transition";
rev = version;
sha256 = "0cl6z3cvdjmbisvfcy281pcg6rhxmyfs31rwv7q4x39352rcs1nw";
sha256 = "sha256-/6PcNLOnBBqLZHVKMg1tdX9OktcllEEqnL93nXpuXL0=";
};
nativeBuildInputs = [ cmake ];
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
cp ${obs-studio.src}/cmake/external/FindLibobs.cmake FindLibobs.cmake
'';
patches = [ ./rename-obs-move-transition-cmake.patch ];
patches = [ ./0001-Use-FindLibobs.cmake.patch ];
postPatch = ''
substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'

View file

@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "plex-mpv-shim";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "iwalton3";
repo = pname;
rev = "v${version}";
sha256 = "06i6pp4jg0f9h6ash60fj1l5mbsdw3zyx7c6anbsrn86802i7paa";
sha256 = "18bd2nvlwzkmadimlkh7rs8rnp0ppfx1dzkxb11dq84pdpbl25pc";
};
propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ];

View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.20.1";
version = "0.20.2";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
sha256 = "00gzm3g297s9bfp13vnb623p7dfac3g6cdhz2b3lc6l0kmnnqs1s";
sha256 = "sha256-9PXvQrh0gmn/G+b7sbQffQkPnUKu1eVrvUoJlRBsOEM=";
};
cargoSha256 = "1dpklyv1b9h4n4k3ar5qbzivds8r4mml76986ic8zj71fy5fxn08";
cargoSha256 = "sha256-6orDR2Ml1Fy20uT47EDkEk0rGFxO0djHZsFiqlS1Tk8=";
nativeBuildInputs = [ pkg-config makeWrapper ];

View file

@ -4,13 +4,13 @@ assert stdenv.hostPlatform.isUnix -> upx != null;
stdenv.mkDerivation rec {
pname = "vlang";
version = "0.1.21";
version = "weekly.2021.25";
src = fetchFromGitHub {
owner = "vlang";
repo = "v";
rev = version;
sha256 = "0npd7a7nhd6r9mr99naib9scqk30209hz18nxif27284ckjbl4fk";
sha256 = "0y4a5rmpcdqina32d6azbmsbi3zqqfl413sicg72x6a1pm2vg33j";
};
# V compiler source translated to C for bootstrap.
@ -18,18 +18,19 @@ stdenv.mkDerivation rec {
vc = fetchFromGitHub {
owner = "vlang";
repo = "vc";
rev = "950a90b6acaebad1c6ddec5486fc54307e38a9cd";
sha256 = "1dh5l2m207rip1xj677hvbp067inw28n70ddz5wxzfpmaim63c0l";
rev = "3201d2dd2faadfa370da0bad2a749a664ad5ade3";
sha256 = "0xzkjdph5wfjr3qfkihgc27vsbbjh2l31rp8z2avq9hc531hwvrz";
};
enableParallelBuilding = true;
propagatedBuildInputs = [ glfw freetype openssl ]
++ lib.optional stdenv.hostPlatform.isUnix upx;
buildPhase = ''
runHook preBuild
cc -std=gnu11 $CFLAGS -w -o v $vc/v.c -lm $LDFLAGS
./v -prod -cflags `$CFLAGS` -o v compiler
# vlang seems to want to write to $HOME/.vmodules,
# so lets give it a writable HOME
HOME=$PWD ./v -prod self
# Exclude thirdparty/vschannel as it is windows-specific.
find thirdparty -path thirdparty/vschannel -prune -o -type f -name "*.c" -execdir cc -std=gnu11 $CFLAGS -w -c {} $LDFLAGS ';'
runHook postBuild
@ -39,8 +40,8 @@ stdenv.mkDerivation rec {
runHook preInstall
mkdir -p $out/{bin,lib,share}
cp -r examples $out/share
cp -r {vlib,thirdparty} $out/lib
cp v $out/lib
cp -r {cmd,vlib,thirdparty} $out/lib
mv v $out/lib
ln -s $out/lib/v $out/bin/v
runHook postInstall
'';

View file

@ -0,0 +1,76 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool
, python3, perl, gmpxx, mpfr, boost, eigen, gfortran
, enableFMA ? false
}:
stdenv.mkDerivation rec {
pname = "libint2";
version = "2.6.0";
src = fetchFromGitHub {
owner = "evaleev";
repo = "libint";
rev = "v${version}";
sha256 = "0pbc2j928jyffhdp4x5bkw68mqmx610qqhnb223vdzr0n2yj5y19";
};
patches = [
./fix-paths.patch
];
nativeBuildInputs = [
autoconf
automake
libtool
gfortran
mpfr
python3
perl
gmpxx
];
buildInputs = [ boost ];
enableParallelBuilding = true;
doCheck = true;
configureFlags = [
"--enable-eri=2"
"--enable-eri3=2"
"--enable-eri2=2"
"--with-eri-max-am=7,5,4"
"--with-eri-opt-am=3"
"--with-eri3-max-am=7"
"--with-eri2-max-am=7"
"--with-g12-max-am=5"
"--with-g12-opt-am=3"
"--with-g12dkh-max-am=5"
"--with-g12dkh-opt-am=3"
"--enable-contracted-ints"
"--enable-shared"
] ++ lib.optional enableFMA "--enable-fma";
preConfigure = ''
./autogen.sh
'';
postBuild = ''
# build the fortran interface file
cd export/fortran
make libint_f.o ENABLE_FORTRAN=yes
cd ../..
'';
postInstall = ''
cp export/fortran/libint_f.mod $out/include/
'';
meta = with lib; {
description = "Library for the evaluation of molecular integrals of many-body operators over Gaussian functions";
homepage = "https://github.com/evaleev/libint";
license = with licenses; [ lgpl3Only gpl3Only ];
maintainers = [ maintainers.markuskowa ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,96 @@
diff --git a/export/fortran/Makefile b/export/fortran/Makefile
index 62d8711..a83edc7 100644
--- a/export/fortran/Makefile
+++ b/export/fortran/Makefile
@@ -1,12 +1,14 @@
-TOPDIR = ..
-SRCDIR = ..
+TOPDIR = ../..
+SRCDIR = ../..
--include ../MakeSuffixRules
--include ../MakeVars
--include ../MakeVars.features
+-include ../../lib/MakeSuffixRules
+-include ../../src/bin/MakeVars
+-include ../../src/lib/libint/MakeVars.features
-FCFLAGS := -I../include -I../include/libint2 -D__COMPILING_LIBINT2=1 $(FCFLAGS)
-COMPUTE_LIB = -L../lib -lint2
+FCFLAGS := -I../../include -I../../include/libint2 -D__COMPILING_LIBINT2=1 $(FCFLAGS)
+COMPUTE_LIB = -L../../lib -lint2
+
+CXXCPP = cc -E -I../../include/libint2
.PHONY: clean distclean default make_test check_test
@@ -28,7 +30,7 @@ libint2_types_f.h: $(TOPDIR)/include/libint2.h.i
fortran_example.o: libint_f.o
-fortran_incldefs.h: $(TOPDIR)/include/libint2_types.h
+fortran_incldefs.h: $(TOPDIR)/include/libint2/libint2_types.h
grep '^#' $< | grep -v '#include' > $@
fortran_example: fortran_example.o libint_f.o
diff --git a/src/bin/libint/Makefile b/src/bin/libint/Makefile
index 406306c..bd8a695 100644
--- a/src/bin/libint/Makefile
+++ b/src/bin/libint/Makefile
@@ -59,7 +59,7 @@ test: $(TESTCXXOBJ) $(LIBTARGET)
$(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $^ $(SYSLIBS)
$(LIBTARGET): $(LIBOBJ)
- /bin/rm -f $@
+ rm -f $@
$(AR) $(ARFLAGS) $@ $(LIBOBJ)
$(RANLIB) $@
@@ -102,7 +102,7 @@ ifneq ($(CXXDEPENDSUF),none)
%.d: %.cc
$(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< > /dev/null
sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' < $(*F).$(CXXDEPENDSUF) > $(@F)
- /bin/rm -f $(*F).$(CXXDEPENDSUF)
+ rm -f $(*F).$(CXXDEPENDSUF)
else
%.d: %.cc
$(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< | sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' > $(@F)
diff --git a/tests/eri/Makefile b/tests/eri/Makefile
index 6223e4f..05909dc 100644
--- a/tests/eri/Makefile
+++ b/tests/eri/Makefile
@@ -62,7 +62,7 @@ ifneq ($(CXXDEPENDSUF),none)
%.d: %.cc
$(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< > /dev/null
sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' < $(*F).$(CXXDEPENDSUF) > $(@F)
- /bin/rm -f $(*F).$(CXXDEPENDSUF)
+ rm -f $(*F).$(CXXDEPENDSUF)
else
%.d: %.cc
$(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< | sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' > $(@F)
diff --git a/tests/hartree-fock/Makefile b/tests/hartree-fock/Makefile
index aaebadc..4971472 100644
--- a/tests/hartree-fock/Makefile
+++ b/tests/hartree-fock/Makefile
@@ -95,7 +95,7 @@ ifneq ($(CXXDEPENDSUF),none)
%.d:: %.cc
$(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< > /dev/null
sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' < $(*F).$(CXXDEPENDSUF) > $(@F)
- /bin/rm -f $(*F).$(CXXDEPENDSUF)
+ rm -f $(*F).$(CXXDEPENDSUF)
else
%.d:: %.cc
$(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< | sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' > $(@F)
diff --git a/tests/unit/Makefile b/tests/unit/Makefile
index f2d9400..da9d82b 100644
--- a/tests/unit/Makefile
+++ b/tests/unit/Makefile
@@ -93,7 +93,7 @@ ifneq ($(CXXDEPENDSUF),none)
%.d:: %.cc
$(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXGENFLAGS) $< > /dev/null
sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' < $(*F).$(CXXDEPENDSUF) > $(@F)
- /bin/rm -f $(*F).$(CXXDEPENDSUF)
+ rm -f $(*F).$(CXXDEPENDSUF)
else
%.d:: %.cc
$(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXGENFLAGS) $< | sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' > $(@F)

View file

@ -39,6 +39,6 @@ mkDerivation rec {
description = "Free and modular front-end framework for developing fast and compelling user experiences";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ dotlambda ];
broken = versionOlder qtbase.version "5.14.0";
broken = versionOlder qtbase.version "5.15.0";
};
}

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "0.2.67";
version = "0.3.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "Jc2k";
repo = pname;
rev = version;
sha256 = "04421p0dq7xh7rhx8ip177g2b91lhlc2yziqxbs9yxd1qyzwiqj1";
sha256 = "sha256-chRUQyCDXW4of0XBdmKuQEzUE3Gt4A2uGlPNy+oEoco=";
};
nativeBuildInputs = [

View file

@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, aiohttp
, backoff
, yarl
, aresponses
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "aiomodernforms";
version = "0.1.8";
src = fetchFromGitHub {
owner = "wonderslug";
repo = "aiomodernforms";
rev = "v${version}";
sha256 = "sha256-Vx51WBjjNPIfLlwMnAuwHnGNljhnjKkU0tWB9M9rjsw=";
};
propagatedBuildInputs = [
aiohttp
backoff
yarl
];
checkInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "aiomodernforms" ];
meta = with lib; {
description = "Asynchronous Python client for Modern Forms fans";
homepage = "https://github.com/wonderslug/aiomodernforms";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, aiodns
, aiohttp
}:
buildPythonPackage rec {
pname = "forecast-solar";
version = "1.3.1";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = "forecast_solar";
rev = version;
sha256 = "1kqzr1ypvdjw0zvac4spb6xdd2qpms9h8nr6vf0w9qx756ir0f95";
};
propagatedBuildInputs = [
aiodns
aiohttp
];
# no unit tests implemented
doCheck = false;
pythonImportsCheck = [ "forecast_solar" ];
meta = with lib; {
description = "Asynchronous Python client for getting forecast solar information";
homepage = "https://github.com/home-assistant-libs/forecast_solar";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -0,0 +1,32 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder, pyyaml }:
buildPythonPackage rec {
pname = "pycritty";
version = "0.3.5";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "1lrmd4a1ps3h9z0pndfjfrd2qa7v3abd6np75fd2q2ffsqv7ar6x";
};
postPatch = ''
# remove custom install
substituteInPlace setup.py \
--replace "'install': PostInstallHook," ""
'';
propagatedBuildInputs = [ pyyaml ];
# The package does not include any tests to run
doCheck = false;
pythonImportsCheck = [ "pycritty" ];
meta = with lib; {
description = "A CLI tool for changing your alacritty configuration on the fly";
homepage = "https://github.com/antoniosarosi/pycritty";
license = licenses.mit;
maintainers = with maintainers; [ jperras ];
};
}

View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, glibcLocales
, python
, tqdm
}:
buildPythonPackage rec {
pname = "pypdf3";
version = "1.0.5";
src = fetchPypi {
pname = "PyPDF3";
inherit version;
sha256 = "sha256-DGKpR4p3z8tw4gKi5Hmj09svysD3Hkn4NklhgROmEAU=";
};
LC_ALL = "en_US.UTF-8";
buildInputs = [ glibcLocales ];
checkPhase = ''
${python.interpreter} -m unittest tests/*.py
'';
propagatedBuildInputs = [
tqdm
];
meta = with lib; {
description = "A Pure-Python library built as a PDF toolkit";
homepage = "https://github.com/sfneal/PyPDF3";
license = licenses.bsd3;
maintainers = with maintainers; [ ambroisie ];
};
}

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyrituals";
version = "0.0.3";
version = "0.0.4";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "milanmeu";
repo = pname;
rev = version;
sha256 = "sha256-oAxQRGP6GxiidnGshSJZEh2RD3XsZ/7kFGwcqaYaBnM=";
sha256 = "sha256-XJoSKGGwLoHMWxPGfXHeLg8VlIH1/j0ktzWe/pjd//0=";
};
propagatedBuildInputs = [ aiohttp ];

View file

@ -0,0 +1,57 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, fetchpatch
, poetry-core
, requests
, urllib3
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "synologydsm-api";
version = "1.0.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "hacf-fr";
repo = "synologydsm-api";
rev = "v${version}";
sha256 = "0gyahf1x6i6j9pslh1y3pyh3si5jvxb06r1w761b9gsxyk14y1si";
};
patches = [
# https://github.com/hacf-fr/synologydsm-api/pull/84
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/hacf-fr/synologydsm-api/commit/f1ea2be927388bdff6d43d09027b82a854635e34.patch";
sha256 = "120pdgp2i4ds6y3rf9j372f9zdcf4y8rsgl1xjbkgdhkp76bkkgr";
})
];
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
requests
urllib3
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "synology_dsm" ];
meta = with lib; {
description = "Python API for communication with Synology DSM";
homepage = "https://github.com/hacf-fr/synologydsm-api";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, zeep
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "total-connect-client";
version = "0.58";
src = fetchFromGitHub {
owner = "craigjmidwinter";
repo = "total-connect-client";
rev = version;
sha256 = "1dqmgvgvwjh235wghygan2jnfvmn9vz789in2as3asig9cifix9z";
};
propagatedBuildInputs = [
zeep
];
checkInputs = [
pytestCheckHook
];
preCheck = ''
export PYTHONPATH="total_connect_client:$PYTHONPATH"
'';
pythonImportsCheck = [ "total_connect_client" ];
meta = with lib; {
description = "Interact with Total Connect 2 alarm systems";
homepage = "https://github.com/craigjmidwinter/total-connect-client";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
, pytestCheckHook
, responses
}:
buildPythonPackage rec {
pname = "upcloud-api";
version = "2.0.0";
src = fetchFromGitHub {
owner = "UpCloudLtd";
repo = "upcloud-python-api";
rev = "v${version}";
sha256 = "1kkgrn97pw4k49ys97hjrvh2j8y2p2r9970v9csgrk5wci4562wm";
};
propagatedBuildInputs = [
requests
];
checkInputs = [
pytestCheckHook
responses
];
pythonImportsCheck = [ "upcloud_api" ];
meta = with lib; {
description = "UpCloud API Client";
homepage = "https://github.com/UpCloudLtd/upcloud-python-api";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rpg-cli";
version = "0.4.1";
version = "0.5.0";
src = fetchFromGitHub {
owner = "facundoolano";
repo = pname;
rev = version;
sha256 = "07ar7almaz005jch7zm63kxyxvk3bphi2gl88xsb2rk5srkbb2s2";
sha256 = "sha256-LRTHnYxjPraVISAERT6XJGKIA3YJIilgEwU6olq2CRc=";
};
cargoSha256 = "sha256-wJPRI3jfV+v/XpIU9+j1jXlyfjkFCEHZdFJx/KMNT9o=";
cargoSha256 = "sha256-ZlQy/JiYKDKPCEWrAFvKV6WsAkk2zsPpfJADB+kPyuo=";
# tests assume the authors macbook, and thus fail
doCheck = false;

View file

@ -413,12 +413,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-06-23";
version = "2021-06-27";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "55936642e7024de9e58914c16e643169c361ebd7";
sha256 = "1zf7bmblzgqy3g5hc24ksi351cw1bmdsdfhw81hkg40sb6bzcmy1";
rev = "9bac6b4623c8b24615bc1f0cfb582e1a8578060f";
sha256 = "0f0birbvd4s28bqb6jp8pc8r24f4k5789gqqg7mwgrf06zhsa8dh";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -509,12 +509,12 @@ final: prev:
coc-fzf = buildVimPluginFrom2Nix {
pname = "coc-fzf";
version = "2021-05-29";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "antoinemadec";
repo = "coc-fzf";
rev = "1be2273dc37c07b98b7a1b2b67fd57c80feb85a9";
sha256 = "06w052x13idb8wfvyasg36hakffxnzfs7paj3wk83qa2m1kiz1n4";
rev = "5b133aaa8c15f1c6fa831713892efd87189b0637";
sha256 = "18cb39d113z8yxriidc0dmkkkzpp6x5hl414n5fcqwhjk5h514rn";
};
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
};
@ -557,12 +557,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
version = "2021-06-22";
version = "2021-06-25";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "153fdc4223594f8079e4025e919605fffd75f6a4";
sha256 = "0mkbg4qsgh3d1b1sj3pgsp8zngfd7cz73knasr5zy8fnx8kp4c2h";
rev = "91b144b090311c29e40832e76ec8624e5e3599b0";
sha256 = "0cwhzk9lkwj0mndjmxny1y5hps0qgmib50flkvlvhl39j6zbrixx";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@ -1014,24 +1014,24 @@ final: prev:
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2021-06-23";
version = "2021-06-25";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "968b94e2e5a9b1d8f3025e69fb84574b9d32177b";
sha256 = "0nsbiqi28niyaqyg8hc2icbhb7gcj0800q3fka8150yb1za6j0bv";
rev = "cfee6f43aaead875bdc5351627e344698064108c";
sha256 = "1yciacr1fh5d155b5d2an4hjy8h0kdp94qrkp9vdi4a46ljrcy9s";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim";
version = "2021-06-23";
version = "2021-06-24";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
rev = "1e5e52f8a00901f3bc6856359ca6ec84c0febea8";
sha256 = "0hdpjvgkfwhjhvlyb452ydbscdmk2nm6vgv0kw6ac4pxnwwmins9";
rev = "8e535d2c19b5307196de736ff9ceadcfe2de9a96";
sha256 = "09xfikgrj4krlqnf6j26yhaiiv7im0sm4h0q049m927sh248kxh7";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@ -1256,12 +1256,12 @@ final: prev:
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
version = "2021-06-23";
version = "2021-06-24";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
rev = "b148aac088a43799c55ebff4369c5ab546bed5c7";
sha256 = "0a4qs2bgjkqzgp0myl48amw53f5s2jnf44s9dn5k5h1s0nx1wl7l";
rev = "a25b3262f7b5ec7e7188560202b680b2763a8359";
sha256 = "0q9cc641x0jwdvd51dwm3grmgj9y9lhlgz5zpgnwwwbx894i55sn";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@ -1619,12 +1619,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
version = "2021-06-22";
version = "2021-06-25";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "bafd08a0993584a7f686498e1944a38087487c14";
sha256 = "1775nll0hjd5v057f365ckk54vxzzla24w8xr00dvswjg6w1jzb0";
rev = "3dca3fc854b72a72233341f4ae51cebd7a864234";
sha256 = "1saasvazmxq5ll0fna0a8kx5q8lq9mg0ldkj1k4g13h9g34sdwgg";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@ -1811,12 +1811,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
version = "2021-06-23";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "9bab79054db0668c0b7e8a60f6a3963387e0d332";
sha256 = "1aimpck2pn3idqx295zdg1qlni48ls23hjx21rnzj8jp095rnqm0";
rev = "521e9357bdbd2cadf4863d5c67f2e816182bdecf";
sha256 = "1cd11gvbw2rs5vg6n5w7g22n8c46prsfd906ycld30zq5sm85fg5";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -1919,12 +1919,12 @@ final: prev:
gruvbox-flat-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox-flat-nvim";
version = "2021-06-11";
version = "2021-06-25";
src = fetchFromGitHub {
owner = "eddyekofo94";
repo = "gruvbox-flat.nvim";
rev = "4e6615e601ce6861dddc6533532a7901fd0a68a4";
sha256 = "0p4390xdf4m3n6604nvpaca4dnswayja69brg55lhs5x1nrrfsn0";
rev = "b98cd51a564881eac30794e64a8db63860d9bcf0";
sha256 = "03drq3sqak2lcb7vs7qw1lhgrbnri0m1qp50cgaq17v0dlk15n4k";
};
meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/";
};
@ -2043,8 +2043,8 @@ final: prev:
src = fetchFromGitHub {
owner = "phaazon";
repo = "hop.nvim";
rev = "dc7b4e02064829d35bf65c95a4e656152ef3e476";
sha256 = "1gidm6hfgmx177czq2c28lq93laa7hh51anpc2amvd46mbi2k5xa";
rev = "a6cd8df18dc2f667e2d10b5fea79d73a7d084cd7";
sha256 = "1j5l012vxrcqs5x4ry8cfpvz3a289xsr6h969avd4b8ic8w7dkwb";
};
meta.homepage = "https://github.com/phaazon/hop.nvim/";
};
@ -2412,12 +2412,12 @@ final: prev:
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
version = "2021-06-10";
version = "2021-06-24";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
rev = "95f14d52554bc5d9e7fe1bfe92c0c542aab9125e";
sha256 = "0isbqyi3ny0zy2npq15j4hpkhnqvf17zv39wpc62i91dqyplp4yy";
rev = "3899965851a0b3e59998f2b42e716eeee6bcc473";
sha256 = "1w89nlkl35yzadbnhxv0c7qcwzynhvv1kqhvwpbj5h4x2gnb9x33";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
};
@ -2556,12 +2556,12 @@ final: prev:
lightspeed-nvim = buildVimPluginFrom2Nix {
pname = "lightspeed-nvim";
version = "2021-06-22";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "ggandor";
repo = "lightspeed.nvim";
rev = "cbc56c6390fa90e37f25ac45aec1d5ac29407679";
sha256 = "04zmq0wrm5jmpss50j7zfc06gw6h5mcpwm1bpdwzz93zayvsbpig";
rev = "1a213ae1a9587afd4083309098b3a3e63cf6ea80";
sha256 = "053drg668sbp0q7xfjm9cx29d87brf02xn86ind81vd039csjd7z";
};
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
};
@ -2616,24 +2616,24 @@ final: prev:
lsp_extensions-nvim = buildVimPluginFrom2Nix {
pname = "lsp_extensions-nvim";
version = "2021-02-17";
version = "2021-06-25";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "lsp_extensions.nvim";
rev = "ce5d03822fda9ddbdeb2461e5b4c06c1641fe7ea";
sha256 = "1gybxaxgbq1s1ijvrl9h9nq443cyrdnhgi1yjqxzrr64wz7nr8v0";
rev = "a1f12b8df1d3d8e46a7010615d2a335cd06814f2";
sha256 = "11aynapcxxm4xjicixj0g93y7qqlhby8zvmc856gq0b14k5n291q";
};
meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/";
};
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim";
version = "2021-06-22";
version = "2021-06-25";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
rev = "8cef9c8fd4f2937e6144b37e38138796cef07539";
sha256 = "1zyfrihlbrfhgbiclb5x1cb6cpc7fgv057p29s00ykgdp7qi60r8";
rev = "69142caa4e48a265467d1c43112de0790f0e5090";
sha256 = "0m69fdblnxydlix5cx1rnrcyxsfvl85ica2vn0d58vpls20hnibd";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@ -2676,12 +2676,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2021-06-23";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "943508a957d27d7b2050a37cb41774ae3a812987";
sha256 = "024c0k7mcwalkrzm0i45ah2ymaysm1jqmba2iq4m2glc6vgr6c2g";
rev = "8c96627d42aeb00b7595bb9fd812762ca4a27019";
sha256 = "0cjphgly8y2gb5izwl670qy58ky6wjfw1qzarfkxi5wmbk1mawv9";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
@ -3084,24 +3084,24 @@ final: prev:
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2021-04-20";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
rev = "1a49552cdaddeaaa766a6f0016effe530634b39f";
sha256 = "114mp407vck6bm224mig91rka5k7jj6641lllijwj25b3yfkgkmr";
rev = "cdf38b33fc4a78c5aa369b8074956a3ebf184f4b";
sha256 = "1cp3p117ij5k2zsmyrg3c01n9hv2a6h5p09i2gllz88ii5x3965y";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2021-06-20";
version = "2021-06-25";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "3823b52399d64baad4aa6b8936cd0384b5d916d2";
sha256 = "0q6f6f56rgx209gs2xzrizrfywp4mnb43jzp1cd10d64qx3qmhys";
rev = "6bf4bfcf36e701658ddb062f1214e3942e339442";
sha256 = "1wgchrv6piykzpwg42yl23qn1qxangf58cv97rj73m80ws8hhwb8";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -3142,6 +3142,18 @@ final: prev:
meta.homepage = "https://github.com/Shougo/neomru.vim/";
};
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "vhyrro";
repo = "neorg";
rev = "950ed23a61ba0b4bb455033f191f15b9b8170fd6";
sha256 = "0c8zqkyjlkbz109k3321ys7jjggwk9w13p72907k64ypfmr70p30";
};
meta.homepage = "https://github.com/vhyrro/neorg/";
};
neosnippet-snippets = buildVimPluginFrom2Nix {
pname = "neosnippet-snippets";
version = "2021-05-05";
@ -3360,12 +3372,12 @@ final: prev:
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
pname = "nvcode-color-schemes-vim";
version = "2021-06-16";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "ChristianChiarulli";
repo = "nvcode-color-schemes.vim";
rev = "2afb852177a28e579c1348033dbc043a99ca6dc7";
sha256 = "1aghwwcwsh4dka8jwq254pdb9l9c193iwnax9ab8s0zzcyk0x4bq";
rev = "cb3682a8eaf25485efe0b377f0b9e8291f68ab59";
sha256 = "0n08mkxf4m0sz07wd893s63l17v3kvvgx5aj62nf5p7paw1zv91c";
};
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
};
@ -3384,24 +3396,24 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2021-06-19";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "4b218c4e3824666b9cdc88cb3ed4c1243612cfd1";
sha256 = "0pp1zn5xpiwymv5x4m6ff5dv5falsjbpxqqkip21lc0zwvjdxhpl";
rev = "3069e5a6cea7e69a75f042740e66fc15169336e8";
sha256 = "1ldsx96x8asc6hlywkba4rn2dx9j1fl682pv1gyjr1x9m9pgjvg0";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
nvim-base16 = buildVimPluginFrom2Nix {
pname = "nvim-base16";
version = "2021-06-21";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "RRethy";
repo = "nvim-base16";
rev = "abded42adc98dccdf7d83d0e671d9064c55d7b73";
sha256 = "18hnv9zy162gz3ikrcvp2wq07q2bb5hgw6papz7qnh1qm9jansap";
rev = "3be30f3165278e31333b44a6dcc937653893f623";
sha256 = "1rzj8fqbbvbyjvcdkvy5p9q02f24m0fc0sbzh1wl2wk91yb42vqb";
};
meta.homepage = "https://github.com/RRethy/nvim-base16/";
};
@ -3480,12 +3492,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2021-06-15";
version = "2021-06-25";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "d5e57dc263ab14ec5d99049f66f5a069b63837dc";
sha256 = "02gjplbgc2lxbgvirhvk4qp0ns1xk73wf7v4iw6v9bcr6sr95iqn";
rev = "e92ef2acc81b668c90b2dbf2e2a4412ea5975242";
sha256 = "0y27kaspmygv0lgvp6msyazhya7indqlii0rsxiahmp5sdg85qap";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -3636,12 +3648,12 @@ final: prev:
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
version = "2021-06-23";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
rev = "e1ef144441847231c0afeab4c41fedbb3739166e";
sha256 = "1az8srf4y7vrvsxd7qgz8dry4j59x6iwrh2vk4rj616m2r090krw";
rev = "f0423e8085503889170b695d56191b29b51239e2";
sha256 = "193h67azj8pldx8csphb7vaj7sza1kv5ayzxx1xq9fynywwncjyy";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@ -3660,12 +3672,12 @@ final: prev:
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
pname = "nvim-toggleterm-lua";
version = "2021-06-20";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-toggleterm.lua";
rev = "1adb2c8288a32db56f8931ad39ece79479610c08";
sha256 = "02jyxw9hfc9ynwrc81v9xkw4dnkpaz5psl1hc79yx884i1lridc8";
rev = "f8cf9ec7592e8b8c19a56f5985cec108e18c3101";
sha256 = "13ayc57q7r3bns0y6qqqhsi2rr1kqi0bxzdw4qz3my4nj3npqk9h";
};
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
};
@ -3684,12 +3696,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-06-22";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "55c5620aa318a11823b5dd3d3cd69265f3763339";
sha256 = "0r057zj21c8cpha7qvvcj2mjm4mynwrygwz0qjjzwbbs5jfrhdca";
rev = "c04aa172a3feab61f8f4fbfa0e3d47fa12513485";
sha256 = "00sp2v423j10rh6hfiwkl7cfnq5y1zjzsfi87sy01phcw5i4aa25";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3732,24 +3744,24 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
version = "2021-06-09";
version = "2021-06-25";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
rev = "6cea13039db901afb75c8efa587274ebd94c875a";
sha256 = "16bi6lzb4dl6m5kcp7z2q26a9w6sb0lb3y39wd3ai5ir3p7alix4";
rev = "2271ffecd5fad9c74fb12c125f39a21ffb5a7673";
sha256 = "1acmhal848jjxv12cp4ihd3jmg6rj8q31v2si15chzap4iizhchc";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
version = "2021-06-21";
version = "2021-06-25";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
rev = "58be73dd0235959991dc54b566597245ee8b1974";
sha256 = "000xwj6df7fqj107byhcaal74gdmcdw9ghirp3sbibv6kpz1xygr";
rev = "c2a5af6b6f08b883ac6925273142eb178178a2f6";
sha256 = "1z07c9w8ms6gpqjy1xfjhqbr1zn717i6gyn9vm7wm60rk86xrn3j";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
@ -4477,12 +4489,12 @@ final: prev:
sideways-vim = buildVimPluginFrom2Nix {
pname = "sideways-vim";
version = "2021-06-07";
version = "2021-06-24";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "sideways.vim";
rev = "bf19ffb2ea583516908ceb861e7c52a0c3260221";
sha256 = "1mrqli7gpn3bzfjn3095ms9m8vkpf7zlia6m75c0ppxgmyry8ngs";
rev = "8703f642db4e545525e6fb10e97c843c74c61964";
sha256 = "1rmrxr53i7vmwh7wrrbcb24jyrqrph6bqr2bifhhgwy1kxx04gvg";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
@ -4538,12 +4550,12 @@ final: prev:
snap = buildVimPluginFrom2Nix {
pname = "snap";
version = "2021-06-22";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "camspiers";
repo = "snap";
rev = "90d907f39345edeeb300ed1dfd2210d852ce645f";
sha256 = "1vby4qllvgadw8gdr1qpsbssrd7lnjhi0flh1vshcv79qvbri9pd";
rev = "9410aa77fb8771288ef0a882cd7e8ee81af51107";
sha256 = "165a8hdkg0ma5s6gbnrhw0sqx37ilmfka6lq5k843sm5h98xyad7";
};
meta.homepage = "https://github.com/camspiers/snap/";
};
@ -4839,12 +4851,12 @@ final: prev:
tagbar = buildVimPluginFrom2Nix {
pname = "tagbar";
version = "2021-06-23";
version = "2021-06-24";
src = fetchFromGitHub {
owner = "preservim";
repo = "tagbar";
rev = "285afffc4769c350ce7793c8b71140647a37aeea";
sha256 = "1x55ywrbivkf6ik6m8srirbp6m0aikkjncyakqz4wr5ci0myjxzy";
rev = "2da3443f5fb78aa0b9a60bb5b2926d72df734e14";
sha256 = "0xihnfp1jv3ixhinqvnfig1v5k8swf3vcqjavspchd94lnb4b2h4";
};
meta.homepage = "https://github.com/preservim/tagbar/";
};
@ -4875,12 +4887,12 @@ final: prev:
taskwiki = buildVimPluginFrom2Nix {
pname = "taskwiki";
version = "2021-06-21";
version = "2021-06-27";
src = fetchFromGitHub {
owner = "tools-life";
repo = "taskwiki";
rev = "c5d6f58ab9e3343377c91493efc2f8b2539ac6b4";
sha256 = "0wzfvsbrx3npq4499ffsqapy1ibdg15qqy7f21m75ii6iqfdibb7";
rev = "f9a1e6ab9f10bd02fab05c225ccca6e253e690a0";
sha256 = "12f1i8dfmd4n3wc4cs45csl6j6aw4g7i6bbqnk017sylwxpiilsq";
};
meta.homepage = "https://github.com/tools-life/taskwiki/";
};
@ -5129,12 +5141,12 @@ final: prev:
trouble-nvim = buildVimPluginFrom2Nix {
pname = "trouble-nvim";
version = "2021-06-17";
version = "2021-06-24";
src = fetchFromGitHub {
owner = "folke";
repo = "trouble.nvim";
rev = "a2a7dbfefc5ebdf1a9c1d37e9df1d26a3b13c1cd";
sha256 = "16nh9qz9wb3mzwq2w4mmr586lc9wq9g30ia9168yk7a4jvpx2zhk";
rev = "7de8bc46164ec1f787dee34b6843b61251b1ea91";
sha256 = "1ybv7vdvyvyx09zwwx1vw91ids13g24as0ag0jnw6ck95f12r7mn";
};
meta.homepage = "https://github.com/folke/trouble.nvim/";
};
@ -5825,12 +5837,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-06-23";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "3556dc6de1fa8aba3656399d1db35fd418152f59";
sha256 = "1pg66s2pb0zxcgak57isxsw8zgj1y08vabrk3b140r4q2b7djw30";
rev = "492eca7ff8e162ec8a8e4535860de399d7e1cd57";
sha256 = "1xxgf3mk26pj3w2lzdr4aw8xvya02ar57v01v1yajlw0rzx23crw";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -6533,12 +6545,12 @@ final: prev:
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
version = "2021-06-20";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
rev = "0cbbec4097d4e51e1f29361479cbbd2663cd71c5";
sha256 = "1kvc4069niv2rk2caphwx7gfgj5mmydwkwv7dkihb8dfga8cqaz8";
rev = "cb6ea20165aeb437d1bf16ca45275748b836c1ce";
sha256 = "1kv309fyf56vp0lglm8b93m4jk5yb8w0bm9gjr9wql4p32nlxkc1";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@ -6713,12 +6725,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2021-06-12";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "57e01d258804fa8a0a2f2e62b33130ecd7d1b57f";
sha256 = "18hn9x2yfr3h1ji13rkp65lgpcljlp7agkhj3argyymzwid5bxzm";
rev = "e32b1a46ad5fc1fcb6765ef6150726c0af174c68";
sha256 = "04pbqwi4n0dyhhfwi3kp78dnyxdza2bg5pn7wbbkz7c6k3jhjysa";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@ -8588,12 +8600,12 @@ final: prev:
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
version = "2021-06-20";
version = "2021-06-24";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
rev = "1f94158c8be14945c0c575288f88f55d0c1a6d1c";
sha256 = "0rjjwnxa2x55qzz6w6csmv8iby7ywc7i816w8mn4r9ck97nsg115";
rev = "7bb2385aca2288845999c05d9eca83e2e8eaed90";
sha256 = "0r41cd27dzfq4pnafr4an1zlafwmi7sa44w4yxmxyn7wky4rhf61";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@ -9057,12 +9069,12 @@ final: prev:
vim-ultest = buildVimPluginFrom2Nix {
pname = "vim-ultest";
version = "2021-06-16";
version = "2021-06-24";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "vim-ultest";
rev = "4d6d02bf940401ee103df8110b412d9ff95be2d2";
sha256 = "12dz6r6fz3pvd62fxyl8smna88l7k8f60n9s1xnyf573xms5ka5w";
rev = "eaa0eeaaa2bcc8f4400a7d2e8ff56cf1141074e4";
sha256 = "148yy7f88jvavz8n0r2lfjn51bfdi2pbs192srf82kikmfg0lxk7";
};
meta.homepage = "https://github.com/rcarriga/vim-ultest/";
};
@ -9477,12 +9489,12 @@ final: prev:
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
version = "2021-06-09";
version = "2021-06-24";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
rev = "bab81953d76f4027e78a9f85ae2ea360597588ef";
sha256 = "0fbqayfg8pdivdg0fa4q42vb59vvwb1llq73kzh65zgwfs1k1zr1";
rev = "aa0cddc0da5b2547d20551dcffe1d9dc073b3904";
sha256 = "0niv2aa294ay0ifksg5ymrslbj9l6sxypyi3pnmgiigqj8m61yzs";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@ -9490,12 +9502,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2021-06-18";
version = "2021-06-25";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "6c0c94e985fd0c46dff92205ad3ac661bf82e3a6";
sha256 = "1xybwyyc6kbmi5nsl0mfnrp2bkgwnkpqgfkmk2lxkpl3wgmcs5mj";
rev = "78789f5c9e73d7b66f87104544d521333b09a33b";
sha256 = "1rrblrip8xa1wxp8kj0kjry63n4pbja4fnnjbvw07bnihr6igjx1";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@ -9586,12 +9598,12 @@ final: prev:
which-key-nvim = buildVimPluginFrom2Nix {
pname = "which-key-nvim";
version = "2021-06-23";
version = "2021-06-26";
src = fetchFromGitHub {
owner = "folke";
repo = "which-key.nvim";
rev = "1872dd8ca9daa0f6478a7771087aedae8518cb97";
sha256 = "0z21pf1s8df30l3msi448fm36lwlhzc5zz10nyxzy9gk04qgbq0b";
rev = "e0dce1552ea37964ae6ac7144709867544eae7f3";
sha256 = "16xwpds1d1dc5p2rz17yqiyr0a844kqj5gnxwnrk2l56fhrhq8xx";
};
meta.homepage = "https://github.com/folke/which-key.nvim/";
};
@ -9768,12 +9780,12 @@ final: prev:
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
version = "2021-06-22";
version = "2021-06-24";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig.vim";
rev = "41c26d6f1d32406b401342857d1e8ae3ec413884";
sha256 = "1mwm6i7krndx4r0n2prcc0b1187wglsfhbm9ibyy7hmi9l1cids6";
rev = "fb534e7d12be7e529f79ad5ab99c08dc99f53294";
sha256 = "17dpkkgazrzym2yqhb6r07y3hxl3hq9yzwkrb1zii94ss4d8lhw9";
};
meta.homepage = "https://github.com/ziglang/zig.vim/";
};

View file

@ -727,6 +727,7 @@ urbit/hoon.vim
Valloric/MatchTagAlways
Valodim/deoplete-notmuch
vhda/verilog_systemverilog.vim
vhyrro/neorg@main
vigoux/LanguageTool.nvim
vim-airline/vim-airline
vim-airline/vim-airline-themes

View file

@ -16,10 +16,34 @@ buildLinux (args // rec {
};
structuredExtraConfig = with lib.kernel; {
PREEMPT = lib.mkForce yes;
# Preemptive Full Tickless Kernel at 500Hz
PREEMPT_VOLUNTARY = lib.mkForce no;
PREEMPT = lib.mkForce yes;
NO_HZ_FULL = yes;
HZ_500 = yes;
# Google's Multigenerational LRU Framework
LRU_GEN = yes;
LRU_GEN_ENABLED = yes;
# Google's BBRv2 TCP congestion Control
TCP_CONG_BBR2 = yes;
DEFAULT_BBR2 = yes;
# FQ-PIE Packet Scheduling
NET_SCH_DEFAULT = yes;
DEFAULT_FQ_PIE = yes;
# Graysky's additional CPU optimizations
CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes;
# Android Ashmem and Binder IPC Driver as module for Anbox
ASHMEM = module;
ANDROID = yes;
ANDROID_BINDER_IPC = module;
ANDROID_BINDERFS = module;
ANDROID_BINDER_DEVICES = freeform "binder,hwbinder,vndbinder";
};
extraMeta = {

View file

@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ nicbk ];
broken = kernel.kernelOlder "4.19";
};
}

View file

@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl
, dbus, readline ? null, pcsclite ? null
, withDbus ? true, dbus
, withReadline ? true, readline
, withPcsclite ? true, pcsclite
, readOnlyModeSSIDs ? false
}:
@ -87,16 +88,16 @@ stdenv.mkDerivation rec {
CONFIG_TDLS=y
CONFIG_BGSCAN_SIMPLE=y
CONFIG_BGSCAN_LEARN=y
'' + optionalString (pcsclite != null) ''
'' + optionalString withPcsclite ''
CONFIG_EAP_SIM=y
CONFIG_EAP_AKA=y
CONFIG_EAP_AKA_PRIME=y
CONFIG_PCSC=y
'' + optionalString (dbus != null) ''
'' + optionalString withDbus ''
CONFIG_CTRL_IFACE_DBUS=y
CONFIG_CTRL_IFACE_DBUS_NEW=y
CONFIG_CTRL_IFACE_DBUS_INTRO=y
'' + (if readline != null then ''
'' + (if withReadline then ''
CONFIG_READLINE=y
'' else ''
CONFIG_WPA_CLI_EDIT=y
@ -113,10 +114,13 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace /usr/local $out
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \
-I$(echo "${lib.getDev libnl}"/include/libnl*/) \
-I${lib.getDev pcsclite}/include/PCSC/"
${optionalString withPcsclite "-I${lib.getDev pcsclite}/include/PCSC/"}"
'';
buildInputs = [ openssl libnl dbus readline pcsclite ];
buildInputs = [ openssl libnl ]
++ optional withDbus dbus
++ optional withReadline readline
++ optional withPcsclite pcsclite;
nativeBuildInputs = [ pkg-config ];

View file

@ -7,22 +7,20 @@
python3.pkgs.buildPythonApplication rec {
pname = "calibre-web";
version = "0.6.11";
version = "0.6.12";
src = fetchFromGitHub {
owner = "janeczku";
repo = "calibre-web";
rev = version;
sha256 = "10sjllhhcamswpa1wlim4mbm2zl4g804bwly5p4nmklg7n1v226g";
sha256 = "sha256-IgS281qDxG302UznC63nZH8/ty4fgFtn+lLYdakGA4w=";
};
prePatch = ''
substituteInPlace setup.cfg \
--replace "singledispatch>=3.4.0.0,<3.5.0.0" "" \
--replace "requests>=2.11.1,<2.25.0" "requests>=2.11.1,<2.26.0" \
--replace "unidecode>=0.04.19,<1.2.0" "unidecode>=0.04.19" \
--replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \
--replace "Babel>=1.3, <2.9" "Babel>=1.3, <=2.9"
--replace "PyPDF3>=1.0.0,<1.0.4" "PyPDF3>=1.0.0"
'';
patches = [
@ -54,7 +52,7 @@ python3.pkgs.buildPythonApplication rec {
flask_login
flask_principal
iso-639
pypdf2
pypdf3
requests
sqlalchemy
tornado

View file

@ -828,7 +828,7 @@
"syncthing" = ps: with ps; [ aiosyncthing ];
"syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru
"synology_chat" = ps: with ps; [ ];
"synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api
"synology_dsm" = ps: with ps; [ synologydsm-api ];
"synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm
"syslog" = ps: with ps; [ ];
"system_bridge" = ps: with ps; [ aiohttp-cors ifaddr systembridge zeroconf ];
@ -873,7 +873,7 @@
"tomato" = ps: with ps; [ ];
"toon" = ps: with ps; [ aiohttp-cors hass-nabucasa toonapi ];
"torque" = ps: with ps; [ aiohttp-cors ];
"totalconnect" = ps: with ps; [ ]; # missing inputs: total_connect_client
"totalconnect" = ps: with ps; [ total-connect-client ];
"touchline" = ps: with ps; [ ]; # missing inputs: pytouchline
"tplink" = ps: with ps; [ pyhs100 ];
"tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected
@ -905,7 +905,7 @@
"universal" = ps: with ps; [ ];
"upb" = ps: with ps; [ upb-lib ];
"upc_connect" = ps: with ps; [ connect-box ];
"upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api
"upcloud" = ps: with ps; [ upcloud-api ];
"updater" = ps: with ps; [ distro ];
"upnp" = ps: with ps; [ async-upnp-client ];
"uptime" = ps: with ps; [ ];

View file

@ -682,6 +682,7 @@ in with py.pkgs; buildPythonApplication rec {
"switch"
"switcher_kis"
"syncthing"
"synology_dsm"
"system_health"
"system_log"
"tado"
@ -701,6 +702,7 @@ in with py.pkgs; buildPythonApplication rec {
"tod"
"tomato"
"toon"
"totalconnect"
"tplink"
"trace"
"tradfri"
@ -717,6 +719,7 @@ in with py.pkgs; buildPythonApplication rec {
"unifi_direct"
"universal"
"upb"
"upcloud"
"updater"
"upnp"
"uptime"

View file

@ -116,13 +116,13 @@ let
in stdenv.mkDerivation rec {
pname = "mpd";
version = "0.22.8";
version = "0.22.9";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${version}";
sha256 = "sha256-nlUgFmiIrheN/FsSlQ/16iqwBXDw6xuwJG/foPZD07M=";
sha256 = "sha256-Qw7qJqxcBKxshT/qbVUegE1Tpt4QV5WbUHT2+qLbr9o=";
};
buildInputs = [

View file

@ -10,14 +10,14 @@ let
"Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-9m5vWobkibqOHsuIJmvEHuwsuJogvQQe8h0dvFj62tw=";
arm64-linux_hash = "sha256-OBm4j5Ez04XLjp4DHyOrwSOSGanuuI8g2y2wZaotH8M=";
x64-osx_hash = "sha256-UPf6Yl0nbhmiWq9oGyi7sRhlahB6zHL7nTj7GRlKoII=";
x64-linux_hash = "sha256-LRScuJVI3/657RYZjY9I3rcmANaEaw48CWIYc0VWHs4=";
arm64-linux_hash = "sha256-k0wi8FlVnU60Cnsng6CNNfoP+UItFLj15OxsqAfkO+4=";
x64-osx_hash = "sha256-czcPj+PC4cfJMqYYZyVy1ReO8pqYFUqeV8o/moHuCRw=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "ombi";
version = "4.0.1345";
version = "4.0.1430";
sourceRoot = ".";

View file

@ -27,7 +27,7 @@ updateVersion()
currentVersion=$(cd $dirname && nix eval --raw '(with import ../../.. {}; ombi.version)')
latestTag=$(curl https://api.github.com/repos/Ombi-App/Ombi/tags | jq -r '.[] | .name' | sort --version-sort | tail -1)
latestTag=$(curl https://api.github.com/repos/Ombi-App/Ombi/releases/latest | jq -r ".tag_name")
latestVersion="$(expr $latestTag : 'v\(.*\)')"
if [[ "$currentVersion" == "$latestVersion" ]]; then

View file

@ -0,0 +1,33 @@
{ stdenv, lib, go, ceph, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "ceph-csi";
version = "3.3.1";
nativeBuildInputs = [ go ];
buildInputs = [ ceph ];
src = fetchFromGitHub {
owner = "ceph";
repo = "ceph-csi";
rev = "v${version}";
sha256 = "16nh4bh8a9s2zbxnnhq1ldww4dzp2fmf5idgq99vkyw2kfp017lf";
};
preConfigure = ''
export GOCACHE=$(pwd)/.cache
'';
installPhase = ''
mkdir -p $out/bin
cp ./_output/* $out/bin
'';
meta = with lib; {
homepage = "https://ceph.com/";
description = "Container Storage Interface (CSI) driver for Ceph RBD and CephFS";
license = [ licenses.asl20 ];
maintainers = with maintainers; [ johanot ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}

View file

@ -46,14 +46,14 @@ let
};
in stdenv.mkDerivation rec {
pname = "mangohud";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "flightlessmango";
repo = "MangoHud";
rev = "v${version}";
sha256 = "wL+/wAqvVFph1QzuXPBbSEFjs33VA0S6euNWr/1J1Mk=";
fetchSubmodules = true;
sha256 = "S7FtO/VLZp6Al13i6IrEbIzsgP3kZ3VSNBLhwReZLqM=";
};
outputs = [ "out" "doc" "man" ];

View file

@ -1,14 +1,17 @@
{ lib, fetchFromGitHub, buildPythonApplication, ffmpeg, ffmpeg-python, musicbrainzngs, rich, simber, pydes, youtube-search, unidecode, pyxdg, downloader-cli, beautifulsoup4, itunespy, mutagen, pysocks, youtube-dl }:
{ lib, fetchFromGitHub, buildPythonApplication, ffmpeg, ffmpeg-python, musicbrainzngs, rich, simber
, pydes, youtube-search, unidecode, pyxdg, downloader-cli, beautifulsoup4, itunespy, mutagen, pysocks
, youtube-dl, ytmusicapi
}:
buildPythonApplication rec {
pname = "ytmdl";
version = "2021.05.26";
version = "2021.06.26";
src = fetchFromGitHub {
owner = "deepjyoti30";
repo = pname;
rev = version;
sha256 = "sha256-AYBhPmv1/cOaMh44kqm7JpJSudHbfriiJztcGL5mbEk=";
sha256 = "1jpd5zhqg2m9vjjjw4mgzb594q1v1pq1yl65py6kw42bq9w5yl5p";
};
postPatch = ''
@ -33,6 +36,7 @@ buildPythonApplication rec {
mutagen
pysocks
youtube-dl
ytmusicapi
];
# This application has no tests

View file

@ -0,0 +1,32 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "cocom";
version = "1.1.3";
src = fetchFromGitHub {
owner = "LamdaLamdaLamda";
repo = pname;
rev = "v${version}";
sha256 = "0sl4ivn95sr5pgw2z877gmhyfc4mk9xr457i5g2i4wqnf2jmy14j";
};
cargoSha256 = "04kj1yj6hhnis3ss0xs4zq8rl71rzn577g8i0wmapkjqzqwg37yb";
buildInputs = lib.optional stdenv.isDarwin Security;
# Tests require network access
doCheck = false;
meta = with lib; {
description = "NTP client";
homepage = "https://github.com/LamdaLamdaLamda/cocom";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -5,6 +5,7 @@
, meson
, ninja
, pkg-config
, libmnl
, libuecc
, libsodium
, libcap
@ -14,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "fastd";
version = "21";
version = "22";
src = fetchFromGitHub {
owner = "Neoraider";
repo = "fastd";
rev = "v${version}";
sha256 = "1p4k50dk8byrghbr0fwmgwps8df6rlkgcd603r14i71m5g27z5gw";
sha256 = "0qni32j7d3za9f87m68wq8zgalvfxdrx1zxi6l4x7vvmpcw5nhpq";
};
nativeBuildInputs = [
@ -36,6 +37,8 @@ stdenv.mkDerivation rec {
libsodium
libuecc
openssl
] ++ lib.optionals (stdenv.isLinux) [
libmnl
];
# some options are only available on x86

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub }:
let
version = "3.7.9";
version = "3.7.10";
in
fetchFromGitHub {
name = "stevenblack-blocklist-${version}";
@ -9,7 +9,7 @@ fetchFromGitHub {
owner = "StevenBlack";
repo = "hosts";
rev = version;
sha256 = "sha256-5PhJ48w/dNmSgc3XUaFUhVWyvH7jSUj8moBM3Yvmrz4=";
sha256 = "sha256-22k52aW7Uu41414tGOHViBM8zxAwoZYY5Mi/TJH9mtE=";
meta = with lib; {
description = "Unified hosts file with base extensions";

View file

@ -3,22 +3,22 @@
}:
let
version = "4.39.2";
version = "4.41.0";
src = fetchFromGitHub {
owner = "v2fly";
repo = "v2ray-core";
rev = "v${version}";
sha256 = "0rgwxsix2qy5w44s2ramalsn1bqznj2yra8bakcms8yl9yh0gbvd";
sha256 = "1300gl6y94i1488ja6kic0m5fa2qxakbdc06qd0lgkg6inzbm6gz";
};
vendorSha256 = "sha256-1LEKg9kyF4QBrzLP5TyKmFLPBprJRNqGxtkAI1mHx4Y=";
vendorSha256 = "sha256-oHKXDzufvTzOzBqFjBzu3vCwTF/FJMomopY3cUktwiM=";
assets = {
# MIT licensed
"geoip.dat" = let
geoipRev = "202105270041";
geoipSha256 = "0g67lggc41himpnbbghm4xlnbv4dl2fyidxplh3pl6ajqb4wxwd5";
geoipRev = "202106240309";
geoipSha256 = "0ypydpgvizf9pfdxna3f6fqn1svsrkac0p3j9s63y55gbqpglacq";
in fetchurl {
url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
sha256 = geoipSha256;
@ -26,8 +26,8 @@ let
# MIT licensed
"geosite.dat" = let
geositeRev = "20210527065138";
geositeSha256 = "1335zyc5zrwws46ldv0sqn51kpkfwfksbfw6hd53fakz0whxki0g";
geositeRev = "20210626145509";
geositeSha256 = "0skhwwlzlyh8rvzyblg1l2xw1bawqs12i6zw5sv3d55pnw7wmf2z";
in fetchurl {
url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
sha256 = geositeSha256;

View file

@ -0,0 +1,29 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "lethe";
version = "0.5.1";
src = fetchFromGitHub {
owner = "kostassoid";
repo = pname;
rev = "v${version}";
sha256 = "173ms4fd09iclm4v5zkmvc60l6iyyb5lzxc6dxd6q21zy0pvs35g";
};
cargoSha256 = "11l7wxadinidf0bsxv14j1kv8gdhq1d6ffnb76n54igxid8gza14";
buildInputs = lib.optional stdenv.isDarwin Security;
meta = with lib; {
description = "Tool to wipe drives in a secure way";
homepage = "https://github.com/kostassoid/lethe";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "bottom";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitHub {
owner = "ClementTsang";
repo = pname;
rev = version;
sha256 = "sha256-/O/VXBpVBgjzYuv1AghzmOBUu0MQXhuF65QswgNwa0k=";
sha256 = "sha256-QCi6Oi5xk88ev2B4rlXwgR55qKZSUbIY/96t/jhJQ0Q=";
};
prePatch = ''
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
libiconv
];
cargoSha256 = "sha256-5AZgOzRg7jEyv/4+IiQplrwt2yQO9yNi6BosdSzh5v8=";
cargoSha256 = "sha256-RJ7xIp9EBiBLSMAchr7XYhrTITNJy+Yfok//vZr3Z38=";
doCheck = false;

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fancy-motd";
version = "unstable-2021-06-26";
version = "unstable-2021-06-27";
src = fetchFromGitHub {
owner = "bcyran";
repo = pname;
rev = "dc3c8768affa6320050a141420b3ca80c687fce6";
sha256 = "1zs0i1cpn6dky2hqmdr2phycmjdk30ipvvdhrxg6z3bgizd502x0";
rev = "839320ab261612c9ba5b13fc8d1445d094ea0ab3";
sha256 = "00wv7nk2f3q186z2qfks5salf97s04vk7ilk8jnbimxg4fl7hcda";
};
buildInputs = [ bc curl figlet fortune gawk iproute2 ];

View file

@ -3566,6 +3566,8 @@ in
nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { };
ceph-csi = callPackage ../tools/filesystems/ceph-csi { };
libceph = ceph.lib;
inherit (callPackages ../tools/filesystems/ceph {
boost = boost17x.override { enablePython = true; python = python3; };
@ -3869,6 +3871,10 @@ in
cocoapods-beta = lowPrio (callPackage ../development/mobile/cocoapods { beta = true; });
cocom = callPackage ../tools/networking/cocom {
inherit (darwin.apple_sdk.frameworks) Security;
};
codebraid = callPackage ../tools/misc/codebraid { };
compass = callPackage ../development/tools/compass { };
@ -6578,6 +6584,10 @@ in
leela = callPackage ../tools/graphics/leela { };
lethe = callPackage ../tools/security/lethe {
inherit (darwin.apple_sdk.frameworks) Security;
};
lftp = callPackage ../tools/networking/lftp { };
libck = callPackage ../development/libraries/libck { };
@ -6619,6 +6629,8 @@ in
libinsane = callPackage ../development/libraries/libinsane { };
libint = callPackage ../development/libraries/libint {};
libipfix = callPackage ../development/libraries/libipfix { };
libircclient = callPackage ../development/libraries/libircclient { };
@ -13948,6 +13960,8 @@ in
pyrseas = callPackage ../development/tools/database/pyrseas { };
pycritty = with python3Packages; toPythonApplication pycritty;
qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { };
qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ;
@ -27297,7 +27311,6 @@ in
unipicker = callPackage ../applications/misc/unipicker { };
unison = callPackage ../applications/networking/sync/unison {
ocamlPackages = ocaml-ng.ocamlPackages_4_09;
enableX11 = config.unison.enableX11 or true;
};

View file

@ -321,6 +321,8 @@ in {
aiolyric = callPackage ../development/python-modules/aiolyric { };
aiomodernforms = callPackage ../development/python-modules/aiomodernforms { };
aiomultiprocess = callPackage ../development/python-modules/aiomultiprocess { };
aiomysql = callPackage ../development/python-modules/aiomysql { };
@ -2684,6 +2686,8 @@ in {
fordpass = callPackage ../development/python-modules/fordpass { };
forecast-solar = callPackage ../development/python-modules/forecast-solar { };
fortiosapi = callPackage ../development/python-modules/fortiosapi { };
FormEncode = callPackage ../development/python-modules/FormEncode { };
@ -5779,6 +5783,8 @@ in {
pycrc = callPackage ../development/python-modules/pycrc { };
pycritty = callPackage ../development/python-modules/pycritty { };
pycron = callPackage ../development/python-modules/pycron { };
pycrypto = callPackage ../development/python-modules/pycrypto { };
@ -6305,6 +6311,8 @@ in {
pypdf2 = callPackage ../development/python-modules/pypdf2 { };
pypdf3 = callPackage ../development/python-modules/pypdf3 { };
pypeg2 = callPackage ../development/python-modules/pypeg2 { };
pyperclip = callPackage ../development/python-modules/pyperclip { };
@ -8342,6 +8350,8 @@ in {
syncer = callPackage ../development/python-modules/syncer { };
synologydsm-api = callPackage ../development/python-modules/synologydsm-api { };
systembridge = callPackage ../development/python-modules/systembridge { };
systemd = callPackage ../development/python-modules/systemd {
@ -8617,6 +8627,8 @@ in {
# Used by streamlit, graphite_beacon, 2021-01-29
tornado_5 = callPackage ../development/python-modules/tornado/5.nix { };
total-connect-client = callPackage ../development/python-modules/total-connect-client { };
towncrier = callPackage ../development/python-modules/towncrier {
inherit (pkgs) git;
};
@ -8851,6 +8863,8 @@ in {
upb-lib = callPackage ../development/python-modules/upb-lib { };
upcloud-api = callPackage ../development/python-modules/upcloud-api { };
update_checker = callPackage ../development/python-modules/update_checker { };
update-copyright = callPackage ../development/python-modules/update-copyright { };