Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-02-19 18:16:56 +00:00 committed by GitHub
commit 99594dd1f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 281 additions and 270 deletions

View file

@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "wasabiwallet";
version = "1.1.12.3";
version = "1.1.12.4";
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
sha256 = "1x4gqmiwdp5bjq7c5hjch3srsvf73d92lswnp355l7l7cxh2hcsx";
sha256 = "sha256-1yg0C1lJrLxQEs2GA+XEBUx/JAyc+aW0UWjLhSEy0RI=";
};
dontBuild = true;

View file

@ -20,7 +20,7 @@ instantenous and formats commits for you.
*/
{ lib, stdenv, texinfo }:
{ lib, stdenv, texinfo, writeText }:
self: let
@ -31,7 +31,7 @@ self: let
};
elpaBuild = import ../../../build-support/emacs/elpa.nix {
inherit lib stdenv texinfo;
inherit lib stdenv texinfo writeText;
inherit (self) emacs;
};

View file

@ -47,6 +47,11 @@ let
});
}) else null;
buildWithGit = pkg: pkg.overrideAttrs (attrs: {
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ];
});
fix-rtags = pkg:
if pkg != null then dontConfigure (externalSrc pkg external.rtags)
else null;
@ -120,27 +125,10 @@ let
packageRequires = with self; [ evil ];
});
evil-magit = super.evil-magit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
eopengrok = super.eopengrok.overrideAttrs (attrs: {
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
ess-R-data-view = super.ess-R-data-view.override {
inherit (self.melpaPackages) ess ctable popup;
};
forge = super.forge.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
flycheck-rtags = fix-rtags super.flycheck-rtags;
pdf-tools = super.pdf-tools.overrideAttrs (old: {
@ -211,113 +199,81 @@ let
'';
});
magit = super.magit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
evil-magit = buildWithGit super.evil-magit;
magit-find-file = super.magit-find-file.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
eopengrok = buildWithGit super.eopengrok;
magit-gh-pulls = super.magit-gh-pulls.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
forge = buildWithGit super.forge;
magit-imerge = super.magit-imerge.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit = buildWithGit super.magit;
magit-lfs = super.magit-lfs.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-find-file = buildWithGit super.magit-find-file;
magit-org-todos = super.magit-org-todos.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-gh-pulls = buildWithGit super.magit-gh-pulls;
magit-tbdiff = super.magit-tbdiff.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-imerge = buildWithGit super.magit-imerge;
magit-topgit = super.magit-topgit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-lfs = buildWithGit super.magit-lfs;
magit-vcsh = super.magit-vcsh.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-org-todos = buildWithGit super.magit-org-todos;
magit-gerrit = super.magit-gerrit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-tbdiff = buildWithGit super.magit-tbdiff;
magit-annex = super.magit-annex.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-topgit = buildWithGit super.magit-topgit;
magit-todos = super.magit-todos.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-vcsh = buildWithGit super.magit-vcsh;
magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-gerrit = buildWithGit super.magit-gerrit;
magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-annex = buildWithGit super.magit-annex;
magithub = super.magithub.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-todos = buildWithGit super.magit-todos;
magit-svn = super.magit-svn.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-filenotify = buildWithGit super.magit-filenotify;
kubernetes = super.kubernetes.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-gitflow = buildWithGit super.magit-gitflow;
kubernetes-evil = super.kubernetes-evil.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magithub = buildWithGit super.magithub;
magit-svn = buildWithGit super.magit-svn;
kubernetes = buildWithGit super.kubernetes;
kubernetes-evil = buildWithGit super.kubernetes-evil;
egg = buildWithGit super.egg;
kapacitor = buildWithGit super.kapacitor;
gerrit = buildWithGit super.gerrit;
gerrit-download = buildWithGit super.gerrit-download;
github-pullrequest = buildWithGit super.github-pullrequest;
jist = buildWithGit super.jist;
mandoku = buildWithGit super.mandoku;
mandoku-tls = buildWithGit super.mandoku-tls;
magit-p4 = buildWithGit super.magit-p4;
magit-rbr = buildWithGit super.magit-rbr;
magit-diff-flycheck = buildWithGit super.magit-diff-flycheck;
magit-reviewboard = buildWithGit super.magit-reviewboard;
magit-patch-changelog = buildWithGit super.magit-patch-changelog;
magit-circleci = buildWithGit super.magit-circleci;
magit-delta = buildWithGit super.magit-delta;
orgit = buildWithGit super.orgit;
orgit-forge = buildWithGit super.orgit-forge;
# upstream issue: missing file header
mhc = super.mhc.override {
@ -462,106 +418,13 @@ let
propagatedUserEnvPkgs = [ external.editorconfig-core-c ];
});
egg = super.egg.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
# missing dependencies
evil-search-highlight-persist = super.evil-search-highlight-persist.overrideAttrs (attrs: {
packageRequires = with self; [ evil highlight ];
});
kapacitor = super.kapacitor.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
gerrit = super.gerrit.overrideAttrs (attrs: {
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
gerrit-download = super.gerrit-download.overrideAttrs (attrs: {
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
github-pullrequest = super.github-pullrequest.overrideAttrs (attrs: {
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
helm-rtags = fix-rtags super.helm-rtags;
jist = super.jist.overrideAttrs (attrs: {
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
mandoku = super.mandoku.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-p4 = super.magit-p4.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-rbr = super.magit-rbr.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
magit-circleci = super.magit-circleci.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
orgit =
(super.orgit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
}));
orgit-forge = super.orgit-forge.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
});
# tries to write to $HOME
php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: {
HOME = "/tmp";

View file

@ -0,0 +1,37 @@
{ lib
, stdenv
, fetchurl
}:
stdenv.mkDerivation rec {
pname = "dap";
version = "3.10";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "Bk5sty/438jLb1PpurMQ5OqMbr6JqUuuQjcg2bejh2Y=";
};
hardeningDisable = [ "format" ];
meta = with lib; {
homepage = "https://www.gnu.org/software/dap";
description = "A small statistics and graphics package based on C";
longDescription = ''
Dap is a small statistics and graphics package based on C. Version 3.0 and
later of Dap can read SBS programs (based on the utterly famous, industry
standard statistics system with similar initials - you know the one I
mean)! The user wishing to perform basic statistical analyses is now freed
from learning and using C syntax for straightforward tasks, while
retaining access to the C-style graphics and statistics features provided
by the original implementation. Dap provides core methods of data
management, analysis, and graphics that are commonly used in statistical
consulting practice (univariate statistics, correlations and regression,
ANOVA, categorical data analysis, logistic regression, and nonparametric
analyses).
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gerrit";
version = "3.3.1";
version = "3.3.2";
src = fetchurl {
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
sha256 = "0swj3lmxwh4a0gnkirqrh7znzizsizy3cnlinhhsi319qns2szb1";
sha256 = "sha256-tqlJANxJl2r0ZxPb7d8KU9cRMQUFPUIm/zMp4zREGL0=";
};
buildCommand = ''

View file

@ -1,6 +1,6 @@
# builder for Emacs packages built for packages.el
{ lib, stdenv, emacs, texinfo }:
{ lib, stdenv, emacs, texinfo, writeText }:
with lib;
@ -19,7 +19,7 @@ let
in
import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({
phases = "installPhase fixupPhase distPhase";

View file

@ -32,13 +32,3 @@ addEmacsVars () {
fi
done
}
if [[ ! -v emacsHookDone ]]; then
emacsHookDone=1
# If this is for a wrapper derivation, emacs and the dependencies are all
# run-time dependencies. If this is for precompiling packages into bytecode,
# emacs is a compile-time dependency of the package.
addEnvHooks "$hostOffset" addEmacsVars
addEnvHooks "$targetOffset" addEmacsVars
fi

View file

@ -1,6 +1,6 @@
# generic builder for Emacs packages
{ lib, stdenv, emacs, texinfo, ... }:
{ lib, stdenv, emacs, texinfo, writeText, ... }:
with lib;
@ -49,7 +49,19 @@ stdenv.mkDerivation ({
propagatedBuildInputs = packageRequires;
propagatedUserEnvPkgs = packageRequires;
setupHook = ./setup-hook.sh;
setupHook = writeText "setup-hook.sh" ''
source ${./emacs-funcs.sh}
if [[ ! -v emacsHookDone ]]; then
emacsHookDone=1
# If this is for a wrapper derivation, emacs and the dependencies are all
# run-time dependencies. If this is for precompiling packages into bytecode,
# emacs is a compile-time dependency of the package.
addEnvHooks "$hostOffset" addEmacsVars
addEnvHooks "$targetOffset" addEmacsVars
fi
'';
doCheck = false;
@ -63,9 +75,16 @@ stdenv.mkDerivation ({
addEmacsNativeLoadPath = true;
postInstall = ''
# Besides adding the output directory to the native load path, make sure
# the current package's elisp files are in the load path, otherwise
# (require 'file-b) from file-a.el in the same package will fail.
mkdir -p $out/share/emacs/native-lisp
source ${./emacs-funcs.sh}
addEmacsVars "$out"
find $out/share/emacs -type f -name '*.el' -print0 \
| xargs -0 -n 1 -I {} -P $NIX_BUILD_CORES sh -c \
"emacs --batch --eval=\"(add-to-list 'comp-eln-load-path \\\"$out/share/emacs/native-lisp/\\\")\" -f batch-native-compile {} || true"
"emacs --batch -f batch-native-compile {} || true"
'';
}

View file

@ -1,7 +1,7 @@
# builder for Emacs packages built for packages.el
# using MELPA package-build.el
{ lib, stdenv, fetchFromGitHub, emacs, texinfo }:
{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText }:
with lib;
@ -28,7 +28,7 @@ let
in
import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({
ename =
if ename == null

View file

@ -1,29 +1,28 @@
# Originally packaged for ArchLinux.
#
# https://aur.archlinux.org/packages/ttf-montserrat/
{ lib, fetchzip }:
{ lib, fetchFromGitHub }:
let
version = "1.0";
in fetchzip {
name = "montserrat-${version}";
url = "https://marvid.fr/~eeva/mirror/Montserrat.tar.gz";
pname = "montserrat";
version = "7.210";
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "JulietaUla";
repo = pname;
rev = "v${version}";
sha256 = "sha256-C6T0Iz1rFC+EsKFJRil2jGTMQ4X7wR80E3eORL5qi0U=";
postFetch = ''
tar -xzf $downloadedFile --strip-components=1
mkdir -p $out/share/fonts/montserrat
cp *.ttf $out/share/fonts/montserrat
tar xf $downloadedFile --strip 1
install -Dm 444 fonts/otf/*.otf -t $out/share/fonts/otf
install -Dm 444 fonts/ttf/*.ttf -t $out/share/fonts/ttf
install -Dm 444 fonts/webfonts/*.woff -t $out/share/fonts/woff
install -Dm 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2
'';
sha256 = "11sdgvhaqg59mq71aqwqp2mb428984hjxy7hd1vasia9kgk8259w";
meta = with lib; {
description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)";
homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ scolobb ];
homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ scolobb jk ];
};
}

View file

@ -3,20 +3,20 @@
haskellPackages.mkDerivation rec {
pname = "carp";
version = "0.3.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "carp-lang";
repo = "Carp";
rev = "v${version}";
sha256 = "07yk3gy4l6h3k7sh8al7lgwk75a13zxwfp7siqpb5gnnqr1z3brc";
sha256 = "sha256-nTSMY8bq0b/JvE/XQGDC4St2sqdni12E5WQU5FXnuCg=";
};
buildDepends = [ makeWrapper ];
buildTools = [ makeWrapper ];
executableHaskellDepends = with haskellPackages; [
HUnit blaze-markup blaze-html split cmdargs ansi-terminal cmark
edit-distance
HUnit blaze-markup blaze-html split ansi-terminal cmark
edit-distance hashable open-browser optparse-applicative
];
isExecutable = true;

View file

@ -7,7 +7,6 @@
, libxml2
, glib
, pipewire
, fontconfig
, flatpak
, gsettings-desktop-schemas
, acl
@ -21,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal";
version = "1.8.0";
version = "1.8.1";
outputs = [ "out" "installedTests" ];
@ -29,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "flatpak";
repo = pname;
rev = version;
sha256 = "1f1f79hy259lm017zaq4rpvys8zkmjspqily4a3lbnm77zk3y079";
sha256 = "sha256-tuRKCBj9ELC7yFPs/Sut/EdO+L8nwW3S8NWU+XedAF8=";
};
patches = [
@ -50,7 +49,6 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
pipewire
fontconfig
flatpak
acl
dbus

View file

@ -1,9 +1,20 @@
{ aiofiles, buildPythonPackage, cryptography, fetchFromGitHub, isPy3k, lib
, libusb1, mock, pyasn1, python, pycryptodome, rsa }:
{ lib
, aiofiles
, buildPythonPackage
, cryptography
, fetchFromGitHub
, isPy3k
, libusb1
, mock
, pyasn1
, pycryptodome
, pytestCheckHook
, rsa
}:
buildPythonPackage rec {
pname = "adb-shell";
version = "0.3.0";
version = "0.3.1";
disabled = !isPy3k;
@ -12,19 +23,27 @@ buildPythonPackage rec {
owner = "JeffLIrion";
repo = "adb_shell";
rev = "v${version}";
sha256 = "0qnlhcd58zxh39cd5xzdx8yc5hc0pf8kix4rbn4avsapwb0l75n2";
sha256 = "sha256-b+9ySme44TdIlVnF8AHBBGd8pkoeYG99wmDK/nyAreo=";
};
propagatedBuildInputs = [ aiofiles cryptography libusb1 pyasn1 rsa ];
propagatedBuildInputs = [
aiofiles
cryptography
libusb1
pyasn1
rsa
];
checkInputs = [ mock pycryptodome ];
checkPhase = ''
${python.interpreter} -m unittest discover -s tests -t .
'';
checkInputs = [
mock
pycryptodome
pytestCheckHook
];
pythonImportsCheck = [ "adb_shell" ];
meta = with lib; {
description =
"A Python implementation of ADB with shell and FileSync functionality.";
description = "Python implementation of ADB with shell and FileSync functionality";
homepage = "https://github.com/JeffLIrion/adb_shell";
license = licenses.asl20;
maintainers = with maintainers; [ jamiemagee ];

View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, docopt
, fetchFromGitHub
, requests
, requests_oauthlib
}:
buildPythonPackage rec {
pname = "tellduslive";
version = "0.10.11";
src = fetchFromGitHub {
owner = "molobrakos";
repo = pname;
rev = "v${version}";
sha256 = "0aqhj6fq2z2qb4jyk23ygjicf5nlj8lkya7blkyqb7jra5k1gyg0";
};
propagatedBuildInputs = [
docopt
requests
requests_oauthlib
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "tellduslive" ];
meta = with lib; {
description = "Python module to communicate with Telldus Live";
homepage = "https://github.com/molobrakos/tellduslive";
license = with licenses; [ unlicense ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -6,12 +6,12 @@
python3.pkgs.buildPythonApplication rec {
pname = "ankisyncd";
version = "2.1.0";
version = "2.2.0";
src = fetchFromGitHub {
owner = "tsudoko";
owner = "ankicommunity";
repo = "anki-sync-server";
rev = version;
sha256 = "6a140afa94fdb1725fed716918875e3d2ad0092cb955136e381c9d826cc4927c";
sha256 = "196xhd6vzp1ncr3ahz0bv0gp1ap2s37j8v48dwmvaywzayakqdab";
};
format = "other";
@ -60,8 +60,8 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Self-hosted Anki sync server";
maintainers = with maintainers; [ matt-snider ];
homepage = "https://github.com/tsudoko/anki-sync-server";
license = licenses.agpl3;
homepage = "https://github.com/ankicommunity/anki-sync-server";
license = licenses.agpl3Only;
platforms = platforms.linux;
};
}

View file

@ -825,7 +825,7 @@
"ted5000" = ps: with ps; [ xmltodict ];
"telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ];
"telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ];
"tellduslive" = ps: with ps; [ ]; # missing inputs: tellduslive
"tellduslive" = ps: with ps; [ tellduslive ];
"tellstick" = ps: with ps; [ ]; # missing inputs: tellcore-net tellcore-py
"telnet" = ps: with ps; [ ];
"temper" = ps: with ps; [ ]; # missing inputs: temperusb

View file

@ -619,7 +619,7 @@ in
_1password = callPackage ../applications/misc/1password { };
_1password-gui = callPackage ../tools/security/1password-gui { };
_1password-gui = callPackage ../applications/misc/1password-gui { };
_6tunnel = callPackage ../tools/networking/6tunnel { };
@ -28380,6 +28380,8 @@ in
cudaSupport = config.cudaSupport or false;
};
dap = callPackage ../applications/science/math/dap { };
ecm = callPackage ../applications/science/math/ecm { };
eukleides = callPackage ../applications/science/math/eukleides {

View file

@ -45,7 +45,7 @@
let
mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
inherit lib stdenv texinfo;
inherit lib stdenv texinfo writeText;
};
# Contains both melpa stable & unstable

View file

@ -8453,6 +8453,20 @@ let
doCheck = false;
};
FunctionParameters = buildPerlPackage {
pname = "Function-Parameters";
version = "2.001003";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MA/MAUKE/Function-Parameters-2.001003.tar.gz";
sha256 = "eaa22c6b43c02499ec7db0758c2dd218a3b2ab47a714b2bdf8010b5ee113c242";
};
buildInputs = [ DirSelf TestFatal ];
meta = {
description = "Define functions and methods with parameter lists (\"subroutine signatures\")";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
Furl = buildPerlModule {
pname = "Furl";
version = "3.13";
@ -13990,6 +14004,25 @@ let
};
};
TestPostgreSQL = buildPerlModule {
pname = "Test-PostgreSQL";
version = "1.27";
src = fetchurl {
url = "mirror://cpan/authors/id/T/TJ/TJC/Test-PostgreSQL-1.27.tar.gz";
sha256 = "b1bd231693100cc40905fb0ba3173173201621de9c8301f21c5b593b0a46f907";
};
buildInputs = [ ModuleBuildTiny TestSharedFork pkgs.postgresql ];
propagatedBuildInputs = [ DBDPg DBI FileWhich FunctionParameters Moo TieHashMethod TryTiny TypeTiny ];
makeMakerFlags = "POSTGRES_HOME=${pkgs.postgresql}";
meta = {
homepage = https://github.com/TJC/Test-postgresql;
description = "PostgreSQL runner for tests";
license = with lib.licenses; [ artistic2 ];
};
};
TestUseAllModules = buildPerlPackage {
pname = "Test-UseAllModules";
version = "0.17";
@ -22077,6 +22110,19 @@ let
doCheck = false; /* test fails on some machines */
};
TieHashMethod = buildPerlPackage {
pname = "Tie-Hash-Method";
version = "0.02";
src = fetchurl {
url = "mirror://cpan/authors/id/Y/YV/YVES/Tie-Hash-Method-0.02.tar.gz";
sha256 = "d513fbb51413f7ca1e64a1bdce6194df7ec6076dea55066d67b950191eec32a9";
};
meta = {
description = "Tied hash with specific methods overriden by callbacks";
license = with lib.licenses; [ artistic1 ];
};
};
TieRefHash = buildPerlPackage {
pname = "Tie-RefHash";
version = "1.40";

View file

@ -7742,6 +7742,8 @@ in {
tensorly = callPackage ../development/python-modules/tensorly { };
tellduslive = callPackage ../development/python-modules/tellduslive { };
termcolor = callPackage ../development/python-modules/termcolor { };
terminado = callPackage ../development/python-modules/terminado { };