public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-24 00:16:17 +00:00 committed by GitHub
commit 6e7c70d02d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
54 changed files with 1710 additions and 1573 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
lib/systems/doubles.nix
View File

@ -6,43 +6,51 @@ let
inherit (lib.attrsets) matchAttrs; inherit (lib.attrsets) matchAttrs;
all = [ all = [
"aarch64-linux" # Cygwin
"armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-cygwin" "x86_64-cygwin"
"mipsel-linux"
"i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd"
"x86_64-cygwin" "x86_64-freebsd" "x86_64-linux"
"x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
# Darwin
"x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin"
"x86_64-windows" "i686-windows" # FreeBSD
"i686-freebsd" "x86_64-freebsd"
"wasm64-wasi" "wasm32-wasi" # Genode
"aarch64-genode" "i686-genode" "x86_64-genode"
"x86_64-redox" # illumos
"x86_64-solaris"
"powerpc64-linux"
"powerpc64le-linux"
"riscv32-linux" "riscv64-linux"
"arm-none" "armv6l-none" "aarch64-none"
"avr-none"
"i686-none" "x86_64-none"
"powerpc-none"
"msp430-none"
"riscv64-none" "riscv32-none"
"vc4-none"
"or1k-none"
"mmix-mmixware"
# JS
"js-ghcjs" "js-ghcjs"
"aarch64-genode" "i686-genode" "x86_64-genode" # Linux
"aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
"armv7l-linux" "i686-linux" "mipsel-linux" "powerpc64-linux"
"powerpc64le-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux"
# MMIXware
"mmix-mmixware"
# NetBSD
"i686-netbsd" "x86_64-netbsd"
# none
"aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none"
"or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none"
"x86_64-none"
# OpenBSD
"i686-openbsd" "x86_64-openbsd"
# Redox
"x86_64-redox"
# WASI
"wasm64-wasi" "wasm32-wasi"
# Windows
"x86_64-windows" "i686-windows"
]; ];
allParsed = map parse.mkSystemFromString all; allParsed = map parse.mkSystemFromString all;

8
maintainers/maintainer-list.nix
View File

@ -3008,13 +3008,13 @@
name = "John Ericson"; name = "John Ericson";
}; };
erictapen = { erictapen = {
email = "justin.humm@posteo.de"; email = "kerstin@erictapen.name";
github = "erictapen"; github = "erictapen";
githubId = 11532355; githubId = 11532355;
name = "Justin Humm"; name = "Kerstin Humm";
keys = [{ keys = [{
longkeyid = "rsa4096/0x438871E000AA178E"; longkeyid = "rsa4096/0x40293358C7B9326B";
fingerprint = "984E 4BAD 9127 4D0E AE47 FF03 4388 71E0 00AA 178E"; fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B";
}]; }];
}; };
erikryb = { erikryb = {

22
nixos/doc/manual/development/writing-nixos-tests.xml
View File

@ -186,6 +186,25 @@ start_all()
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>
<methodname>get_screen_text_variants</methodname>
</term>
<listitem>
<para>
Return a list of different interpretations of what is currently visible
on the machine's screen using optical character recognition. The number
and order of the interpretations is not specified and is subject to
change, but if no exception is raised at least one will be returned.
</para>
<note>
<para>
This requires passing <option>enableOCR</option> to the test attribute
set.
</para>
</note>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term> <term>
<methodname>get_screen_text</methodname> <methodname>get_screen_text</methodname>
@ -350,7 +369,8 @@ start_all()
<para> <para>
Wait until the supplied regular expressions matches the textual contents Wait until the supplied regular expressions matches the textual contents
of the screen by using optical character recognition (see of the screen by using optical character recognition (see
<methodname>get_screen_text</methodname>). <methodname>get_screen_text</methodname> and
<methodname>get_screen_text_variants</methodname>).
</para> </para>
<note> <note>
<para> <para>

81
nixos/lib/test-driver/test-driver.py
View File

@ -1,7 +1,7 @@
#! /somewhere/python3 #! /somewhere/python3
from contextlib import contextmanager, _GeneratorContextManager from contextlib import contextmanager, _GeneratorContextManager
from queue import Queue, Empty from queue import Queue, Empty
from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List, Iterable
from xml.sax.saxutils import XMLGenerator from xml.sax.saxutils import XMLGenerator
import queue import queue
import io import io
@ -205,6 +205,37 @@ class Logger:
self.xml.endElement("nest") self.xml.endElement("nest")
def _perform_ocr_on_screenshot(
screenshot_path: str, model_ids: Iterable[int]
) -> List[str]:
if shutil.which("tesseract") is None:
raise Exception("OCR requested but enableOCR is false")
magick_args = (
"-filter Catrom -density 72 -resample 300 "
+ "-contrast -normalize -despeckle -type grayscale "
+ "-sharpen 1 -posterize 3 -negate -gamma 100 "
+ "-blur 1x65535"
)
tess_args = f"-c debug_file=/dev/null --psm 11"
cmd = f"convert {magick_args} {screenshot_path} tiff:{screenshot_path}.tiff"
ret = subprocess.run(cmd, shell=True, capture_output=True)
if ret.returncode != 0:
raise Exception(f"TIFF conversion failed with exit code {ret.returncode}")
model_results = []
for model_id in model_ids:
cmd = f"tesseract {screenshot_path}.tiff - {tess_args} --oem {model_id}"
ret = subprocess.run(cmd, shell=True, capture_output=True)
if ret.returncode != 0:
raise Exception(f"OCR failed with exit code {ret.returncode}")
model_results.append(ret.stdout.decode("utf-8"))
return model_results
class Machine: class Machine:
def __init__(self, args: Dict[str, Any]) -> None: def __init__(self, args: Dict[str, Any]) -> None:
if "name" in args: if "name" in args:
@ -637,43 +668,29 @@ class Machine:
"""Debugging: Dump the contents of the TTY<n>""" """Debugging: Dump the contents of the TTY<n>"""
self.execute("fold -w 80 /dev/vcs{} | systemd-cat".format(tty)) self.execute("fold -w 80 /dev/vcs{} | systemd-cat".format(tty))
def _get_screen_text_variants(self, model_ids: Iterable[int]) -> List[str]:
with tempfile.TemporaryDirectory() as tmpdir:
screenshot_path = os.path.join(tmpdir, "ppm")
self.send_monitor_command(f"screendump {screenshot_path}")
return _perform_ocr_on_screenshot(screenshot_path, model_ids)
def get_screen_text_variants(self) -> List[str]:
return self._get_screen_text_variants([0, 1, 2])
def get_screen_text(self) -> str: def get_screen_text(self) -> str:
if shutil.which("tesseract") is None: return self._get_screen_text_variants([2])[0]
raise Exception("get_screen_text used but enableOCR is false")
magick_args = (
"-filter Catrom -density 72 -resample 300 "
+ "-contrast -normalize -despeckle -type grayscale "
+ "-sharpen 1 -posterize 3 -negate -gamma 100 "
+ "-blur 1x65535"
)
tess_args = "-c debug_file=/dev/null --psm 11 --oem 2"
with self.nested("performing optical character recognition"):
with tempfile.NamedTemporaryFile() as tmpin:
self.send_monitor_command("screendump {}".format(tmpin.name))
cmd = "convert {} {} tiff:- | tesseract - - {}".format(
magick_args, tmpin.name, tess_args
)
ret = subprocess.run(cmd, shell=True, capture_output=True)
if ret.returncode != 0:
raise Exception(
"OCR failed with exit code {}".format(ret.returncode)
)
return ret.stdout.decode("utf-8")
def wait_for_text(self, regex: str) -> None: def wait_for_text(self, regex: str) -> None:
def screen_matches(last: bool) -> bool: def screen_matches(last: bool) -> bool:
text = self.get_screen_text() variants = self.get_screen_text_variants()
matches = re.search(regex, text) is not None for text in variants:
if re.search(regex, text) is not None:
return True
if last and not matches: if last:
self.log("Last OCR attempt failed. Text was: {}".format(text)) self.log("Last OCR attempt failed. Text was: {}".format(variants))
return matches return False
with self.nested("waiting for {} to appear on screen".format(regex)): with self.nested("waiting for {} to appear on screen".format(regex)):
retry(screen_matches) retry(screen_matches)

24
nixos/modules/services/monitoring/vnstat.nix
View File

@ -6,21 +6,21 @@ let
cfg = config.services.vnstat; cfg = config.services.vnstat;
in { in {
options.services.vnstat = { options.services.vnstat = {
enable = mkOption { enable = mkEnableOption "update of network usage statistics via vnstatd";
type = types.bool;
default = false;
description = ''
Whether to enable update of network usage statistics via vnstatd.
'';
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
users.users.vnstatd = {
environment.systemPackages = [ pkgs.vnstat ];
users = {
groups.vnstatd = {};
users.vnstatd = {
isSystemUser = true; isSystemUser = true;
group = "vnstatd";
description = "vnstat daemon user"; description = "vnstat daemon user";
home = "/var/lib/vnstat"; };
createHome = true;
}; };
systemd.services.vnstat = { systemd.services.vnstat = {
@ -33,7 +33,6 @@ in {
"man:vnstat(1)" "man:vnstat(1)"
"man:vnstat.conf(5)" "man:vnstat.conf(5)"
]; ];
preStart = "chmod 755 /var/lib/vnstat";
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.vnstat}/bin/vnstatd -n"; ExecStart = "${pkgs.vnstat}/bin/vnstatd -n";
ExecReload = "${pkgs.procps}/bin/kill -HUP $MAINPID"; ExecReload = "${pkgs.procps}/bin/kill -HUP $MAINPID";
@ -52,7 +51,10 @@ in {
RestrictNamespaces = true; RestrictNamespaces = true;
User = "vnstatd"; User = "vnstatd";
Group = "vnstatd";
}; };
}; };
}; };
meta.maintainers = [ maintainers.evils ];
} }

32
nixos/modules/services/security/sshguard.nix
View File

@ -5,6 +5,21 @@ with lib;
let let
cfg = config.services.sshguard; cfg = config.services.sshguard;
configFile = let
args = lib.concatStringsSep " " ([
"-afb"
"-p info"
"-o cat"
"-n1"
] ++ (map (name: "-t ${escapeShellArg name}") cfg.services));
backend = if config.networking.nftables.enable
then "sshg-fw-nft-sets"
else "sshg-fw-ipset";
in pkgs.writeText "sshguard.conf" ''
BACKEND="${pkgs.sshguard}/libexec/${backend}"
LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl ${args}"
'';
in { in {
###### interface ###### interface
@ -85,20 +100,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.etc."sshguard.conf".text = let environment.etc."sshguard.conf".source = configFile;
args = lib.concatStringsSep " " ([
"-afb"
"-p info"
"-o cat"
"-n1"
] ++ (map (name: "-t ${escapeShellArg name}") cfg.services));
backend = if config.networking.nftables.enable
then "sshg-fw-nft-sets"
else "sshg-fw-ipset";
in ''
BACKEND="${pkgs.sshguard}/libexec/${backend}"
LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl ${args}"
'';
systemd.services.sshguard = { systemd.services.sshguard = {
description = "SSHGuard brute-force attacks protection system"; description = "SSHGuard brute-force attacks protection system";
@ -107,6 +109,8 @@ in {
after = [ "network.target" ]; after = [ "network.target" ];
partOf = optional config.networking.firewall.enable "firewall.service"; partOf = optional config.networking.firewall.enable "firewall.service";
restartTriggers = [ configFile ];
path = with pkgs; if config.networking.nftables.enable path = with pkgs; if config.networking.nftables.enable
then [ nftables iproute2 systemd ] then [ nftables iproute2 systemd ]
else [ iptables ipset iproute2 systemd ]; else [ iptables ipset iproute2 systemd ];

15
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -10,7 +10,7 @@ let
extensions = { enabled, all }: extensions = { enabled, all }:
(with all; (with all;
enabled enabled
++ optional (!cfg.disableImagemagick) imagick ++ optional cfg.enableImagemagick imagick
# Optionally enabled depending on caching settings # Optionally enabled depending on caching settings
++ optional cfg.caching.apcu apcu ++ optional cfg.caching.apcu apcu
++ optional cfg.caching.redis redis ++ optional cfg.caching.redis redis
@ -63,6 +63,9 @@ in {
Further details about this can be found in the `Nextcloud`-section of the NixOS-manual Further details about this can be found in the `Nextcloud`-section of the NixOS-manual
(which can be openend e.g. by running `nixos-help`). (which can be openend e.g. by running `nixos-help`).
'') '')
(mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] ''
Use services.nextcloud.nginx.enableImagemagick instead.
'')
]; ];
options.services.nextcloud = { options.services.nextcloud = {
@ -303,16 +306,14 @@ in {
}; };
}; };
disableImagemagick = mkOption { enableImagemagick = mkEnableOption ''
type = types.bool; Whether to load the ImageMagick module into PHP.
default = false;
description = ''
Whether to not load the ImageMagick module into PHP.
This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF). This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF).
You may want to disable it for increased security. In that case, previews will still be available You may want to disable it for increased security. In that case, previews will still be available
for some images (e.g. JPEG and PNG). for some images (e.g. JPEG and PNG).
See https://github.com/nextcloud/server/issues/13099 See https://github.com/nextcloud/server/issues/13099
''; '' // {
default = true;
}; };
caching = { caching = {

2
nixos/tests/nextcloud/basic.nix
View File

@ -51,7 +51,7 @@ in {
nextcloudWithoutMagick = args@{ config, pkgs, lib, ... }: nextcloudWithoutMagick = args@{ config, pkgs, lib, ... }:
lib.mkMerge lib.mkMerge
[ (nextcloud args) [ (nextcloud args)
{ services.nextcloud.disableImagemagick = true; } ]; { services.nextcloud.enableImagemagick = false; } ];
}; };
testScript = { nodes, ... }: let testScript = { nodes, ... }: let

7
pkgs/applications/audio/mympd/default.nix
View File

@ -8,18 +8,18 @@
, lua5_3 , lua5_3
, libid3tag , libid3tag
, flac , flac
, mongoose , pcre
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mympd"; pname = "mympd";
version = "6.10.0"; version = "7.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jcorporation"; owner = "jcorporation";
repo = "myMPD"; repo = "myMPD";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-QGJti1tKKJlumLgABPmROplF0UVGMWMnyRXLb2cEieQ="; sha256 = "sha256-2V3LbgnJfTIO71quZ+hfLnw/lNLYxXt19jw2Od6BVvM=";
}; };
nativeBuildInputs = [ pkg-config cmake ]; nativeBuildInputs = [ pkg-config cmake ];
@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
lua5_3 lua5_3
libid3tag libid3tag
flac flac
pcre
]; ];
cmakeFlags = [ cmakeFlags = [

4
pkgs/applications/graphics/ImageMagick/6.x.nix
View File

@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imagemagick"; pname = "imagemagick";
version = "6.9.12-3"; version = "6.9.12-8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ImageMagick"; owner = "ImageMagick";
repo = "ImageMagick6"; repo = "ImageMagick6";
rev = version; rev = version;
sha256 = "sha256-h9c0N9AcFVpNYpKl+95q1RVJWuacN4N4kbAJIKJp8Jc="; sha256 = "sha256-ZFCmoZOdZ3jbM5S90zBNiMGJKFylMLO0r3DB25wu3MM=";
}; };
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

