Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-05-10 12:24:32 +00:00 committed by GitHub
commit 115881e756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 315 additions and 259 deletions

View File

@ -81,14 +81,9 @@ in
jobdir=/var/spool/atjobs
etcdir=/etc/at
for dir in "$spooldir" "$jobdir" "$etcdir"; do
if [ ! -d "$dir" ]; then
mkdir -p "$dir"
chown atd:atd "$dir"
fi
done
chmod 1770 "$spooldir" "$jobdir"
${if cfg.allowEveryone then ''chmod a+rwxt "$spooldir" "$jobdir" '' else ""}
install -dm755 -o atd -g atd "$etcdir"
spool_and_job_dir_perms=${if cfg.allowEveryone then "1777" else "1770"}
install -dm"$spool_and_job_dir_perms" -o atd -g atd "$spooldir" "$jobdir"
if [ ! -f "$etcdir"/at.deny ]; then
touch "$etcdir"/at.deny
chown root:atd "$etcdir"/at.deny

View File

@ -30,24 +30,26 @@
, soundtouch
, pcre /*, portaudio - given up fighting their portaudio.patch */
, linuxHeaders
, at-spi2-core ? null
, dbus ? null
, epoxy ? null
, libXdmcp ? null
, libXtst ? null
, libpthreadstubs ? null
, libselinux ? null
, libsepol ? null
, libxkbcommon ? null
, utillinux ? null
, at-spi2-core
, dbus
, epoxy
, libXdmcp
, libXtst
, libpthreadstubs
, libselinux
, libsepol
, libxkbcommon
, util-linux
}:
# TODO
# - as of 3.0.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions
# - detach sbsms
# 1. as of 3.0.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions
# 2. detach sbsms
let
wxGTK-audacity = wxGTK.overrideAttrs (oldAttrs: rec {
inherit (lib) optionals;
wxGTK' = wxGTK.overrideAttrs (oldAttrs: rec {
src = fetchFromGitHub {
owner = "audacity";
repo = "wxWidgets";
@ -56,6 +58,7 @@ let
fetchSubmodules = true;
};
});
in
stdenv.mkDerivation rec {
pname = "audacity";
@ -70,28 +73,21 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch {
url = "https://github.com/audacity/audacity/commit/007852e51fcbb5f1f359d112f28b8984a604dac6.patch";
url = "https://github.com/audacity/audacity/pull/831/commits/007852e51fcbb5f1f359d112f28b8984a604dac6.patch";
sha256 = "0zp2iydd46analda9cfnbmzdkjphz5m7dynrdj5qdnmq6j3px9fw";
name = "audacity_xdg_paths.patch";
})
];
# this file *should* be generated by cmake but as of 2.4.2 isn't yet
postPatch = ''
touch src/RevisionIdent.h
'';
preConfigure = ''
substituteInPlace src/FileNames.cpp --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
substituteInPlace src/FileNames.cpp \
--replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
'';
# workaround for a broken cmake. Drop it with a later version to see if it works.
# https://github.com/NixOS/nixpkgs/issues/94905
cmakeFlags = lib.optional stdenv.isLinux "-DCMAKE_OSX_ARCHITECTURES=";
# audacity only looks for ffmpeg at runtime, so we need to link it in manually
NIX_LDFLAGS = toString [
# ffmpeg
"-lavcodec"
"-lavdevice"
"-lavfilter"
@ -108,7 +104,7 @@ stdenv.mkDerivation rec {
gettext
pkg-config
python3
] ++ lib.optionals stdenv.isLinux [
] ++ optionals stdenv.isLinux [
linuxHeaders
];
@ -135,9 +131,9 @@ stdenv.mkDerivation rec {
sratom
suil
twolame
wxGTK-audacity
wxGTK-audacity.gtk
] ++ lib.optionals stdenv.isLinux [
wxGTK'
wxGTK'.gtk
] ++ optionals stdenv.isLinux [
at-spi2-core
dbus
epoxy
@ -147,7 +143,7 @@ stdenv.mkDerivation rec {
libxkbcommon
libselinux
libsepol
utillinux
util-linux
];
doCheck = false; # Test fails

View File

@ -1,44 +1,37 @@
{ lib, fetchFromGitHub, python27Packages, geoip }:
{ lib, fetchFromGitHub, python3Packages, gettext, gdk-pixbuf
, gobject-introspection, gtk3, wrapGAppsHook }:
with lib;
python27Packages.buildPythonApplication {
python3Packages.buildPythonApplication rec {
pname = "nicotine-plus";
version = "1.4.1";
version = "3.0.6";
src = fetchFromGitHub {
owner = "Nicotine-Plus";
repo = "nicotine-plus";
rev = "4e057d64184885c63488d4213ade3233bd33e67b";
sha256 = "11j2qm67sszfqq730czsr2zmpgkghsb50556ax1vlpm7rw3gm33c";
rev = version;
sha256 = "sha256-NL6TXFRB7OeqNEfdANkEqh+MCOF1+ehR+6RO1XsIix8=";
};
propagatedBuildInputs = with python27Packages; [
pygtk
miniupnpc
mutagen
notify
(GeoIP.override { inherit geoip; })
];
nativeBuildInputs = [ gettext wrapGAppsHook ];
# Insert real docs directory.
# os.getcwd() is not needed
postPatch = ''
substituteInPlace ./pynicotine/gtkgui/frame.py \
--replace "paths.append(os.getcwd())" "paths.append('"$out"/doc')"
'';
propagatedBuildInputs = [ gtk3 gdk-pixbuf gobject-introspection ]
++ (with python3Packages; [ pygobject3 ]);
postFixup = ''
mkdir -p $out/doc/
mv ./doc/NicotinePlusGuide $out/doc/
postInstall = ''
mv $out/bin/nicotine $out/bin/nicotine-plus
substituteInPlace $out/share/applications/org.nicotine_plus.Nicotine.desktop \
--replace "Exec=nicotine" "Exec=$out/bin/nicotine-plus"
'';
doCheck = false;
meta = {
description = "A graphical client for the SoulSeek peer-to-peer system";
homepage = "https://www.nicotine-plus.org";
license = licenses.gpl3;
maintainers = with maintainers; [ klntsky ];
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ehmry klntsky ];
platforms = platforms.unix;
};
}

View File

@ -1,39 +1,50 @@
{ lib, mkDerivation, fetchFromGitHub, installShellFiles,
qmake, qtbase, poppler, qtmultimedia }:
{ lib, stdenv, fetchFromGitHub, installShellFiles,
qmake, qtbase, qtmultimedia, wrapQtAppsHook,
poppler, mupdf, freetype, jbig2dec, openjpeg, gumbo,
renderer ? "mupdf" }:
mkDerivation rec {
let
renderers = {
mupdf.buildInputs = [ mupdf freetype jbig2dec openjpeg gumbo ];
poppler.buildInputs = [ poppler ];
};
in
stdenv.mkDerivation rec {
pname = "beamerpresenter";
version = "0.1.3";
version = "0.2.0";
src = fetchFromGitHub {
owner = "stiglers-eponym";
repo = "BeamerPresenter";
rev = "v${version}";
sha256 = "1nbcqrfdjcsc6czqk1v163whka4x1w883b1298aws8yi7vac4f1i";
sha256 = "10i5nc5b5syaqvsixam4lmfiz3b5cphbjfgfqavi5jilq769792a";
};
nativeBuildInputs = [ qmake installShellFiles ];
buildInputs = [ qtbase qtmultimedia poppler ];
nativeBuildInputs = [ qmake installShellFiles wrapQtAppsHook ];
buildInputs = [ qtbase qtmultimedia ] ++ renderers.${renderer}.buildInputs;
qmakeFlags = [ "RENDERER=${renderer}" ];
postPatch = ''
# Fix location of poppler-*.h
shopt -s globstar
for f in **/*.{h,cpp}; do
substituteInPlace $f --replace '#include <poppler-' '#include <poppler/qt5/poppler-'
for f in **/*.{pro,conf,h,cpp}; do
substituteInPlace "$f" \
--replace "/usr/" "$out/" \
--replace "/etc/" "$out/etc/" \
--replace '$${GUI_CONFIG_PATH}' "$out/etc/xdg/beamerpresenter/gui.json"
done
'';
installPhase = ''
install -m755 beamerpresenter -Dt $out/bin/
install -m644 src/icons/beamerpresenter.svg -Dt $out/share/icons/hicolor/scalable/apps/
install -m644 share/applications/beamerpresenter.desktop -Dt $out/share/applications/
installManPage man/*.{1,5}
postInstall = lib.optionalString stdenv.isDarwin ''
wrapQtApp "$out"/bin/beamerpresenter.app/Contents/MacOS/beamerpresenter
'';
meta = with lib; {
description = "Simple dual screen pdf presentation software";
description = "Modular multi screen pdf presentation software respecting your window manager";
homepage = "https://github.com/stiglers-eponym/BeamerPresenter";
license = licenses.gpl3Plus;
license = licenses.agpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ pacien ];
};

View File

@ -1,134 +0,0 @@
From 5b40a32e35fe446cda20ed34c756a010856f39ce Mon Sep 17 00:00:00 2001
From: Theo Giannakopoulos <theo.giannakopoulos@baesystems.com>
Date: Wed, 5 Apr 2017 15:48:55 -0400
Subject: [PATCH] changes to work with Coq 8.6
---
theories/Autosubst_Derive.v | 12 ++++++++++++
theories/Autosubst_MMap.v | 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/theories/Autosubst_Derive.v b/theories/Autosubst_Derive.v
index 61995de..cf87f67 100644
--- a/theories/Autosubst_Derive.v
+++ b/theories/Autosubst_Derive.v
@@ -18,6 +18,7 @@ Hint Extern 0 (Ids _) => derive_Ids : derive.
Ltac derive_Rename :=
match goal with [ |- Rename ?term ] =>
+ let inst := fresh "inst" in
hnf; fix inst 2; change _ with (Rename term) in inst;
intros xi s; change (annot term s); destruct s;
match goal with
@@ -66,6 +67,7 @@ Ltac has_var s :=
Ltac derive_Subst :=
match goal with [ |- Subst ?term ] =>
require_instance (Rename term);
+ let inst := fresh "inst" in
hnf; fix inst 2; change _ with (Subst term) in inst;
intros sigma s; change (annot term s); destruct s;
match goal with
@@ -107,6 +109,7 @@ Hint Extern 0 (Subst _) => derive_Subst : derive.
Ltac derive_HSubst :=
match goal with [ |- HSubst ?inner ?outer ] =>
require_instance (Subst inner);
+ let inst := fresh "inst" in
hnf; fix inst 2; change _ with (HSubst inner outer) in inst;
intros sigma s; change (annot outer s); destruct s;
match goal with
@@ -327,6 +330,7 @@ Ltac derive_SubstLemmas :=
assert (up_upren_n :
forall xi n, upn n (ren xi) = ren (iterate upren n xi)) by
(apply up_upren_n_internal, up_upren);
+ let ih := fresh "ih" in
fix ih 2; intros xi s; destruct s; try reflexivity; simpl; f_equal;
try apply mmap_ext; intros; rewrite ?up_upren, ?up_upren_n; apply ih);
@@ -337,6 +341,7 @@ Ltac derive_SubstLemmas :=
(apply up_id_internal; reflexivity);
assert (up_id_n : forall n, upn n ids = ids) by
(apply up_id_n_internal, up_id);
+ let ih := fresh "ih" in
fix ih 1; intros s; destruct s; simpl; f_equal; try reflexivity;
rewrite ?up_id, ?up_id_n; try apply mmap_id_ext; intros; apply ih);
@@ -344,6 +349,7 @@ Ltac derive_SubstLemmas :=
assert (ren_subst_comp :
forall xi sigma (s : term), (rename xi s).[sigma] = s.[xi >>> sigma]) by(
+ let ih := fresh "ih" in
fix ih 3; intros xi sigma s; destruct s; try reflexivity; simpl; f_equal;
rewrite ?up_comp_ren_subst, ?up_comp_ren_subst_n, ?mmap_comp;
try apply mmap_ext; intros; apply ih);
@@ -357,6 +363,7 @@ Ltac derive_SubstLemmas :=
assert (up_comp_subst_ren_n :
forall sigma xi n, upn n (sigma >>> rename xi) = upn n sigma >>> rename (iterate upren n xi))
by (apply up_comp_subst_ren_n_internal; apply up_comp_subst_ren);
+ let ih := fresh "ih" in
fix ih 3; intros sigma xi s; destruct s; try reflexivity; simpl;
f_equal; rewrite ?up_comp_subst_ren, ?up_comp_subst_ren_n, ?mmap_comp;
try (rewrite hcomp_ren_internal; [|apply rename_subst]);
@@ -368,6 +375,7 @@ Ltac derive_SubstLemmas :=
by (apply up_comp_internal; [reflexivity|apply ren_subst_comp|apply subst_ren_comp]);
assert (up_comp_n : forall sigma tau n, upn n (sigma >> tau) = upn n sigma >> upn n tau)
by (apply up_comp_n_internal; apply up_comp);
+ let ih := fresh "ih" in
fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal;
rewrite ?up_comp, ?up_comp_n, ?mmap_comp, ?hcomp_dist_internal;
try apply mmap_ext; intros; apply ih);
@@ -382,6 +390,7 @@ Ltac derive_HSubstLemmas :=
let ids := constr:(ids : var -> inner) in
assert (hsubst_id : forall (s : outer), s.|[ids] = s) by (
+ let ih := fresh "ih" in
fix ih 1; intros s; destruct s; try reflexivity; simpl; f_equal;
rewrite ?up_id, ?up_id_n; try apply mmap_id_ext; intros;
(apply subst_id || apply ih)
@@ -390,6 +399,7 @@ Ltac derive_HSubstLemmas :=
assert (hsubst_comp : forall (theta eta : var -> inner) (s : outer),
s.|[theta].|[eta] = s.|[theta >> eta])
by (
+ let ih := fresh "ih" in
fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal;
rewrite <- ?up_comp, <- ?up_comp_n, ?mmap_comp; try apply mmap_ext; intros;
(apply subst_comp || apply ih)
@@ -405,6 +415,7 @@ Ltac derive_SubstHSubstComp :=
assert (ren_hsubst_comp : forall xi (theta : var -> inner) (s : outer),
rename xi s.|[theta] = (rename xi s).|[theta]
) by (
+ let ih := fresh "ih" in
fix ih 3; intros xi theta s; destruct s; try reflexivity; simpl; f_equal;
rewrite ?mmap_comp; try apply mmap_ext; intros; simpl; apply ih
);
@@ -421,6 +432,7 @@ Ltac derive_SubstHSubstComp :=
apply up_hcomp_n_internal; apply up_hcomp
);
+ let ih := fresh "ih" in
fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal;
rewrite ?up_hcomp, ?up_hcomp_n, ?hcomp_lift_n_internal, ?mmap_comp;
try apply mmap_ext; intros; apply ih
diff --git a/theories/Autosubst_MMap.v b/theories/Autosubst_MMap.v
index f8387e7..7af7902 100644
--- a/theories/Autosubst_MMap.v
+++ b/theories/Autosubst_MMap.v
@@ -23,7 +23,7 @@ Arguments mmap {A B _} f !s /.
Class MMapExt (A B : Type) `{MMap A B} :=
mmap_ext : forall f g,
(forall t, f t = g t) -> forall s, mmap f s = mmap g s.
-Arguments mmap_ext {A B _ _ f g} H s.
+Arguments mmap_ext {A B H' _ f g} H s : rename.
Class MMapLemmas (A B : Type) `{MMap A B} := {
mmap_id x : mmap id x = x;
@@ -123,6 +123,7 @@ Tactic Notation "msimpl" "in" "*" := (in_all msimplH); msimpl.
Ltac derive_MMap :=
hnf; match goal with [ |- (?A -> ?A) -> ?B -> ?B ] =>
+ let map := fresh "map" in
intros f; fix map 1; intros xs; change (annot B xs); destruct xs;
match goal with
| [ |- annot _ ?ys ] =>
--
2.13.2

View File

@ -1,22 +1,23 @@
{ lib, mkCoqDerivation, coq, mathcomp, version ? null }:
{ lib, mkCoqDerivation, coq, mathcomp-ssreflect, version ? null }:
with lib;
mkCoqDerivation {
pname = "autosubst";
release."1.7".rev = "v1.7";
release."1.7".sha256 = "sha256-qoyteQ5W2Noxf12uACOVeHhPLvgmTzrvEo6Ts+FKTGI=";
with lib; mkCoqDerivation {
pname = "autosubst";
owner = "uds-psl";
inherit version;
defaultVersion = with versions;
if range "8.5" "8.7" coq.coq-version then "5b40a32e" else null;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.10"; out = "1.7"; }
] null;
release."5b40a32e".rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034";
release."5b40a32e".sha256 = "1wqfzc9az85fvx71xxfii502jgc3mp0r3xwfb8vnb03vkk625ln0";
propagatedBuildInputs = [ mathcomp.ssreflect ];
patches = [./0001-changes-to-work-with-Coq-8.6.patch];
propagatedBuildInputs = [ mathcomp-ssreflect ];
meta = {
homepage = "https://www.ps.uni-saarland.de/autosubst/";
description = "Automation for de Bruijn syntax and substitution in Coq";
maintainers = with maintainers; [ jwiegley ];
maintainers = with maintainers; [ siraben jwiegley ];
license = licenses.mit;
};
}

View File

@ -0,0 +1,24 @@
{ lib, mkCoqDerivation, coq, hydra-battles, pocklington, version ? null }:
with lib;
mkCoqDerivation {
pname = "goedel";
owner = "coq-community";
release."8.12.0".rev = "v8.12.0";
release."8.12.0".sha256 = "sha256-4lAwWFHGUzPcfHI9u5b+N+7mQ0sLJ8bH8beqQubfFEQ=";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.11"; out = "8.12.0"; }
] null;
propagatedBuildInputs = [ hydra-battles pocklington ];
meta = {
description = "The Gödel-Rosser 1st incompleteness theorem in Coq";
maintainers = with maintainers; [ siraben ];
license = licenses.mit;
platforms = platforms.unix;
};
}

View File

@ -0,0 +1,29 @@
{ lib, mkCoqDerivation, coq, mathcomp, equations, paramcoq, version ? null }:
with lib;
mkCoqDerivation {
pname = "hydra-battles";
owner = "coq-community";
release."0.3".rev = "v0.3";
release."0.3".sha256 = "sha256-rXP/vJqVEg2tN/I9LWV13YQ1+C7M6lzGu3oI+7pSZzg=";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.11"; out = "0.3"; }
] null;
propagatedBuildInputs = [ mathcomp equations paramcoq ];
meta = {
description = "Variations on Kirby & Paris' hydra battles and other entertaining math in Coq";
longDescription = ''
Variations on Kirby & Paris' hydra battles and other
entertaining math in Coq (collaborative, documented, includes
exercises)
'';
maintainers = with maintainers; [ siraben ];
license = licenses.mit;
platforms = platforms.unix;
};
}

View File

@ -1,6 +1,4 @@
{ lib, mkCoqDerivation, which, autoconf
, coq, coquelicot, flocq, mathcomp
, bignums ? null, version ? null }:
{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, version ? null }:
with lib; mkCoqDerivation {
pname = "interval";
@ -8,12 +6,12 @@ with lib; mkCoqDerivation {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.8" ; out = "4.1.0"; }
{ case = isGe "8.8" ; out = "4.1.1"; }
{ case = range "8.8" "8.12"; out = "4.0.0"; }
{ case = range "8.7" "8.11"; out = "3.4.2"; }
{ case = range "8.5" "8.6"; out = "3.3.0"; }
] null;
release."4.1.0".sha256 = "1jv27n5c4f3a9d8sizraa920iqi35x8cik8lm7pjp1dkiifz47nb";
release."4.1.1".sha256 = "sha256-h2NJ6sZt1C/88v7W2xyuftEDoyRt3H6kqm5g2hc1aoU=";
release."4.0.0".sha256 = "1hhih6zmid610l6c8z3x4yzdzw9jniyjiknd1vpkyb2rxvqm3gzp";
release."3.4.2".sha256 = "07ngix32qarl3pjnm9d0vqc9fdrgm08gy7zp306hwxjyq7h1v7z0";
release."3.3.0".sha256 = "0lz2hgggzn4cvklvm8rpaxvwaryf37i8mzqajqgdxdbd8f12acsz";

View File

@ -0,0 +1,22 @@
{ lib, mkCoqDerivation, coq, version ? null }:
with lib;
mkCoqDerivation {
pname = "pocklington";
owner = "coq-community";
release."8.12.0".rev = "v8.12.0";
release."8.12.0".sha256 = "sha256-0xBrw9+4g14niYdNqp0nx00fPJoSSnaDSDEaIVpPfjs=";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.7"; out = "8.12.0"; }
] null;
meta = {
description = "Pocklington's criterion for primality in Coq";
maintainers = with maintainers; [ siraben ];
license = licenses.mit;
platforms = platforms.unix;
};
}

View File

@ -0,0 +1,33 @@
{ lib, buildPythonPackage, fetchPypi, cmake, perl, stdenv, gcc10, darwin }:
buildPythonPackage rec {
pname = "awscrt";
version = "0.11.13";
buildInputs = lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [ Security ]);
# Required to suppress -Werror
# https://github.com/NixOS/nixpkgs/issues/39687
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isAarch64 ([ gcc10 perl ]);
dontUseCmakeConfigure = true;
# Unable to import test module
# https://github.com/awslabs/aws-crt-python/issues/281
doCheck = false;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-G/bf2AzWp8AHL4of0zfX3jIYyTtmTLBIC2ZKiMi19c0=";
};
meta = with lib; {
homepage = "https://github.com/awslabs/aws-crt-python";
description = "Python bindings for the AWS Common Runtime";
license = licenses.asl20;
maintainers = with maintainers; [ davegallant ];
};
}

View File

@ -3,8 +3,7 @@
, docutils
, fetchFromGitHub
, isPy27
, nose
, pytest
, pytestCheckHook
}:
buildPythonPackage rec {
@ -21,7 +20,13 @@ buildPythonPackage rec {
checkInputs = [
docutils
pytest
pytestCheckHook
];
disabledTestPaths = [
# file imports 'dummy_threading', which was deprecated since py37
# and removed in py39
"test_python_toolbox/test_cute_profile/test_cute_profile.py"
];
meta = with lib; {

View File

@ -0,0 +1,53 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pybind11
, pytestCheckHook
, dateutil
, doxygen
, python
, pelican
, matplotlib
}:
buildPythonPackage rec {
pname = "pytomlpp";
version = "0.3.5";
src = fetchFromGitHub {
owner = "bobfang1992";
repo = pname;
rev = version;
fetchSubmodules = true;
sha256 = "1h06a2r0f5q4mml485113mn7a7585zmhqsk2p1apcybyydllcqda";
};
buildInputs = [ pybind11 ];
checkInputs = [
pytestCheckHook
dateutil
doxygen
python
pelican
matplotlib
];
# pelican requires > 2.7
doCheck = !pythonOlder "3.6";
preCheck = ''
cd tests
'';
pythonImportsCheck = [ "pytomlpp" ];
meta = with lib; {
description = "A python wrapper for tomlplusplus";
homepage = "https://github.com/bobfang1992/pytomlpp";
license = licenses.mit;
maintainers = with maintainers; [ evils ];
};
}

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pytube";
version = "10.7.2";
version = "10.8.1";
disabled = pythonOlder "3.6";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "pytube";
repo = "pytube";
rev = "v${version}";
sha256 = "sha256-85pHzfQYyqwX8mQ5msIojM/0FSfeaC12KJw4mXmji3g=";
sha256 = "sha256-QPYu6UA0CEf/FSFoN+OfjhbDgkrMOjxaxNpFcDQzAz0=";
};
checkInputs = [

View File

@ -2,6 +2,8 @@
, rustPlatform
, fetchFromGitHub
, nix-update-script
, stdenv
, libiconv
}:
rustPlatform.buildRustPackage rec {
@ -17,6 +19,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-LxqxRtMKUKZeuvk1caoYy8rv1bkEOQBM8i5SXMF4GXc=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
passthru = {
updateScript = nix-update-script {
attrPath = pname;

View File

@ -3,10 +3,10 @@ let
s = # Generated upstream information
rec {
baseName="gnuchess";
version="6.2.7";
version="6.2.8";
name="${baseName}-${version}";
url="mirror://gnu/chess/${name}.tar.gz";
sha256="0ilq4bfl0lwyzf11q7n2skydjhalfn3bgxhrp5hjxs5bc5d6fdp5";
sha256="0irqb0wl30c2i1rs8f6mm1c89l7l9nxxv7533lr408h1m36lc16m";
};
buildInputs = [
flex

View File

@ -2,13 +2,7 @@
, asio, boost, check, openssl, cmake
}:
let
galeraLibs = buildEnv {
name = "galera-lib-inputs-united";
paths = [ openssl.out boost check ];
};
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "mariadb-galera";
version = "26.4.8";
@ -29,7 +23,8 @@ in stdenv.mkDerivation rec {
postInstall = ''
# for backwards compatibility
ln -s . $out/lib/galera
mkdir $out/lib/galera
ln -s $out/lib/libgalera_smm.so $out/lib/galera/libgalera_smm.so
'';
meta = with lib; {

View File

@ -3,12 +3,12 @@ let
py = python3.override {
packageOverrides = self: super: {
botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
version = "2.0.0dev103";
version = "2.0.0dev109";
src = fetchFromGitHub {
owner = "boto";
repo = "botocore";
rev = "e30d580042687a79776fdf93264e80746e08d21f";
sha256 = "sha256-+cTQQO6dPctvf3WZOk8Mgo1eQUdqRdGCcz7jcVhEvNo=";
rev = "b006ff741d12608a9187b873e276abd1fd8eb707";
sha256 = "sha256-uU3XVQiwtbBt7cdSwAeHkv6NUbL8kK2Ro44h1GYyA1A=";
};
});
prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec {
@ -18,19 +18,26 @@ let
sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi";
};
});
s3transfer = super.s3transfer.overridePythonAttrs (oldAttrs: rec {
version = "0.4.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI=";
};
});
};
};
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.1.35"; # N.B: if you change this, change botocore to a matching version too
version = "2.2.1"; # N.B: if you change this, change botocore to a matching version too
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
sha256 = "sha256-YgzagbbVLlGSPIhck0YaJg3gQGEdoqXtLapN04Q6hLw=";
sha256 = "sha256-TafYBkRlPCqewGBMgTfcX8kLtDhSCdiUYK1xXofKrLk=";
};
postPatch = ''
@ -41,10 +48,10 @@ with py.pkgs; buildPythonApplication rec {
substituteInPlace setup.py --replace "wcwidth<0.2.0" "wcwidth"
'';
# No tests included
doCheck = false;
checkInputs = [ jsonschema mock nose ];
propagatedBuildInputs = [
awscrt
bcdoc
botocore
colorama
@ -62,6 +69,15 @@ with py.pkgs; buildPythonApplication rec {
wcwidth
];
checkPhase = ''
export PATH=$PATH:$out/bin
# https://github.com/NixOS/nixpkgs/issues/16144#issuecomment-225422439
export HOME=$TMP
AWS_TEST_COMMAND=$out/bin/aws python scripts/ci/run-tests
'';
postInstall = ''
mkdir -p $out/${python3.sitePackages}/awscli/data
${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index

View File

@ -3,6 +3,7 @@
, fetchFromGitHub
, rustPlatform
, rust
, libiconv
, Security
}:
@ -17,7 +18,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-2eOWhxKZ+YPj5oKTe5g7PyeakiSNnPz27dK150GAcVQ=";
};
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
cargoSha256 = "sha256-QmchuY+4R7w0zMOdReH1m8idl9RI1hHE9VtbwT2K9YM=";

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
version = "2.3.6";
version = "2.3.7";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9C/r1B+lEveRHRLgD0ay9xhi6100c/SGfUaiP7qwstc=";
sha256 = "sha256-loViPW84KdAOJbL8oUJeiON1f6vrZTcYXRP2VBMNkGk=";
};
vendorSha256 = "sha256-GAJxEBLZmbSmCeuAEYIHQ4xEzbTJYlJU+JCAL5hlVzY=";
vendorSha256 = "sha256-HBpKaRI7gcWp13GVxTlnZvvTyRncfLmu0NmwAUyQ4hQ=";
modRoot = "./v2";
subPackages = [

View File

@ -3210,7 +3210,14 @@ in
bdsync = callPackage ../tools/backup/bdsync { };
beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { };
beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter {
# developed for a compiler with C++20 support
stdenv =
if stdenv.isDarwin then
overrideCC stdenv clang_10
else
stdenv;
};
beanstalkd = callPackage ../servers/beanstalkd { };
@ -22211,7 +22218,9 @@ in
audacious = libsForQt5.callPackage ../applications/audio/audacious { };
audaciousQt5 = audacious;
audacity = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; };
audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; };
audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; };
audacity = audacity-gtk2;
audio-recorder = callPackage ../applications/audio/audio-recorder { };
@ -24956,9 +24965,7 @@ in
newsflash = callPackage ../applications/networking/feedreaders/newsflash { };
nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus {
geoip = geoipWithDatabase;
};
nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { };
nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { };

View File

@ -36,9 +36,11 @@ let
flocq = callPackage ../development/coq-modules/flocq {};
fourcolor = callPackage ../development/coq-modules/fourcolor {};
gappalib = callPackage ../development/coq-modules/gappalib {};
goedel = callPackage ../development/coq-modules/goedel {};
heq = callPackage ../development/coq-modules/heq {};
hierarchy-builder = callPackage ../development/coq-modules/hierarchy-builder {};
HoTT = callPackage ../development/coq-modules/HoTT {};
hydra-battles = callPackage ../development/coq-modules/hydra-battles {};
interval = callPackage ../development/coq-modules/interval {};
InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {};
iris = callPackage ../development/coq-modules/iris {};
@ -63,6 +65,7 @@ let
odd-order = callPackage ../development/coq-modules/odd-order { };
paco = callPackage ../development/coq-modules/paco {};
paramcoq = callPackage ../development/coq-modules/paramcoq {};
pocklington = callPackage ../development/coq-modules/pocklington {};
QuickChick = callPackage ../development/coq-modules/QuickChick {};
simple-io = callPackage ../development/coq-modules/simple-io { };
stdpp = callPackage ../development/coq-modules/stdpp { };

View File

@ -665,6 +665,8 @@ in {
aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { };
awscrt = callPackage ../development/python-modules/awscrt { };
awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { };
awslambdaric = callPackage ../development/python-modules/awslambdaric { };
@ -6734,6 +6736,8 @@ in {
pytoml = callPackage ../development/python-modules/pytoml { };
pytomlpp = callPackage ../development/python-modules/pytomlpp { };
pytools = callPackage ../development/python-modules/pytools { };
pytorch = callPackage ../development/python-modules/pytorch {