cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-10-03 06:01:22 +00:00 committed by GitHub
commit a484ea4131
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 2188 additions and 2017 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
maintainers/maintainer-list.nix
View file

@ -578,6 +578,16 @@
githubId = 2626481;
name = "Ambroz Bizjak";
};
ametrine = {
name = "Matilde Ametrine";
email = "matilde@diffyq.xyz";
github = "matilde-ametrine";
githubId = 90799677;
keys = [{
longkeyid = "rsa3072/0x07EE1FFCA58A11C5";
fingerprint = "7931 EB4E 4712 D7BE 04F8 6D34 07EE 1FFC A58A 11C5";
}];
};
amiddelk = {
email = "amiddelk@gmail.com";
github = "amiddelk";

250
nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json
View file

@ -1,250 +0,0 @@
{
"bluez5.features.device": [
{
"name": "Air 1 Plus",
"no-features": [
"hw-volume-mic"
]
},
{
"name": "AirPods",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"name": "AirPods Pro",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"name": "AXLOIE Goin",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"name": "BAA 100",
"no-features": [
"hw-volume"
]
},
{
"name": "D50s",
"address": "~^00:13:ef:",
"no-features": [
"hw-volume"
]
},
{
"name": "JBL Endurance RUN BT",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl",
"sbc-xq"
]
},
{
"name": "JBL LIVE650BTNC"
},
{
"name": "Motorola DC800",
"no-features": [
"sbc-xq"
]
},
{
"name": "Motorola S305",
"no-features": [
"sbc-xq"
]
},
{
"name": "Soundcore Life P2-L",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"name": "Urbanista Stockholm Plus",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"address": "~^94:16:25:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^9c:64:8b:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^a0:e9:db:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^0c:a6:94:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^00:14:02:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^44:5e:f3:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^d4:9c:28:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^00:18:6b:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^b8:ad:3e:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^a0:e9:db:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^00:24:1c:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^00:11:b1:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^a4:15:66:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^00:14:f1:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^00:26:7e:",
"no-features": [
"hw-volume"
]
},
{
"address": "~^90:03:b7:",
"no-features": [
"hw-volume"
]
}
],
"bluez5.features.adapter": [
{
"bus-type": "usb",
"vendor-id": "usb:0bda"
},
{
"bus-type": "usb",
"no-features": [
"msbc-alt1-rtl"
]
},
{
"no-features": [
"msbc-alt1-rtl"
]
}
],
"bluez5.features.kernel": [
{
"sysname": "Linux",
"release": "~^[0-4]\\.",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"sysname": "Linux",
"release": "~^5\\.[1-7]\\.",
"no-features": [
"msbc-alt1",
"msbc-alt1-rtl"
]
},
{
"sysname": "Linux",
"release": "~^5\\.(8|9)\\.",
"no-features": [
"msbc-alt1"
]
},
{
"sysname": "Linux",
"release": "~^5\\.10\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|51|52|53|54|55|56|57|58|59|60|61)($|[^0-9])",
"no-features": [
"msbc-alt1"
]
},
{
"sysname": "Linux",
"release": "~^5\\.12\\.(18|19)($|[^0-9])",
"no-features": [
"msbc-alt1"
]
},
{
"sysname": "Linux",
"release": "~^5\\.13\\.(3|4|5|6|7|8|9|10|11|12|13)($|[^0-9])",
"no-features": [
"msbc-alt1"
]
},
{
"sysname": "Linux",
"release": "~^5\\.14($|[^0-9])",
"no-features": [
"msbc-alt1"
]
},
{
"no-features": []
}
]
}

6
nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
View file