4
pkgs/applications/graphics/ImageMagick/7.0.nix
View File

@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imagemagick"; pname = "imagemagick";
version = "7.0.11-6"; version = "7.0.11-8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ImageMagick"; owner = "ImageMagick";
repo = "ImageMagick"; repo = "ImageMagick";
rev = version; rev = version;
sha256 = "sha256-QClOS58l17KHeQXya+IKNx6nIkd6jCKp8uupRH7Fwnk="; sha256 = "sha256-h9hoFXnxuLVQRVtEh83P7efz2KFLLqOXKD6nVJEhqiM=";
}; };
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

7
pkgs/applications/misc/safeeyes/default.nix
View File

@ -1,16 +1,16 @@
{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg { lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg
}: }:
let inherit (python3Packages) python buildPythonApplication fetchPypi; let inherit (python3Packages) python buildPythonApplication fetchPypi croniter;
in buildPythonApplication rec { in buildPythonApplication rec {
pname = "safeeyes"; pname = "safeeyes";
version = "2.0.9"; version = "2.1.3";
namePrefix = ""; namePrefix = "";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "13q06jv8hm0dynmr3g5pf1m4j3w9iabrpz1nhpl02f7x0d90whg2"; sha256 = "1b5w887hivmdrkm1ydbar4nmnks6grpbbpvxgf9j9s46msj03c9x";
}; };
buildInputs = [ buildInputs = [
@ -30,6 +30,7 @@ in buildPythonApplication rec {
xlib xlib
pygobject3 pygobject3
dbus-python dbus-python
croniter
libappindicator-gtk3 libappindicator-gtk3
libnotify libnotify

20
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -7,7 +7,7 @@
, xdg-utils, yasm, nasm, minizip, libwebp , xdg-utils, yasm, nasm, minizip, libwebp
, libusb1, pciutils, nss, re2 , libusb1, pciutils, nss, re2
, python2Packages, perl, pkg-config , python2Packages, python3Packages, perl, pkg-config
, nspr, systemd, libkrb5 , nspr, systemd, libkrb5
, util-linux, alsaLib , util-linux, alsaLib
, bison, gperf , bison, gperf
@ -42,6 +42,16 @@ with lib;
let let
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
# TODO: Python 3 support is incomplete and "python3 ../../build/util/python2_action.py"
# currently doesn't work due to mixed Python 2/3 dependencies:
pythonPackages = if chromiumVersionAtLeast "93"
then python3Packages
else python2Packages;
forcePython3Patch = (githubPatch
# Reland #8 of "Force Python 3 to be used in build."":
"a2d3c362802d9e6b62f895fcda75a3695b77b1b8"
"1r9spr2wmjk9x9l3m1gzn6692mlvbxdz0r5hlr5rfwiwr900rxi2"
);
# The additional attributes for creating derivations based on the chromium # The additional attributes for creating derivations based on the chromium
# source tree. # source tree.
@ -127,9 +137,9 @@ let
nativeBuildInputs = [ nativeBuildInputs = [
llvmPackages.lldClang.bintools llvmPackages.lldClang.bintools
ninja which python2Packages.python perl pkg-config ninja which pythonPackages.python perl pkg-config
python2Packages.ply python2Packages.jinja2 nodejs pythonPackages.ply pythonPackages.jinja2 nodejs
gnutar python2Packages.setuptools gnutar pythonPackages.setuptools
]; ];
buildInputs = defaultDependencies ++ [ buildInputs = defaultDependencies ++ [
@ -169,6 +179,8 @@ let
postPatch = lib.optionalString (chromiumVersionAtLeast "91") '' postPatch = lib.optionalString (chromiumVersionAtLeast "91") ''
# Required for patchShebangs (unsupported): # Required for patchShebangs (unsupported):
chmod -x third_party/webgpu-cts/src/tools/deno chmod -x third_party/webgpu-cts/src/tools/deno
'' + optionalString (chromiumVersionAtLeast "92") ''
patch -p1 --reverse < ${forcePython3Patch}
'' + '' '' + ''
# remove unused third-party # remove unused third-party
for lib in ${toString gnSystemLibraries}; do for lib in ${toString gnSystemLibraries}; do

6
pkgs/applications/networking/instant-messengers/nheko/default.nix
View File

@ -7,7 +7,6 @@
, lmdb , lmdb
, lmdbxx , lmdbxx
, libsecret , libsecret
, tweeny
, mkDerivation , mkDerivation
, qtbase , qtbase
, qtkeychain , qtkeychain
@ -30,13 +29,13 @@
mkDerivation rec { mkDerivation rec {
pname = "nheko"; pname = "nheko";
version = "0.8.1"; version = "0.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nheko-Reborn"; owner = "Nheko-Reborn";
repo = "nheko"; repo = "nheko";
rev = "v${version}"; rev = "v${version}";
sha256 = "1v7k3ifzi05fdr06hmws1wkfl1bmhrnam3dbwahp086vkj0r8524"; sha256 = "sha256-w4l91/W6F1FL+Q37qWSjYRHv4vad/10fxdKwfNeEwgw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -47,7 +46,6 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
nlohmann_json nlohmann_json
tweeny
mtxclient mtxclient
olm olm
boost17x boost17x

87
pkgs/applications/networking/instant-messengers/signald/default.nix Normal file
View File

@ -0,0 +1,87 @@
{ lib, stdenv, fetchurl, fetchgit, jre, coreutils, gradle_6, git, perl
, makeWrapper }:
let
pname = "signald";
version = "0.13.1";
# This package uses the .git directory
src = fetchgit {
url = "https://gitlab.com/signald/signald";
rev = version;
sha256 = "1ilmg0i1kw2yc7m3hxw1bqdpl3i9wwbj8623qmz9cxhhavbcd5i7";
leaveDotGit = true;
};
buildConfigJar = fetchurl {
url = "https://dl.bintray.com/mfuerstenau/maven/gradle/plugin/de/fuerstenau/BuildConfigPlugin/1.1.8/BuildConfigPlugin-1.1.8.jar";
sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f";
};
patches = [ ./git-describe-always.patch ./gradle-plugin.patch ];
postPatch = ''
patchShebangs gradlew
sed -i -e 's|BuildConfig.jar|${buildConfigJar}|' build.gradle
'';
# fake build to pre-download deps into fixed-output derivation
deps = stdenv.mkDerivation {
name = "${pname}-deps";
inherit src version postPatch patches;
nativeBuildInputs = [ gradle_6 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
gradle --no-daemon build
'';
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
installPhase = ''
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \
| sh
'';
# Don't move info to share/
forceShare = [ "dummy" ];
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0w8ixp1l0ch1jc2dqzxdx3ljlh17hpgns2ba7qvj43nr4prl71l7";
};
in stdenv.mkDerivation rec {
inherit pname src version postPatch patches;
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
# Use the local packages from -deps
sed -i -e 's|mavenCentral()|mavenLocal(); maven { url uri("${deps}") }|' build.gradle
gradle --offline --no-daemon distTar
'';
installPhase = ''
mkdir -p $out
tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/
wrapProgram $out/bin/signald \
--prefix PATH : ${lib.makeBinPath [ coreutils ]} \
--set JAVA_HOME "${jre}"
'';
nativeBuildInputs = [ git gradle_6 makeWrapper ];
doCheck = true;
meta = with lib; {
description = "Unofficial daemon for interacting with Signal";
longDescription = ''
Signald is a daemon that facilitates communication over Signal. It is
unofficial, unapproved, and not nearly as secure as the real Signal
clients.
'';
homepage = "https://signald.org";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ expipiplus1 ];
platforms = platforms.unix;
};
}

9
pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch Normal file
View File

@ -0,0 +1,9 @@
diff --git a/version.sh b/version.sh
index 7aeeb3c..060cba3 100755
--- a/version.sh
+++ b/version.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --abbrev=0)..HEAD --count)
+VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --always --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --always --abbrev=0)..HEAD --count)
echo $VERSION

26
pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/build.gradle b/build.gradle
index 11d7a99..66805bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
import org.xml.sax.SAXParseException
-plugins {
- id 'de.fuerstenau.buildconfig' version '1.1.8'
+buildscript {
+ dependencies {
+ classpath files ("BuildConfig.jar")
+ }
}
+apply plugin: 'de.fuerstenau.buildconfig'
apply plugin: 'java'
apply plugin: 'application'
@@ -185,4 +188,4 @@ task integrationTest(type: Test) {
testClassesDirs = sourceSets.integrationTest.output.classesDirs
classpath = sourceSets.integrationTest.runtimeClasspath
outputs.upToDateWhen { false }
-}
\ No newline at end of file
+}

6
pkgs/data/documentation/scheme-manpages/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "scheme-manpages-unstable"; pname = "scheme-manpages-unstable";
version = "2021-01-17"; version = "2021-03-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "schemedoc"; owner = "schemedoc";
repo = "manpages"; repo = "manpages";
rev = "817798ccca81424e797fda0e218d53a95f50ded7"; rev = "d0163a4e29d29b2f0beb762be4095775134f5ef9";
sha256 = "1amc0dmliz2a37pivlkx88jbc08ypfiwv3z477znx8khhc538glk"; sha256 = "0a8f7rq458c7985chwn1qb9yxcwyr0hl39r9vlvm5j687hy3igs2";
}; };
dontBuild = true; dontBuild = true;

11
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -85,7 +85,6 @@ self: super: {
kademlia = dontCheck super.kademlia; kademlia = dontCheck super.kademlia;
# Tests require older versions of tasty. # Tests require older versions of tasty.
cborg = (doJailbreak super.cborg).override { base16-bytestring = self.base16-bytestring_0_1_1_7; };
hzk = dontCheck super.hzk; hzk = dontCheck super.hzk;
resolv = doJailbreak super.resolv; resolv = doJailbreak super.resolv;
tdigest = doJailbreak super.tdigest; tdigest = doJailbreak super.tdigest;
@ -326,6 +325,7 @@ self: super: {
optional = dontCheck super.optional; optional = dontCheck super.optional;
orgmode-parse = dontCheck super.orgmode-parse; orgmode-parse = dontCheck super.orgmode-parse;
os-release = dontCheck super.os-release; os-release = dontCheck super.os-release;
parameterized = dontCheck super.parameterized; # https://github.com/louispan/parameterized/issues/2
persistent-redis = dontCheck super.persistent-redis; persistent-redis = dontCheck super.persistent-redis;
pipes-extra = dontCheck super.pipes-extra; pipes-extra = dontCheck super.pipes-extra;
pipes-websockets = dontCheck super.pipes-websockets; pipes-websockets = dontCheck super.pipes-websockets;
@ -1529,7 +1529,7 @@ self: super: {
# 2020-12-05: http-client is fixed on too old version # 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override { essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override {
http-client = self.http-client_0_7_7; http-client = self.http-client_0_7_8;
}); });
# 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
@ -1780,4 +1780,11 @@ self: super: {
# https://github.com/hasufell/lzma-static/issues/1 # https://github.com/hasufell/lzma-static/issues/1
lzma-static = doJailbreak super.lzma-static; lzma-static = doJailbreak super.lzma-static;
# Fix haddock errors: https://github.com/koalaman/shellcheck/issues/2216
ShellCheck = appendPatch super.ShellCheck (pkgs.fetchpatch {
url = "https://github.com/koalaman/shellcheck/commit/9e60b3ea841bcaf48780bfcfc2e44aa6563a62de.patch";
sha256 = "1vmg8mmmnph34x7y0mhkcd5nzky8f1rh10pird750xbkp9zlk099";
excludes = ["test/buildtest"];
});
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

122
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -101,7 +101,7 @@ default-package-overrides:
- gi-secret < 0.0.13 - gi-secret < 0.0.13
- gi-vte < 2.91.28 - gi-vte < 2.91.28
# Stackage Nightly 2021-04-06 # Stackage Nightly 2021-04-15
- abstract-deque ==0.3 - abstract-deque ==0.3
- abstract-par ==0.3.3 - abstract-par ==0.3.3
- AC-Angle ==1.0 - AC-Angle ==1.0
@ -139,7 +139,7 @@ default-package-overrides:
- alex-meta ==0.3.0.13 - alex-meta ==0.3.0.13
- alg ==0.2.13.1 - alg ==0.2.13.1
- algebraic-graphs ==0.5 - algebraic-graphs ==0.5
- Allure ==0.9.5.0 - Allure ==0.10.2.0
- almost-fix ==0.0.2 - almost-fix ==0.0.2
- alsa-core ==0.5.0.1 - alsa-core ==0.5.0.1
- alsa-mixer ==0.3.0 - alsa-mixer ==0.3.0
@ -327,7 +327,7 @@ default-package-overrides:
- bazel-runfiles ==0.12 - bazel-runfiles ==0.12
- bbdb ==0.8 - bbdb ==0.8
- bcp47 ==0.2.0.3 - bcp47 ==0.2.0.3
- bcp47-orphans ==0.1.0.2 - bcp47-orphans ==0.1.0.3
- bcrypt ==0.0.11 - bcrypt ==0.0.11
- bech32 ==1.1.0 - bech32 ==1.1.0
- bech32-th ==1.0.2 - bech32-th ==1.0.2
@ -391,7 +391,7 @@ default-package-overrides:
- boundingboxes ==0.2.3 - boundingboxes ==0.2.3
- bower-json ==1.0.0.1 - bower-json ==1.0.0.1
- boxes ==0.1.5 - boxes ==0.1.5
- brick ==0.60.2 - brick ==0.61
- broadcast-chan ==0.2.1.1 - broadcast-chan ==0.2.1.1
- bsb-http-chunked ==0.0.0.4 - bsb-http-chunked ==0.0.0.4
- bson ==0.4.0.1 - bson ==0.4.0.1
@ -451,8 +451,8 @@ default-package-overrides:
- cassava-megaparsec ==2.0.2 - cassava-megaparsec ==2.0.2
- cast ==0.1.0.2 - cast ==0.1.0.2
- category ==0.2.5.0 - category ==0.2.5.0
- cayley-client ==0.4.14 - cayley-client ==0.4.15
- cborg ==0.2.4.0 - cborg ==0.2.5.0
- cborg-json ==0.2.2.0 - cborg-json ==0.2.2.0
- cereal ==0.5.8.1 - cereal ==0.5.8.1
- cereal-conduit ==0.8.0 - cereal-conduit ==0.8.0
@ -528,13 +528,13 @@ default-package-overrides:
- compiler-warnings ==0.1.0 - compiler-warnings ==0.1.0
- composable-associations ==0.1.0.0 - composable-associations ==0.1.0.0
- composable-associations-aeson ==0.1.0.1 - composable-associations-aeson ==0.1.0.1
- composite-aeson ==0.7.4.0 - composite-aeson ==0.7.5.0
- composite-aeson-path ==0.7.4.0 - composite-aeson-path ==0.7.5.0
- composite-aeson-refined ==0.7.4.0 - composite-aeson-refined ==0.7.5.0
- composite-base ==0.7.4.0 - composite-base ==0.7.5.0
- composite-binary ==0.7.4.0 - composite-binary ==0.7.5.0
- composite-ekg ==0.7.4.0 - composite-ekg ==0.7.5.0
- composite-hashable ==0.7.4.0 - composite-hashable ==0.7.5.0
- composite-tuple ==0.1.2.0 - composite-tuple ==0.1.2.0
- composite-xstep ==0.1.0.0 - composite-xstep ==0.1.0.0
- composition ==1.0.2.2 - composition ==1.0.2.2
@ -681,7 +681,7 @@ default-package-overrides:
- deferred-folds ==0.9.17 - deferred-folds ==0.9.17
- dejafu ==2.4.0.2 - dejafu ==2.4.0.2
- dense-linear-algebra ==0.1.0.0 - dense-linear-algebra ==0.1.0.0
- depq ==0.4.1.0 - depq ==0.4.2
- deque ==0.4.3 - deque ==0.4.3
- deriveJsonNoPrefix ==0.1.0.1 - deriveJsonNoPrefix ==0.1.0.1
- derive-topdown ==0.0.2.2 - derive-topdown ==0.0.2.2
@ -710,7 +710,7 @@ default-package-overrides:
- distributed-closure ==0.4.2.0 - distributed-closure ==0.4.2.0
- distribution-opensuse ==1.1.1 - distribution-opensuse ==1.1.1
- distributive ==0.6.2.1 - distributive ==0.6.2.1
- dl-fedora ==0.7.7 - dl-fedora ==0.8
- dlist ==0.8.0.8 - dlist ==0.8.0.8
- dlist-instances ==0.1.1.1 - dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1 - dlist-nonempty ==0.1.1
@ -800,10 +800,10 @@ default-package-overrides:
- errors-ext ==0.4.2 - errors-ext ==0.4.2
- ersatz ==0.4.9 - ersatz ==0.4.9
- esqueleto ==3.4.1.1 - esqueleto ==3.4.1.1
- essence-of-live-coding ==0.2.4 - essence-of-live-coding ==0.2.5
- essence-of-live-coding-gloss ==0.2.4 - essence-of-live-coding-gloss ==0.2.5
- essence-of-live-coding-pulse ==0.2.4 - essence-of-live-coding-pulse ==0.2.5
- essence-of-live-coding-quickcheck ==0.2.4 - essence-of-live-coding-quickcheck ==0.2.5
- etc ==0.4.1.0 - etc ==0.4.1.0
- eve ==0.1.9.0 - eve ==0.1.9.0
- eventful-core ==0.2.0 - eventful-core ==0.2.0
@ -825,7 +825,7 @@ default-package-overrides:
- expiring-cache-map ==0.0.6.1 - expiring-cache-map ==0.0.6.1
- explicit-exception ==0.1.10 - explicit-exception ==0.1.10
- exp-pairs ==0.2.1.0 - exp-pairs ==0.2.1.0
- express ==0.1.3 - express ==0.1.4
- extended-reals ==0.2.4.0 - extended-reals ==0.2.4.0
- extensible-effects ==5.0.0.1 - extensible-effects ==5.0.0.1
- extensible-exceptions ==0.1.1.4 - extensible-exceptions ==0.1.1.4
@ -869,7 +869,7 @@ default-package-overrides:
- first-class-patterns ==0.3.2.5 - first-class-patterns ==0.3.2.5
- fitspec ==0.4.8 - fitspec ==0.4.8
- fixed ==0.3 - fixed ==0.3
- fixed-length ==0.2.2 - fixed-length ==0.2.2.1
- fixed-vector ==1.2.0.0 - fixed-vector ==1.2.0.0
- fixed-vector-hetero ==0.6.1.0 - fixed-vector-hetero ==0.6.1.0
- fix-whitespace ==0.0.5 - fix-whitespace ==0.0.5
@ -936,10 +936,10 @@ default-package-overrides:
- generic-data-surgery ==0.3.0.0 - generic-data-surgery ==0.3.0.0
- generic-deriving ==1.13.1 - generic-deriving ==1.13.1
- generic-functor ==0.2.0.0 - generic-functor ==0.2.0.0
- generic-lens ==2.0.0.0 - generic-lens ==2.1.0.0
- generic-lens-core ==2.0.0.0 - generic-lens-core ==2.1.0.0
- generic-monoid ==0.1.0.1 - generic-monoid ==0.1.0.1
- generic-optics ==2.0.0.0 - generic-optics ==2.1.0.0
- GenericPretty ==1.2.2 - GenericPretty ==1.2.2
- generic-random ==1.3.0.1 - generic-random ==1.3.0.1
- generics-eot ==0.4.0.1 - generics-eot ==0.4.0.1
@ -978,7 +978,7 @@ default-package-overrides:
- geojson ==4.0.2 - geojson ==4.0.2
- getopt-generics ==0.13.0.4 - getopt-generics ==0.13.0.4
- ghc-byteorder ==4.11.0.0.10 - ghc-byteorder ==4.11.0.0.10
- ghc-check ==0.5.0.3 - ghc-check ==0.5.0.4
- ghc-core ==0.5.6 - ghc-core ==0.5.6
- ghc-events ==0.16.0 - ghc-events ==0.16.0
- ghc-exactprint ==0.6.4 - ghc-exactprint ==0.6.4
@ -1028,7 +1028,7 @@ default-package-overrides:
- gitrev ==1.3.1 - gitrev ==1.3.1
- gi-xlib ==2.0.9 - gi-xlib ==2.0.9
- gl ==0.9 - gl ==0.9
- glabrous ==2.0.2 - glabrous ==2.0.3
- GLFW-b ==3.3.0.0 - GLFW-b ==3.3.0.0
- Glob ==0.10.1 - Glob ==0.10.1
- gloss ==1.13.2.1 - gloss ==1.13.2.1
@ -1130,7 +1130,7 @@ default-package-overrides:
- hgrev ==0.2.6 - hgrev ==0.2.6
- hidapi ==0.1.7 - hidapi ==0.1.7
- hie-bios ==0.7.5 - hie-bios ==0.7.5
- hi-file-parser ==0.1.1.0 - hi-file-parser ==0.1.2.0
- higher-leveldb ==0.6.0.0 - higher-leveldb ==0.6.0.0
- highlighting-kate ==0.6.4 - highlighting-kate ==0.6.4
- hinfo ==0.0.3.0 - hinfo ==0.0.3.0
@ -1187,7 +1187,7 @@ default-package-overrides:
- hslua-module-path ==0.1.0.1 - hslua-module-path ==0.1.0.1
- hslua-module-system ==0.2.2.1 - hslua-module-system ==0.2.2.1
- hslua-module-text ==0.3.0.1 - hslua-module-text ==0.3.0.1
- HsOpenSSL ==0.11.6.1 - HsOpenSSL ==0.11.6.2
- HsOpenSSL-x509-system ==0.1.0.4 - HsOpenSSL-x509-system ==0.1.0.4
- hsp ==0.10.0 - hsp ==0.10.0
- hspec ==2.7.9 - hspec ==2.7.9
@ -1197,13 +1197,13 @@ default-package-overrides:
- hspec-core ==2.7.9 - hspec-core ==2.7.9
- hspec-discover ==2.7.9 - hspec-discover ==2.7.9
- hspec-expectations ==0.8.2 - hspec-expectations ==0.8.2
- hspec-expectations-json ==1.0.0.2 - hspec-expectations-json ==1.0.0.3
- hspec-expectations-lifted ==0.10.0 - hspec-expectations-lifted ==0.10.0
- hspec-expectations-pretty-diff ==0.7.2.5 - hspec-expectations-pretty-diff ==0.7.2.5
- hspec-golden ==0.1.0.3 - hspec-golden ==0.1.0.3
- hspec-golden-aeson ==0.7.0.0 - hspec-golden-aeson ==0.7.0.0
- hspec-hedgehog ==0.0.1.2 - hspec-hedgehog ==0.0.1.2
- hspec-junit-formatter ==1.0.0.1 - hspec-junit-formatter ==1.0.0.2
- hspec-leancheck ==0.0.4 - hspec-leancheck ==0.0.4
- hspec-megaparsec ==2.2.0 - hspec-megaparsec ==2.2.0
- hspec-meta ==2.7.8 - hspec-meta ==2.7.8
@ -1316,7 +1316,7 @@ default-package-overrides:
- indexed ==0.1.3 - indexed ==0.1.3
- indexed-containers ==0.1.0.2 - indexed-containers ==0.1.0.2
- indexed-list-literals ==0.2.1.3 - indexed-list-literals ==0.2.1.3
- indexed-profunctors ==0.1 - indexed-profunctors ==0.1.1
- indexed-traversable ==0.1.1 - indexed-traversable ==0.1.1
- indexed-traversable-instances ==0.1 - indexed-traversable-instances ==0.1
- infer-license ==0.2.0 - infer-license ==0.2.0
@ -1332,6 +1332,7 @@ default-package-overrides:
- insert-ordered-containers ==0.2.4 - insert-ordered-containers ==0.2.4
- inspection-testing ==0.4.3.0 - inspection-testing ==0.4.3.0
- instance-control ==0.1.2.0 - instance-control ==0.1.2.0
- int-cast ==0.2.0.0
- integer-logarithms ==1.0.3.1 - integer-logarithms ==1.0.3.1
- integer-roots ==1.0 - integer-roots ==1.0
- integration ==0.2.1 - integration ==0.2.1
@ -1356,7 +1357,7 @@ default-package-overrides:
- io-streams-haproxy ==1.0.1.0 - io-streams-haproxy ==1.0.1.0
- ip6addr ==1.0.2 - ip6addr ==1.0.2
- iproute ==1.7.11 - iproute ==1.7.11
- IPv6Addr ==2.0.1 - IPv6Addr ==2.0.2
- ipynb ==0.1.0.1 - ipynb ==0.1.0.1
- ipython-kernel ==0.10.2.1 - ipython-kernel ==0.10.2.1
- irc ==0.6.1.0 - irc ==0.6.1.0
@ -1369,13 +1370,12 @@ default-package-overrides:
- iso639 ==0.1.0.3 - iso639 ==0.1.0.3
- iso8601-time ==0.1.5 - iso8601-time ==0.1.5
- iterable ==3.0 - iterable ==3.0
- it-has ==0.2.0.0
- ixset-typed ==0.5 - ixset-typed ==0.5
- ixset-typed-binary-instance ==0.1.0.2 - ixset-typed-binary-instance ==0.1.0.2
- ixset-typed-conversions ==0.1.2.0 - ixset-typed-conversions ==0.1.2.0
- ixset-typed-hashable-instance ==0.1.0.2 - ixset-typed-hashable-instance ==0.1.0.2
- ix-shapable ==0.1.0 - ix-shapable ==0.1.0
- jack ==0.7.1.4 - jack ==0.7.2
- jalaali ==1.0.0.0 - jalaali ==1.0.0.0
- jira-wiki-markup ==1.3.4 - jira-wiki-markup ==1.3.4
- jose ==0.8.4 - jose ==0.8.4
@ -1416,13 +1416,13 @@ default-package-overrides:
- l10n ==0.1.0.1 - l10n ==0.1.0.1
- labels ==0.3.3 - labels ==0.3.3
- lackey ==1.0.14 - lackey ==1.0.14
- LambdaHack ==0.9.5.0 - LambdaHack ==0.10.2.0
- lame ==0.2.0 - lame ==0.2.0
- language-avro ==0.1.3.1 - language-avro ==0.1.3.1
- language-bash ==0.9.2 - language-bash ==0.9.2
- language-c ==0.8.3 - language-c ==0.8.3
- language-c-quote ==0.12.2.1 - language-c-quote ==0.12.2.1
- language-docker ==9.1.3 - language-docker ==9.2.0
- language-java ==0.2.9 - language-java ==0.2.9
- language-javascript ==0.7.1.0 - language-javascript ==0.7.1.0
- language-protobuf ==1.0.1 - language-protobuf ==1.0.1
@ -1591,7 +1591,7 @@ default-package-overrides:
- mnist-idx ==0.1.2.8 - mnist-idx ==0.1.2.8
- mockery ==0.3.5 - mockery ==0.3.5
- mock-time ==0.1.0 - mock-time ==0.1.0
- mod ==0.1.2.1 - mod ==0.1.2.2
- model ==0.5 - model ==0.5
- modern-uri ==0.3.4.1 - modern-uri ==0.3.4.1
- modular ==0.1.0.8 - modular ==0.1.0.8
@ -1617,7 +1617,7 @@ default-package-overrides:
- monad-primitive ==0.1 - monad-primitive ==0.1
- monad-products ==4.0.1 - monad-products ==4.0.1
- MonadPrompt ==1.0.0.5 - MonadPrompt ==1.0.0.5
- MonadRandom ==0.5.2 - MonadRandom ==0.5.3
- monad-resumption ==0.1.4.0 - monad-resumption ==0.1.4.0
- monad-skeleton ==0.1.5 - monad-skeleton ==0.1.5
- monad-st ==0.2.4.1 - monad-st ==0.2.4.1
@ -1707,7 +1707,7 @@ default-package-overrides:
- nonemptymap ==0.0.6.0 - nonemptymap ==0.0.6.0
- non-empty-sequence ==0.2.0.4 - non-empty-sequence ==0.2.0.4
- nonempty-vector ==0.2.1.0 - nonempty-vector ==0.2.1.0
- nonempty-zipper ==1.0.0.1 - nonempty-zipper ==1.0.0.2
- non-negative ==0.1.2 - non-negative ==0.1.2
- not-gloss ==0.7.7.0 - not-gloss ==0.7.7.0
- no-value ==1.0.0.0 - no-value ==1.0.0.0
@ -1715,7 +1715,7 @@ default-package-overrides:
- nqe ==0.6.3 - nqe ==0.6.3
- nri-env-parser ==0.1.0.6 - nri-env-parser ==0.1.0.6
- nri-observability ==0.1.0.1 - nri-observability ==0.1.0.1
- nri-prelude ==0.5.0.2 - nri-prelude ==0.5.0.3
- nsis ==0.3.3 - nsis ==0.3.3
- numbers ==3000.2.0.2 - numbers ==3000.2.0.2
- numeric-extras ==0.1 - numeric-extras ==0.1
@ -1961,8 +1961,8 @@ default-package-overrides:
- QuickCheck ==2.14.2 - QuickCheck ==2.14.2
- quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-arbitrary-adt ==0.3.1.0
- quickcheck-assertions ==0.3.0 - quickcheck-assertions ==0.3.0
- quickcheck-classes ==0.6.4.0 - quickcheck-classes ==0.6.5.0
- quickcheck-classes-base ==0.6.1.0 - quickcheck-classes-base ==0.6.2.0
- quickcheck-higherorder ==0.1.0.0 - quickcheck-higherorder ==0.1.0.0
- quickcheck-instances ==0.3.25.2 - quickcheck-instances ==0.3.25.2
- quickcheck-io ==0.2.0 - quickcheck-io ==0.2.0
@ -2013,7 +2013,7 @@ default-package-overrides:
- rebase ==1.6.1 - rebase ==1.6.1
- record-dot-preprocessor ==0.2.10 - record-dot-preprocessor ==0.2.10
- record-hasfield ==1.0 - record-hasfield ==1.0
- records-sop ==0.1.0.3 - records-sop ==0.1.1.0
- record-wrangler ==0.1.1.0 - record-wrangler ==0.1.1.0
- recursion-schemes ==5.2.2.1 - recursion-schemes ==5.2.2.1
- reducers ==3.12.3 - reducers ==3.12.3
@ -2038,7 +2038,7 @@ default-package-overrides:
- regex-posix ==0.96.0.0 - regex-posix ==0.96.0.0
- regex-tdfa ==1.3.1.0 - regex-tdfa ==1.3.1.0
- regex-with-pcre ==1.1.0.0 - regex-with-pcre ==1.1.0.0
- registry ==0.2.0.2 - registry ==0.2.0.3
- reinterpret-cast ==0.1.0 - reinterpret-cast ==0.1.0
- relapse ==1.0.0.0 - relapse ==1.0.0.0
- relational-query ==0.12.2.3 - relational-query ==0.12.2.3
@ -2087,7 +2087,7 @@ default-package-overrides:
- rvar ==0.2.0.6 - rvar ==0.2.0.6
- safe ==0.3.19 - safe ==0.3.19
- safe-coloured-text ==0.0.0.0 - safe-coloured-text ==0.0.0.0
- safecopy ==0.10.4.1 - safecopy ==0.10.4.2
- safe-decimal ==0.2.0.0 - safe-decimal ==0.2.0.0
- safe-exceptions ==0.1.7.1 - safe-exceptions ==0.1.7.1
- safe-foldable ==0.1.0.0 - safe-foldable ==0.1.0.0
@ -2248,9 +2248,9 @@ default-package-overrides:
- sparse-tensor ==0.2.1.5 - sparse-tensor ==0.2.1.5
- spatial-math ==0.5.0.1 - spatial-math ==0.5.0.1
- special-values ==0.1.0.0 - special-values ==0.1.0.0
- speculate ==0.4.2 - speculate ==0.4.4
- speedy-slice ==0.3.2 - speedy-slice ==0.3.2
- Spintax ==0.3.5 - Spintax ==0.3.6
- splice ==0.6.1.1 - splice ==0.6.1.1
- splint ==1.0.1.4 - splint ==1.0.1.4
- split ==0.2.3.4 - split ==0.2.3.4
@ -2419,7 +2419,7 @@ default-package-overrides:
- text-metrics ==0.3.0 - text-metrics ==0.3.0
- text-postgresql ==0.0.3.1 - text-postgresql ==0.0.3.1
- text-printer ==0.5.0.1 - text-printer ==0.5.0.1
- text-regex-replace ==0.1.1.3 - text-regex-replace ==0.1.1.4
- text-region ==0.3.1.0 - text-region ==0.3.1.0
- text-short ==0.1.3 - text-short ==0.1.3
- text-show ==3.9 - text-show ==3.9
@ -2457,9 +2457,9 @@ default-package-overrides:
- throwable-exceptions ==0.1.0.9 - throwable-exceptions ==0.1.0.9
- th-strict-compat ==0.1.0.1 - th-strict-compat ==0.1.0.1
- th-test-utils ==1.1.0 - th-test-utils ==1.1.0
- th-utilities ==0.2.4.2 - th-utilities ==0.2.4.3
- thyme ==0.3.5.5 - thyme ==0.3.5.5
- tidal ==1.7.2 - tidal ==1.7.3
- tile ==0.3.0.0 - tile ==0.3.0.0
- time-compat ==1.9.5 - time-compat ==1.9.5
- timeit ==2.0 - timeit ==2.0
@ -2604,9 +2604,9 @@ default-package-overrides:
- valor ==0.1.0.0 - valor ==0.1.0.0
- vault ==0.3.1.5 - vault ==0.3.1.5
- vec ==0.4 - vec ==0.4
- vector ==0.12.2.0 - vector ==0.12.3.0
- vector-algorithms ==0.8.0.4 - vector-algorithms ==0.8.0.4
- vector-binary-instances ==0.2.5.1 - vector-binary-instances ==0.2.5.2
- vector-buffer ==0.4.1 - vector-buffer ==0.4.1
- vector-builder ==0.3.8.1 - vector-builder ==0.3.8.1
- vector-bytes-instances ==0.1.1 - vector-bytes-instances ==0.1.1
@ -2729,15 +2729,15 @@ default-package-overrides:
- yesod ==1.6.1.0 - yesod ==1.6.1.0
- yesod-auth ==1.6.10.2 - yesod-auth ==1.6.10.2
- yesod-auth-hashdb ==1.7.1.5 - yesod-auth-hashdb ==1.7.1.5
- yesod-auth-oauth2 ==0.6.2.3 - yesod-auth-oauth2 ==0.6.3.0
- yesod-bin ==1.6.1 - yesod-bin ==1.6.1
- yesod-core ==1.6.18.8 - yesod-core ==1.6.19.0
- yesod-fb ==0.6.1 - yesod-fb ==0.6.1
- yesod-form ==1.6.7 - yesod-form ==1.6.7
- yesod-gitrev ==0.2.1 - yesod-gitrev ==0.2.1
- yesod-markdown ==0.12.6.8 - yesod-markdown ==0.12.6.8
- yesod-newsfeed ==1.7.0.0 - yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.5 - yesod-page-cursor ==2.0.0.6
- yesod-paginator ==1.1.1.0 - yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.6 - yesod-persistent ==1.6.0.6
- yesod-sitemap ==1.6.0 - yesod-sitemap ==1.6.0
@ -5951,7 +5951,6 @@ broken-packages:
- gw - gw
- gyah-bin - gyah-bin
- gym-http-api - gym-http-api
- H
- h-booru - h-booru
- h-gpgme - h-gpgme
- h-reversi - h-reversi
@ -6838,6 +6837,7 @@ broken-packages:
- hsdip - hsdip
- hsdns-cache - hsdns-cache
- Hsed - Hsed
- hsendxmpp
- hsenv - hsenv
- HSet - HSet
- hset - hset
@ -7193,7 +7193,6 @@ broken-packages:
- inject-function - inject-function
- inline-asm - inline-asm
- inline-java - inline-java
- inline-r
- inserts - inserts
- inspector-wrecker - inspector-wrecker
- instana-haskell-trace-sdk - instana-haskell-trace-sdk
@ -8693,6 +8692,8 @@ broken-packages:
- opentelemetry-http-client - opentelemetry-http-client
- opentheory-char - opentheory-char
- opentok - opentok
- opentracing-jaeger
- opentracing-zipkin-v1
- opentype - opentype
- OpenVG - OpenVG
- OpenVGRaw - OpenVGRaw
@ -8813,7 +8814,6 @@ broken-packages:
- Paraiso - Paraiso
- Parallel-Arrows-Eden - Parallel-Arrows-Eden
- parallel-tasks - parallel-tasks
- parameterized
- parameterized-utils - parameterized-utils
- paranoia - paranoia
- parco - parco
@ -9818,6 +9818,7 @@ broken-packages:
- safe-globals - safe-globals
- safe-lazy-io - safe-lazy-io
- safe-length - safe-length
- safe-numeric
- safe-plugins - safe-plugins
- safe-printf - safe-printf
- safecopy-migrate - safecopy-migrate
@ -10004,11 +10005,11 @@ broken-packages:
- servant-db - servant-db
- servant-db-postgresql - servant-db-postgresql
- servant-dhall - servant-dhall
- servant-docs
- servant-docs-simple - servant-docs-simple
- servant-ede - servant-ede
- servant-ekg - servant-ekg
- servant-elm - servant-elm
- servant-event-stream
- servant-examples - servant-examples
- servant-fiat-content - servant-fiat-content
- servant-generate - servant-generate
@ -10769,6 +10770,7 @@ broken-packages:
- TaskMonad - TaskMonad
- tasty-auto - tasty-auto
- tasty-bdd - tasty-bdd
- tasty-checklist
- tasty-fail-fast - tasty-fail-fast
- tasty-grading-system - tasty-grading-system
- tasty-groundhog-converters - tasty-groundhog-converters
@ -11574,6 +11576,7 @@ broken-packages:
- whois - whois
- why3 - why3
- wide-word - wide-word
- wide-word-instances
- WikimediaParser - WikimediaParser
- wikipedia4epub - wikipedia4epub
- wild-bind-indicator - wild-bind-indicator
@ -11637,7 +11640,6 @@ broken-packages:
- wshterm - wshterm
- wsjtx-udp - wsjtx-udp
- wss-client - wss-client
- wstunnel
- wtk - wtk
- wtk-gtk - wtk-gtk
- wu-wei - wu-wei

34
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -661,20 +661,26 @@ self: super: builtins.intersectAttrs super {
# fine with newer versions. # fine with newer versions.
spagoWithOverrides = doJailbreak super.spago; spagoWithOverrides = doJailbreak super.spago;
# This defines the version of the purescript-docs-search release we are using. docsSearchApp_0_0_10 = pkgs.fetchurl {
# This is defined in the src/Spago/Prelude.hs file in the spago source. url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/docs-search-app.js";
docsSearchVersion = "v0.0.10";
docsSearchAppJsFile = pkgs.fetchurl {
url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/docs-search-app.js";
sha256 = "0m5ah29x290r0zk19hx2wix2djy7bs4plh9kvjz6bs9r45x25pa5"; sha256 = "0m5ah29x290r0zk19hx2wix2djy7bs4plh9kvjz6bs9r45x25pa5";
}; };
purescriptDocsSearchFile = pkgs.fetchurl { docsSearchApp_0_0_11 = pkgs.fetchurl {
url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/purescript-docs-search"; url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.11/docs-search-app.js";
sha256 = "17qngsdxfg96cka1cgrl3zdrpal8ll6vyhhnazqm4hwj16ywjm02";
};
purescriptDocsSearch_0_0_10 = pkgs.fetchurl {
url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/purescript-docs-search";
sha256 = "0wc1zyhli4m2yykc6i0crm048gyizxh7b81n8xc4yb7ibjqwhyj3"; sha256 = "0wc1zyhli4m2yykc6i0crm048gyizxh7b81n8xc4yb7ibjqwhyj3";
}; };
purescriptDocsSearch_0_0_11 = pkgs.fetchurl {
url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.11/purescript-docs-search";
sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6";
};
spagoFixHpack = overrideCabal spagoWithOverrides (drv: { spagoFixHpack = overrideCabal spagoWithOverrides (drv: {
postUnpack = (drv.postUnpack or "") + '' postUnpack = (drv.postUnpack or "") + ''
# The source for spago is pulled directly from GitHub. It uses a # The source for spago is pulled directly from GitHub. It uses a
@ -695,13 +701,19 @@ self: super: builtins.intersectAttrs super {
# However, they are not actually available in the spago source, so they # However, they are not actually available in the spago source, so they
# need to fetched with nix and put in the correct place. # need to fetched with nix and put in the correct place.
# https://github.com/spacchetti/spago/issues/510 # https://github.com/spacchetti/spago/issues/510
cp ${docsSearchAppJsFile} "$sourceRoot/templates/docs-search-app.js" cp ${docsSearchApp_0_0_10} "$sourceRoot/templates/docs-search-app-0.0.10.js"
cp ${purescriptDocsSearchFile} "$sourceRoot/templates/purescript-docs-search" cp ${docsSearchApp_0_0_11} "$sourceRoot/templates/docs-search-app-0.0.11.js"
cp ${purescriptDocsSearch_0_0_10} "$sourceRoot/templates/purescript-docs-search-0.0.10"
cp ${purescriptDocsSearch_0_0_11} "$sourceRoot/templates/purescript-docs-search-0.0.11"
# For some weird reason, on Darwin, the open(2) call to embed these files # For some weird reason, on Darwin, the open(2) call to embed these files
# requires write permissions. The easiest resolution is just to permit that # requires write permissions. The easiest resolution is just to permit that
# (doesn't cause any harm on other systems). # (doesn't cause any harm on other systems).
chmod u+w "$sourceRoot/templates/docs-search-app.js" "$sourceRoot/templates/purescript-docs-search" chmod u+w \
"$sourceRoot/templates/docs-search-app-0.0.10.js" \
"$sourceRoot/templates/purescript-docs-search-0.0.10" \
"$sourceRoot/templates/docs-search-app-0.0.11.js" \
"$sourceRoot/templates/purescript-docs-search-0.0.11"
''; '';
}); });

2154
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/libraries/intel-gmmlib/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "intel-gmmlib"; pname = "intel-gmmlib";
version = "21.1.1"; version = "21.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intel"; owner = "intel";
repo = "gmmlib"; repo = "gmmlib";
rev = "${pname}-${version}"; rev = "${pname}-${version}";
sha256 = "0cdyrfyn05fadva8k02kp4nk14k274xfmhzwc0v7jijm1dw8v8rf"; sha256 = "0zs8l0q1q7xps3kxlch6jddxjiny8n8avdg1ghiwbkvgf76gb3as";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lmdbxx"; pname = "lmdbxx";
version = "0.9.14.0"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "drycpp"; owner = "hoytech";
repo = "lmdbxx"; repo = "lmdbxx";
rev = version; rev = version;
sha256 = "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6"; sha256 = "sha256-7CxQZdgHVvmof6wVR9Mzic6tg89XJT3Z1ICGRs7PZYo=";
}; };
buildInputs = [ lmdb ]; buildInputs = [ lmdb ];

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

