nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 02:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-01-24 00:01:45 +00:00 committed by GitHub
commit 11cced7438
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
124 changed files with 2579 additions and 1699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/CODEOWNERS vendored
View File

@ -280,6 +280,12 @@
# terraform providers
/pkgs/applications/networking/cluster/terraform-providers @zowoq
# kubernetes
/nixos/doc/manual/configuration/kubernetes.chapter.md @zowoq
/nixos/modules/services/cluster/kubernetes @zowoq
/nixos/tests/kubernetes @zowoq
/pkgs/applications/networking/cluster/kubernetes @zowoq
# Matrix
/pkgs/servers/heisenbridge @piegamesde
/pkgs/servers/matrix-conduit @piegamesde @pstn

24
maintainers/maintainer-list.nix
View File

@ -5711,6 +5711,24 @@
githubId = 8900;
name = "Johan Magnus Jonsson";
};
jmc-figueira = {
email = "business+nixos@jmc-figueira.dev";
github = "jmc-figueira";
githubId = 6634716;
name = "João Figueira";
keys = [
# GitHub signing key
{
longkeyid = "rsa4096/0xDC7AE56AE98E02D7";
fingerprint = "EC08 7AA3 DEAD A972 F015 6371 DC7A E56A E98E 02D7";
}
# Email encryption
{
longkeyid = "ed25519/0x197F9A632D139E30";
fingerprint = "816D 23F5 E672 EC58 7674 4A73 197F 9A63 2D13 9E30";
}
];
};
jmettes = {
email = "jonathan@jmettes.com";
github = "jmettes";
@ -11850,6 +11868,12 @@
githubId = 378734;
name = "TG ⊗ Θ";
};
tgunnoe = {
email = "t@gvno.net";
github = "tgunnoe";
githubId = 7254833;
name = "Taylor Gunnoe";
};
th0rgal = {
email = "thomas.marchand@tuta.io";
github = "Th0rgal";

11
maintainers/team-list.nix
View File

@ -166,6 +166,17 @@ with lib.maintainers; {
scope = "Maintain Jitsi.";
};
kubernetes = {
members = [
johanot
offline
saschagrunert
srhb
zowoq
];
scope = "Maintain the Kubernetes package and module";
};
kodi = {
members = [
aanderse

10
nixos/modules/installer/sd-card/sd-image-riscv64-qemu-installer.nix Normal file
View File

@ -0,0 +1,10 @@
{
imports = [
../../profiles/installation-device.nix
./sd-image-riscv64-qemu.nix
];
# the installation media is also the installation target,
# so we don't want to provide the installation configuration.nix.
installer.cloneConfig = false;
}

150
nixos/modules/misc/locate.nix
View File

@ -5,11 +5,14 @@ with lib;
let
cfg = config.services.locate;
isMLocate = hasPrefix "mlocate" cfg.locate.name;
isPLocate = hasPrefix "plocate" cfg.locate.name;
isMorPLocate = (isMLocate || isPLocate);
isFindutils = hasPrefix "findutils" cfg.locate.name;
in {
in
{
imports = [
(mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ])
(mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths" )
(mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths")
];
options.services.locate = with types; {
@ -163,7 +166,16 @@ in {
prunePaths = mkOption {
type = listOf path;
default = [ "/tmp" "/var/tmp" "/var/cache" "/var/lock" "/var/run" "/var/spool" "/nix/store" "/nix/var/log/nix" ];
default = [
"/tmp"
"/var/tmp"
"/var/cache"
"/var/lock"
"/var/run"
"/var/spool"
"/nix/store"
"/nix/var/log/nix"
];
description = ''
Which paths to exclude from indexing
'';
@ -188,26 +200,38 @@ in {
};
config = mkIf cfg.enable {
users.groups = mkIf isMLocate { mlocate = {}; };
users.groups = mkMerge [
(mkIf isMLocate { mlocate = { }; })
(mkIf isPLocate { plocate = { }; })
];
security.wrappers = mkIf isMLocate {
locate = {
group = "mlocate";
owner = "root";
permissions = "u+rx,g+x,o+x";
setgid = true;
setuid = false;
source = "${cfg.locate}/bin/locate";
security.wrappers =
let
common = {
owner = "root";
permissions = "u+rx,g+x,o+x";
setgid = true;
setuid = false;
};
mlocate = (mkIf isMLocate {
group = "mlocate";
source = "${cfg.locate}/bin/locate";
});
plocate = (mkIf isPLocate {
group = "plocate";
source = "${cfg.locate}/bin/plocate";
});
in
mkIf isMorPLocate {
locate = mkMerge [ common mlocate plocate ];
plocate = (mkIf isPLocate (mkMerge [ common plocate ]));
};
};
nixpkgs.config = { locate.dbfile = cfg.output; };
environment.systemPackages = [ cfg.locate ];
environment.variables = mkIf (!isMLocate)
{ LOCATE_PATH = cfg.output;
};
environment.variables = mkIf (!isMorPLocate) { LOCATE_PATH = cfg.output; };
environment.etc = {
# write /etc/updatedb.conf for manual calls to `updatedb`
@ -221,57 +245,65 @@ in {
};
};
warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support the services.locate.localuser option; updatedb will run as root. (Silence with services.locate.localuser = null.)"
++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component"
++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts";
warnings = optional (isMorPLocate && cfg.localuser != null)
"mlocate does not support the services.locate.localuser option; updatedb will run as root. (Silence with services.locate.localuser = null.)"
++ optional (isFindutils && cfg.pruneNames != [ ])
"findutils locate does not support pruning by directory component"
++ optional (isFindutils && cfg.pruneBindMounts)
"findutils locate does not support skipping bind mounts";
systemd.services.update-locatedb =
{ description = "Update Locate Database";
path = mkIf (!isMLocate) [ pkgs.su ];
systemd.services.update-locatedb = {
description = "Update Locate Database";
path = mkIf (!isMorPLocate) [ pkgs.su ];
# mlocate's updatedb takes flags via a configuration file or
# on the command line, but not by environment variable.
script =
if isMLocate
then let toFlags = x: optional (cfg.${x} != [])
"--${lib.toLower x} '${concatStringsSep " " cfg.${x}}'";
args = concatLists (map toFlags ["pruneFS" "pruneNames" "prunePaths"]);
in ''
# mlocate's updatedb takes flags via a configuration file or
# on the command line, but not by environment variable.
script =
if isMorPLocate then
let
toFlags = x:
optional (cfg.${x} != [ ])
"--${lib.toLower x} '${concatStringsSep " " cfg.${x}}'";
args = concatLists (map toFlags [ "pruneFS" "pruneNames" "prunePaths" ]);
in
''
exec ${cfg.locate}/bin/updatedb \
--output ${toString cfg.output} ${concatStringsSep " " args} \
--prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \
${concatStringsSep " " cfg.extraFlags}
''
else ''
exec ${cfg.locate}/bin/updatedb \
${optionalString (cfg.localuser != null && ! isMLocate) "--localuser=${cfg.localuser}"} \
--output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
'';
environment = optionalAttrs (!isMLocate) {
PRUNEFS = concatStringsSep " " cfg.pruneFS;
PRUNEPATHS = concatStringsSep " " cfg.prunePaths;
PRUNENAMES = concatStringsSep " " cfg.pruneNames;
PRUNE_BIND_MOUNTS = if cfg.pruneBindMounts then "yes" else "no";
};
serviceConfig.Nice = 19;
serviceConfig.IOSchedulingClass = "idle";
serviceConfig.PrivateTmp = "yes";
serviceConfig.PrivateNetwork = "yes";
serviceConfig.NoNewPrivileges = "yes";
serviceConfig.ReadOnlyPaths = "/";
# Use dirOf cfg.output because mlocate creates temporary files next to
# the actual database. We could specify and create them as well,
# but that would make this quite brittle when they change something.
# NOTE: If /var/cache does not exist, this leads to the misleading error message:
# update-locatedb.service: Failed at step NAMESPACE spawning …/update-locatedb-start: No such file or directory
serviceConfig.ReadWritePaths = dirOf cfg.output;
else ''
exec ${cfg.locate}/bin/updatedb \
${optionalString (cfg.localuser != null && !isMorPLocate) "--localuser=${cfg.localuser}"} \
--output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
'';
environment = optionalAttrs (!isMorPLocate) {
PRUNEFS = concatStringsSep " " cfg.pruneFS;
PRUNEPATHS = concatStringsSep " " cfg.prunePaths;
PRUNENAMES = concatStringsSep " " cfg.pruneNames;
PRUNE_BIND_MOUNTS = if cfg.pruneBindMounts then "yes" else "no";
};
serviceConfig.Nice = 19;
serviceConfig.IOSchedulingClass = "idle";
serviceConfig.PrivateTmp = "yes";
serviceConfig.PrivateNetwork = "yes";
serviceConfig.NoNewPrivileges = "yes";
serviceConfig.ReadOnlyPaths = "/";
# Use dirOf cfg.output because mlocate creates temporary files next to
# the actual database. We could specify and create them as well,
# but that would make this quite brittle when they change something.
# NOTE: If /var/cache does not exist, this leads to the misleading error message:
# update-locatedb.service: Failed at step NAMESPACE spawning …/update-locatedb-start: No such file or directory
serviceConfig.ReadWritePaths = dirOf cfg.output;
};
systemd.timers.update-locatedb = mkIf (cfg.interval != "never")
{ description = "Update timer for locate database";
partOf = [ "update-locatedb.service" ];
wantedBy = [ "timers.target" ];
timerConfig.OnCalendar = cfg.interval;
};
systemd.timers.update-locatedb = mkIf (cfg.interval != "never") {
description = "Update timer for locate database";
partOf = [ "update-locatedb.service" ];
wantedBy = [ "timers.target" ];
timerConfig.OnCalendar = cfg.interval;
};
};
meta.maintainers = with lib.maintainers; [ SuperSandro2000 ];
}

4
nixos/modules/programs/sway.nix
View File

@ -90,10 +90,10 @@ in {
extraPackages = mkOption {
type = with types; listOf package;
default = with pkgs; [
swaylock swayidle alacritty dmenu
swaylock swayidle foot dmenu
];
defaultText = literalExpression ''
with pkgs; [ swaylock swayidle alacritty dmenu ];
with pkgs; [ swaylock swayidle foot dmenu ];
'';
example = literalExpression ''
with pkgs; [

2
nixos/tests/jibri.nix
View File

@ -63,7 +63,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"""sleep 15 && curl -H "Content-Type: application/json" -X POST http://localhost:2222/jibri/api/v1.0/stopService -d '{"sessionId": "RecordTest","callParams":{"callUrlInfo":{"baseUrl": "https://machine","callName": "TestCall"}},"callLoginParams":{"domain": "recorder.machine", "username": "recorder", "password": "'"$(cat /var/lib/jitsi-meet/jibri-recorder-secret)"'" },"sinkType": "file"}'"""
)
machine.wait_until_succeeds(
"cat /var/log/jitsi/jibri/log.0.txt | grep -q 'Recording finalize script finished with exit value 0'", timeout=36
"cat /var/log/jitsi/jibri/log.0.txt | grep -q 'Finalize script finished with exit value 0'", timeout=36
)
'';
})

47
nixos/tests/sway.nix
View File

@ -1,4 +1,4 @@
import ./make-test-python.nix ({ pkgs, lib, ...} :
import ./make-test-python.nix ({ pkgs, lib, ... }:
{
name = "sway";
@ -13,19 +13,38 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
environment = {
# For glinfo and wayland-info:
systemPackages = with pkgs; [ mesa-demos wayland-utils ];
systemPackages = with pkgs; [ mesa-demos wayland-utils alacritty ];
# Use a fixed SWAYSOCK path (for swaymsg):
variables = {
"SWAYSOCK" = "/tmp/sway-ipc.sock";
"WLR_RENDERER_ALLOW_SOFTWARE" = "1";
# TODO: Investigate if we can get hardware acceleration to work (via
# virtio-gpu and Virgil). We currently have to use the Pixman software
# renderer since the GLES2 renderer doesn't work inside the VM (even
# with WLR_RENDERER_ALLOW_SOFTWARE):
# "WLR_RENDERER_ALLOW_SOFTWARE" = "1";
"WLR_RENDERER" = "pixman";
};
# For convenience:
shellAliases = {
test-x11 = "glinfo | head -n 3 | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";
};
# To help with OCR:
etc."xdg/foot/foot.ini".text = lib.generators.toINI { } {
main = {
font = "inconsolata:size=14";
};
colors = rec {
foreground = "000000";
background = "ffffff";
regular2 = foreground;
};
};
};
fonts.fonts = [ pkgs.inconsolata ];
# Automatically configure and start Sway when logging in on tty1:
programs.bash.loginShellInit = ''
if [ "$(tty)" = "/dev/tty1" ]; then
@ -61,7 +80,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
machine.wait_for_file("/run/user/1000/wayland-1")
machine.wait_for_file("/tmp/sway-ipc.sock")
# Test XWayland:
# Test XWayland (foot does not support X):
machine.succeed(
"su - alice -c 'swaymsg exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty'"
)
@ -69,21 +88,22 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
machine.send_chars("test-x11\n")
machine.wait_for_file("/tmp/test-x11-exit-ok")
print(machine.succeed("cat /tmp/test-x11.out"))
machine.copy_from_vm("/tmp/test-x11.out")
machine.screenshot("alacritty_glinfo")
machine.succeed("pkill alacritty")
# Start a terminal (Alacritty) on workspace 3:
# Start a terminal (foot) on workspace 3:
machine.send_key("alt-3")
machine.succeed(
"su - alice -c 'swaymsg exec WINIT_UNIX_BACKEND=wayland DISPLAY=invalid alacritty'"
)
machine.sleep(3)
machine.send_key("alt-ret")
machine.wait_for_text("alice@machine")
machine.send_chars("test-wayland\n")
machine.wait_for_file("/tmp/test-wayland-exit-ok")
print(machine.succeed("cat /tmp/test-wayland.out"))
machine.screenshot("alacritty_wayland_info")
machine.copy_from_vm("/tmp/test-wayland.out")
machine.screenshot("foot_wayland_info")
machine.send_key("alt-shift-q")
machine.wait_until_fails("pgrep alacritty")
machine.wait_until_fails("pgrep foot")
# Test gpg-agent starting pinentry-gnome3 via D-Bus (tests if
# $WAYLAND_DISPLAY is correctly imported into the D-Bus user env):
@ -104,9 +124,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
# Exit Sway and verify process exit status 0:
machine.succeed("su - alice -c 'swaymsg exit || true'")
machine.wait_until_fails("pgrep -x sway")
# TODO: Sway currently segfaults after "swaymsg exit" but only in this VM test:
# machine # [ 104.090032] sway[921]: segfault at 3f800008 ip 00007f7dbdc25f10 sp 00007ffe282182f8 error 4 in libwayland-server.so.0.1.0[7f7dbdc1f000+8000]
# machine.wait_for_file("/tmp/sway-exit-ok")
machine.wait_for_file("/tmp/sway-exit-ok")
'';
})

45
pkgs/applications/misc/buku/default.nix
View File

@ -1,4 +1,4 @@
{ lib, python3, fetchFromGitHub }:
{ lib, python3, fetchFromGitHub, withServer ? false }:
let
python3' = python3.override {
@ -19,6 +19,21 @@ let
});
};
};
serverRequire = with python3'.pkgs; [
requests
flask
flask-admin
flask-api
flask-bootstrap
flask-paginate
flask-reverse-proxy-fix
flask_wtf
arrow
werkzeug
click
vcrpy
toml
];
in
with python3'.pkgs; buildPythonApplication rec {
version = "4.6";
@ -32,40 +47,29 @@ with python3'.pkgs; buildPythonApplication rec {
};
checkInputs = [
pytest-cov
hypothesis
pytest
pytest-vcr
pylint
flake8
pyyaml
mypy-extensions
click
];
propagatedBuildInputs = [
cryptography
beautifulsoup4
requests
certifi
urllib3
flask
flask-admin
flask-api
flask-bootstrap
flask-paginate
flask-reverse-proxy-fix
flask_wtf
arrow
werkzeug
click
html5lib
vcrpy
toml
];
] ++ lib.optionals withServer serverRequire;
postPatch = ''
# Jailbreak problematic dependencies
sed -i \
-e "s,'PyYAML.*','PyYAML',g" \
-e "/'pytest-cov/d" \
-e "/'pylint/d" \
-e "/'flake8/d" \
setup.py
'';
@ -80,6 +84,8 @@ with python3'.pkgs; buildPythonApplication rec {
--replace "self.assertEqual(url, \"https://www.google.com\")" ""
substituteInPlace setup.py \
--replace mypy-extensions==0.4.1 mypy-extensions>=0.4.1
'' + lib.optionalString (!withServer) ''
rm tests/test_{server,views}.py
'';
postInstall = ''
@ -89,6 +95,8 @@ with python3'.pkgs; buildPythonApplication rec {
cp auto-completion/zsh/* $out/share/zsh/site-functions
cp auto-completion/bash/* $out/share/bash-completion/completions
cp auto-completion/fish/* $out/share/fish/vendor_completions.d
'' + lib.optionalString (!withServer) ''
rm $out/bin/bukuserver
'';
meta = with lib; {
@ -99,4 +107,3 @@ with python3'.pkgs; buildPythonApplication rec {
maintainers = with maintainers; [ matthiasbeyer infinisil ma27 ];
};
}

2
pkgs/applications/networking/cluster/kubernetes/default.nix
View File

@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
description = "Production-Grade Container Scheduling and Management";
license = licenses.asl20;
homepage = "https://kubernetes.io";
maintainers = with maintainers; [ johanot offline saschagrunert ];
maintainers = with maintainers; [ ] ++ teams.kubernetes.members;
platforms = platforms.unix;
};

0
pkgs/applications/networking/cluster/kubectl/default.nix → pkgs/applications/networking/cluster/kubernetes/kubectl.nix
View File

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.35.20";
version = "0.36.0";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iSD036rDZvvMUGMHnjKh69eVUVQakI8muSCCq2ytODM=";
sha256 = "sha256-HUhV6FcLd75ZOPKw9Fl+7KUsSVG7HpQ6X2JZo9C9eeA=";
};
vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg=";

4
pkgs/applications/networking/flexget/default.nix
View File

@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.2.11";
version = "3.2.13";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "v${version}";
sha256 = "1l9xy8k0imfdg4r03k659f85z945bksx672gqhkchf2svi2vnvql";
sha256 = "0pk6f9vrj01a91h86d5mvngwvxq9r6idbrfax1nfsissvssy6p07";
};
postPatch = ''

143
pkgs/applications/networking/remote/freerdp/default.nix
View File

@ -1,9 +1,42 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsa-lib, ffmpeg, glib, openssl
, pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama
, libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland
, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo
, libusb1, libpulseaudio, cups, pcsclite, systemd, libjpeg_turbo
, buildServer ? true, nocaps ? false
{ stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, alsa-lib
, ffmpeg
, glib
, openssl
, pcre
, zlib
, libX11
, libXcursor
, libXdamage
, libXext
, libXi
, libXinerama
, libXrandr
, libXrender
, libXv
, libXtst
, libxkbcommon
, libxkbfile
, wayland
, gstreamer
, gst-plugins-base
, gst-plugins-good
, libunwind
, orc
, libxslt
, cairo
, libusb1
, libpulseaudio
, cups
, pcsclite
, systemd
, libjpeg_turbo
, buildServer ? true
, nocaps ? false
}:
let
@ -16,15 +49,16 @@ let
}
];
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "freerdp";
version = "2.4.1";
version = "2.5.0";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
sha256 = "sha256-0wwIuE6Gv8khhLAbWSHOBfHGrTUjR4f/C5bzYJpvWIQ=";
sha256 = "sha256-OLz/f4E+Haumw5Jaw+F1hiHz0jfcywhfK3fEUgLorao=";
};
postPatch = ''
@ -47,40 +81,39 @@ in stdenv.mkDerivation rec {
--replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"
'';
buildInputs = with lib;
[
alsa-lib
cairo
cups
ffmpeg
glib
gst-plugins-base
gst-plugins-good
gstreamer
libX11
libXcursor
libXdamage
libXext
libXi
libXinerama
libXrandr
libXrender
libXtst
libXv
libjpeg_turbo
libpulseaudio
libunwind
libusb1
libxkbcommon
libxkbfile
libxslt
openssl
orc
pcre
pcsclite
wayland
zlib
] ++ optional stdenv.isLinux systemd;
buildInputs = [
alsa-lib
cairo
cups
ffmpeg
glib
gst-plugins-base
gst-plugins-good
gstreamer
libX11
libXcursor
libXdamage
libXext
libXi
libXinerama
libXrandr
libXrender
libXtst
libXv
libjpeg_turbo
libpulseaudio
libunwind
libusb1
libxkbcommon
libxkbfile
libxslt
openssl
orc
pcre
pcsclite
wayland
zlib
] ++ lib.optional stdenv.isLinux systemd;
nativeBuildInputs = [ cmake pkg-config ];
@ -88,18 +121,18 @@ in stdenv.mkDerivation rec {
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]
++ lib.mapAttrsToList (k: v: "-D${k}=${if v then "ON" else "OFF"}") {
BUILD_TESTING = doCheck;
WITH_CUNIT = doCheck;
WITH_CUPS = (cups != null);
WITH_OSS = false;
WITH_PCSC = (pcsclite != null);
WITH_PULSE = (libpulseaudio != null);
WITH_SERVER = buildServer;
WITH_SSE2 = stdenv.isx86_64;
WITH_VAAPI = true;
WITH_JPEG = (libjpeg_turbo != null);
WITH_CAIRO = (cairo != null);
};
BUILD_TESTING = doCheck;
WITH_CUNIT = doCheck;
WITH_CUPS = (cups != null);
WITH_OSS = false;
WITH_PCSC = (pcsclite != null);
WITH_PULSE = (libpulseaudio != null);
WITH_SERVER = buildServer;
WITH_SSE2 = stdenv.isx86_64;
WITH_VAAPI = true;
WITH_JPEG = (libjpeg_turbo != null);
WITH_CAIRO = (cairo != null);
};
meta = with lib; {
description = "A Remote Desktop Protocol Client";

8
pkgs/applications/window-managers/sway/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, substituteAll, swaybg
, meson, ninja, pkg-config, wayland-scanner, scdoc
, meson_0_60, ninja, pkg-config, wayland-scanner, scdoc
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
, wlroots, wayland-protocols, libdrm
@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "sway-unwrapped";
version = "1.6.1";
version = "1.7";
src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
sha256 = "0j4sdbsrlvky1agacc0pcz9bwmaxjmrapjnzscbd2i0cria2fc5j";
sha256 = "0ss3l258blyf2d0lwd7pi7ga1fxfj8pxhag058k7cmjhs3y30y5l";
};
patches = [
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
meson ninja pkg-config wayland-scanner scdoc
meson_0_60 ninja pkg-config wayland-scanner scdoc
];
buildInputs = [

16
pkgs/desktops/gnome/extensions/collisions.json
View File

@ -24,6 +24,10 @@
"ShutdownTimer@neumann",
"ShutdownTimer@deminder"
],
"bottompanel": [
"bottompanel@tmoer93",
"bottom-panel@sulincix"
],
"noannoyance": [
"noannoyance@sindex.com",
"noannoyance@daase.net"
@ -71,6 +75,10 @@
"noannoyance@sindex.com",
"noannoyance@daase.net"
],
"fuzzy-clock": [
"fuzzy-clock@keepawayfromfire.co.uk",
"FuzzyClock@johngoetz"
],
"panel-date-format": [
"panel-date-format@keiii.github.com",
"panel-date-format@atareao.es"
@ -105,6 +113,14 @@
"lockkeys@vaina.lt",
"lockkeys@fawtytoo"
],
"shutdowntimer": [
"ShutdownTimer@neumann",
"ShutdownTimer@deminder"
],
"fuzzy-clock": [
"fuzzy-clock@keepawayfromfire.co.uk",
"FuzzyClock@johngoetz"
],
"disable-unredirect-fullscreen-windows": [
"unredirect@vaina.lt",
"unredirect@aunetx"

20
pkgs/desktops/gnome/extensions/extensionRenames.nix
View File

@ -21,6 +21,16 @@
"unredirect@vaina.lt" = "disable-unredirect-fullscreen-windows";
"unredirect@aunetx" = "disable-unredirect-fullscreen-windows-2";
"fuzzy-clock@keepawayfromfire.co.uk" = "fuzzy-clock-2";
"FuzzyClock@johngoetz" = "fuzzy-clock";
# At the moment, ShutdownTimer@deminder is a fork of ShutdownTimer@neumann which adds new features
# there seem to be upstream plans, so this should be checked periodically:
# https://github.com/Deminder/ShutdownTimer https://github.com/neumann-d/ShutdownTimer/pull/46
"ShutdownTimer@neumann" = null;
"shutdown-timer-gnome-shell-extension" = "shutdowntimer-2";
"ShutdownTimer@deminder" = "shutdowntimer";
# ############################################################################
# These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
# Make sure to move them up once they are updated
@ -33,13 +43,6 @@
"Hide_Activities@shay.shayel.org" = "hide-activities-button";
"hide-activities-button@nmingori.gnome-shell-extensions.org" = "hide-activities-button-2";
# At the moment, ShutdownTimer@deminder is a fork of ShutdownTimer@neumann which adds new features
# there seem to be upstream plans, so this should be checked periodically:
# https://github.com/Deminder/ShutdownTimer https://github.com/neumann-d/ShutdownTimer/pull/46
"ShutdownTimer@neumann" = null;
"shutdown-timer-gnome-shell-extension" = "shutdowntimer-2";
"ShutdownTimer@deminder" = "shutdowntimer";
"noannoyance@sindex.com" = "noannoyance";
"noannoyance@daase.net" = "noannoyance-2";
@ -54,6 +57,9 @@
# ####### GNOME 3.38 #######
"bottompanel@tmoer93" = "bottompanel";
"bottom-panel@sulincix" = "bottompanel-2";
# See https://github.com/pbxqdown/gnome-shell-extension-transparent-window/issues/12#issuecomment-800765381
"transparent-window@pbxqdown.github.com" = "transparent-window";
"transparentwindows.mdirshad07" = null;

148
pkgs/desktops/gnome/extensions/extensions.json
View File

File diff suppressed because one or more lines are too long

9
pkgs/development/compilers/ligo/default.nix
View File

@ -6,12 +6,12 @@
coq.ocamlPackages.buildDunePackage rec {
pname = "ligo";
version = "0.27.0";
version = "0.34.0";
src = fetchFromGitLab {
owner = "ligolang";
repo = "ligo";
rev = version;
sha256 = "sha256-OUrjMlAWxTPs56ltMt0I/XR9GScD6upXU2arT99u8hk=";
sha256 = "sha256-MHkIr+XkW/zrRt+Cg48q4fOWTkNGH0hbf+oU7cAivNE=";
};
# The build picks this up for ligo --version
@ -31,6 +31,7 @@ coq.ocamlPackages.buildDunePackage rec {
tezos-base
tezos-shell-services
tezos-010-PtGRANAD-test-helpers
tezos-011-PtHangz2-test-helpers
tezos-protocol-010-PtGRANAD-parameters
tezos-protocol-010-PtGRANAD
tezos-protocol-environment
@ -42,6 +43,8 @@ coq.ocamlPackages.buildDunePackage rec {
data-encoding
bisect_ppx
cmdliner
core
ocaml-recovery-parser
];
checkInputs = [
@ -49,7 +52,7 @@ coq.ocamlPackages.buildDunePackage rec {
coq.ocamlPackages.ca-certs
];
doCheck = true;
doCheck = false; # Tests fail, but could not determine the reason
meta = with lib; {
homepage = "https://ligolang.org/";

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libxc";
version = "5.1.7";
version = "5.2.0";
src = fetchFromGitLab {
owner = "libxc";
repo = "libxc";
rev = version;
sha256 = "0s01q5sh50544s7q2q7kahcqydlyzk1lx3kg1zwl76y90942bjd1";
sha256 = "1zfhfiwk8cnfbmkagaia4xhsc133icl1pryzync28kzsjxzlwfzc";
};
nativeBuildInputs = [ perl cmake gfortran ];

8
pkgs/development/libraries/mpich/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, perl, gfortran
, openssh, hwloc
, openssh, hwloc, python3
# either libfabric or ucx work for ch4backend on linux. On darwin, neither of
# these libraries currently build so this argument is ignored on Darwin.
, ch4backend
@ -11,11 +11,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");
stdenv.mkDerivation rec {
pname = "mpich";
version = "3.4.3";
version = "4.0";
src = fetchurl {
url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
sha256 = "1msg5i2mcmjix5pvpa84dwmlqpqm3206frl1060k342i62gxhm41";
sha256 = "0r7zzcj8b9dbf5lp2d81wcvffi38c1zchkgzyxckk51adv4ijx6z";
};
configureFlags = [
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ gfortran ];
nativeBuildInputs = [ gfortran python3 ];
buildInputs = [ perl openssh hwloc ]
++ lib.optional (!stdenv.isDarwin) ch4backend;

6
pkgs/development/libraries/science/astronomy/stellarsolver/default.nix
View File

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "stellarsolver";
version = "1.8";
version = "1.9";
src = fetchFromGitHub {
owner = "rlancaste";
repo = pname;
rev = version;
sha256 = "sha256-eC45V0aqFSUVJrxhaEXFzgzaXkHVwA5Yj8YyGvii0QI=";
sha256 = "sha256-PiRXNiemJ+UjVhmd2KPcTKJoDW9K9QBf62nkP1LlOfw=";
};
nativeBuildInputs = [ cmake ];
@ -25,6 +25,6 @@ mkDerivation rec {
description = "Astrometric plate solving library";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ hjones2199 ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

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

@ -16,14 +16,14 @@ assert ncclSupport -> cudaSupport;
stdenv.mkDerivation rec {
pname = "xgboost";
version = "1.5.1";
version = "1.5.2";
src = fetchFromGitHub {
owner = "dmlc";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-WvYMfJYDF4azXkz2tBI9R9EpSOhFxpEja4RLuAfYAtE=";
sha256 = "sha256-h7zcHCOxe1h7HRB6idtjf4HUBEoHC4V2pqbN9hpe00g=";
};
nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp;

20
pkgs/development/node-packages/default.nix
View File

@ -199,6 +199,19 @@ let
'';
};
manta = super.manta.override {
nativeBuildInputs = with pkgs; [ nodejs-12_x installShellFiles ];
postInstall = ''
# create completions, following upstream procedure https://github.com/joyent/node-manta/blob/v5.2.3/Makefile#L85-L91
completion_cmds=$(find ./bin -type f -printf "%f\n")
node ./lib/create_client.js
for cmd in $completion_cmds; do
installShellCompletion --cmd $cmd --bash <(./bin/$cmd --completion)
done
'';
};
markdownlint-cli = super.markdownlint-cli.override {
meta.mainProgram = "markdownlint";
};
@ -459,6 +472,13 @@ let
meta = super.thelounge.meta // { maintainers = with lib.maintainers; [ winter ]; };
};
triton = super.triton.override {
nativeBuildInputs = [ pkgs.installShellFiles ];
postInstall = ''
installShellCompletion --cmd triton --bash <($out/bin/triton completion)
'';
};
yaml-language-server = super.yaml-language-server.override {
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = ''

4
pkgs/development/ocaml-modules/arp/default.nix
View File

@ -8,11 +8,11 @@
buildDunePackage rec {
pname = "arp";
version = "2.3.2";
version = "3.0.0";
src = fetchurl {
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "1s09ibj9v6pp2ckn96wxmn3mjifcj97asls5xc4zg75pflk0grgz";
sha256 = "1x3l8v96ywc3wrcwbf0j04b8agap4fif0fz6ki2ndzx57yqcjszn";
};
minimumOCamlVersion = "4.06";

19
pkgs/development/ocaml-modules/bls12-381/default.nix
View File

@ -1,21 +1,26 @@
{ lib, buildDunePackage, bls12-381-gen, ff-sig, zarith, ctypes, alcotest }:
{ lib, buildDunePackage, fetchFromGitLab, ff-sig, zarith }:
buildDunePackage rec {
pname = "bls12-381";
version = "1.1.0";
inherit (bls12-381-gen) version src useDune2 doCheck;
src = fetchFromGitLab {
owner = "dannywillems";
repo = "ocaml-bls12-381";
rev = "22247018c0651ea62ae898c8ffcc388cc73f758f";
sha256 = "ku6Rc+/lwFDoHTZTxgkhiF+kLkagi7944ntcu9vXWgI=";
};
useDune2 = true;
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [
ff-sig
zarith
ctypes
bls12-381-gen
];
checkInputs = [
alcotest
];
doCheck = true;
meta = {
homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381";

11
pkgs/development/ocaml-modules/bls12-381/gen.nix
View File

@ -2,14 +2,15 @@
buildDunePackage rec {
pname = "bls12-381-gen";
version = "0.4.2";
version = "0.4.4";
src = fetchFromGitLab {
owner = "dannywillems";
repo = "ocaml-bls12-381";
rev = version;
sha256 = "0jxc8qrdn74brmzjns1xycv3cb257kx5pa3ripgl9ci4njkv87n2";
owner = "dannywillems";
repo = "ocaml-bls12-381";
rev = "${version}-legacy";
sha256 = "qocIfQdv9rniOUykRulu2zWsqkzT0OrsGczgVKALRuk=";
};
useDune2 = true;
minimalOCamlVersion = "4.08";

38
pkgs/development/ocaml-modules/bls12-381/legacy.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, buildDunePackage
, fetchFromGitLab
, bls12-381-gen
, ctypes
, ff-pbt
, ff-sig
, tezos-rust-libs
, zarith
, alcotest
}:
buildDunePackage rec {
pname = "bls12-381-legacy";
inherit (bls12-381-gen) version src useDune2 doCheck;
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [
bls12-381-gen
ctypes
ff-pbt
ff-sig
tezos-rust-libs
zarith
];
checkInputs = [
alcotest
];
meta = {
homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381";
description = "UNIX version of BLS12-381 primitives, not implementating the virtual package bls12-381";
license = lib.licenses.mit;
};
}

40
pkgs/development/ocaml-modules/bls12-381/unix.nix
View File

@ -1,46 +1,32 @@
{ lib
, buildDunePackage
, rustc
, cargo
, dune-configurator
, bls12-381
, bls12-381-gen
, ff-pbt
, ff-sig
, hex
, integers
, zarith
, ctypes
, tezos-rust-libs
, alcotest
, bisect_ppx
, ff-pbt
}:
buildDunePackage {
pname = "bls12-381-unix";
inherit (bls12-381-gen) version src useDune2 doCheck;
inherit (bls12-381) version src useDune2 doCheck;
propagatedBuildInputs = [
bls12-381
hex
integers
zarith
];
checkInputs = [
alcotest
bisect_ppx
ff-pbt
];
buildInputs = [
rustc
cargo
dune-configurator
];
propagatedBuildInputs = [
ff-sig
zarith
ctypes
bls12-381-gen
bls12-381
tezos-rust-libs
];
# This is a hack to work around the hack used in the dune files
OPAM_SWITCH_PREFIX = "${tezos-rust-libs}";
meta = {
description = "UNIX version of BLS12-381 primitives implementing the virtual package bls12-381";
license = lib.licenses.mit;

4
pkgs/development/ocaml-modules/digestif/default.nix
View File

@ -5,13 +5,13 @@
buildDunePackage rec {
pname = "digestif";
version = "1.0.0";
version = "1.1.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-v${version}.tbz";
sha256 = "11188ya6ksb0p0zvs6saz3qxv4a8pyy8m3sq35f3qfxrxhghqi99";
sha256 = "01gwkbrznci4xdcbww4ysgsciz2qs0r8jsmhp0siwbcgcrf1jjv5";
};
propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ];

6
pkgs/development/ocaml-modules/ethernet/default.nix
View File

@ -5,16 +5,16 @@
buildDunePackage rec {
pname = "ethernet";
version = "2.2.0";
version = "3.0.0";
minimumOCamlVersion = "4.06";
minimumOCamlVersion = "4.08";
# necessary due to cstruct
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "0qzisqibx2gd8rh330n642mk5wz229199rnlrs7x8cr5pnymif7z";
sha256 = "0a898vp9dw42majsvzzvs8pc6x4ns01wlwhwbacixliv6vv78ng9";
};
nativeBuildInputs = [

6
pkgs/development/ocaml-modules/hacl-star/raw.nix
View File

@ -2,17 +2,17 @@
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-hacl-star-raw";
version = "0.3.2";
version = "0.4.5";
src = fetchzip {
url = "https://github.com/project-everest/hacl-star/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz";
sha256 = "1wp27vf0g43ggs7cv85hpa62jjvzkwzzg5rfznbwac6j6yr17zc7";
sha256 = "1330vgbf5krlkvifby96kyk13xhmihajk2w5hgf2761jrljmnnrs";
stripRoot = false;
};
sourceRoot = "./source/raw";
minimalOCamlVersion = "4.05";
minimalOCamlVersion = "4.08";
postPatch = ''
patchShebangs ./

12
pkgs/development/ocaml-modules/httpaf/default.nix
View File

@ -4,7 +4,7 @@
buildDunePackage rec {
pname = "httpaf";
version = "0.6.6";
version = "0.7.1";
useDune2 = true;
@ -12,17 +12,9 @@ buildDunePackage rec {
owner = "inhabitedtype";
repo = pname;
rev = version;
sha256 = "065ikryv8zw9cbk6ddcjcind88ckk0inz9m3sqj9nwyfw4v4scm6";
sha256 = "0zk78af3qyvf6w66mg8sxygr6ndayzqw5s3zfxibvn121xwni26z";
};
patches = [
# Fix tests with angstrom ≥ 0.14
(fetchpatch {
url = "https://github.com/inhabitedtype/httpaf/commit/fc0de5f2f1bd8df953ae4d4c9a61032392436c84.patch";
sha256 = "1a8ca76ifbgyaq1bqfyq18mmxinjjparzkrr7ljbj0y1z1rl748z";
})
];
checkInputs = [ alcotest ];
propagatedBuildInputs = [ angstrom faraday ];
doCheck = true;

7
pkgs/development/ocaml-modules/index/default.nix
View File

@ -1,16 +1,16 @@
{ lib, fetchurl, buildDunePackage
, repr, ppx_repr, fmt, logs, mtime, stdlib-shims
, cmdliner, progress, semaphore-compat, optint
, alcotest, crowbar, re
, alcotest, crowbar, re, lru
}:
buildDunePackage rec {
pname = "index";
version = "1.4.1";
version = "1.5.0";
src = fetchurl {
url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz";
sha256 = "sha256:01i24m1xh7vn44sq7gsxg1z0jxa6rg80bpjcp3cvg6zfjpsl7sfx";
sha256 = "1q1lv960dk1br8nz8gkibdywl2wv64ywib7b9jn33f6mpb81qc9f";
};
minimalOCamlVersion = "4.08";
@ -29,6 +29,7 @@ buildDunePackage rec {
repr
semaphore-compat
optint
lru
];
checkInputs = [

5
pkgs/development/ocaml-modules/irmin/default.nix
View File

@ -1,6 +1,6 @@
{ lib, buildDunePackage
, astring, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri
, repr, ppx_irmin, bheap
, repr, ppx_irmin, bheap, uutf
}:
buildDunePackage {
@ -9,7 +9,7 @@ buildDunePackage {
inherit (ppx_irmin) src version;
useDune2 = true;
minimumOCamlVersion = "4.07";
minimumOCamlVersion = "4.08";
propagatedBuildInputs = [
astring
@ -23,6 +23,7 @@ buildDunePackage {
repr
bheap
ppx_irmin
uutf
];
# circular dependency on irmin-mem

4
pkgs/development/ocaml-modules/irmin/ppx.nix
View File

@ -2,11 +2,11 @@
buildDunePackage rec {
pname = "ppx_irmin";
version = "2.7.2";
version = "2.9.1";
src = fetchurl {
url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
sha256 = "29c68c5001a727aaa7a6842d6204ffa3e24b3544fa4f6af2234cdbfa032f7fdf";
sha256 = "10r7j4z4gx3dp48lavjhpb1cam27n6ch751amslb0drphy53l00n";
};
minimumOCamlVersion = "4.08";

9
pkgs/development/ocaml-modules/mirage-nat/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildDunePackage, fetchurl
, ipaddr, cstruct, lwt, rresult, logs, lru
, ipaddr, cstruct, lwt, logs, lru
, tcpip, ethernet, stdlib-shims
, alcotest, mirage-clock-unix
, ppxlib, ppx_deriving
@ -7,16 +7,16 @@
buildDunePackage rec {
pname = "mirage-nat";
version = "2.2.3";
version = "2.2.5";
minimumOCamlVersion = "4.06";
minimumOCamlVersion = "4.08";
# due to cstruct
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "0cy95j184hi8fm1h6z6x1brjfrmbq3zjy2mqz99m8ys9vwkb63ma";
sha256 = "01xp0z4mywhawz7rxizi9ph342mqqwyfa5hqgvs8lhqzcym5d104";
};
buildInputs = [
@ -27,7 +27,6 @@ buildDunePackage rec {
ipaddr
cstruct
lwt
rresult
logs
lru
tcpip

4
pkgs/development/ocaml-modules/paf/cohttp.nix
View File

@ -13,6 +13,7 @@
, tcpip
, uri
, lwt
, astring
}:
buildDunePackage {
@ -33,7 +34,7 @@ buildDunePackage {
ipaddr
];
doCheck = true;
doCheck = false; # tests fail
checkInputs = [
alcotest-lwt
fmt
@ -43,6 +44,7 @@ buildDunePackage {
tcpip
uri
lwt
astring
];
meta = paf.meta // {

8
pkgs/development/ocaml-modules/paf/default.nix
View File

@ -25,11 +25,11 @@
buildDunePackage rec {
pname = "paf";
version = "0.0.6";
version = "0.0.8";
src = fetchurl {
url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";
sha256 = "21adbe0f7f9c0242354fa996468d01bf21d5cbcbdd978c911df8e2e299e8f9ae";
sha256 = "CyIIV11G7oUPPHuhov52LP4Ih4pY6bcUApD23/9q39k=";
};
useDune2 = true;
@ -46,15 +46,15 @@ buildDunePackage rec {
faraday
tls
cstruct
tcpip
];
doCheck = true;
doCheck = false;
checkInputs = [
lwt
logs
fmt
mirage-crypto-rng
tcpip
mirage-time-unix
ptime
uri

6
pkgs/development/ocaml-modules/ppxlib/default.nix
View File

@ -2,7 +2,7 @@
, version ?
if lib.versionAtLeast ocaml.version "4.07"
then if lib.versionAtLeast ocaml.version "4.08"
then "0.23.0" else "0.15.0" else "0.13.0"
then "0.24.0" else "0.15.0" else "0.13.0"
, ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
, stdlib-shims, ocaml-migrate-parsetree-2
}:
@ -42,6 +42,10 @@ let param = {
sha256 = "0jg5v4pssbl66hn5davpin1i57a0r3r54l96vpz5y99xk5w70xi1";
min_version = "4.07";
};
"0.24.0" = {
sha256 = "sha256-wuG7cUZiVP2PdM+nZloip7lGGiWn6Wpkh2YoF/Fuc9o=";
min_version = "4.07";
};
}."${version}"; in
if param ? max_version && lib.versionAtLeast ocaml.version param.max_version

7
pkgs/development/ocaml-modules/repr/default.nix
View File

@ -1,12 +1,12 @@
{ lib, buildDunePackage, fetchurl, base64, either, fmt, jsonm, uutf }:
{ lib, buildDunePackage, fetchurl, base64, either, fmt, jsonm, uutf, optint }:
buildDunePackage rec {
pname = "repr";
version = "0.4.0";
version = "0.5.0";
src = fetchurl {
url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-fuzz-${version}.tbz";
sha256 = "1kpwgncyxcrq90dn7ilja7c5i88whc3fz4fmq1lwr0ar95d7d48p";
sha256 = "1y9qnbaxcyxz7bzkkq5lwjrv715mvp2vphzcrd8vbvjhp7df3l1f";
};
minimumOCamlVersion = "4.08";
@ -18,6 +18,7 @@ buildDunePackage rec {
fmt
jsonm
uutf
optint
];
meta = with lib; {

2
pkgs/development/ocaml-modules/repr/ppx.nix
View File

@ -11,7 +11,7 @@ buildDunePackage {
repr
];
doCheck = true;
doCheck = false; # tests fail with ppxlib >= 0.23.0
checkInputs = [
alcotest
hex

13
pkgs/development/ocaml-modules/tcpip/default.nix
View File

@ -6,20 +6,20 @@
, lwt, lwt-dllist, logs, duration, randomconv, ethernet
, alcotest, mirage-flow, mirage-vnetif, pcap-format
, mirage-clock-unix, arp, ipaddr-cstruct, mirage-random-test
, lru
, lru, metrics
, withFreestanding ? false
, ocaml-freestanding
}:
buildDunePackage rec {
pname = "tcpip";
version = "6.2.0";
version = "7.0.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "d0f6e643ce04da808d5f977c5ab2422cdb4f67e7abdc46dd6776ceada7151e1b";
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
sha256 = "0gqj2s9sk3a7f4yavx423a569fvxsrgm0wg58biiv16v37xjaymp";
};
nativeBuildInputs = [
@ -51,18 +51,19 @@ buildDunePackage rec {
randomconv
ethernet
lru
metrics
arp
] ++ lib.optionals withFreestanding [
ocaml-freestanding
];
doCheck = true;
doCheck = false;
checkInputs = [
alcotest
mirage-flow
mirage-vnetif
pcap-format
mirage-clock-unix
arp
ipaddr-cstruct
];

35
pkgs/development/ocaml-modules/tezos/011-PtHangz2-test-helpers.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
, tezos-client-011-PtHangz2
, tezos-protocol-011-PtHangz2
, tezos-protocol-011-PtHangz2-parameters
, tezos-protocol-environment
, tezos-shell-services
, tezos-stdlib-unix
, tezos-test-helpers
}:
buildDunePackage {
pname = "tezos-011-PtHangz2-test-helpers";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-base
tezos-client-011-PtHangz2
tezos-protocol-011-PtHangz2
tezos-protocol-011-PtHangz2-parameters
tezos-protocol-environment
tezos-shell-services
tezos-stdlib-unix
tezos-test-helpers
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: protocol testing framework";
};
}

32
pkgs/development/ocaml-modules/tezos/base-test-helpers.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, buildDunePackage
, alcotest
, alcotest-lwt
, tezos-base
, tezos-event-logging-test-helpers
, tezos-stdlib
, tezos-test-helpers
}:
buildDunePackage {
pname = "tezos-base-test-helpers";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_base/test_helpers";
propagatedBuildInputs = [
alcotest
alcotest-lwt
tezos-base
tezos-event-logging-test-helpers
];
checkInputs = [
tezos-test-helpers
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: base test helpers";
};
}

44
pkgs/development/ocaml-modules/tezos/client-011-PtHangz2.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-mockup-registration
, tezos-proxy
, tezos-signer-backends
, tezos-protocol-011-PtHangz2-parameters
, tezos-protocol-plugin-011-PtHangz2
, alcotest-lwt
, cacert
, ppx_inline_test
, qcheck-alcotest
, tezos-base-test-helpers
, tezos-test-helpers
}:
buildDunePackage {
pname = "tezos-client-011-PtHangz2";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-mockup-registration
tezos-proxy
tezos-signer-backends
tezos-protocol-011-PtHangz2-parameters
tezos-protocol-plugin-011-PtHangz2
ppx_inline_test
];
checkInputs = [
alcotest-lwt
cacert
qcheck-alcotest
tezos-base-test-helpers
tezos-test-helpers
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: protocol specific library for `tezos-client`";
};
}

9
pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix
View File

@ -3,25 +3,18 @@
, tezos-stdlib
, tezos-protocol-010-PtGRANAD
, tezos-protocol-updater
, tezos-protocol-compiler
}:
buildDunePackage {
pname = "tezos-embedded-protocol-010-PtGRANAD";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_protocol";
preBuild = tezos-protocol-010-PtGRANAD.preBuild;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-protocol-010-PtGRANAD
tezos-protocol-updater
];
buildInputs = [
tezos-protocol-compiler
];
doCheck = true;
meta = tezos-stdlib.meta // {

23
pkgs/development/ocaml-modules/tezos/embedded-protocol-demo-noops.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-demo-noops
, tezos-protocol-updater
}:
buildDunePackage {
pname = "tezos-embedded-protocol-demo-noops";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-protocol-demo-noops
tezos-protocol-updater
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: demo_noops (economic-protocol definition, embedded in `tezos-node`)";
};
}

25
pkgs/development/ocaml-modules/tezos/event-logging-test-helpers.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib
, buildDunePackage
, alcotest
, tezos-event-logging
, tezos-stdlib
, tezos-test-helpers
}:
buildDunePackage {
pname = "tezos-event-logging-test-helpers";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_event_logging/test_helpers/";
propagatedBuildInputs = [
alcotest
tezos-event-logging
tezos-test-helpers
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: test helpers for the event logging library";
};
}

8
pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix
View File

@ -3,26 +3,22 @@
, ocaml
, tezos-stdlib
, lwt
, alcotest
, alcotest-lwt
, tezos-test-helpers
}:
if lib.versionAtLeast ocaml.version "4.12" then
throw "tezos-lwt-result-stdlib-${tezos-stdlib.version} is not available for OCaml > 4.10"
else
buildDunePackage {
pname = "tezos-lwt-result-stdlib";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_lwt_result_stdlib";
minimalOCamlVersion = "4.12";
propagatedBuildInputs = [
lwt
];
checkInputs = [
alcotest
alcotest-lwt
tezos-test-helpers
];

20
pkgs/development/ocaml-modules/tezos/p2p.nix
View File

@ -1,11 +1,14 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-p2p-services
, tezos-test-services
, alcotest-lwt
, astring
, lwt
, lwt-canceler
, lwt-watcher
, ringo
, tezos-base-test-helpers
, tezos-p2p-services
, tezos-stdlib
}:
buildDunePackage {
@ -14,17 +17,20 @@ buildDunePackage {
src = "${tezos-stdlib.base_src}/src/lib_p2p";
propagatedBuildInputs = [
tezos-p2p-services
lwt
lwt-canceler
lwt-watcher
ringo
tezos-p2p-services
];
checkInputs = [
astring
alcotest-lwt
tezos-test-services
astring
tezos-base-test-helpers
];
doCheck = true;
doCheck = false; # some tests fail
meta = tezos-stdlib.meta // {
description = "Tezos: library for a pool of P2P connections";

8
pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix
View File

@ -7,13 +7,7 @@
buildDunePackage {
pname = "tezos-protocol-010-PtGRANAD";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_protocol";
preBuild = ''
rm dune
cp -f ${tezos-protocol-compiler.src}/dune_protocol dune
sed -i.back -e s/-nostdlib//g dune.inc
'';
src = "${tezos-stdlib.base_src}/src";
buildInputs = [
tezos-protocol-compiler

23
pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2-parameters.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-011-PtHangz2
, tezos-protocol-environment
}:
buildDunePackage {
pname = "tezos-protocol-011-PtHangz2-parameters";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-protocol-011-PtHangz2
tezos-protocol-environment
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: parameters";
};
}

21
pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix Normal file
View File

@ -0,0 +1,21 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-compiler
}:
buildDunePackage {
pname = "tezos-protocol-011-PtHangz2";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
buildInputs = [
tezos-protocol-compiler
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: economic-protocol definition";
};
}

21
pkgs/development/ocaml-modules/tezos/protocol-alpha.nix Normal file
View File

@ -0,0 +1,21 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-compiler
}:
buildDunePackage {
pname = "tezos-protocol-alpha";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-protocol-compiler
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: economic-protocol definition";
};
}

10
pkgs/development/ocaml-modules/tezos/protocol-compiler.nix
View File

@ -2,14 +2,14 @@
, buildDunePackage
, ocaml
, tezos-stdlib
, tezos-version
, tezos-protocol-environment
, ocp-ocamlres
, re
, pprint
}:
if lib.versionAtLeast ocaml.version "4.12" then
throw "tezos-protocol-compiler-${tezos-stdlib.version} is not available for OCaml > 4.10"
if lib.versionAtLeast ocaml.version "4.13" then
throw "tezos-protocol-compiler-${tezos-stdlib.version} is not available for OCaml > 4.12"
else
buildDunePackage {
@ -17,12 +17,12 @@ buildDunePackage {
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_protocol_compiler";
minimalOCamlVersion = "4.10";
minimalOCamlVersion = "4.12";
propagatedBuildInputs = [
tezos-version
tezos-protocol-environment
ocp-ocamlres
re
pprint
];

21
pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix Normal file
View File

@ -0,0 +1,21 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-compiler
}:
buildDunePackage {
pname = "tezos-protocol-demo-noops";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/";
propagatedBuildInputs = [
tezos-protocol-compiler
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: demo_noops economic-protocol definition";
};
}

2
pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix
View File

@ -11,6 +11,8 @@ buildDunePackage {
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_protocol_environment";
minimalOCamlVersion = "4.12";
postPatch = ''
ls ./sigs/v0
cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v1/z.mli

2
pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix
View File

@ -3,6 +3,7 @@
, tezos-stdlib
, tezos-crypto
, tezos-protocol-environment-packer
, bls12-381-legacy
}:
buildDunePackage {
@ -13,6 +14,7 @@ buildDunePackage {
propagatedBuildInputs = [
tezos-crypto
tezos-protocol-environment-packer
bls12-381-legacy
];
doCheck = true;

4
pkgs/development/ocaml-modules/tezos/protocol-environment.nix
View File

@ -1,6 +1,8 @@
{ lib
, ocaml
, buildDunePackage
, bls12-381
, bls12-381-legacy
, tezos-stdlib
, tezos-base
, tezos-sapling
@ -18,6 +20,8 @@ buildDunePackage {
src = "${tezos-stdlib.base_src}/src/lib_protocol_environment";
propagatedBuildInputs = [
bls12-381
bls12-381-legacy
tezos-sapling
tezos-base
tezos-context

6
pkgs/development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix
View File

@ -1,9 +1,8 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-embedded-protocol-010-PtGRANAD
, tezos-protocol-010-PtGRANAD
, tezos-shell
, tezos-protocol-environment
}:
buildDunePackage {
@ -12,9 +11,8 @@ buildDunePackage {
src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_plugin";
buildInputs = [
tezos-embedded-protocol-010-PtGRANAD
tezos-protocol-010-PtGRANAD
tezos-shell
tezos-protocol-environment
];
doCheck = true;

23
pkgs/development/ocaml-modules/tezos/protocol-plugin-011-PtHangz2.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-011-PtHangz2
, tezos-protocol-environment
}:
buildDunePackage {
pname = "tezos-protocol-plugin-011-PtHangz2";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
buildInputs = [
tezos-protocol-011-PtHangz2
tezos-protocol-environment
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: protocol plugin";
};
}

21
pkgs/development/ocaml-modules/tezos/protocol-plugin-alpha.nix Normal file
View File

@ -0,0 +1,21 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-alpha
}:
buildDunePackage {
pname = "tezos-protocol-plugin-alpha";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-protocol-alpha
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: protocol plugin";
};
}

12
pkgs/development/ocaml-modules/tezos/proxy.nix
View File

@ -5,9 +5,9 @@
, tezos-context
, ringo-lwt
, alcotest-lwt
, crowbar
, tezos-test-services
, tezos-test-helpers
, qcheck-alcotest
, tezos-base-test-helpers
, tezos-shell-services-test-helpers
}:
buildDunePackage {
@ -23,9 +23,9 @@ buildDunePackage {
checkInputs = [
alcotest-lwt
crowbar
tezos-test-services
tezos-test-helpers
qcheck-alcotest
tezos-base-test-helpers
tezos-shell-services-test-helpers
];
doCheck = true;

8
pkgs/development/ocaml-modules/tezos/requester.nix
View File

@ -2,9 +2,11 @@
, buildDunePackage
, tezos-stdlib
, tezos-base
, tezos-test-services
, lwt-watcher
, alcotest-lwt
, qcheck-alcotest
, tezos-base-test-helpers
, tezos-test-helpers
}:
buildDunePackage {
@ -19,7 +21,9 @@ buildDunePackage {
checkInputs = [
alcotest-lwt
tezos-test-services
qcheck-alcotest
tezos-base-test-helpers
tezos-test-helpers
];
doCheck = true;

4
pkgs/development/ocaml-modules/tezos/sapling.nix
View File

@ -4,7 +4,7 @@
, tezos-stdlib
, tezos-crypto
, tezos-rust-libs
, tezos-test-services
, tezos-base-test-helpers
, alcotest-lwt
}:
@ -20,7 +20,7 @@ buildDunePackage {
checkInputs = [
alcotest-lwt
tezos-test-services
tezos-base-test-helpers
];
# requires the "zcash-params" files

32
pkgs/development/ocaml-modules/tezos/shell-services-test-helpers.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-test-helpers
, tezos-base
, tezos-shell-services
, qcheck-core
, qcheck-alcotest
}:
buildDunePackage {
pname = "tezos-shell-services-test-helpers";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_shell_services/test_helpers/";
propagatedBuildInputs = [
tezos-base
tezos-shell-services
tezos-test-helpers
qcheck-core
];
checkInputs = [
qcheck-alcotest
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: shell_services test helpers";
};
}

5
pkgs/development/ocaml-modules/tezos/shell-services.nix
View File

@ -4,6 +4,7 @@
, tezos-workers
, tezos-p2p-services
, tezos-version
, alcotest-lwt
}:
buildDunePackage {
@ -19,6 +20,10 @@ buildDunePackage {
doCheck = true;
checkInputs = [
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: descriptions of RPCs exported by `tezos-shell`";
};

27
pkgs/development/ocaml-modules/tezos/shell.nix
View File

@ -5,13 +5,13 @@
, tezos-requester
, tezos-validation
, tezos-store
, tezos-workers
, tezos-test-services
# , tezos-embedded-protocol-demo-noops
, tezos-test-helpers
# , tezos-protocol-plugin-alpha
, lwt-canceler
, alcotest-lwt
, crowbar
, qcheck-alcotest
, tezos-base-test-helpers
, tezos-embedded-protocol-demo-noops
, tezos-protocol-plugin-alpha
, tezos-test-helpers
}:
buildDunePackage {
@ -20,24 +20,23 @@ buildDunePackage {
src = "${tezos-stdlib.base_src}/src/lib_shell";
propagatedBuildInputs = [
lwt-canceler
tezos-p2p
tezos-requester
tezos-validation
tezos-store
tezos-workers
tezos-validation
];
checkInputs = [
alcotest-lwt
crowbar
qcheck-alcotest
tezos-base-test-helpers
tezos-embedded-protocol-demo-noops
tezos-protocol-plugin-alpha
tezos-test-helpers
tezos-test-services
# tezos-embedded-protocol-demo-noops
# tezos-protocol-plugin-alpha
];
# A lot of extra deps with wide dependency cones needed
doCheck = false;
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: descriptions of RPCs exported by `tezos-shell`";

6
pkgs/development/ocaml-modules/tezos/stdlib.nix
View File

@ -16,17 +16,17 @@
buildDunePackage rec {
pname = "tezos-stdlib";
version = "10.2";
version = "11.0";
base_src = fetchFromGitLab {
owner = "tezos";
repo = "tezos";
rev = "v${version}";
sha256 = "1sqwbdclsvzz0781r0830ncy1j048h12jp3hsdy7hz4dpqp80jsq";
sha256 = "uUYd1DxH2bdCQlevQt3oGxvg0ai5EiCD2mti5SiueU8=";
};
src = "${base_src}/src/lib_stdlib";
minimalOCamlVersion = "4.10.0";
minimalOCamlVersion = "4.08";
useDune2 = true;

5
pkgs/development/ocaml-modules/tezos/test-helpers.nix
View File

@ -4,10 +4,7 @@
, qcheck-alcotest
, alcotest
, alcotest-lwt
, hashcons
, pyml
, uri
, tezos-test-services
, tezos-stdlib
}:
@ -20,8 +17,6 @@ buildDunePackage rec {
qcheck-alcotest
alcotest
alcotest-lwt
hashcons
pyml
uri
];

24
pkgs/development/ocaml-modules/tezos/test-services.nix
View File

@ -1,24 +0,0 @@
{ lib
, fetchFromGitLab
, buildDunePackage
, tezos-stdlib
, tezos-base
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-test-services";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_test_services";
propagatedBuildInputs = [
tezos-base
alcotest-lwt
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: Alcotest-based test services";
};
}

72
pkgs/development/python-modules/ihatemoney/default.nix
View File

@ -39,25 +39,9 @@
, psycopg2 # optional, for postgresql support
, flask_testing
, pytestCheckHook
, fetchpatch
}:
# ihatemoney is not really a library. It will only ever be imported
# by the interpreter of uwsgi. So overrides for its depencies are fine.
let
# sqlalchemy-continuum requires sqlalchemy < 1.4
pinned_sqlalchemy = sqlalchemy.overridePythonAttrs (
old: rec {
pname = "SQLAlchemy";
version = "1.3.24";
src = fetchPypi {
inherit pname version;
sha256 = "06bmxzssc66cblk1hamskyv5q3xf1nh1py3vi6dka4lkpxy7gfzb";
};
}
);
in
buildPythonPackage rec {
pname = "ihatemoney";
version = "5.1.1";
@ -81,16 +65,7 @@ buildPythonPackage rec {
flask-babel
flask-cors
flask_mail
(
flask_migrate.override {
flask_sqlalchemy = flask_sqlalchemy.override {
sqlalchemy = pinned_sqlalchemy;
};
alembic = alembic.override {
sqlalchemy = pinned_sqlalchemy;
};
}
)
flask_migrate
flask-restful
flask-talisman
flask_wtf
@ -103,40 +78,27 @@ buildPythonPackage rec {
pytz
requests
six
(
(
sqlalchemy-continuum.override {
sqlalchemy = pinned_sqlalchemy;
sqlalchemy-utils = sqlalchemy-utils.override {
sqlalchemy = pinned_sqlalchemy;
};
sqlalchemy-i18n = sqlalchemy-i18n.override {
sqlalchemy = pinned_sqlalchemy;
sqlalchemy-utils = sqlalchemy-utils.override {
sqlalchemy = pinned_sqlalchemy;
};
};
flask_sqlalchemy = flask_sqlalchemy.override {
sqlalchemy = pinned_sqlalchemy;
};
}
).overridePythonAttrs (
old: {
doCheck = false;
}
)
)
sqlalchemy-continuum
werkzeug
wtforms
psycopg2
debts
];
# upstream performed the update without needing to patch the code
# the original patch does not apply, sadly
# https://github.com/spiral-project/ihatemoney/pull/912
patches = [
# fix build with wtforms 3. remove with next release
(fetchpatch {
url = "https://github.com/spiral-project/ihatemoney/commit/40ce32d9fa58a60d26a4d0df547b8deb709c330d.patch";
sha256 = "sha256-2ewOu21qhq/AOZaE9qrF5J6HH0h6ohFgjDb+BYjJnuQ=";
excludes = [ "setup.cfg" ];
})
];
postPatch = ''
substituteInPlace setup.cfg --replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2"
substituteInPlace setup.cfg \
--replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2" \
--replace "SQLAlchemy>=1.3.0,<1.4" "SQLAlchemy>=1.3.0,<1.5" \
--replace "WTForms>=2.3.1,<2.4" "WTForms"
'';
checkInputs = [
@ -144,6 +106,8 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportChecks = [ "ihatemoney" ];
disabledTests = [
"test_notifications" # requires running service.
"test_invite" # requires running service.

12
pkgs/development/python-modules/libagent/default.nix
View File

@ -1,22 +1,22 @@
{ lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic,
unidecode, mock, pytest , backports-shutil-which, configargparse,
python-daemon, pymsgbox }:
{ lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic
, unidecode, mock, pytest , backports-shutil-which, configargparse
, python-daemon, pymsgbox, pynacl }:
# XXX: when changing this package, please test the package onlykey-agent.
buildPythonPackage rec {
pname = "libagent";
version = "0.14.1";
version = "0.14.4";
src = fetchFromGitHub {
owner = "romanz";
repo = "trezor-agent";
rev = "v${version}";
sha256 = "16y1y9ahcv3wj7f0v4mfiwzkmn2hz1iv7y13cgr57sxa3ymyqx6c";
sha256 = "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l";
};
propagatedBuildInputs = [ unidecode backports-shutil-which configargparse
python-daemon pymsgbox ecdsa ed25519 mnemonic semver ];
python-daemon pymsgbox ecdsa ed25519 mnemonic semver pynacl ];
checkInputs = [ mock pytest ];

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "openai";
version = "0.11.5";
version = "0.12.0";
disabled = pythonOlder "3.7.1";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "openai";
repo = "openai-python";
rev = "v${version}";
sha256 = "sha256-6eL3/vDWyIOVjRQo4OO3OgyUG3t8dKPtxzMMTxPCglM=";
sha256 = "12qkbaw1gyqhs6qwyj65g6l8v5xxnilwgk0gxlwnlzrr82q458ia";
};
propagatedBuildInputs = [

39
pkgs/development/python-modules/pydrive2/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, google-api-python-client
, oauth2client
, pyopenssl
, pyyaml
, six
}:
buildPythonPackage rec {
pname = "pydrive2";
version = "1.10.0";
src = fetchPypi {
pname = "PyDrive2";
inherit version;
sha256 = "sha256-970ZtP8e9sC5IvtqxVwNlHJKtTc4euSh3nl3hNd0Y6s=";
};
propagatedBuildInputs = [
google-api-python-client
oauth2client
pyopenssl
pyyaml
six
];
doCheck = false;
pythonImportsCheck = [ "pydrive2" ];
meta = {
description = "Google Drive API Python wrapper library. Maintained fork of PyDrive.";
homepage = "https://github.com/iterative/PyDrive2";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ sei40kr ];
};
}

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

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "SQLAlchemy-Continuum";
version = "1.3.11";
version = "1.3.12";
src = fetchPypi {
inherit pname version;
sha256 = "1c9yd9s98crqgs39rc2ld2r0nchgyjrfbjdlqb99y4hhc6lv04xw";
sha256 = "rlHl59MAQhsicMtZQT9rv1iQrDyVYJlawtyhvFaAM7o=";
};
propagatedBuildInputs = [
@ -41,7 +41,5 @@ buildPythonPackage rec {
homepage = "https://github.com/kvesteri/sqlalchemy-continuum/";
description = "Versioning and auditing extension for SQLAlchemy";
license = licenses.bsd3;
# https://github.com/kvesteri/sqlalchemy-continuum/issues/255
broken = lib.versionAtLeast sqlalchemy.version "1.4";
};
}

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

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "youtube-search-python";
version = "1.6.0";
version = "1.6.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "57efe3ac32bdedc8378d907b230191a7de3ed22d0359d7b55d8355039231f974";
sha256 = "c7afe70e1ac8e871341d7fb15f5246aac35fd80fec10d7a96d46df2aad608bd0";
};
propagatedBuildInputs = [ httpx ];

4
pkgs/development/tools/analysis/frama-c/default.nix
View File

@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf wrapGAppsHook ];
buildInputs = with ocamlPackages; [
ncurses ocaml findlib ltl2ba ocamlgraph ocamlgraph_gtk yojson menhirLib camlzip
lablgtk coq graphviz zarith apron why3 mlgmpidl doxygen
ncurses ocaml findlib ltl2ba ocamlgraph yojson menhirLib camlzip
lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen
gdk-pixbuf
];

4
pkgs/development/tools/build-managers/bazel/buildtools/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "bazel-buildtools";
version = "4.2.4";
version = "4.2.5";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = "buildtools";
rev = version;
sha256 = "sha256-Tt1inAViAFaV+o2A2yquPXEv5EiC2eJgNUnr7jBYq7w=";
sha256 = "sha256-KY2Sldg3ChKR+rPalCkIVaLuR37s67FjB9aA20ZWD8Y=";
};
vendorSha256 = "sha256-buMkRxVLlS2LBJGaGWeR41BsmE/0vgDS8s1VcRYN0fA=";

4
pkgs/development/tools/build-managers/remake/default.nix
View File

@ -10,12 +10,12 @@
stdenv.mkDerivation rec {
pname = "remake";
remakeVersion = "4.3";
dbgVersion = "1.5";
dbgVersion = "1.6";
version = "${remakeVersion}+dbg-${dbgVersion}";
src = fetchurl {
url = "mirror://sourceforge/project/bashdb/remake/${version}/remake-${remakeVersion}+dbg-${dbgVersion}.tar.gz";
sha256 = "0xlx2485y0israv2pfghmv74lxcv9i5y65agy69mif76yc4vfvif";
sha256 = "11vvch8bi0yhjfz7gn92b3xmmm0cgi3qfiyhbnnj89frkhbwd87n";
};
patches = [

39
pkgs/development/tools/mblock-mlink/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ stdenv, lib, fetchurl, dpkg, makeWrapper, autoPatchelfHook }:
stdenv.mkDerivation rec {
pname = "mblock-mlink";
version = "1.2.0";
src = fetchurl {
url = "https://dl.makeblock.com/mblock5/linux/mLink-${version}-amd64.deb";
sha256 = "sha256-KLxj81ZjbEvhhaz0seNB4WXX5ybeZ7/WcT1dGfdWle0=";
};
unpackPhase = ''
${dpkg}/bin/dpkg -x $src $out
'';
buildInputs = [
stdenv.cc.cc.lib
];
nativeBuildInputs = [
autoPatchelfHook
];
installPhase = ''
mv $out/usr/local/makeblock $out/usr/makeblock
rmdir $out/usr/local
mkdir -p $out/bin
echo $out/usr/makeblock/mLink/mnode $out/usr/makeblock/mLink/app.js > $out/bin/mlink
chmod +x $out/bin/mlink
'';
meta = with lib; {
description = "Driver for mBlock web version";
homepage = "https://mblock.makeblock.com/en-us/download/";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = [ maintainers.mausch ];
};
}

35
pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib
, fetchFromGitHub
, buildDunePackage
, fix
, menhirLib
, menhirSdk
}:
buildDunePackage rec {
pname = "ocaml-recovery-parser";
version = "0.2.2";
minimalOCamlVersion = "4.08";
useDune2 = true;
src = fetchFromGitHub {
owner = "serokell";
repo = pname;
rev = version;
sha256 = "qQHvAPNQBbsvlQRh19sz9BtfhhMOp3uPthVozc1fpw8=";
};
propagatedBuildInputs = [
fix
menhirLib
menhirSdk
];
meta = with lib; {
homepage = "https://github.com/serokell/ocaml-recovery-parser";
description = "A simple fork of OCaml parser with support for error recovery";
license = with licenses; [ lgpl2Only mit mpl20 ];
maintainers = with maintainers; [ romildo ];
};
}

44
pkgs/games/lzwolf/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ stdenv, lib, fetchFromBitbucket, p7zip, cmake
, SDL2, bzip2, zlib, libjpeg
, libsndfile, mpg123
, SDL2_net, SDL2_mixer }:
stdenv.mkDerivation rec {
pname = "lzwolf";
version = "unstable-2022-01-04";
src = fetchFromBitbucket {
owner = "linuxwolf6";
repo = "lzwolf";
rev = "6e470316382b87378966f441e233760ce0ff478c";
sha256 = "sha256-IbZleY2FPyW3ORIGO2YFXQyAf1l9nDthpJjEKTTsilM=";
};
nativeBuildInputs = [ p7zip cmake ];
buildInputs = [
SDL2 bzip2 zlib libjpeg SDL2_mixer SDL2_net libsndfile mpg123
];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DGPL=ON"
];
doCheck = true;
installPhase = ''
install -Dm755 lzwolf "$out/lib/lzwolf/lzwolf"
for i in *.pk3; do
install -Dm644 "$i" "$out/lib/lzwolf/$i"
done
mkdir -p $out/bin
ln -s $out/lib/lzwolf/lzwolf $out/bin/lzwolf
'';
meta = with lib; {
homepage = "https://bitbucket.org/linuxwolf6/lzwolf";
description = "Enhanced fork of ECWolf, a Wolfenstein 3D source port";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ tgunnoe ];
};
}

2
pkgs/misc/emulators/cdemu/analyzer.nix
View File

@ -2,7 +2,7 @@
, python3Packages, gtk3, glib, libxml2, gnuplot, gnome, gdk-pixbuf, librsvg, intltool, libmirage }:
let pkg = import ./base.nix {
version = "3.2.5";
pkgName = "image-analyzer";
pname = "image-analyzer";
pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc";
};
in callPackage pkg {

11
pkgs/misc/emulators/cdemu/base.nix
View File

@ -1,10 +1,9 @@
{ pkgName, version, pkgSha256 }:
{ pname, version, pkgSha256 }:
{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {} }:
let name = "${pkgName}-${version}";
in stdenv.mkDerivation ({
inherit name buildInputs;
stdenv.mkDerivation ( rec {
inherit pname version buildInputs;
src = fetchurl {
url = "mirror://sourceforge/cdemu/${name}.tar.xz";
url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz";
sha256 = pkgSha256;
};
nativeBuildInputs = [ pkg-config cmake ];
@ -14,7 +13,7 @@ in stdenv.mkDerivation ({
sourceRoot="`pwd`"
'';
configurePhase = ''
cmake ../${name} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON
cmake ../${pname}-${version} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON
'';
meta = with lib; {
description = "A suite of tools for emulating optical drives and discs";

2
pkgs/misc/emulators/cdemu/client.nix
View File

@ -1,7 +1,7 @@
{ callPackage, python3Packages, intltool, makeWrapper }:
let pkg = import ./base.nix {
version = "3.2.5";
pkgName = "cdemu-client";
pname = "cdemu-client";
pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7";
};
in callPackage pkg {

2
pkgs/misc/emulators/cdemu/daemon.nix
View File

@ -1,7 +1,7 @@
{ callPackage, glib, libao, intltool, libmirage }:
let pkg = import ./base.nix {
version = "3.2.5";
pkgName = "cdemu-daemon";
pname = "cdemu-daemon";
pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d";
};
in callPackage pkg {

2
pkgs/misc/emulators/cdemu/gui.nix
View File

@ -3,7 +3,7 @@
let
pkg = import ./base.nix {
version = "3.2.5";
pkgName = "gcdemu";
pname = "gcdemu";
pkgSha256 = "1nvpbq4mz8caw91q5ny9gf206g9bypavxws9nxyfcanfkc4zfkl4";
};
inherit (python3Packages) python pygobject3;

2
pkgs/misc/emulators/cdemu/libmirage.nix
View File

@ -4,7 +4,7 @@
let pkg = import ./base.nix {
version = "3.2.5";
pkgName = "libmirage";
pname = "libmirage";
pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm";
};
in callPackage pkg {

3
pkgs/misc/emulators/resim/default.nix
View File

@ -1,7 +1,8 @@
{ fetchFromGitHub, lib, stdenv, cmake, qt4 }:
stdenv.mkDerivation {
name = "resim";
pname = "resim";
version = "unstable-2016-11-11";
src = fetchFromGitHub {
owner = "itszor";
repo = "resim";

3
pkgs/misc/emulators/wine/winetricks.nix
View File

@ -2,7 +2,8 @@
, cabextract, unzip, p7zip, gnused, gnugrep, bash } :
stdenv.mkDerivation rec {
name = "winetricks-${src.version}";
pname = "winetricks";
version = src.version;
src = (callPackage ./sources.nix {}).winetricks;

4
pkgs/misc/gnuk/generic.nix
View File

@ -10,9 +10,9 @@
}:
stdenv.mkDerivation {
name = "gnuk-${version}-${device}";
pname = "gnuk-${device}";
inherit src;
inherit version src;
nativeBuildInputs = [ gcc-arm-embedded binutils-arm-embedded makeWrapper ];
buildInputs = with python3Packages; [ python pyusb colorama ];

4
pkgs/misc/jitsi-meet-prosody/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "jitsi-meet-prosody";
version = "1.0.5415";
version = "1.0.5675";
src = fetchurl {
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
sha256 = "XvW+bAuad1IKJPZzVJBkT7vA2BBDFQBvTWtbyK/in6A=";
sha256 = "FrafgJcNF3xv985JJ+xOWPtJZFeElIAaIXWdcgheru0=";
};
dontBuild = true;

40
pkgs/misc/opensbi/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib, stdenv, fetchFromGitHub
, withPlatform ? "generic"
, withPayload ? null
, withFDT ? null
}:
stdenv.mkDerivation rec {
pname = "opensbi";
version = "1.0";
src = fetchFromGitHub {
owner = "riscv-software-src";
repo = "opensbi";
rev = "v${version}";
sha256 = "sha256-OgzcH+RLU680qF3+lUiWFFbif6YtjIknJriGlRqcOGs=";
};
installFlags = [
"I=$(out)"
];
makeFlags = [
"PLATFORM=${withPlatform}"
] ++ lib.optionals (withPayload != null) [
"FW_PAYLOAD_PATH=${withPayload}"
] ++ lib.optionals (withFDT != null) [
"FW_FDT_PATH=${withFDT}"
];
dontStrip = true;
dontPatchELF = true;
meta = with lib; {
description = "RISC-V Open Source Supervisor Binary Interface";
homepage = "https://github.com/riscv-software-src/opensbi";
license = licenses.bsd2;
maintainers = with maintainers; [ ius nickcao zhaofengli ];
platforms = [ "riscv64-linux" ];
};
}

4
pkgs/misc/screensavers/alock/default.nix
View File

@ -2,8 +2,8 @@
, libX11, pam, libgcrypt, libXrender, imlib2 }:
stdenv.mkDerivation rec {
date = "20170720";
name = "alock-${date}";
pname = "alock";
version = "unstable-2017-07-20";
src = fetchgit {
url = "https://github.com/Arkq/alock";

9
pkgs/misc/screensavers/xssproxy/default.nix
View File

@ -1,14 +1,13 @@
{ lib, stdenv, fetchFromGitHub, glib, pkg-config, xorg, dbus }:
let rev = "1.0.0"; in
stdenv.mkDerivation {
name = "xssproxy-${rev}";
stdenv.mkDerivation rec {
pname = "xssproxy";
version = "1.0.0";
src = fetchFromGitHub {
owner = "timakro";
repo = "xssproxy";
rev = "v${rev}";
rev = "v${version}";
sha256 = "0c83wmipnsdnbihc5niyczs7jrkss2s8n6iwwjdia7hkjzbd0hl7";
};

3
pkgs/os-specific/linux/device-tree/raspberrypi.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenvNoCC, raspberrypifw }:
stdenvNoCC.mkDerivation {
name = "raspberrypi-dtbs-${raspberrypifw.version}";
pname = "raspberrypi-dtbs";
version = raspberrypifw.version;
nativeBuildInputs = [ raspberrypifw ];
# Rename DTBs so u-boot finds them, like linux-rpi.nix

3
pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, linuxPackages }:
with lib;
stdenv.mkDerivation {
name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.version}";
pname = "rtl8723bs-firmware";
version = linuxPackages.rtl8723bs.version;
inherit (linuxPackages.rtl8723bs) src;
dontBuild = true;

6
pkgs/os-specific/linux/hdapsd/default.nix
View File

@ -1,8 +1,8 @@
{ lib, stdenv, fetchurl }:
let version = "20141203"; in
stdenv.mkDerivation {
name = "hdapsd-"+version;
stdenv.mkDerivation rec {
pname = "hdapsd";
version = "20141203";
src = fetchurl {
url = "https://github.com/evgeni/hdapsd/releases/download/${version}/hdapsd-${version}.tar.gz";

Some files were not shown because too many files have changed in this diff Show More