@ -15,7 +15,6 @@ let
defaults = {
alsa-monitor = (builtins.fromJSON (builtins.readFile ./alsa-monitor.conf.json));
bluez-monitor = (builtins.fromJSON (builtins.readFile ./bluez-monitor.conf.json));
bluez-hardware = (builtins.fromJSON (builtins.readFile ./bluez-hardware.conf.json));
media-session = (builtins.fromJSON (builtins.readFile ./media-session.conf.json));
v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json));
};
@ -23,7 +22,6 @@ let
configs = {
alsa-monitor = recursiveUpdate defaults.alsa-monitor cfg.config.alsa-monitor;
bluez-monitor = recursiveUpdate defaults.bluez-monitor cfg.config.bluez-monitor;
bluez-hardware = defaults.bluez-hardware;
media-session = recursiveUpdate defaults.media-session cfg.config.media-session;
v4l2-monitor = recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor;
};
@ -122,10 +120,6 @@ in {
mkIf config.services.pipewire.pulse.enable {
source = json.generate "bluez-monitor.conf" configs.bluez-monitor;
};
environment.etc."pipewire/media-session.d/bluez-hardware.conf" =
mkIf config.services.pipewire.pulse.enable {
source = json.generate "bluez-hardware.conf" configs.bluez-hardware;
};
environment.etc."pipewire/media-session.d/with-jack" =
mkIf config.services.pipewire.jack.enable {

2
nixos/modules/services/misc/cfdyndns.nix
View file

@ -48,7 +48,7 @@ in
description = "CloudFlare Dynamic DNS Client";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
startAt = "5 minutes";
startAt = "*:0/5";
serviceConfig = {
Type = "simple";
User = config.ids.uids.cfdyndns;

5
pkgs/applications/graphics/hydrus/default.nix
View file

@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "454";
version = "456";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "v${version}";
sha256 = "sha256-AX72fOiwp/CLaaGxBBKlcRskwayHCeUC2/FGUoXp3lU=";
sha256 = "sha256-r5EeHWqhJQMvImxB7IVV8MAoW8qIVYpuSN1uOYCTlHY=";
};
nativeBuildInputs = [
@ -71,6 +71,7 @@ python3Packages.buildPythonPackage rec {
-e TestClientThreading \
-e TestDialogs \
-e TestFunctions \
-e TestHydrusNetwork \
-e TestHydrusNATPunch \
-e TestHydrusSerialisable \
-e TestHydrusServer \

4
pkgs/applications/misc/1password-gui/default.nix
View file

@ -33,11 +33,11 @@
}:
stdenv.mkDerivation rec {
pname = "1password";
version = "8.1.1";
version = "8.2.0";
src = fetchurl {
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
sha256 = "0y39sfhj9xrgprh01i9apzfkqzm6pdhjc8x59x5p5djjjvxbcwmy";
sha256 = "1hnpvvval8a9ny5x5zffn5lf5qrwc4hcs3jvhqmd7m4adh2i6y2i";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/applications/networking/browsers/castor/default.nix
View file

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "castor";
version = "0.8.16";
version = "0.8.18";
src = fetchFromSourcehut {
owner = "~julienxx";
repo = pname;
rev = version;
sha256 = "0rwg1w7srjwa23mkypl8zk6674nhph4xsc6nc01f6g5k959szylr";
sha256 = "sha256-sv6hiSTVFe3jxNuaM6Jyn7UeqFqUNmRvYtWfkJTJ4tA=";
};
cargoSha256 = "0dm3walwi3vzpk69l7nz6yl6w49676x8pjnigpn67q4bn7lpaqb1";
cargoSha256 = "sha256-/IHxvTW9VYZmgjmDh0zJFDQqfw/H5CXVwEuLKq6Hnys=";
nativeBuildInputs = [
pkg-config

8
pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
View file

@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
name = "chromium-codecs-ffmpeg";
version = "78.0.3904.70";
pname = "chromium-codecs-ffmpeg-extra";
version = "94.0.4606.50";
src = fetchurl {
url = "https://launchpadlibrarian.net/449403909/${name}-extra_${version}-0ubuntu0.16.04.2_amd64.deb";
sha256 = "00j604nm49z6hbyw7xsxcvmdjf7117kb478plkpizzvmm3w72b9v";
url = "https://launchpadlibrarian.net/558847674/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
sha256 = "sha256-H7Tzd8tkaoLClXtNiwEO5nD4+PPt7Jgs+gtLiag/KN4=";
};
buildInputs = [ dpkg ];

6
pkgs/applications/networking/mailreaders/notmuch/default.nix
View file

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, lib, stdenv
{ fetchurl, lib, stdenv
, pkg-config, gnupg
, xapian, gmime, talloc, zlib
, doxygen, perl, texinfo
@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "notmuch";
version = "0.33";
version = "0.33.2";
src = fetchurl {
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
hash = "sha256-iD4EW0v6LEjJpGcQYqQGA6f2Flck3VRhi+66EAVJ0mw=";
hash = "sha256:1bic1f2va136aygfy53bsgziwiidcpb7qf1v05mlza2jmgv94j14";
};
nativeBuildInputs = [

11
pkgs/applications/radio/direwolf/default.nix
View file

@ -22,22 +22,23 @@ stdenv.mkDerivation rec {
espeak gpsd hamlib perl python3
] ++ (optionals stdenv.isLinux [alsa-lib udev]);
patches = [
./udev-fix.patch
];
postPatch = ''
substituteInPlace conf/CMakeLists.txt \
--replace /etc/udev/rules.d/ $out/lib/udev/rules.d/
substituteInPlace src/symbols.c \
--replace /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \
--replace /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt
substituteInPlace src/decode_aprs.c \
--replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \
--replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt
patchShebangs scripts/dwespeak.sh
substituteInPlace scripts/dwespeak.sh \
--replace espeak ${espeak}/bin/espeak
substituteInPlace cmake/cpack/direwolf.desktop.in \
--replace 'Terminal=false' 'Terminal=true' \
--replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf' \
--replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf'
substituteInPlace src/dwgpsd.c \
--replace 'GPSD_API_MAJOR_VERSION > 11' 'GPSD_API_MAJOR_VERSION > 12'
'';
meta = {

11
pkgs/applications/radio/direwolf/udev-fix.patch
View file

@ -1,11 +0,0 @@
--- direwolf/conf/CMakeLists.txt.orig 2020-12-04 11:12:59.739390894 -0600
+++ direwolf/conf/CMakeLists.txt 2020-12-04 11:23:09.146594795 -0600
@@ -26,7 +26,7 @@
# install udev rules for CM108
if(LINUX)
- install(FILES "${CUSTOM_CONF_DIR}/99-direwolf-cmedia.rules" DESTINATION /etc/udev/rules.d/)
+ install(FILES "${CUSTOM_CONF_DIR}/99-direwolf-cmedia.rules" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d/")
endif()
install(FILES "${CMAKE_BINARY_DIR}/direwolf.conf" DESTINATION ${INSTALL_CONF_DIR})

50
pkgs/development/compilers/graalvm/community-edition/repository.nix
View file

@ -130,37 +130,53 @@ let
unpack_jar ''${arr[4]}
'';
installPhase = {
"8-linux-amd64" = ''
outputs = [ "out" "lib" ];
installPhase = let
nativePRNGWorkaround = path: ''
# BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
substituteInPlace $out/jre/lib/security/java.security \
substituteInPlace ${path} \
--replace file:/dev/random file:/dev/./urandom \
--replace NativePRNGBlocking SHA1PRNG
'';
copyClibrariesToOut = basepath: ''
# provide libraries needed for static compilation
for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do
ln -s $f $out/jre/lib/svm/clibraries/${platform}/$(basename $f)
ln -s $f ${basepath}/${platform}/$(basename $f)
done
'';
copyClibrariesToLib = ''
# add those libraries to $lib output too, so we can use them with
# `native-image -H:CLibraryPath=''${graalvm11-ce.lib}/lib ...` and reduce
# closure size by not depending on GraalVM $out (that is much bigger)
mkdir -p $lib/lib
for f in ${glibc}/lib/*; do
ln -s $f $lib/lib/$(basename $f)
done
'';
in {
"8-linux-amd64" = ''
${nativePRNGWorkaround "$out/jre/lib/security/java.security"}
${copyClibrariesToOut "$out/jre/lib/svm/clibraries"}
${copyClibrariesToLib}
# allow using external truffle-api.jar and languages not included in the distrubution
rm $out/jre/lib/jvmci/parentClassLoader.classpath
'';
"11-linux-amd64" = ''
# BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
substituteInPlace $out/conf/security/java.security \
--replace file:/dev/random file:/dev/./urandom \
--replace NativePRNGBlocking SHA1PRNG
${nativePRNGWorkaround "$out/conf/security/java.security"}
# provide libraries needed for static compilation
for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do
ln -s $f $out/lib/svm/clibraries/${platform}/$(basename $f)
done
${copyClibrariesToOut "$out/lib/svm/clibraries"}
${copyClibrariesToLib}
'';
"11-darwin-amd64" = ''
# BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
substituteInPlace $out/conf/security/java.security \
--replace file:/dev/random file:/dev/./urandom \
--replace NativePRNGBlocking SHA1PRNG
# create empty $lib/lib to avoid breaking builds
mkdir -p $lib/lib
${nativePRNGWorkaround "$out/conf/security/java.security"}
'';
}.${javaVersionPlatform} + ''
# jni.h expects jni_md.h to be in the header search path.

2
pkgs/development/compilers/rust/1_45.nix
View file

@ -10,7 +10,7 @@
{ stdenv, lib
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
, CoreFoundation, Security, SystemConfiguration
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
, makeRustPlatform
, llvmPackages_5, llvm_10

2
pkgs/development/compilers/rust/1_55.nix
View file

@ -12,7 +12,7 @@
{ stdenv, lib
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
, CoreFoundation, Security, SystemConfiguration
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
, makeRustPlatform
, llvmPackages_11

4
pkgs/development/compilers/rust/default.nix
View file

@ -14,7 +14,7 @@
{ stdenv, lib
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
, CoreFoundation, Security, SystemConfiguration
, pkgsBuildTarget, pkgsBuildBuild
, makeRustPlatform
}: rec {
@ -104,7 +104,7 @@
inherit CoreFoundation Security;
};
clippy = self.callPackage ./clippy.nix { inherit Security; };
rls = self.callPackage ./rls { inherit CoreFoundation Security; };
rls = self.callPackage ./rls { inherit CoreFoundation Security SystemConfiguration; };
});
};
}

4
pkgs/development/compilers/rust/rls/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, makeWrapper, fetchFromGitHub, rustPlatform
, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv
, CoreFoundation, Security }:
, CoreFoundation, Security, SystemConfiguration }:
rustPlatform.buildRustPackage rec {
pname = "rls";
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config cmake makeWrapper ];
buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ]
++ (lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
++ lib.optionals stdenv.isDarwin [ CoreFoundation Security SystemConfiguration ];
doCheck = true;

1
pkgs/development/interpreters/clojure/babashka.nix
View file

@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
# https://github.com/babashka/babashka/blob/v0.6.1/script/compile#L41-L52
args=("-jar" "$BABASHKA_JAR"
"-H:CLibraryPath=${graalvm11-ce.lib}/lib"
# Required to build babashka on darwin. Do not remove.
"${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}"
"-H:Name=$BABASHKA_BINARY"

8
pkgs/development/libraries/libcamera/default.nix
View file

@ -19,12 +19,12 @@
stdenv.mkDerivation {
pname = "libcamera";
version = "unstable-2021-06-02";
version = "unstable-2021-09-24";
src = fetchgit {
url = "git://linuxtv.org/libcamera.git";
rev = "143b252462b9b795a1286a30349348642fcb87f5";
sha256 = "0mlwgd3rxagzhmc94lnn6snriyqvfdpz8r8f58blcf16859galyl";
url = "https://git.libcamera.org/libcamera/libcamera.git";
rev = "40f5fddca7f774944a53f58eeaebc4db79c373d8";
sha256 = "0jklgdv5ma4nszxibms5lkf5d2ips7ncynwa1flglrhl5bl4wkzz";
};
postPatch = ''

13
pkgs/development/libraries/libdecor/default.nix
View file

@ -6,6 +6,7 @@
, ninja
, wayland
, wayland-protocols
, wayland-scanner
, cairo
, dbus
, pango
@ -21,10 +22,18 @@ stdenv.mkDerivation rec {
owner = "jadahl";
repo = "libdecor";
rev = "${version}";
hash = "sha256:0qdg3r7k086wzszr969s0ljlqdvfqm31zpl8p5h397bw076zr6p2";
sha256 = "0qdg3r7k086wzszr969s0ljlqdvfqm31zpl8p5h397bw076zr6p2";
};
nativeBuildInputs = [ meson ninja pkg-config ];
strictDeps = true;
nativeBuildInputs = [
meson
ninja
pkg-config
wayland-scanner
];
buildInputs = [
wayland
wayland-protocols

6
pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch
View file

@ -1,5 +1,5 @@
diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
index 95632c250..a88aac6e2 100644
index 648e13069..50f767f0c 100644
--- a/src/daemon/pipewire.conf.in
+++ b/src/daemon/pipewire.conf.in
@@ -131,7 +131,7 @@ context.modules = [
@ -15,8 +15,8 @@ index 95632c250..a88aac6e2 100644
# but it is better to start it as a systemd service.
# Run the session manager with -h for options.
#
- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
+ @sm_comment@{ path = "<session_manager_path>" args = "@session_manager_args@" }
- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
+ @sm_comment@{ path = "<session_manager_path>" args = "@session_manager_args@" }
#
# You can optionally start the pulseaudio-server here as well
# but it is better to start it as a systemd service.

12
pkgs/development/libraries/pipewire/0095-spa-data-dir.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/meson.build b/meson.build
index 56599ebd1..3bed2d3e3 100644
--- a/meson.build
+++ b/meson.build
@@ -54,7 +54,7 @@ else
endif
spa_plugindir = pipewire_libdir / spa_name
-spa_datadir = pipewire_datadir / spa_name
+spa_datadir = pipewire_libdir / spa_name
alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer'

15
pkgs/development/libraries/pipewire/default.nix
View file

@ -24,10 +24,14 @@
, vulkan-loader
, webrtc-audio-processing
, ncurses
, readline81 # meson can't find <7 as those versions don't have a .pc file
, makeFontsConf
, callPackage
, nixosTests
, withMediaSession ? true
, libcameraSupport ? true
, libcamera
, libdrm
, gstreamerSupport ? true
, gst_all_1 ? null
, ffmpegSupport ? true
@ -58,7 +62,7 @@ let
self = stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.36";
version = "0.3.38";
outputs = [
"out"
@ -77,7 +81,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "sha256-kwoffB0Hi84T4Q0NaxLxsCyPV4R0LayX9kHmXU/vRPA=";
sha256 = "sha256-QENz4MVyKuPJynA+NBdmKa6g1GrcRg9vzXLJ1/i3VJU=";
};
patches = [
@ -93,6 +97,8 @@ let
./0080-pipewire-config-dir.patch
# Remove output paths from the comments in the config templates to break dependency cycles
./0090-pipewire-config-template-paths.patch
# Place SPA data files in lib output to avoid dependency cycles
./0095-spa-data-dir.patch
];
nativeBuildInputs = [
@ -113,6 +119,7 @@ let
libusb1
libsndfile
ncurses
readline81
udev
vulkan-headers
vulkan-loader
@ -121,6 +128,7 @@ let
SDL2
systemd
] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ]
++ lib.optionals libcameraSupport [ libcamera libdrm ]
++ lib.optional ffmpegSupport ffmpeg
++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac ]
++ lib.optional pulseTunnelSupport libpulseaudio
@ -128,14 +136,13 @@ let
mesonFlags = [
"-Ddocs=enabled"
"-Dexamples=${mesonEnable withMediaSession}" # only needed for `pipewire-media-session`
"-Dudevrulesdir=lib/udev/rules.d"
"-Dinstalled_tests=enabled"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
"-Dpipewire_pulse_prefix=${placeholder "pulse"}"
"-Dmedia-session-prefix=${placeholder "mediaSession"}"
"-Dlibjack-path=${placeholder "jack"}/lib"
"-Dlibcamera=disabled"
"-Dlibcamera=${mesonEnable libcameraSupport}"
"-Droc=disabled"
"-Dlibpulse=${mesonEnable pulseTunnelSupport}"
"-Davahi=${mesonEnable zeroconfSupport}"

1
pkgs/development/node-packages/node-packages.json
View file

@ -174,6 +174,7 @@
, "madoko"
, "markdownlint-cli"
, "markdown-link-check"
, {"markdown-preview-nvim": "../../misc/vim-plugins/markdown-preview-nvim"}
, "mastodon-bot"
, "mathjax"
, "meat"

3154
pkgs/development/node-packages/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

42
pkgs/development/python-modules/amberelectric/default.nix Normal file
View file

@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest-mock
, pytestCheckHook
, python-dateutil
, pythonOlder
, setuptools-scm
, urllib3
}:
buildPythonPackage rec {
pname = "amberelectric";
version = "1.0.3";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "1hsbk2v7j1nsa083j28jb7b3rv76flan0g9wav97qccp1gjds5b0";
};
propagatedBuildInputs = [
urllib3
python-dateutil
];
checkInputs = [
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [ "amberelectric" ];
meta = with lib; {
description = "Python Amber Electric API interface";
homepage = "https://github.com/madpilot/amberelectric.py";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/development/python-modules/django_taggit/default.nix
View file

@ -4,6 +4,7 @@
, fetchPypi
, pythonOlder
, django
, djangorestframework
, mock
, isort
, isPy3k
@ -19,12 +20,15 @@ buildPythonPackage rec {
sha256 = "e5bb62891f458d55332e36a32e19c08d20142c43f74bc5656c803f8af25c084a";
};
propagatedBuildInputs = [ isort django ];
propagatedBuildInputs = [ isort django djangorestframework ];
checkInputs = [ mock ];
checkPhase = ''
# prove we're running tests against installed package, not build dir
rm -r taggit
# Replace directory of locale
substituteInPlace ./tests/test_utils.py \
--replace 'os.path.dirname(__file__), ".."' "\"$out/lib/python${lib.versions.majorMinor python.version}/site-packages/\""
${python.interpreter} -m django test --settings=tests.settings
'';

45
pkgs/development/python-modules/frigidaire/default.nix Normal file
View file

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, certifi
, chardet
, fetchFromGitHub
, idna
, pythonOlder
, requests
, urllib3
}:
buildPythonPackage rec {
pname = "frigidaire";
version = "0.16";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "bm1549";
repo = pname;
rev = version;
sha256 = "1yzwzvlxz28rhnwhwsn37v7l7fxikzr4j7m293db9452w340p0zl";
};
propagatedBuildInputs = [
certifi
chardet
idna
requests
urllib3
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "frigidaire" ];
meta = with lib; {
description = "Python API for the Frigidaire devices";
homepage = "https://github.com/bm1549/frigidaire";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/identify/default.nix
View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "identify";
version = "2.2.15";
version = "2.3.0";
src = fetchFromGitHub {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mr778CszspTuKSPwXBDaehCMqbfkNFgAVzpkn7seVoU=";
sha256 = "sha256-V+pRxdbWPaIVqIJYcrmeZKPmmC1ouRgdFsaVVrDUsQc=";
};
checkInputs = [

38
pkgs/development/python-modules/marisa-trie/default.nix
View file

@ -2,9 +2,9 @@
, buildPythonPackage
, fetchPypi
, cython
, pytest-runner
, pytestCheckHook
, hypothesis
, readme_renderer
}:
buildPythonPackage rec {
@ -16,35 +16,49 @@ buildPythonPackage rec {
sha256 = "bbeafb7d92839dc221365340e79d012cb50ee48a1f3f30dd916eb35a8b93db00";
};
nativeBuildInputs = [
cython
];
checkInputs = [
pytestCheckHook
readme_renderer
hypothesis
];
postPatch = ''
substituteInPlace setup.py \
--replace "hypothesis==" "hypothesis>="
'';
nativeBuildInputs = [
cython
pytest-runner
];
preBuild = ''
./update_cpp.sh
'';
checkInputs = [
pytestCheckHook
hypothesis
disabledTestPaths = [
# Don't test packaging
"tests/test_packaging.py"
];
disabledTests = [
# Pins hypothesis==2.0.0 from 2016/01 which complains about
# hypothesis.errors.FailedHealthCheck: tests/test_trie.py::[...] uses the 'tmpdir' fixture, which is reset between function calls but not between test cases generated by `@given(...)`.
# hypothesis.errors.FailedHealthCheck: tests/test_trie.py::[...] uses
# the 'tmpdir' fixture, which is reset between function calls but not
# between test cases generated by `@given(...)`.
"test_saveload"
"test_mmap"
];
pythonImportsCheck = [
"marisa_trie"
];
meta = with lib; {
description = "Static memory-efficient Trie-like structures for Python (2.x and 3.x) based on marisa-trie C++ library";
longDescription = "There are official SWIG-based Python bindings included in C++ library distribution; this package provides alternative Cython-based pip-installable Python bindings.";
description = "Static memory-efficient Trie-like structures for Python based on marisa-trie C++ library";
longDescription = ''
There are official SWIG-based Python bindings included in C++ library distribution.
This package provides alternative Cython-based pip-installable Python bindings.
'';
homepage = "https://github.com/kmike/marisa-trie";
license = licenses.mit;
maintainers = with maintainers; [ ixxie ];

46
pkgs/development/python-modules/obspy/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, fetchPypi
, decorator
, future
, lxml
, matplotlib
, numpy
, requests
, scipy
, sqlalchemy
}:
buildPythonPackage rec {
pname = "obspy";
version = "1.2.2";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "a0f2b0915beeb597762563fa0358aa1b4d6b09ffda49909c760b5cdf5bdc419e";
};
propagatedBuildInputs = [
decorator
future
lxml
matplotlib
numpy
requests
scipy
sqlalchemy
];
# Tests require Internet access.
doCheck = false;
pythonImportsCheck = [ "obspy" ];
meta = with lib; {
description = "Python framework for seismological observatories";
homepage = "https://www.obspy.org";
license = licenses.lgpl3;
maintainers = [ maintainers.ametrine ];
};
}

24
pkgs/development/python-modules/pyserial-asyncio/default.nix
View file

@ -1,21 +1,31 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
, pyserial }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, pyserial
}:
buildPythonPackage rec {
pname = "pyserial-asyncio";
version = "0.5";
version = "0.6";
disabled = !isPy3k; # Doesn't support python older than 3.4
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "1641e5433a866eeaf6464b3ab88b741e7a89dd8cd0f851b3343b15f425138d33";
sha256 = "sha256-tgMpI+BenXXsF6WvmphCnEbSg5rfr4BgTVLg+qzXoy8=";
};
propagatedBuildInputs = [ pyserial ];
propagatedBuildInputs = [
pyserial
];
pythonImportsCheck = [
"serial_asyncio"
];
meta = with lib; {
description = "asyncio extension package for pyserial";
description = "Asyncio extension package for pyserial";
homepage = "https://github.com/pyserial/pyserial-asyncio";
license = licenses.bsd3;
maintainers = with maintainers; [ etu ];

4
pkgs/development/python-modules/pyturbojpeg/default.nix
View file

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "pyturbojpeg";
version = "1.5.4";
version = "1.6.1";
src = fetchPypi {
pname = "PyTurboJPEG";
inherit version;
sha256 = "sha256-KU24J6iU2y8iLyxjJiuh6Zqx+t1PVBrleOf/mWnfA4I=";
sha256 = "sha256-RiWkDoBETMYigAdbxdj5xb5ht9mQ5qzifE1omqTVZlo=";
};
patches = [

43
pkgs/development/python-modules/tuya-iot-py-sdk/default.nix Normal file
View file

@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, paho-mqtt
, pycryptodome
, pythonOlder
, requests
, websocket-client
}:
buildPythonPackage rec {
pname = "tuya-iot-py-sdk";
version = "0.5.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "tuya";
repo = "tuya-iot-python-sdk";
rev = "v${version}";
sha256 = "1qfjq4h62phsrmrfb11xwd6gjc28vhs90g3mmx7d8ikgsgnqlvza";
};
propagatedBuildInputs = [
paho-mqtt
pycryptodome
requests
websocket-client
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "tuya_iot" ];
meta = with lib; {
description = "Tuya IoT Python SDK for Tuya Open API";
homepage = "https://github.com/tuya/tuya-iot-python-sdk";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

38
pkgs/development/tools/clj-kondo/default.nix
View file

@ -4,12 +4,6 @@ stdenv.mkDerivation rec {
pname = "clj-kondo";
version = "2021.09.25";
reflectionJson = fetchurl {
name = "reflection.json";
url = "https://raw.githubusercontent.com/clj-kondo/${pname}/v${version}/reflection.json";
sha256 = "sha256-C4QYk5lLienCHKnWXXZPcKmsCTMtIIkXOkvCrZfyIhA=";
};
src = fetchurl {
url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-kS6bwsYH/cbjJlIeiDAy6QsAw+D1uHp26d4NBLfStjg=";
@ -20,21 +14,21 @@ stdenv.mkDerivation rec {
buildInputs = [ graalvm11-ce ];
buildPhase = ''
native-image \
-jar ${src} \
-H:Name=clj-kondo \
${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \
-H:+ReportExceptionStackTraces \
-J-Dclojure.spec.skip-macros=true \
-J-Dclojure.compiler.direct-linking=true \
"-H:IncludeResources=clj_kondo/impl/cache/built_in/.*" \
-H:ReflectionConfigurationFiles=${reflectionJson} \
--initialize-at-build-time \
-H:Log=registerResource: \
--verbose \
--no-fallback \
--no-server \
"-J-Xmx3g"
runHook preBuild
# https://github.com/clj-kondo/clj-kondo/blob/v2021.09.25/script/compile#L17-L21
args=("-jar" "$src"
"-H:CLibraryPath=${graalvm11-ce.lib}/lib"
# Required to build babashka on darwin. Do not remove.
"${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}"
"-H:+ReportExceptionStackTraces"
"--verbose"
"--no-fallback"
"-J-Xmx3g")
native-image ''${args[@]}
runHook postBuild
'';
installPhase = ''
@ -47,6 +41,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/clj-kondo/clj-kondo";
license = licenses.epl10;
platforms = graalvm11-ce.meta.platforms;
maintainers = with maintainers; [ jlesquembre bandresen ];
maintainers = with maintainers; [ jlesquembre bandresen thiagokokada ];
};
}

48
pkgs/development/tools/electron/default.nix
View file

@ -105,33 +105,33 @@ rec {
headers = "1zkdgpjrh1dc9j8qyrrrh49v24960yhvwi2c530qbpf2azgqj71b";
};
electron_12 = mkElectron "12.1.2" {
x86_64-linux = "e0ed1e223e956213f4f835573dd9c84aac3588c1d12ca67f81399534611a873d";
x86_64-darwin = "6a0efef7cee47d5f7cff7edfe2f3eaa134368f9ac8741742dfcb49f59da51e59";
i686-linux = "90c60083261bf86410f30d2588204276943cc7cbfe7751192723fdde6a67da72";
armv7l-linux = "cdff93b3ee2ab175c45d1afa33c7dde38030abe54fe285804a0eb3f983f67bdd";
aarch64-linux = "fe1351253cc8e9f6828de90957b40fab1cad31d38e88ef085c98a1b72d9cd14b";
aarch64-darwin = "4b2a2b9986938f332894946b22fc6cac357f69aaa72afe61b6ca6084d48dce67";
headers = "019rf1r9mk0hzhbl5fq48zr0l4y943biv2xwnpdhr5bm1wqpvz6l";
electron_12 = mkElectron "12.2.1" {
armv7l-linux = "7cad4f432655e3ac8b4b2f792648015f820f52abe4f2f489302de6d5a170d62a";
aarch64-linux = "53f4397bf88f026f1a73919b6d1c74eb15b908283f93935801b76647530acd08";
x86_64-linux = "a3e736c286f326eced0080f29a56b546c308716f4ce0d4f144adc37b530990ef";
i686-linux = "be333c8fffb8adbf96b19b33f87e1cbe6ff8a36ecd0a5c48fa8352fed8850510";
x86_64-darwin = "9a8e4fe8069e164fb2a87736bc9f9a1546a5c4060c499a92a7f9a95bd3c5c19d";
aarch64-darwin = "e9844eeb0e2a26ba60a8eb1540f0d1c52069806c885842a33b45b4fd2b2bb187";
headers = "1m1hcdb96rcxcdg812cn2m68bh1s1h6qyy39lmvkjvhbpyzd02pr";
};
electron_13 = mkElectron "13.4.0" {
x86_64-linux = "383549a918c6e3990345adc3ba8bb6551ab73c7c945a3137d44cb6e109c4b849";
x86_64-darwin = "902bf07fb7e84f824cce7addb31743eda375d9d4a3f41ac1cf74c152fb43250b";
i686-linux = "f7c8570a1fcbeab9211f182b957c16e17914df529c474643e4ae24e397055542";
armv7l-linux = "e783ec550da7e948e51be58dc395e14805b29053be084a1423edfcdccd639dbd";
aarch64-linux = "3daac7966d6bb609d09780a13eeb9cf2cabdda79d25c4ba30b6fb6b95371c8b5";
aarch64-darwin = "54c7cdaf0efaf9e9b19a5619a6403c656cd8c0f5d4108b6f6577f6968f263618";
headers = "0wm92fppm9xqik9mbabpsh04da062q1sfhcdjczihxsfaxs3klaq";
electron_13 = mkElectron "13.5.1" {
armv7l-linux = "9cb773eaa9882c313513cb1bb552f8bcac859f35854de477dc2ec6cc24e7d003";
aarch64-linux = "ae605f169482b1c40e9449073c0f962cceeac4166a00cb304ba22f4f5a7a5d48";
x86_64-linux = "4d145dbca59541d665435198c9fb697b1ec85c6e525878b7f48ecb8431dc4836";
i686-linux = "95acabcf7d0a5a3bbfa0634c1956d8aea59565fb695d22ec65edd77c2a09e3a8";
x86_64-darwin = "ac342741a17034ccc305b83fde18d014f8c6080f8f7143e953545a945542168d";
aarch64-darwin = "79ad1c22afb2e5338467621fc16a092d16be329c3b60bb753caa311e9933a4b4";
headers = "0pjj0ra5ksn6cdqiy84ydy45hivksknzbq3szs9r9dlajcczgw9l";
};
electron_14 = mkElectron "14.0.1" {
x86_64-linux = "8a364aaff446f7ac034bcad7130330ce5a9384eb0f8736aca30ea1a4ffc7cb2f";
x86_64-darwin = "66f14e804b0a40e50562fcb4ed44a0dca4fd27be5420b787045276fcb9a4b9fd";
i686-linux = "7ee08215f4e6b144ee8a17796f0967c12ee6755c29617f398047e0d5e1dd52bb";
armv7l-linux = "8dd205bb9fad6ae46344b524dda6e76991f67a78b67d6f6361431b2e5cb8e942";
aarch64-linux = "02f8c4e0af9370082404f13ace86faa6e927ee9d5899722bb2fac50a030cb213";
aarch64-darwin = "a8816214dd31c5a44a51fd43c6709e7a7fe69750e5e42b75bfa747402ea3f75f";
headers = "08b6sx1bq1mshvdj1qzv8vxalmf8qb57qhs9krz0l4c7wf722idm";
electron_14 = mkElectron "14.1.0" {
armv7l-linux = "25a68645cdd1356d95a8bab9488f5aeeb9a206f9b5ee2df23c2e13f87d775847";
aarch64-linux = "94047dcf53c54f6a5520a6eb62e400174addf04fc0e3ebe04b548ca962de349a";
x86_64-linux = "27b60841c85369a0ea8b65a8b71cdd1fb08eba80d70e855e9311f46c595874f3";
i686-linux = "808795405d6b27221b219c2a0f7a058e3acb2e56195c87dc08828dc882ffb8e9";
x86_64-darwin = "36d8e900bdcf5b410655e7fcb47800fa1f5a473c46acc1c4ce326822e5e95ee1";
aarch64-darwin = "5c81f418f3f83dc6fc5893247dd386e1d23e609c83f798dd5aad451febed13c8";
headers = "0p8lkhy97yq43sl6s4rskhdnzl520968cyh5l4fdhl2fhm5mayd4";
};
}

11
pkgs/development/tools/misc/clojure-lsp/default.nix
View file

@ -25,7 +25,16 @@ stdenv.mkDerivation rec {
buildPhase = with lib; ''
runHook preBuild
bash ./graalvm/native-unix-compile.sh
# https://github.com/clojure-lsp/clojure-lsp/blob/2021.09.30-15.28.01/graalvm/native-unix-compile.sh#L19-L24
args=("-jar" "$CLOJURE_LSP_JAR"
"-H:CLibraryPath=${graalvm11-ce.lib}/lib"
"-H:+ReportExceptionStackTraces"
"--verbose"
"--no-fallback"
"--native-image-info"
"$CLOJURE_LSP_XMX")
native-image ''${args[@]}
runHook postBuild
'';

1
pkgs/development/tools/zprint/default.nix
View file

@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
-H:Name=${pname} \
-H:EnableURLProtocols=https,http \
-H:+ReportExceptionStackTraces \
-H:CLibraryPath=${graalvm11-ce.lib}/lib \
${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \
--report-unsupported-elements-at-runtime \
--initialize-at-build-time \

114
pkgs/misc/vim-plugins/generated.nix
View file

@ -53,12 +53,12 @@ final: prev:
agda-vim = buildVimPluginFrom2Nix {
pname = "agda-vim";
version = "2020-11-23";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "derekelkins";
repo = "agda-vim";
rev = "81b0a1a612621f3b8d9ce30c48527cc85a950f1c";
sha256 = "1yqvcyw8zaryqy2hbbq4iaf5af0n4wpw07i8508z7dp9ib92w85v";
rev = "a25cbab0cb60b57b734a2dd9248675724963d63b";
sha256 = "0yxsxraszcpfb11b2lmgjhz947lmrs5b6r8gy1swi1678w8rbifq";
};
meta.homepage = "https://github.com/derekelkins/agda-vim/";
};
@ -77,12 +77,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2021-09-23";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "c9c89a1853c01f3451edd7105814d123023ddbd8";
sha256 = "1szaw6jar86376wflzy644zm8l1ah8h5bvqkl7sxd8wijkxn1gph";
rev = "f9deee0e416f626d8597e3e6ea8e89172e5aaa78";
sha256 = "0qa0lprnhhdlfahjic1nq71cn4q7slnb2rg7mfhbd1791zscffwg";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -449,12 +449,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-10-01";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "1cbb4ae2f5f770d5ff548b68fb2766dec1d60adf";
sha256 = "0ms74vv3g2qz3573b132qd2cb04vz4n1rgmlxj20rkgqqvwd3h88";
rev = "3a57532f32aed5c46efee2fdf0f079bcf76b12ec";
sha256 = "0l4az480sv6zpymsds9lqh9nd2j5pzwr7cvh5m9bgkfvwbh76p7h";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -701,12 +701,12 @@ final: prev:
cmp_luasnip = buildVimPluginFrom2Nix {
pname = "cmp_luasnip";
version = "2021-09-23";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "saadparwaiz1";
repo = "cmp_luasnip";
rev = "a93949643912a5e8cb64075af4b50d38a0b2fb22";
sha256 = "12qdi9hsrhpf67m5im7y3hgq33dsfkqnvvyqx3ddqk1y5mdgc069";
rev = "a8af71da3c7d0f72ade3fef1714f250134b849d7";
sha256 = "0zwyfhgmzw2cp8axs52k6f1pbm5nhx4yxckds3ldxqmxar769znj";
};
meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";
};
@ -3060,12 +3060,12 @@ final: prev:
lualine-lsp-progress = buildVimPluginFrom2Nix {
pname = "lualine-lsp-progress";
version = "2021-07-10";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "arkav";
repo = "lualine-lsp-progress";
rev = "7c024f40a3b26c8f7925745cdd2fe7acc96939c4";
sha256 = "0flmd69d7kjzcnzclx6k2yxjfy9nmkwxjlrgl3sszw5qpffxjlk1";
rev = "c9537d085a8fce6f8473d30965b6a0e2536b2c80";
sha256 = "1xy7g4d7k4is81mxdsjgagqkbzygpb4dmpbypapwxp6vv44wfl36";
};
meta.homepage = "https://github.com/arkav/lualine-lsp-progress/";
};
@ -3084,12 +3084,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2021-10-01";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "0349dccdfe9bb27af5280dc252cd38ca61f2fbbf";
sha256 = "0sqy2bk10dpfn1fh3cfk2j8szc5na2cci6gslp0bl8gwj8xiwvgn";
rev = "94bf4e7cc56d03d82c4058df7090f9d982aa264d";
sha256 = "14hyyhggj37nvyb9r325sfh020kb584bzyq44f50m655682c6pnq";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
@ -3600,12 +3600,12 @@ final: prev:
neosnippet-snippets = buildVimPluginFrom2Nix {
pname = "neosnippet-snippets";
version = "2021-09-11";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neosnippet-snippets";
rev = "24115acf7549620c1e64be1f996fe1cf5435d039";
sha256 = "1jr4vk8r3p5qnd2l6v278c3ppggzxaq28dqmdg267rd34jybng8d";
rev = "8a6655a034eb7c12138dad505ef1004bf383a45d";
sha256 = "0mwvcjdrk324azqy5m2lpl3z1gi92jspxvmcjcxqnppfjsv1iyhd";
};
meta.homepage = "https://github.com/Shougo/neosnippet-snippets/";
};
@ -3754,6 +3754,18 @@ final: prev:
meta.homepage = "https://github.com/chr4/nginx.vim/";
};
nightfox-nvim = buildVimPluginFrom2Nix {
pname = "nightfox.nvim";
version = "2021-10-01";
src = fetchFromGitHub {
owner = "EdenEast";
repo = "nightfox.nvim";
rev = "84c1d22f2108034f3597045155ac8fac230c90db";
sha256 = "0bz6h1c6hfw80nw1y1b89gnlbdnb2zjn4inn6fkhdvyg04yi8sn5";
};
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
};
nim-vim = buildVimPluginFrom2Nix {
pname = "nim.vim";
version = "2020-10-16";
@ -3900,12 +3912,12 @@ final: prev:
nvim-base16 = buildVimPluginFrom2Nix {
pname = "nvim-base16";
version = "2021-09-28";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "RRethy";
repo = "nvim-base16";
rev = "330819c826cf2ef37de5d1d51d75022840262b00";
sha256 = "1hwzwsmj2q3rhdxpsqw7qcr2y2yqzax9ij8ggxbff0pvqi1kjk91";
rev = "dc4fad8f5f3d6f4ae3f58a6917fbb89cd84f82b2";
sha256 = "13akplwcsndp8a7n9jvzs19b2906g5a9zb1zy9lx4q8anw6fyaq2";
};
meta.homepage = "https://github.com/RRethy/nvim-base16/";
};
@ -3960,12 +3972,12 @@ final: prev:
nvim-code-action-menu = buildVimPluginFrom2Nix {
pname = "nvim-code-action-menu";
version = "2021-09-28";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "weilbith";
repo = "nvim-code-action-menu";
rev = "4efac33349a6d4669c2072a22ede61d94886c48d";
sha256 = "180c8mxyqrl70z2r235rlva8w3d83sypfdq087l74qg0jdcas2gj";
rev = "f616a37d1be4bab330d5f1ea3ae5fc4b275a1fad";
sha256 = "1nkkxpj2bw03gy55yfgvdk7h4d4ag20rmw4s0l1w6wai5szpc2wj";
};
meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/";
};
@ -3984,12 +3996,12 @@ final: prev:
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
version = "2021-09-07";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
rev = "980357a9eeabe84f29c96d38421c9bff321a2bc8";
sha256 = "1qh8axjfwc2dwdfvc9izfmzwy382vzg9jcnfzs8fkl7lqb87i3a0";
rev = "d186d739c54823e0b010feb205c6f97792322c08";
sha256 = "1cl3c4cazzpjj2wmsi42czrklzngzm82bbb9ivmcsa40rfz2lsk3";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@ -4020,12 +4032,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2021-09-30";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "409fd0cfbaa39e52e02c06eeae5456cadb0b6748";
sha256 = "0ssdq3v3rqi4bn7fpn4anzaa5kjx0xf7zvrzm6wan16nix7y522a";
rev = "f9eaa955c832339e148b10f4bf47d498005c0a16";
sha256 = "14kz1y9na14apygp927n9qw8phyaifnyabslz13gxkhw5637gdv8";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -4188,12 +4200,12 @@ final: prev:
nvim-notify = buildVimPluginFrom2Nix {
pname = "nvim-notify";
version = "2021-10-01";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-notify";
rev = "dfaf5b90a8a827cb541b201218aeb0062cd8f312";
sha256 = "0scfh3y54cwczn9iwjbwczqxj9bnc025mkxw2l0bqzfp9a157d0a";
rev = "712c79efad72f73dd4e554999d82bd9b31e56c64";
sha256 = "13pwnhcg70ld3n7c8pvb945axlz7sf5mfgr6xkl9xv6a9n76dilk";
};
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
};
@ -4260,12 +4272,12 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
version = "2021-10-01";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
rev = "7c88a0f8ee6250a8408c28e0b03a4925b396c916";
sha256 = "1cqz25d619yhrvk3l4asr6vsyynip092difimmp6c1i5nb6hv6sx";
rev = "422404d3efefcf78d7e74afeb19e37320fa9a5e8";
sha256 = "0iis18pj63wbv1q90gsj4v3kadgykrribav342lyprcxk996wjl1";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
@ -5017,12 +5029,12 @@ final: prev:
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools.nvim";
version = "2021-09-30";
version = "2021-10-01";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
rev = "5484e0ba0c1fa44889986253551fab5c71adefc4";
sha256 = "1bfik6qskmkw12wvb8cmc7k6xpgrlbbmr8w49695iz3rrm5gq46l";
rev = "c2aacb9cd51907ec6cce65a683cb2df6ae78a227";
sha256 = "067hjyw7d2wf443bny3m3gjkq3avf3k99xwzkl1yrd4vn321h2kn";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
@ -7554,12 +7566,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2021-09-30";
version = "2021-10-01";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "194d63da4f7111c156109375e8ca153f19b245cb";
sha256 = "05x9f2sh6dmgkzbg4nwp2yqgaax6rwq614nzcckal0ijb6k1ibhj";
rev = "a67854368ea9810936d57e3fea00a4c05bf47c26";
sha256 = "0zqlbiqgxijf7ddhl99ys7162mjr9agk3j59nal2bpfgzh3b70rq";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@ -10234,12 +10246,12 @@ final: prev:
vim-vsnip-integ = buildVimPluginFrom2Nix {
pname = "vim-vsnip-integ";
version = "2021-09-28";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "vim-vsnip-integ";
rev = "c16628dd4b8f48eb22a597c9a5cba1a04ec3c41a";
sha256 = "1p5fnjn8cxy4xkppml4bxnadz2zazprkn19b1drwdsk3kmfg625b";
rev = "0eee427f96aa11dec031adc104e218775bafc172";
sha256 = "1nb0kbv986vw4nf785s24435pyrya8jn4sjqn0168x5a0j83n2vr";
};
meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
};
@ -10559,12 +10571,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2021-09-30";
version = "2021-10-02";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "3a541ae44cc36cc7395f9eb4de267820d22fd1ca";
sha256 = "16v09ff8ha9nf2vpb4ikg807kzb0s6m15zd1ipq6np2kmrv11ld8";
rev = "05d2bfb13aacb2d0db051815ba6e9096e6859392";
sha256 = "05189dn2f67ad1mlk95lhb5k7qfs0cpvzg7pl3miqsn66pbknx6r";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};

46
pkgs/misc/vim-plugins/markdown-preview-nvim/fix-node-paths.patch Normal file
View file

@ -0,0 +1,46 @@
diff --git a/autoload/health/mkdp.vim b/autoload/health/mkdp.vim
index 9eebb56..0700333 100644
--- a/autoload/health/mkdp.vim
+++ b/autoload/health/mkdp.vim
@@ -9,8 +9,8 @@ function! health#mkdp#check() abort
call health#report_info('Pre build: ' . l:mkdp_server_script)
call health#report_info('Pre build version: ' . mkdp#util#pre_build_version())
call health#report_ok('Using pre build')
- elseif executable('node')
- call health#report_info('Node version: ' . system('node --version'))
+ else
+ call health#report_info('Node version: ' . system('@node@ --version'))
let l:mkdp_server_script = s:mkdp_root_dir . '/app/server.js'
call health#report_info('Script: ' . l:mkdp_server_script)
call health#report_info('Script exists: ' . filereadable(l:mkdp_server_script))
diff --git a/autoload/mkdp/nvim/rpc.vim b/autoload/mkdp/nvim/rpc.vim
index 5abd807..db1067b 100644
--- a/autoload/mkdp/nvim/rpc.vim
+++ b/autoload/mkdp/nvim/rpc.vim
@@ -53,8 +53,8 @@ function! mkdp#nvim#rpc#get_command() abort
let l:pre_build = s:root_dir . '/app/bin/markdown-preview-' . mkdp#util#get_platform()
if executable(l:pre_build)
let l:cmd = [l:pre_build, '--path', s:script]
- elseif executable('node')
- let l:cmd = ['node', s:root_dir . '/app/index.js', '--path', s:script]
+ else
+ let l:cmd = ['@node@', s:root_dir . '/app/index.js', '--path', s:script]
endif
if !exists('l:cmd')
echohl Error | echon '[vim-node-rpc] pre build and node not found!' | echohl None
diff --git a/autoload/mkdp/rpc.vim b/autoload/mkdp/rpc.vim
index a3361ec..d42f7a6 100644
--- a/autoload/mkdp/rpc.vim
+++ b/autoload/mkdp/rpc.vim
@@ -59,9 +59,9 @@ function! mkdp#rpc#start_server() abort
let l:mkdp_server_script = s:mkdp_root_dir . '/app/bin/markdown-preview-' . mkdp#util#get_platform()
if executable(l:mkdp_server_script)
let l:cmd = [l:mkdp_server_script, '--path', s:mkdp_root_dir . '/app/server.js']
- elseif executable('node')
+ else
let l:mkdp_server_script = s:mkdp_root_dir . '/app/index.js'
- let l:cmd = ['node', l:mkdp_server_script, '--path', s:mkdp_root_dir . '/app/server.js']
+ let l:cmd = ['@node@', l:mkdp_server_script, '--path', s:mkdp_root_dir . '/app/server.js']
endif
if exists('l:cmd')
if s:is_vim

17
pkgs/misc/vim-plugins/markdown-preview-nvim/package.json Normal file
View file

@ -0,0 +1,17 @@
{
"name": "markdown-preview-vim",
"version": "0.0.1",
"description": "markdown preview plugin for (neo)vim",
"bin": "./index.js",
"repository": "https://github.com/iamcco/markdown-preview.vim.git",
"author": "年糕小豆汤 <ooiss@qq.com>",
"license": "MIT",
"private": true,
"dependencies": {
"log4js": "3.0.6",
"neovim": "4.2.1",
"socket.io": "2.1.1",
"tslib": "1.9.3",
"vim-node-rpc": "0.1.24"
}
}

25
pkgs/misc/vim-plugins/overrides.nix
View file

@ -36,6 +36,7 @@
, which
, xkb-switch
, ycmd
, nodejs
# test dependencies
, neovim-unwrapped
@ -391,6 +392,30 @@ self: super: {
dependencies = with self; [ plenary-nvim ];
});
markdown-preview-nvim = super.markdown-preview-nvim.overrideAttrs (old: let
# We only need its dependencies `node-modules`.
nodeDep = nodePackages."markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim".overrideAttrs (old: {
dontNpmInstall = true;
});
in {
patches = [
(substituteAll {
src = ./markdown-preview-nvim/fix-node-paths.patch;
node = "${nodejs}/bin/node";
})
];
postInstall = ''
# The node package name is `*-vim` not `*-nvim`.
ln -s ${nodeDep}/lib/node_modules/markdown-preview-vim/node_modules $out/app
'';
nativeBuildInputs = [ nodejs ];
doInstallCheck = true;
installCheckPhase = ''
node $out/app/index.js --version
'';
});
meson = buildVimPluginFrom2Nix {
inherit (meson) pname version src;
preInstall = "cd data/syntax-highlighting/vim";

1
pkgs/misc/vim-plugins/vim-plugin-names
View file

@ -124,6 +124,7 @@ eagletmt/neco-ghc
easymotion/vim-easymotion
eddiebergman/nvim-treesitter-pyfold
eddyekofo94/gruvbox-flat.nvim
EdenEast/nightfox.nvim@main
editorconfig/editorconfig-vim
edkolev/tmuxline.vim
edluffy/hologram.nvim@main

1
pkgs/servers/nosql/redis/default.nix
View file

@ -55,5 +55,6 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
changelog = "https://github.com/redis/redis/raw/${version}/00-RELEASENOTES";
maintainers = with maintainers; [ berdario globin marsam ];
mainProgram = "redis-cli";
};
}

4
pkgs/tools/misc/elfcat/default.nix
View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "elfcat";
version = "0.1.6";
version = "0.1.7";
src = fetchFromGitHub {
owner = "ruslashev";
repo = pname;
rev = version;
sha256 = "sha256-v8G9XiZS+49HtuLjs4Co9A1J+5STAerphkLaMGvqXT4=";
sha256 = "sha256-qmyD9BkD00yAQxmkgP2g5uvv/U7D/hUkCMJq44MI4YI=";
};
cargoSha256 = null;

14
pkgs/tools/misc/watchexec/default.nix
View file

@ -1,21 +1,21 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices, installShellFiles, libiconv }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices, Foundation, installShellFiles, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "watchexec";
version = "1.15.1";
version = "1.17.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "1xznhfljvsvc0ykv5h1wg31n93v96lvhbxfhavxivq3b0xh5vxrw";
rev = "cli-v${version}";
sha256 = "13yqghdhakkwp607j84a1vbqgnqqn77a5mh27cr24352ik2vkrkq";
};
cargoSha256 = "00dampnsnpzmchjcn0j5zslx17i0qgrv99gq772n0683m1l2lfq3";
cargoSha256 = "0grzfzxw705zs5qb2h7k0yws45m20ihhh4mnpmk3wargbxpn6gsh";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ];
postInstall = ''
installManPage doc/watchexec.1
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Executes commands in response to file modifications";
homepage = "https://github.com/watchexec/watchexec";
homepage = "https://watchexec.github.io/";
license = with licenses; [ asl20 ];
maintainers = [ maintainers.michalrus ];
};

6
pkgs/tools/networking/croc/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
version = "9.3.0";
version = "9.4.2";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-chSVAQXGtcAFs4GzqywjAUM9qng9j6j7KOrlQalxdOw=";
sha256 = "sha256-aB3jYQKyqfaQBcCbFbN8ZIfosyLy+bX6SJF+iiT2ELQ=";
};
vendorSha256 = "sha256-z8xU1IH+xemx/kxE4crj90roF73QW5D9jFLpykH7meo=";
vendorSha256 = "sha256-bsggZ6e9a7tq0jgOpqIRgfj4FUu/krLWuLBZjaialO0=";
doCheck = false;

6
pkgs/tools/networking/rustcat/default.nix
View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "rustcat";
version = "1.3.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "robiot";
repo = pname;
rev = "v${version}";
sha256 = "0f4g0fk3i9p403r21w1cdz4r9778pkz58y8h7w2fmj27bamsyfhb";
sha256 = "sha256-aoeinz1XVJ+MNt8ndV/HnKLdwa7rXwxIZucCkZCnNaM=";
};
cargoSha256 = "0zlgnnlnglix0qrjc5v0g91v083lm20iw1fhvjpvjlfq7shdkhyd";
cargoSha256 = "sha256-cQxBM8m0sy9WKvKqyY/sNE3p4l2v9zdx80mReQEAoc8=";
buildInputs = lib.optional stdenv.isDarwin Security;

4
pkgs/tools/networking/stevenblack-blocklist/default.nix
View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub }:
let
version = "3.8.2";
version = "3.9.7";
in
fetchFromGitHub {
name = "stevenblack-blocklist-${version}";
@ -9,7 +9,7 @@ fetchFromGitHub {
owner = "StevenBlack";
repo = "hosts";
rev = version;
sha256 = "sha256-rkyAF1/kPI34nZ57Hqg8QivK0YERZ54jZ1HQ5oXYgxc=";
sha256 = "sha256-AMeUY4aeyPIyirCLawLVjqDGB8z28q/Hm/UI+wGYZvY=";
meta = with lib; {
description = "Unified hosts file with base extensions";

12
pkgs/tools/text/rpl/default.nix
View file

@ -1,10 +1,5 @@
{ lib, fetchFromGitHub, python3Packages }:
let
rev = "4467bd46a7a798f738247a7f090c1505176bd597";
sha256 = "0yf3pc3fws4nnh4nd8d3jpglmsyi69d17qqgpcnkpqca5l4cd25w";
in
python3Packages.buildPythonApplication rec {
pname = "rpl";
version = "1.10";
@ -14,9 +9,10 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "rrthomas";
repo = "rpl";
inherit rev sha256;
owner = "rrthomas";
repo = "rpl";
rev = "4467bd46a7a798f738247a7f090c1505176bd597";
sha256 = "0yf3pc3fws4nnh4nd8d3jpglmsyi69d17qqgpcnkpqca5l4cd25w";
};
patches = [

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

@ -10164,7 +10164,7 @@ with pkgs;
wal_e = callPackage ../tools/backup/wal-e { };
watchexec = callPackage ../tools/misc/watchexec {
inherit (darwin.apple_sdk.frameworks) CoreServices;
inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
};
watchman = callPackage ../development/tools/watchman {
@ -12410,11 +12410,11 @@ with pkgs;
#
# So this commit doesn't remove the 1.45.2 release.
rust_1_45 = callPackage ../development/compilers/rust/1_45.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
llvm_10 = llvmPackages_10.libllvm;
};
rust_1_55 = callPackage ../development/compilers/rust/1_55.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
llvm_12 = llvmPackages_12.libllvm;
};
rust = rust_1_55;

8
pkgs/top-level/python-packages.nix
View file

@ -427,6 +427,8 @@ in {
ambee = callPackage ../development/python-modules/ambee { };
amberelectric = callPackage ../development/python-modules/amberelectric { };
ambiclimate = callPackage ../development/python-modules/ambiclimate { };
amcrest = callPackage ../development/python-modules/amcrest { };
@ -2823,6 +2825,8 @@ in {
freezegun = callPackage ../development/python-modules/freezegun { };
frigidaire = callPackage ../development/python-modules/frigidaire { };
frilouz = callPackage ../development/python-modules/frilouz { };
fritzconnection = callPackage ../development/python-modules/fritzconnection { };
@ -5108,6 +5112,8 @@ in {
graphvizPkgs = pkgs.graphviz;
};
obspy = callPackage ../development/python-modules/obspy { };
oci = callPackage ../development/python-modules/oci { };
ocrmypdf = callPackage ../development/python-modules/ocrmypdf { };
@ -9176,6 +9182,8 @@ in {
tumpa = callPackage ../development/python-modules/tumpa { };
tuya-iot-py-sdk = callPackage ../development/python-modules/tuya-iot-py-sdk { };
tuyaha = callPackage ../development/python-modules/tuyaha { };
tvdb_api = callPackage ../development/python-modules/tvdb_api { };