@ -12,13 +12,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mtxclient"; pname = "mtxclient";
version = "0.4.1"; version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nheko-Reborn"; owner = "Nheko-Reborn";
repo = "mtxclient"; repo = "mtxclient";
rev = "v${version}"; rev = "v${version}";
sha256 = "1044zil3izhb3whhfjah7w0kg5mr3hys32cjffky681d3mb3wi5n"; sha256 = "sha256-UKroV1p7jYuNzCAFMsuUsYC/C9AZ1D4rhwpwuER39vc=";
}; };
cmakeFlags = [ cmakeFlags = [

34
pkgs/development/python-modules/python-picnic-api/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
}:
buildPythonPackage rec {
pname = "python-picnic-api";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "1axqw4bs3wa9mdac35h7r25v3i5g7v55cvyy48c4sg31dxnr4wcp";
};
propagatedBuildInputs = [
requests
];
# Project doesn't ship tests
# https://github.com/MikeBrink/python-picnic-api/issues/13
doCheck = false;
pythonImportsCheck = [
"python_picnic_api"
];
meta = with lib; {
description = "Python wrapper for the Picnic API";
homepage = "https://github.com/MikeBrink/python-picnic-api";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

41
pkgs/development/python-modules/rokuecp/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, aiohttp
, xmltodict
, yarl
, aresponses
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "rokuecp";
version = "0.8.1";
src = fetchFromGitHub {
owner = "ctalkington";
repo = "python-rokuecp";
rev = version;
sha256 = "02mbmwljcvqj3ksj2irdm8849lcxzwa6fycgjqb0i75cgidxpans";
};
propagatedBuildInputs = [
aiohttp
xmltodict
yarl
];
checkInputs = [
aresponses
pytestCheckHook
pytest-asyncio
];
meta = with lib; {
description = "Asynchronous Python client for Roku (ECP)";
homepage = "https://github.com/ctalkington/python-rokuecp";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

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

@ -11,13 +11,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sendgrid"; pname = "sendgrid";
version = "6.6.0"; version = "6.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = "sendgrid-python"; repo = "sendgrid-python";
rev = version; rev = version;
sha256 = "sha256-R9ASHDIGuPRh4yf0FAlpjUZ6QAakYs35EFSqAPc02Q8="; sha256 = "sha256-Y0h5Aiu85/EWCmSc+eCtK6ZaPuu/LYZiwhXOx0XhfwQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -21,14 +21,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "slack-sdk"; pname = "slack-sdk";
version = "3.4.2"; version = "3.5.0";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "slackapi"; owner = "slackapi";
repo = "python-slack-sdk"; repo = "python-slack-sdk";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-AbQqe6hCy6Ke5lwKHFWLJlXv7HdDApYYK++SPNQ2Nxg="; sha256 = "sha256-5ZBaF/6p/eOWjAmo+IlF9zCb9xBr2bP6suPZblRogUg=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -7,13 +7,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "twitterapi"; pname = "twitterapi";
version = "2.7.1"; version = "2.7.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "geduldig"; owner = "geduldig";
repo = "TwitterAPI"; repo = "TwitterAPI";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-fLexFlnoh58b9q4mo9atGQmMttKytTfAYmaPj6xmPj8="; sha256 = "sha256-kSL+zAWn/6itBu4T1OcIbg4k5Asatgz/dqzbnlcsqkg=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "xknx"; pname = "xknx";
version = "0.18.0"; version = "0.18.1";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "XKNX"; owner = "XKNX";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-8g8DrFvhecdPsfiw+uKnfJOrLQeuFUziK2Jl3xKmrf4="; sha256 = "sha256-Zf7Od3v54LxMofm67XHeRM4Yeg1+KQLRhFl1BihAxGc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -7,13 +7,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ytmusicapi"; pname = "ytmusicapi";
version = "0.15.1"; version = "0.16.0";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-W/eZubJ/SNLBya1S6wLUwTwZCUD+wCQ5FAuNcSpl+9Y="; sha256 = "sha256-/94/taeBI6xZ3uN/wfMnk/NPmk+j0+aaH8CAZBEsK10=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "esbuild"; pname = "esbuild";
version = "0.11.12"; version = "0.11.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "evanw"; owner = "evanw";
repo = "esbuild"; repo = "esbuild";
rev = "v${version}"; rev = "v${version}";
sha256 = "1mxj4mrq1zbvv25alnc3s36bhnnhghivgwp45a7m3cp1389ffcd1"; sha256 = "0v358n2vpa1l1a699zyq43yzb3lcxjp3k4acppx0ggva05qn9zd1";
}; };
vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q";

41
pkgs/development/tools/purescript/spago/spago.nix
View File

@ -1,22 +1,22 @@
{ mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool { mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool
, base, bower-json, bytestring, Cabal, containers, cryptonite , base, bower-json, bytestring, Cabal, containers, cryptonite
, dhall, directory, either, exceptions, extra, fetchgit, file-embed , dhall, directory, either, extra, fetchgit, file-embed, filepath
, filepath, foldl, fsnotify, generic-lens, github, Glob, hpack , foldl, fsnotify, generic-lens, Glob, hpack, hspec, hspec-discover
, hspec, hspec-discover, hspec-megaparsec, http-client , hspec-megaparsec, http-client, http-conduit, http-types
, http-conduit, http-types, lens-family-core, megaparsec, mtl , lens-family-core, lib, megaparsec, mtl, network-uri, open-browser
, network-uri, open-browser, optparse-applicative, prettyprinter , optparse-applicative, prettyprinter, process, QuickCheck, retry
, process, QuickCheck, retry, rio, rio-orphans, safe, semver-range , rio, rio-orphans, safe, semver-range, stm, stringsearch
, lib, stm, stringsearch, tar, template-haskell, temporary, text , tar, template-haskell, temporary, text, time, transformers
, time, transformers, turtle, unliftio, unordered-containers , turtle, unliftio, unordered-containers, utf8-string, versions
, utf8-string, vector, versions, with-utf8, zlib , with-utf8, zlib
}: }:
mkDerivation { mkDerivation {
pname = "spago"; pname = "spago";
version = "0.20.0"; version = "0.20.1";
src = fetchgit { src = fetchgit {
url = "https://github.com/purescript/spago.git"; url = "https://github.com/purescript/spago.git";
sha256 = "1n48p9ycry8bjnf9jlcfgyxsbgn5985l4vhbwlv46kbb41ddwi51"; sha256 = "1j2yi6zz9m0k0298wllin39h244v8b2rx87yxxgdbjg77kn96vxg";
rev = "7dfd2236aff92e5ae4f7a4dc336b50a7e14e4f44"; rev = "41ad739614f4f2c2356ac921308f9475a5a918f4";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = true; isLibrary = true;
@ -24,16 +24,17 @@ mkDerivation {
libraryHaskellDepends = [ libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal async-pool base bower-json aeson aeson-pretty ansi-terminal async-pool base bower-json
bytestring Cabal containers cryptonite dhall directory either bytestring Cabal containers cryptonite dhall directory either
exceptions file-embed filepath foldl fsnotify generic-lens github file-embed filepath foldl fsnotify generic-lens Glob http-client
Glob http-client http-conduit http-types lens-family-core http-conduit http-types lens-family-core megaparsec mtl network-uri
megaparsec mtl network-uri open-browser optparse-applicative open-browser optparse-applicative prettyprinter process retry rio
prettyprinter process retry rio rio-orphans safe semver-range stm rio-orphans safe semver-range stm stringsearch tar template-haskell
stringsearch tar template-haskell temporary text time transformers temporary text time transformers turtle unliftio
turtle unliftio unordered-containers utf8-string vector versions unordered-containers utf8-string versions with-utf8 zlib
with-utf8 zlib
]; ];
libraryToolDepends = [ hpack ]; libraryToolDepends = [ hpack ];
executableHaskellDepends = [ base text turtle with-utf8 ]; executableHaskellDepends = [
ansi-terminal base text turtle with-utf8
];
testHaskellDepends = [ testHaskellDepends = [
base containers directory extra hspec hspec-megaparsec megaparsec base containers directory extra hspec hspec-megaparsec megaparsec
process QuickCheck temporary text turtle versions process QuickCheck temporary text turtle versions

6
pkgs/development/web/deno/default.nix
View File

@ -16,15 +16,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "deno"; pname = "deno";
version = "1.9.1"; version = "1.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "denoland"; owner = "denoland";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-h8dXGSu7DebzwZdc92A2d9xlYy6wD34phBUj5v5KuIc="; sha256 = "sha256-FKhSFqFZhqzrXrJcBc0YBNHoUq0/1+ULZ9sE+LyNQTI=";
}; };
cargoSha256 = "sha256-htxpaALOXFQpQ68YE4b0T0jhcCIONgUZwpMPCcSdcgs="; cargoSha256 = "sha256-Pp322D7YtdpeNnKWcE78tvLh5nFNcrh9oGYX2eCiPzI=";
# Install completions post-install # Install completions post-install
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

24
pkgs/games/factorio/versions.json
View File

@ -10,12 +10,12 @@
"version": "1.1.32" "version": "1.1.32"
}, },
"stable": { "stable": {
"name": "factorio_alpha_x64-1.1.30.tar.xz", "name": "factorio_alpha_x64-1.1.32.tar.xz",
"needsAuth": true, "needsAuth": true,
"sha256": "14mcf9pj6s5ms2hl68n3r5jk1q5y2qzw88wiahsb5plkv9qyqyp6", "sha256": "0ciz7y8xqlk9vg3akvflq1aabzgbqpazfnihyk4gsadk12b6a490",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.30/alpha/linux64", "url": "https://factorio.com/get-download/1.1.32/alpha/linux64",
"version": "1.1.30" "version": "1.1.32"
} }
}, },
"demo": { "demo": {
@ -28,12 +28,12 @@
"version": "1.1.30" "version": "1.1.30"
}, },
"stable": { "stable": {
"name": "factorio_demo_x64-1.1.30.tar.xz", "name": "factorio_demo_x64-1.1.32.tar.xz",
"needsAuth": false, "needsAuth": false,
"sha256": "1b3na8xn9lhlvrsd6hxr130nf9p81s26n25a4qdgkczz6waysgjv", "sha256": "19zwl20hn8hh942avqri1kslf7dcqi9nim50vh4w5d0493srybfw",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.30/demo/linux64", "url": "https://factorio.com/get-download/1.1.32/demo/linux64",
"version": "1.1.30" "version": "1.1.32"
} }
}, },
"headless": { "headless": {
@ -46,12 +46,12 @@
"version": "1.1.32" "version": "1.1.32"
}, },
"stable": { "stable": {
"name": "factorio_headless_x64-1.1.30.tar.xz", "name": "factorio_headless_x64-1.1.32.tar.xz",
"needsAuth": false, "needsAuth": false,
"sha256": "1rac6d8v8swiw1nn2hl53rhjfhsyv98qg8hfnwhfqn76jgspspdl", "sha256": "0dg98ycs7m8rm996pk0p1iajalpmiy30p0pwr9dw2chf1d887kvz",
"tarDirectory": "x64", "tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.30/headless/linux64", "url": "https://factorio.com/get-download/1.1.32/headless/linux64",
"version": "1.1.30" "version": "1.1.32"
} }
} }
} }

4
pkgs/games/openttd/default.nix
View File

@ -29,11 +29,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openttd"; pname = "openttd";
version = "1.11.0"; version = "1.11.1";
src = fetchurl { src = fetchurl {
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
sha256 = "sha256-XmUYTgc2i6Gvpi27PjWrrubE2mcw/0vJ60RH1TNjx6g="; sha256 = "sha256-qZGeLkKbsI+in+jme6m8dckOnvb6ZCSOs0IjoyXUAKM=";
}; };
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];

4
pkgs/games/openttd/jgrpp.nix
View File

@ -2,12 +2,12 @@
openttd.overrideAttrs (oldAttrs: rec { openttd.overrideAttrs (oldAttrs: rec {
pname = "openttd-jgrpp"; pname = "openttd-jgrpp";
version = "0.40.5"; version = "0.41.0";
src = fetchFromGitHub rec { src = fetchFromGitHub rec {
owner = "JGRennison"; owner = "JGRennison";
repo = "OpenTTD-patches"; repo = "OpenTTD-patches";
rev = "jgrpp-${version}"; rev = "jgrpp-${version}";
sha256 = "sha256-g1RmgVjefOrOVLTvFBiPEd19aLoFvB9yX/hMiKgGcGw="; sha256 = "sha256-DrtxqXyeqA+X4iLTvTSPFDKDoLCyVd458+nJWc+9MF4=";
}; };
}) })

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

@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix { chadtree = buildVimPluginFrom2Nix {
pname = "chadtree"; pname = "chadtree";
version = "2021-04-22"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "chadtree"; repo = "chadtree";
rev = "27fefd2ccd0b4c376afdc53e7bb4c6185518d1cd"; rev = "5b286768438921cbc77d6cfb4a7046ea45c8adfc";
sha256 = "0l1j2n8v2dngyxym8k0b1gf0dn2cc2gbwy36rrv447zb51g1vlv5"; sha256 = "1g5g1yqr78l620vr7vslx15j2f4dfg4bb8wwjgfqx0pw5lc982yc";
}; };
meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.homepage = "https://github.com/ms-jpq/chadtree/";
}; };
@ -533,12 +533,12 @@ let
coc-nvim = buildVimPluginFrom2Nix { coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim"; pname = "coc-nvim";
version = "2021-04-20"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neoclide"; owner = "neoclide";
repo = "coc.nvim"; repo = "coc.nvim";
rev = "19bfd9443708a769b2d1379af874f644ba9f1cd4"; rev = "f9c4fc96fd08f13f549c4bc0eb56f2d91ca91919";
sha256 = "0c9i25dsqhb1v6kcym424zmc5yn396wz6k9w71s1ja5q4p1jmxd8"; sha256 = "087nvvxfxrllnx2ggi8m088wgcrm1hd9c5mqfx37zmzfjqk78rw4";
}; };
meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.homepage = "https://github.com/neoclide/coc.nvim/";
}; };
@ -618,12 +618,12 @@ let
compe-tabnine = buildVimPluginFrom2Nix { compe-tabnine = buildVimPluginFrom2Nix {
pname = "compe-tabnine"; pname = "compe-tabnine";
version = "2021-04-21"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tzachar"; owner = "tzachar";
repo = "compe-tabnine"; repo = "compe-tabnine";
rev = "cb7f22500a6c3b7e3eda36db6ce9ffe5fb45d94c"; rev = "f6ace45ef5cbd8b274d7163a2931c11083d34d44";
sha256 = "0lpy5h6171xjg6dinhv1m98p0qs0a3qrrhhg7vriicz3x4px73fb"; sha256 = "0wjy38v3h5nqr2vw2ydhy2227cqkd8k14cnb3vr39xm5c0fc3ci5";
}; };
meta.homepage = "https://github.com/tzachar/compe-tabnine/"; meta.homepage = "https://github.com/tzachar/compe-tabnine/";
}; };
@ -1244,12 +1244,12 @@ let
dracula-vim = buildVimPluginFrom2Nix { dracula-vim = buildVimPluginFrom2Nix {
pname = "dracula-vim"; pname = "dracula-vim";
version = "2021-04-15"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dracula"; owner = "dracula";
repo = "vim"; repo = "vim";
rev = "e9efa96bf130496537c978c8ee150bed280f7b19"; rev = "d21059cd5960f4d0a5627fda82d29371772b247f";
sha256 = "0jzn6vax8ia9ha938jbs0wpm6wgz5m4vg6q3w8z562rq8kq70hcx"; sha256 = "0cbsiw0qkynm0glq8kidkbfxwy6lhn7rc6dvxflrrm62cl7yvw91";
}; };
meta.homepage = "https://github.com/dracula/vim/"; meta.homepage = "https://github.com/dracula/vim/";
}; };
@ -1631,12 +1631,12 @@ let
git-worktree-nvim = buildVimPluginFrom2Nix { git-worktree-nvim = buildVimPluginFrom2Nix {
pname = "git-worktree-nvim"; pname = "git-worktree-nvim";
version = "2021-04-22"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ThePrimeagen"; owner = "ThePrimeagen";
repo = "git-worktree.nvim"; repo = "git-worktree.nvim";
rev = "0ef6f419ba56154320a2547c92bf1ccb08631f9e"; rev = "34d1c630546dc21517cd2faad82e23f02f2860d1";
sha256 = "1pr4p6akq2wivhqb116jrm72v4m1i649p624p3kb55frfxf5pynn"; sha256 = "0ddz2z7plw320kgsddlfywsa202bl8sxr9jbvldhh0j34q5lgdja";
}; };
meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/";
}; };
@ -2088,12 +2088,12 @@ let
julia-vim = buildVimPluginFrom2Nix { julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim"; pname = "julia-vim";
version = "2021-04-16"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "JuliaEditorSupport"; owner = "JuliaEditorSupport";
repo = "julia-vim"; repo = "julia-vim";
rev = "5b3984bbd411fae75933dcf21bfe2faeb6ec3b34"; rev = "d0bb06ffc40ff7c49dfa2548e007e9013eaeabb7";
sha256 = "1ynd3ricc3xja9b0wswg4dh1b09p8pnppf682bfkm5a5cqar7n5k"; sha256 = "0zj12xp8djy3zr360lg9pkydz92cgkjiz33n9v5s2wyx63gk0dq4";
}; };
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
}; };
@ -2314,6 +2314,18 @@ let
meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; meta.homepage = "https://github.com/tami5/lispdocs.nvim/";
}; };
lsp-colors-nvim = buildVimPluginFrom2Nix {
pname = "lsp-colors-nvim";
version = "2021-04-23";
src = fetchFromGitHub {
owner = "folke";
repo = "lsp-colors.nvim";
rev = "525c57c1138ca5640547efb476758938aedba943";
sha256 = "0dxalh12ifsghksl423bbawq096k8fcl1cgmnvaw3f2x71fngfs6";
};
meta.homepage = "https://github.com/folke/lsp-colors.nvim/";
};
lsp-status-nvim = buildVimPluginFrom2Nix { lsp-status-nvim = buildVimPluginFrom2Nix {
pname = "lsp-status-nvim"; pname = "lsp-status-nvim";
version = "2021-04-09"; version = "2021-04-09";
@ -2364,12 +2376,12 @@ let
lualine-nvim = buildVimPluginFrom2Nix { lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim"; pname = "lualine-nvim";
version = "2021-04-22"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hoob3rt"; owner = "hoob3rt";
repo = "lualine.nvim"; repo = "lualine.nvim";
rev = "2f17e432ee85420adcf8e0a4ebf6e638657c4253"; rev = "e3a558bc1dfbda29cde5b356b975a8abaf3f41b2";
sha256 = "055pvfmmk8yzjajb9xx46mb5ixass3y1fsvx9p3nchsik1h3vsib"; sha256 = "1qwrpyjfcn23z4lw5ln5gn4lh8y0rw68gbmyd62pdqazckqhasds";
}; };
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
}; };
@ -2760,12 +2772,12 @@ let
neogit = buildVimPluginFrom2Nix { neogit = buildVimPluginFrom2Nix {
pname = "neogit"; pname = "neogit";
version = "2021-04-21"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TimUntersberger"; owner = "TimUntersberger";
repo = "neogit"; repo = "neogit";
rev = "e28c434c26f76f235087ca65ff8040ff834f9210"; rev = "a62ce86411048e1bed471d4c4ba5f56eb5b59c50";
sha256 = "0fdbyijlpbh845jfpp5xcc378j5m7h2yav6dwj00bvm1n79zy1wh"; sha256 = "1cnywkl21a8mw62bing202nw04y375968bggqraky1c57fpdq35j";
}; };
meta.homepage = "https://github.com/TimUntersberger/neogit/"; meta.homepage = "https://github.com/TimUntersberger/neogit/";
}; };
@ -3036,24 +3048,36 @@ let
nvim-autopairs = buildVimPluginFrom2Nix { nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs"; pname = "nvim-autopairs";
version = "2021-04-22"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "windwp"; owner = "windwp";
repo = "nvim-autopairs"; repo = "nvim-autopairs";
rev = "50a1c65caf42a0dfe3f63b3dfe1867eec5f4889d"; rev = "41b3ed55c345b56190a282b125897dc99d2292d4";
sha256 = "1rar4dkd0i277k71a0ydw3ipgbxjjg1hmhddwd993ihcwvk5d496"; sha256 = "1pjfani0g0wixsyxk8j0g4289jhnkbxl703fpdp9dls7c427pi8x";
}; };
meta.homepage = "https://github.com/windwp/nvim-autopairs/"; meta.homepage = "https://github.com/windwp/nvim-autopairs/";
}; };
nvim-base16 = buildVimPluginFrom2Nix {
pname = "nvim-base16";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "RRethy";
repo = "nvim-base16";
rev = "9d6649c01221680e5bb20ff9e2455280d9665de2";
sha256 = "18a974l753d92x3jyv5j0anri99hxzfw454lkz94amabbnc010p6";
};
meta.homepage = "https://github.com/RRethy/nvim-base16/";
};
nvim-bqf = buildVimPluginFrom2Nix { nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf"; pname = "nvim-bqf";
version = "2021-04-17"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kevinhwang91"; owner = "kevinhwang91";
repo = "nvim-bqf"; repo = "nvim-bqf";
rev = "20e19029c9d212d8eb43eb590ac7530077e13350"; rev = "55135d23dc8da4f75a95f425283c0080ec5a8ac6";
sha256 = "097iplsdkkq72981nwfppj07d0fg0fzjglwlvpxq61w1jwscd8fj"; sha256 = "162wa2hwq1i9v2xgdfvg1d4ab392m4jcw815cn9l3z4r10g9719p";
}; };
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
}; };
@ -3120,12 +3144,12 @@ let
nvim-dap = buildVimPluginFrom2Nix { nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap"; pname = "nvim-dap";
version = "2021-04-18"; version = "2021-04-22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mfussenegger"; owner = "mfussenegger";
repo = "nvim-dap"; repo = "nvim-dap";
rev = "d646bbc4c820777c2b61dd73819eead1133b15f8"; rev = "41f982b646b29059749bd588ba783cb99d8fc781";
sha256 = "1bnxpcyrzi71b4ia0p1v8g3qx204ja4g3yfydcppdiwqfkhm2688"; sha256 = "0z2kl2iqs8vcb8l4r508ny3h7vl3vm1l6cjsl5bi1s7387pizxbl";
}; };
meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
}; };
@ -3168,12 +3192,12 @@ let
nvim-hlslens = buildVimPluginFrom2Nix { nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens"; pname = "nvim-hlslens";
version = "2021-04-21"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kevinhwang91"; owner = "kevinhwang91";
repo = "nvim-hlslens"; repo = "nvim-hlslens";
rev = "3ad85775c081a8ab8ae8d1f2ecd1afc1bc1500d6"; rev = "2f8bd90f3b4fa7620c61f66bcddb965139eb176f";
sha256 = "0p55zms25kxlayjwy8i831c01fdja0k8y55iw3nx0p257fb06zbz"; sha256 = "1zsvr9pba62ngchfmab7yns64mlkdqclqv516c7h62fh82fyx23a";
}; };
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
}; };
@ -3216,12 +3240,12 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2021-04-22"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "0840c91e25557a47ed559d2281b0b65fe33b271f"; rev = "62977b6b2eeb20bd37703ebe4bc4b4c2ef006db2";
sha256 = "1k34khp227g9xffnz0sr9bm6h3hnvi3g9csxynpdzd0s2sbjsfgk"; sha256 = "0niwaq3mc7x1zaf3qx9dp43607rnhq2nvyizkxb7j1yir8a8dk4x";
}; };
meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
}; };
@ -3312,12 +3336,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2021-04-22"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "e8e8c0f0f21ef5089bb305ded8ed81a16902baa7"; rev = "af3537fbe57a2a37ab2b620c9ecc487e31b4da64";
sha256 = "19lb10zk6mn09l4adg4xfqpsjbag52fjg9sr2ic8c6la1x8abzqk"; sha256 = "1z4k0a8gyz8ycd6wq8npg056l0axz3vj7pipxcpi1i9xa4kx3j6i";
}; };
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
}; };
@ -3348,12 +3372,12 @@ let
nvim-treesitter-textobjects = buildVimPluginFrom2Nix { nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects"; pname = "nvim-treesitter-textobjects";
version = "2021-04-18"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects"; repo = "nvim-treesitter-textobjects";
rev = "18cf678f6218ca40652b6d9017dad1b9e2899ba9"; rev = "522b26a8795994b719a921a03cfacb0d7dcabf78";
sha256 = "0xawv5pjz0mv4pf06vn3pvl4k996jmw4nmawbizqlvladcc2hc1k"; sha256 = "0ww1agq33l3jhbfwr5ri9m3ipr48kgwzlzxv96w43x6y29p61g2v";
}; };
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
}; };
@ -3913,12 +3937,12 @@ let
rust-tools-nvim = buildVimPluginFrom2Nix { rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools-nvim"; pname = "rust-tools-nvim";
version = "2021-04-16"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simrat39"; owner = "simrat39";
repo = "rust-tools.nvim"; repo = "rust-tools.nvim";
rev = "cd1b5632cc2b7981bd7bdb9e55701ae58942864f"; rev = "7d734e9b52fe54b6cd19435f0823d56dc2d17426";
sha256 = "1jam4fnzg0nvj06d1vd9ryaan8fza7xc7fwdd7675bw828cs2fq8"; sha256 = "181vq3p1f136qmb0qbd77khc04vrkdw8z9851car7lxs5m83wwp2";
}; };
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
}; };
@ -4467,12 +4491,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix { telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim"; pname = "telescope-nvim";
version = "2021-04-22"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope.nvim"; repo = "telescope.nvim";
rev = "c6980a9acf8af836196508000c34dcb06b11137b"; rev = "6fd1b3bd255a6ebc2e44cec367ff60ce8e6e6cab";
sha256 = "0q2xqxn56gdll1pk6f9kkkfwrp1hlawqmfmj1rzp5aahm77jdx9x"; sha256 = "1qifrnd0fq9844vvxy9fdp90kkb094a04wcshbfdy4cv489cqfax";
}; };
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
}; };
@ -4996,12 +5020,12 @@ let
vim-airline = buildVimPluginFrom2Nix { vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline"; pname = "vim-airline";
version = "2021-04-15"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vim-airline"; owner = "vim-airline";
repo = "vim-airline"; repo = "vim-airline";
rev = "07ab201a272fe8a848141a60adec3c0b837c0b37"; rev = "0a87d08dbdb398b2bb644b5041f68396f0c92d5d";
sha256 = "131fj6fmpgbx7hiql1ci60rnpfffkzww0yf6ag3sclvnw375ylx4"; sha256 = "1ihg44f3pn4v3naxlzd9gmhw7hzywv4zzc97i9smbcacg9xm6mna";
}; };
meta.homepage = "https://github.com/vim-airline/vim-airline/"; meta.homepage = "https://github.com/vim-airline/vim-airline/";
}; };
@ -5992,12 +6016,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix { vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive"; pname = "vim-fugitive";
version = "2021-04-16"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tpope"; owner = "tpope";
repo = "vim-fugitive"; repo = "vim-fugitive";
rev = "895e56daca03c441427f2adca291cb10ea4d7ca8"; rev = "8f4a23e6639ff67c0efd7242870d4beed47b5d37";
sha256 = "139zdz0zsaqpwbscqzp61xilrvdjlvhrn985mfpgiwwrr6sa6gdr"; sha256 = "0ss8qlxgidlf1ma6z3ma63lqgaynnbrj9fdbw38szwc823vdqiid";
}; };
meta.homepage = "https://github.com/tpope/vim-fugitive/"; meta.homepage = "https://github.com/tpope/vim-fugitive/";
}; };
@ -6112,12 +6136,12 @@ let
vim-go = buildVimPluginFrom2Nix { vim-go = buildVimPluginFrom2Nix {
pname = "vim-go"; pname = "vim-go";
version = "2021-04-20"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fatih"; owner = "fatih";
repo = "vim-go"; repo = "vim-go";
rev = "3ec431eaefb75520cbcfed0b6d0d7999d7ea3805"; rev = "87fd4bf57646f984b37de5041232047fa5fdee5a";
sha256 = "1h6lcxzm9njnyaxf9qjs4gspd5ag2dmqjjik947idxjs1435xjls"; sha256 = "00clqf82731zz6r1h4vs15zy4dka549cbngr1j9w605k5m9hrrzs";
}; };
meta.homepage = "https://github.com/fatih/vim-go/"; meta.homepage = "https://github.com/fatih/vim-go/";
}; };
@ -8011,12 +8035,12 @@ let
vim-startify = buildVimPluginFrom2Nix { vim-startify = buildVimPluginFrom2Nix {
pname = "vim-startify"; pname = "vim-startify";
version = "2021-04-22"; version = "2021-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mhinz"; owner = "mhinz";
repo = "vim-startify"; repo = "vim-startify";
rev = "3ffa62fbe781b3df20fafa3bd9d710dc99c16a8c"; rev = "df0f1dbdc0689f6172bdd3b8685868aa93446c6f";
sha256 = "0ysr07yy9fxgz8drn11hgcwns7d0minh4afrjxrz9lwcm7c994h4"; sha256 = "0idrzl2kgclalsxixrh21fkw6d2vd53apw47ajjlcsl94acy2139";
}; };
meta.homepage = "https://github.com/mhinz/vim-startify/"; meta.homepage = "https://github.com/mhinz/vim-startify/";
}; };

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

@ -132,6 +132,7 @@ fiatjaf/neuron.vim
fisadev/vim-isort fisadev/vim-isort
flazz/vim-colorschemes flazz/vim-colorschemes
floobits/floobits-neovim floobits/floobits-neovim
folke/lsp-colors.nvim@main
freitass/todo.txt-vim freitass/todo.txt-vim
frigoeu/psc-ide-vim frigoeu/psc-ide-vim
fruit-in/brainfuck-vim fruit-in/brainfuck-vim
@ -529,6 +530,7 @@ roxma/nvim-cm-racer
roxma/nvim-completion-manager roxma/nvim-completion-manager
roxma/nvim-yarp roxma/nvim-yarp
roxma/vim-tmux-clipboard roxma/vim-tmux-clipboard
RRethy/nvim-base16
RRethy/vim-hexokinase RRethy/vim-hexokinase
RRethy/vim-illuminate RRethy/vim-illuminate
rstacruz/vim-closer rstacruz/vim-closer

7
pkgs/os-specific/bsd/netbsd/default.nix
View File

@ -484,13 +484,6 @@ let
''; '';
}; };
libkern = mkDerivation {
path = "lib/libkern";
version = "8.0";
sha256 = "1wirqr9bms69n4b5sr32g1b1k41hcamm7c9n7i8c440m73r92yv4";
meta.platforms = lib.platforms.netbsd;
};
column = mkDerivation { column = mkDerivation {
path = "usr.bin/column"; path = "usr.bin/column";
version = "8.0"; version = "8.0";

4
pkgs/os-specific/linux/zfs/default.nix
View File

@ -210,9 +210,9 @@ in {
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12"; kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12";
# this package should point to a version / git revision compatible with the latest kernel release # this package should point to a version / git revision compatible with the latest kernel release
version = "2.1.0-rc3"; version = "2.1.0-rc4";
sha256 = "sha256-ARRUuyu07dWwEuXerTz9KBmclhlmsnnGucfBxxn0Zsw="; sha256 = "sha256-eakOEA7LCJOYDsZH24Y5JbEd2wh1KfCN+qX3QxQZ4e8=";
isUnstable = true; isUnstable = true;
}; };

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -692,7 +692,7 @@
"rituals_perfume_genie" = ps: with ps; [ pyrituals ]; "rituals_perfume_genie" = ps: with ps; [ pyrituals ];
"rmvtransport" = ps: with ps; [ PyRMVtransport ]; "rmvtransport" = ps: with ps; [ PyRMVtransport ];
"rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API
"roku" = ps: with ps; [ ]; # missing inputs: rokuecp "roku" = ps: with ps; [ rokuecp ];
"roomba" = ps: with ps; [ roombapy ]; "roomba" = ps: with ps; [ roombapy ];
"roon" = ps: with ps; [ ]; # missing inputs: roonapi "roon" = ps: with ps; [ ]; # missing inputs: roonapi
"route53" = ps: with ps; [ boto3 ]; "route53" = ps: with ps; [ boto3 ];

2
pkgs/servers/home-assistant/default.nix
View File

@ -299,6 +299,7 @@ in with py.pkgs; buildPythonApplication rec {
"intent_script" "intent_script"
"ipp" "ipp"
"kmtronic" "kmtronic"
"knx"
"kodi" "kodi"
"light" "light"
"litterrobot" "litterrobot"
@ -349,6 +350,7 @@ in with py.pkgs; buildPythonApplication rec {
"rest_command" "rest_command"
"rituals_perfume_genie" "rituals_perfume_genie"
"rmvtransport" "rmvtransport"
"roku"
"rss_feed_template" "rss_feed_template"
"ruckus_unleashed" "ruckus_unleashed"
"safe_mode" "safe_mode"

4
pkgs/servers/matrix-synapse/default.nix
View File

@ -12,11 +12,11 @@ let
in in
buildPythonApplication rec { buildPythonApplication rec {
pname = "matrix-synapse"; pname = "matrix-synapse";
version = "1.30.0"; version = "1.32.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1ca69v479537bbj2hjliwk9zzy9fqqsf7fm188k6xxj0a37q9y41"; sha256 = "sha256-Biwj/zORBsU8XvpMMlSjR3Nqx0q1LqaSX/vX+UDeXI8=";
}; };
patches = [ patches = [

55
pkgs/servers/mautrix-signal/default.nix Normal file
View File

@ -0,0 +1,55 @@
{ lib, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonPackage rec {
pname = "mautrix-signal";
version = "0.1.1";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-signal";
rev = "v${version}";
sha256 = "11snsl7i407855h39g1fgk26hinnq0inr8sjrgd319li0d3jwzxl";
};
propagatedBuildInputs = with python3Packages; [
CommonMark
aiohttp
asyncpg
attrs
mautrix
phonenumbers
pillow
prometheus_client
pycryptodome
python-olm
python_magic
qrcode
ruamel_yaml
unpaddedbase64
yarl
];
doCheck = false;
postInstall = ''
mkdir -p $out/bin
# Make a little wrapper for running mautrix-signal with its dependencies
echo "$mautrixSignalScript" > $out/bin/mautrix-signal
echo "#!/bin/sh
exec python -m mautrix_signal \"$@\"
" > $out/bin/mautrix-signal
chmod +x $out/bin/mautrix-signal
wrapProgram $out/bin/mautrix-signal \
--set PATH ${python3Packages.python}/bin \
--set PYTHONPATH "$PYTHONPATH"
'';
meta = with lib; {
homepage = "https://github.com/tulir/mautrix-signal";
description = "A Matrix-Signal puppeting bridge";
license = licenses.agpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ expipiplus1 ];
};
}

26
pkgs/servers/radicale/3.x.nix
View File

@ -1,14 +1,20 @@
{ lib, python3 }: { lib, python3, fetchFromGitHub, nixosTests }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "Radicale"; pname = "radicale";
version = "3.0.6"; version = "3.0.6";
src = python3.pkgs.fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "Kozea";
sha256 = "a9433d3df97135d9c02cec8dde4199444daf1b73ad161ded398d67b8e629fdc6"; repo = "Radicale";
rev = version;
sha256 = "1xlsvrmx6jhi71j6j8z9sli5vwxasivzjyqf8zq8r0l5p7350clf";
}; };
postPatch = ''
sed -i '/addopts/d' setup.cfg
'';
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
defusedxml defusedxml
passlib passlib
@ -18,14 +24,14 @@ python3.pkgs.buildPythonApplication rec {
]; ];
checkInputs = with python3.pkgs; [ checkInputs = with python3.pkgs; [
pytestrunner pytestCheckHook
pytest
pytestcov
pytest-flake8
pytest-isort
waitress waitress
]; ];
passthru.tests = {
inherit (nixosTests) radicale;
};
meta = with lib; { meta = with lib; {
homepage = "https://www.radicale.org/3.0.html"; homepage = "https://www.radicale.org/3.0.html";
description = "CalDAV and CardDAV server"; description = "CalDAV and CardDAV server";

1
pkgs/tools/filesystems/ceph/default.nix
View File

@ -161,6 +161,7 @@ in rec {
preConfigure ='' preConfigure =''
substituteInPlace src/common/module.c --replace "/sbin/modinfo" "modinfo" substituteInPlace src/common/module.c --replace "/sbin/modinfo" "modinfo"
substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe" substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe"
substituteInPlace src/common/module.c --replace "/bin/grep" "grep"
# for pybind/rgw to find internal dep # for pybind/rgw to find internal dep
export LD_LIBRARY_PATH="$PWD/build/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$PWD/build/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"

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

@ -1,14 +1,14 @@
{ lib, stdenvNoCC, fetchFromGitHub, bash, makeWrapper, pciutils }: { lib, stdenvNoCC, fetchFromGitHub, bash, makeWrapper, pciutils, ueberzug }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "neofetch"; pname = "neofetch";
version = "7.1.0"; version = "unstable-2020-11-26";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dylanaraps"; owner = "dylanaraps";
repo = "neofetch"; repo = "neofetch";
rev = version; rev = "6dd85d67fc0d4ede9248f2df31b2cd554cca6c2f";
sha256 = "0i7wpisipwzk0j62pzaigbiq42y1mn4sbraz4my2jlz6ahwf00kv"; sha256 = "sha256-PZjFF/K7bvPIjGVoGqaoR8pWE6Di/qJVKFNcIz7G8xE=";
}; };
strictDeps = true; strictDeps = true;
@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/neofetch \ wrapProgram $out/bin/neofetch \
--prefix PATH : ${lib.makeBinPath [ pciutils ]} --prefix PATH : ${lib.makeBinPath [ pciutils ueberzug ]}
''; '';
makeFlags = [ makeFlags = [

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

@ -1,5 +1,6 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, autoreconfHook , autoreconfHook
, pkg-config , pkg-config
, bison , bison
@ -31,6 +32,15 @@ stdenv.mkDerivation rec {
sha256 = "0alq81h1rz1f0zsy8qb2dvsl47axpa86j4bplngwkph0ksqqgr3p"; sha256 = "0alq81h1rz1f0zsy8qb2dvsl47axpa86j4bplngwkph0ksqqgr3p";
}; };
patches = [
# Fix cross-compilation
# https://github.com/tmux/tmux/pull/2651
(fetchpatch {
url = "https://github.com/tmux/tmux/commit/bb6242675ad0c7447daef148fffced882e5b4a61.patch";
sha256 = "1acr3xv3gqpq7qa2f8hw7c4f42hi444lfm1bz6wqj8f3yi320zjr";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
autoreconfHook autoreconfHook

41
pkgs/tools/networking/wstunnel/default.nix
View File

@ -1,41 +0,0 @@
{ mkDerivation, async, base, base64-bytestring, binary, bytestring
, classy-prelude, cmdargs, connection, hslogger, mtl, network
, network-conduit-tls, streaming-commons, text
, unordered-containers, websockets
, hspec, iproute
, lib, fetchFromGitHub, fetchpatch
}:
mkDerivation rec {
pname = "wstunnel";
version = "unstable-2020-07-12";
src = fetchFromGitHub {
owner = "erebe";
repo = pname;
rev = "093a01fa3a34eee5efd8f827900e64eab9d16c05";
sha256 = "17p9kq0ssz05qzl6fyi5a5fjbpn4bxkkwibb9si3fhzrxc508b59";
};
isLibrary = false;
isExecutable = true;
libraryHaskellDepends = [
async base base64-bytestring binary bytestring classy-prelude
connection hslogger mtl network network-conduit-tls
streaming-commons text unordered-containers websockets
iproute
];
executableHaskellDepends = [
base bytestring classy-prelude cmdargs hslogger text
];
testHaskellDepends = [ base text hspec ];
homepage = "https://github.com/erebe/wstunnel";
description = "UDP and TCP tunnelling over WebSocket";
maintainers = with lib.maintainers; [ gebner ];
license = lib.licenses.bsd3;
}

15
pkgs/tools/security/prs/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, rustPlatform , rustPlatform
, fetchFromGitLab , fetchFromGitLab
, installShellFiles
, pkg-config , pkg-config
, python3 , python3
, dbus , dbus
@ -12,16 +13,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "prs"; pname = "prs";
version = "0.2.7"; version = "0.2.8";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "timvisee"; owner = "timvisee";
repo = "prs"; repo = "prs";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-1Jrgf5UW6k0x3q6kQIB6Q7moOhConEnUU9r+21W5Uu8="; sha256 = "sha256-TPgS3gtSfCAtQyQCZ0HadxvmX6+dP/3SE/WumzzYUAw=";
}; };
cargoSha256 = "sha256-N3pLW/OGeurrl+AlwdfbZ3T7WzEOAuyUMdIR164Xp7k="; cargoSha256 = "sha256-djKtmQHBVXEfn91avJCsVJwEJIE3xL1umvoLAIyXSrw=";
postPatch = '' postPatch = ''
# The GPGME backend is recommended # The GPGME backend is recommended
@ -31,10 +32,16 @@ rustPlatform.buildRustPackage rec {
done done
''; '';
nativeBuildInputs = [ gpgme pkg-config python3 ]; nativeBuildInputs = [ gpgme installShellFiles pkg-config python3 ];
buildInputs = [ dbus glib gpgme gtk3 libxcb ]; buildInputs = [ dbus glib gpgme gtk3 libxcb ];
postInstall = ''
for shell in bash fish zsh; do
installShellCompletion --cmd prs --$shell <($out/bin/prs internal completions $shell --stdout)
done
'';
meta = with lib; { meta = with lib; {
description = "Secure, fast & convenient password manager CLI using GPG and git to sync"; description = "Secure, fast & convenient password manager CLI using GPG and git to sync";
homepage = "https://gitlab.com/timvisee/prs"; homepage = "https://gitlab.com/timvisee/prs";

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

@ -6089,6 +6089,8 @@ in
matrix-corporal = callPackage ../servers/matrix-corporal { }; matrix-corporal = callPackage ../servers/matrix-corporal { };
mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { });
mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { };
@ -8303,6 +8305,8 @@ in
sigil = libsForQt5.callPackage ../applications/editors/sigil { }; sigil = libsForQt5.callPackage ../applications/editors/sigil { };
signald = callPackage ../applications/networking/instant-messengers/signald { };
signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { }; signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { };
signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { };
@ -9312,8 +9316,7 @@ in
wsmancli = callPackage ../tools/system/wsmancli {}; wsmancli = callPackage ../tools/system/wsmancli {};
wstunnel = haskell.lib.justStaticExecutables wstunnel = haskell.lib.justStaticExecutables haskellPackages.wstunnel;
(haskellPackages.callPackage ../tools/networking/wstunnel {});
wolfebin = callPackage ../tools/networking/wolfebin { wolfebin = callPackage ../tools/networking/wolfebin {
python = python2; python = python2;

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

@ -6539,6 +6539,8 @@ in {
python-periphery = callPackage ../development/python-modules/python-periphery { }; python-periphery = callPackage ../development/python-modules/python-periphery { };
python-picnic-api = callPackage ../development/python-modules/python-picnic-api { };
python-pipedrive = callPackage ../development/python-modules/python-pipedrive { }; python-pipedrive = callPackage ../development/python-modules/python-pipedrive { };
python-prctl = callPackage ../development/python-modules/python-prctl { }; python-prctl = callPackage ../development/python-modules/python-prctl { };
@ -7058,6 +7060,8 @@ in {
roku = callPackage ../development/python-modules/roku { }; roku = callPackage ../development/python-modules/roku { };
rokuecp = callPackage ../development/python-modules/rokuecp { };
roman = callPackage ../development/python-modules/roman { }; roman = callPackage ../development/python-modules/roman { };
roombapy = callPackage ../development/python-modules/roombapy { }; roombapy = callPackage ../development/python-modules/roombapy { };