Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
c01e301153
|
|
@ -254,7 +254,7 @@ rec {
|
|||
=> false
|
||||
*/
|
||||
hasInfix = infix: content:
|
||||
builtins.match ".*${escapeRegex infix}.*" content != null;
|
||||
builtins.match ".*${escapeRegex infix}.*" "${content}" != null;
|
||||
|
||||
/* Convert a string to a list of characters (i.e. singleton strings).
|
||||
This allows you to, e.g., map a function over each character. However,
|
||||
|
|
|
|||
|
|
@ -280,6 +280,36 @@ runTests {
|
|||
'';
|
||||
};
|
||||
|
||||
testHasInfixFalse = {
|
||||
expr = hasInfix "c" "abde";
|
||||
expected = false;
|
||||
};
|
||||
|
||||
testHasInfixTrue = {
|
||||
expr = hasInfix "c" "abcde";
|
||||
expected = true;
|
||||
};
|
||||
|
||||
testHasInfixDerivation = {
|
||||
expr = hasInfix "hello" (import ../.. { system = "x86_64-linux"; }).hello;
|
||||
expected = true;
|
||||
};
|
||||
|
||||
testHasInfixPath = {
|
||||
expr = hasInfix "tests" ./.;
|
||||
expected = true;
|
||||
};
|
||||
|
||||
testHasInfixPathStoreDir = {
|
||||
expr = hasInfix builtins.storeDir ./.;
|
||||
expected = true;
|
||||
};
|
||||
|
||||
testHasInfixToString = {
|
||||
expr = hasInfix "a" { __toString = _: "a"; };
|
||||
expected = true;
|
||||
};
|
||||
|
||||
# LISTS
|
||||
|
||||
testFilter = {
|
||||
|
|
|
|||
|
|
@ -1358,6 +1358,16 @@ Existing 3rd party modules that provided similar functionality, like <literal>pu
|
|||
<literal>otelcorecol</literal> and enjoy a 7x smaller binary.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>services.zookeeper</literal> has a new option
|
||||
<literal>jre</literal> for specifying the JRE to start
|
||||
zookeeper with. It defaults to the JRE that
|
||||
<literal>pkgs.zookeeper</literal> was wrapped with, instead of
|
||||
<literal>pkgs.jre</literal>. This changes the JRE to
|
||||
<literal>pkgs.jdk11_headless</literal> by default.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>pkgs.pgadmin</literal> now refers to
|
||||
|
|
|
|||
|
|
@ -541,6 +541,10 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
you should change the package you refer to. If you don't need them update your
|
||||
commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary.
|
||||
|
||||
- `services.zookeeper` has a new option `jre` for specifying the JRE to start
|
||||
zookeeper with. It defaults to the JRE that `pkgs.zookeeper` was wrapped with,
|
||||
instead of `pkgs.jre`. This changes the JRE to `pkgs.jdk11_headless` by default.
|
||||
|
||||
- `pkgs.pgadmin` now refers to `pkgs.pgadmin4`. `pgadmin3` has been removed.
|
||||
|
||||
- `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans`
|
||||
|
|
|
|||
|
|
@ -114,6 +114,13 @@ in {
|
|||
type = types.package;
|
||||
};
|
||||
|
||||
jre = mkOption {
|
||||
description = "The JRE with which to run Zookeeper";
|
||||
default = cfg.package.jre;
|
||||
defaultText = literalExpression "pkgs.zookeeper.jre";
|
||||
example = literalExpression "pkgs.jre";
|
||||
type = types.package;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -131,7 +138,7 @@ in {
|
|||
after = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.jre}/bin/java \
|
||||
${cfg.jre}/bin/java \
|
||||
-cp "${cfg.package}/lib/*:${configDir}" \
|
||||
${escapeShellArgs cfg.extraCmdLineOptions} \
|
||||
-Dzookeeper.datadir.autocreate=false \
|
||||
|
|
|
|||
|
|
@ -14,28 +14,9 @@ let
|
|||
|
||||
# Add filecontents from files of useTheseDefaultConfFiles to confFiles, do not override
|
||||
defaultConfFiles = subtractLists (attrNames cfg.confFiles) cfg.useTheseDefaultConfFiles;
|
||||
allConfFiles =
|
||||
cfg.confFiles //
|
||||
builtins.listToAttrs (map (x: { name = x;
|
||||
value = builtins.readFile (cfg.package + "/etc/asterisk/" + x); })
|
||||
defaultConfFiles);
|
||||
|
||||
asteriskEtc = pkgs.stdenv.mkDerivation
|
||||
((mapAttrs' (name: value: nameValuePair
|
||||
# Fudge the names to make bash happy
|
||||
((replaceChars ["."] ["_"] name) + "_")
|
||||
(value)
|
||||
) allConfFiles) //
|
||||
{
|
||||
confFilesString = concatStringsSep " " (
|
||||
attrNames allConfFiles
|
||||
);
|
||||
|
||||
name = "asterisk-etc";
|
||||
|
||||
allConfFiles = {
|
||||
# Default asterisk.conf file
|
||||
# (Notice that astetcdir will be set to the path of this derivation)
|
||||
asteriskConf = ''
|
||||
"asterisk.conf".text = ''
|
||||
[directories]
|
||||
astetcdir => /etc/asterisk
|
||||
astmoddir => ${cfg.package}/lib/asterisk/modules
|
||||
|
|
@ -48,43 +29,28 @@ let
|
|||
astrundir => /run/asterisk
|
||||
astlogdir => /var/log/asterisk
|
||||
astsbindir => ${cfg.package}/sbin
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
extraConf = cfg.extraConfig;
|
||||
|
||||
# Loading all modules by default is considered sensible by the authors of
|
||||
# "Asterisk: The Definitive Guide". Secure sites will likely want to
|
||||
# specify their own "modules.conf" in the confFiles option.
|
||||
modulesConf = ''
|
||||
"modules.conf".text = ''
|
||||
[modules]
|
||||
autoload=yes
|
||||
'';
|
||||
|
||||
# Use syslog for logging so logs can be viewed with journalctl
|
||||
loggerConf = ''
|
||||
"logger.conf".text = ''
|
||||
[general]
|
||||
|
||||
[logfiles]
|
||||
syslog.local0 => notice,warning,error
|
||||
'';
|
||||
} //
|
||||
mapAttrs (name: text: { inherit text; }) cfg.confFiles //
|
||||
listToAttrs (map (x: nameValuePair x { source = cfg.package + "/etc/asterisk/" + x; }) defaultConfFiles);
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p "$out"
|
||||
|
||||
# Create asterisk.conf, pointing astetcdir to the path of this derivation
|
||||
echo "$asteriskConf" | sed "s|@out@|$out|g" > "$out"/asterisk.conf
|
||||
echo "$extraConf" >> "$out"/asterisk.conf
|
||||
|
||||
echo "$modulesConf" > "$out"/modules.conf
|
||||
|
||||
echo "$loggerConf" > "$out"/logger.conf
|
||||
|
||||
# Config files specified in confFiles option override all other files
|
||||
for i in $confFilesString; do
|
||||
conf=$(echo "$i"_ | sed 's/\./_/g')
|
||||
echo "''${!conf}" > "$out"/"$i"
|
||||
done
|
||||
'';
|
||||
});
|
||||
in
|
||||
|
||||
{
|
||||
|
|
@ -209,7 +175,9 @@ in
|
|||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
environment.etc.asterisk.source = asteriskEtc;
|
||||
environment.etc = mapAttrs' (name: value:
|
||||
nameValuePair "asterisk/${name}" value
|
||||
) allConfFiles;
|
||||
|
||||
users.users.asterisk =
|
||||
{ name = asteriskUser;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ in
|
|||
default = if pkgs.stdenv.hostPlatform.libc == "glibc"
|
||||
then pkgs.stdenv.cc.libc.bin
|
||||
else pkgs.glibc.bin;
|
||||
defaultText = literalExample ''
|
||||
defaultText = lib.literalExpression ''
|
||||
if pkgs.stdenv.hostPlatform.libc == "glibc"
|
||||
then pkgs.stdenv.cc.libc.bin
|
||||
else pkgs.glibc.bin;
|
||||
|
|
|
|||
|
|
@ -108,6 +108,8 @@ stdenv.mkDerivation rec {
|
|||
"--install-roboto-font"
|
||||
] ++ optional optimizationSupport "--optimization";
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A virtual guitar amplifier for Linux running with JACK";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -14,23 +14,27 @@ if [ ! -f "$ROOT/vscodium.nix" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
update_vscodium () {
|
||||
VSCODIUM_VER=$1
|
||||
ARCH=$2
|
||||
ARCH_LONG=$3
|
||||
ARCHIVE_FMT=$4
|
||||
VSCODIUM_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-${ARCH}-${VSCODIUM_VER}.${ARCHIVE_FMT}"
|
||||
VSCODIUM_SHA256=$(nix-prefetch-url ${VSCODIUM_URL})
|
||||
sed -i "s/${ARCH_LONG} = \".\{52\}\"/${ARCH_LONG} = \"${VSCODIUM_SHA256}\"/" "$ROOT/vscodium.nix"
|
||||
}
|
||||
|
||||
# VSCodium
|
||||
|
||||
VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}')
|
||||
sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix"
|
||||
|
||||
VSCODIUM_LINUX_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz"
|
||||
VSCODIUM_LINUX_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_X64_URL})
|
||||
sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_X64_SHA256}\"/" "$ROOT/vscodium.nix"
|
||||
update_vscodium $VSCODIUM_VER linux-x64 x86_64-linux tar.gz
|
||||
|
||||
VSCODIUM_DARWIN_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-x64-${VSCODIUM_VER}.zip"
|
||||
VSCODIUM_DARWIN_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_X64_URL})
|
||||
sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_X64_SHA256}\"/" "$ROOT/vscodium.nix"
|
||||
update_vscodium $VSCODIUM_VER darwin-x64 x86_64-darwin zip
|
||||
|
||||
VSCODIUM_LINUX_AARCH64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-arm64-${VSCODIUM_VER}.tar.gz"
|
||||
VSCODIUM_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_AARCH64_URL})
|
||||
sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODIUM_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscodium.nix"
|
||||
update_vscodium $VSCODIUM_VER linux-arm64 aarch64-linux tar.gz
|
||||
|
||||
VSCODIUM_LINUX_ARMV7L_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-armhf-${VSCODIUM_VER}.tar.gz"
|
||||
VSCODIUM_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_ARMV7L_URL})
|
||||
sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODIUM_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscodium.nix"
|
||||
update_vscodium $VSCODIUM_VER darwin-arm64 aarch64-darwin zip
|
||||
|
||||
update_vscodium $VSCODIUM_VER linux-armhf armv7l-linux tar.gz
|
||||
|
|
|
|||
|
|
@ -7,24 +7,21 @@ let
|
|||
x86_64-linux = "linux-x64";
|
||||
x86_64-darwin = "darwin-x64";
|
||||
aarch64-linux = "linux-arm64";
|
||||
aarch64-darwin = "darwin-arm64";
|
||||
armv7l-linux = "linux-armhf";
|
||||
}.${system};
|
||||
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1i76ix318y6b2dcfnisg13bp5d7nzvcx7zcpl94mkrn974db30pn";
|
||||
x86_64-darwin = "1qk1vykl838vwsffyjpazx7x9ajwxczpgz5vhch16iikfz2vh1vk";
|
||||
aarch64-linux = "13jifiqn2v17d6vwacq6aib1lzyp2021kjdswkp7wpx6ck5lkm21";
|
||||
aarch64-darwin = "1jgmvw52hp2zfvk6z51yni4vn7wfq63gsih42mzadg5a1b2fr9rx";
|
||||
armv7l-linux = "1zhriscsmfcsagsp2ds0fn316fybs5f2f2r3w5q29jwczgcnlam4";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
x86_64-linux = ".";
|
||||
x86_64-darwin = "";
|
||||
aarch64-linux = ".";
|
||||
armv7l-linux = ".";
|
||||
}.${system};
|
||||
sourceRoot = if stdenv.isDarwin then "" else ".";
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
inherit sourceRoot;
|
||||
|
|
@ -63,6 +60,6 @@ in
|
|||
downloadPage = "https://github.com/VSCodium/vscodium/releases";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ synthetica turion bobby285271 ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,17 +5,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nomad-pack";
|
||||
version = "2022-02-11";
|
||||
rev = "568ac5e42bc41172a1fa3c8b18af2f42b9e341ff";
|
||||
version = "2022-04-12";
|
||||
rev = "50ad747d2a5a2b90af1b3564483510cb04fefbea";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "sha256-0hvnGdUT72sWvMER67ZBxcC+VTbuFMIos2NudOjeTB8=";
|
||||
sha256 = "sha256-VG6Dmx5WD2AzKReMbmrpzXCNhrJqaZY3aQV9P+4ET68=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wmoXZIogKj4i9+AsEjY7QaT2Tn4LQyGQcEFHrRO0W9s=";
|
||||
vendorSha256 = "sha256-7ovR2F9N94iFK/B5OXRcqfykOYHST3354+Ge2L8yzq0=";
|
||||
|
||||
# skip running go tests as they require network access
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
let
|
||||
pname = "teams";
|
||||
version = "1.4.00.26453";
|
||||
version = "1.5.00.10453";
|
||||
meta = with lib; {
|
||||
description = "Microsoft Teams";
|
||||
homepage = "https://teams.microsoft.com";
|
||||
|
|
@ -37,7 +37,7 @@ let
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
|
||||
sha256 = "0ndqk893l17m42hf5fiiv6mka0v7v8r54kblvb67jsxajdvva5gf";
|
||||
hash = "sha256-fLVw2axSMetuaoRzjg+x4DRYY8WP5TQbL7LbfF6LFfA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,21 @@
|
|||
{ lib, python3Packages, fetchFromGitHub }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "6.15.5";
|
||||
version = "7.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KIKuV6DVHn3dDY/rJG1zNWM79tdDB6GGVH9/kYn6XaE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
appdirs
|
||||
configargparse
|
||||
connection-pool
|
||||
|
|
@ -22,26 +33,21 @@ python3Packages.buildPythonApplication rec {
|
|||
pyyaml
|
||||
ratelimiter
|
||||
requests
|
||||
retry
|
||||
smart-open
|
||||
stopit
|
||||
tabulate
|
||||
toposort
|
||||
wrapt
|
||||
yte
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i8C7gPLzUzSxNH9xwpr+fUKI1SvpYFsFBlspS74LoWU=";
|
||||
};
|
||||
|
||||
# See
|
||||
# https://github.com/snakemake/snakemake/blob/main/.github/workflows/main.yml#L99
|
||||
# for the current basic test suite. Tibanna and Tes require extra
|
||||
# setup.
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
checkInputs = with python3.pkgs; [
|
||||
pandas
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
|
|
@ -53,7 +59,15 @@ python3Packages.buildPythonApplication rec {
|
|||
"tests/test_linting.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "snakemake" ];
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_github_issue1396"
|
||||
"test_github_issue1460"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"snakemake"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://snakemake.github.io";
|
||||
|
|
|
|||
|
|
@ -354,6 +354,8 @@ stdenv.mkDerivation {
|
|||
disable_test t9902-completion
|
||||
# not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin)
|
||||
disable_test t5003-archive-zip
|
||||
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
disable_test t7527-builtin-fsmonitor
|
||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
# Test fails (as of 2.17.0, musl 1.1.19)
|
||||
disable_test t3900-i18n-commit
|
||||
|
|
|
|||
|
|
@ -47,13 +47,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkvtoolnix";
|
||||
version = "66.0.0";
|
||||
version = "67.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mbunkus";
|
||||
repo = "mkvtoolnix";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-JTPayZhV3Z+o1v+TbHp9SGMAZk1oEzMdNhk67BYB75A=";
|
||||
sha256 = "0gyjgp5iyr9kvgpgl064w025ji1w8dy0cnw4fmbp71wis7qp7yl1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }:
|
||||
|
||||
assert withLibgladeConvert -> python2 != null;
|
||||
{ lib, stdenv, fetchurl, pkg-config, gtk2, libxml2, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libglade";
|
||||
|
|
@ -14,8 +12,7 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 gettext ]
|
||||
++ lib.optional withLibgladeConvert python2;
|
||||
buildInputs = [ gtk2 gettext ];
|
||||
|
||||
NIX_LDFLAGS = "-lgmodule-2.0";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, zlib, python2, cmake, pkg-config }:
|
||||
{ lib, stdenv, fetchFromGitHub, zlib, cmake, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec
|
||||
{
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec
|
|||
outputs = [ "bin" "dev" "out" "lib" ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zlib python2 pkg-config ];
|
||||
buildInputs = [ zlib pkg-config ];
|
||||
|
||||
# Can be removed in the next release
|
||||
# https://github.com/wdas/ptex/pull/42
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# This file has been generated by node2nix 1.9.0. Do not edit!
|
||||
# This file has been generated by node2nix 1.11.1. Do not edit!
|
||||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
|
|
|
|||
|
|
@ -247,44 +247,14 @@ let
|
|||
|
||||
node2nix = super.node2nix.override {
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
# We need to apply a patch to the source, but buildNodePackage doesn't allow patches.
|
||||
# So we pin the patched commit instead. The commit actually contains two other newer commits
|
||||
# since the last (1.9.0) release, but actually this is a good thing since one of them is a
|
||||
# Hydra-specific fix.
|
||||
src = applyPatches {
|
||||
src = fetchFromGitHub {
|
||||
owner = "svanderburg";
|
||||
repo = "node2nix";
|
||||
rev = "node2nix-1.9.0";
|
||||
sha256 = "0l4wp1131nhl9c14cn8bwawb8f77h1nfbnswgi5lp5m3kzkb27jn";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# remove node_ name prefix
|
||||
(fetchpatch {
|
||||
url = "https://github.com/svanderburg/node2nix/commit/b54d45207427ff46e90f16f2f32771fdc8bff5a4.patch";
|
||||
sha256 = "sha256-ubUdF0q3l4xxqZ7f9EiQEUQzyqxi9Q6zsRPETHlfzh8=";
|
||||
})
|
||||
# set meta platform
|
||||
(fetchpatch {
|
||||
url = "https://github.com/svanderburg/node2nix/commit/58736093161f2d237c17e75a96529b018cd0ac64.patch";
|
||||
sha256 = "0sif7803c9g6gjmmdniw5qxrq5igiz9nqdmdrcf1hxfi5x43a32h";
|
||||
})
|
||||
# Extract common logic from composePackage to a shell function
|
||||
(fetchpatch {
|
||||
url = "https://github.com/svanderburg/node2nix/commit/e4c951971df6c9f9584c7252971c13b55c369916.patch";
|
||||
sha256 = "0w8fcyr12g2340rn06isv40jkmz2khmak81c95zpkjgipzx7hp7w";
|
||||
})
|
||||
# handle package alias in dependencies
|
||||
# https://github.com/svanderburg/node2nix/pull/240
|
||||
#
|
||||
# TODO: remove after node2nix 1.10.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/svanderburg/node2nix/commit/644e90c0304038a446ed53efc97e9eb1e2831e71.patch";
|
||||
sha256 = "sha256-sQgVf80H1ouUjzHq+2d9RO4a+o++kh+l+FOTNXfPBH0=";
|
||||
})
|
||||
];
|
||||
# We need to use master because of a fix that replaces git:// url to https://.
|
||||
src = fetchFromGitHub {
|
||||
owner = "svanderburg";
|
||||
repo = "node2nix";
|
||||
rev = "68f5735f9a56737e3fedceb182705985e3ab8799";
|
||||
sha256 = "sha256-NK6gDTkGx0GG7yPTwgtFC4ttQZPfcLaLp8W8OOMO6bg=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/node2nix" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ let
|
|||
''
|
||||
+ (lib.concatMapStrings (dependency:
|
||||
''
|
||||
if [ ! -e "${dependency.name}" ]; then
|
||||
if [ ! -e "${dependency.packageName}" ]; then
|
||||
${composePackage dependency}
|
||||
fi
|
||||
''
|
||||
|
|
@ -257,8 +257,8 @@ let
|
|||
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
|
||||
|
||||
if(![1, 2].includes(packageLock.lockfileVersion)) {
|
||||
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
|
||||
process.exit(1);
|
||||
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if(packageLock.dependencies !== undefined) {
|
||||
|
|
@ -390,7 +390,7 @@ let
|
|||
buildNodePackage =
|
||||
{ name
|
||||
, packageName
|
||||
, version
|
||||
, version ? null
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
, production ? true
|
||||
|
|
@ -409,7 +409,7 @@ let
|
|||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "${name}-${version}";
|
||||
name = "${name}${if version == null then "" else "-${version}"}";
|
||||
buildInputs = [ tarWrapper python nodejs ]
|
||||
++ lib.optional (stdenv.isLinux) utillinux
|
||||
++ lib.optional (stdenv.isDarwin) libtool
|
||||
|
|
@ -441,6 +441,14 @@ let
|
|||
if [ -d "$out/lib/node_modules/.bin" ]
|
||||
then
|
||||
ln -s $out/lib/node_modules/.bin $out/bin
|
||||
|
||||
# Patch the shebang lines of all the executables
|
||||
ls $out/bin/* | while read i
|
||||
do
|
||||
file="$(readlink -f "$i")"
|
||||
chmod u+rwx "$file"
|
||||
patchShebangs "$file"
|
||||
done
|
||||
fi
|
||||
|
||||
# Create symlinks to the deployed manual page folders, if applicable
|
||||
|
|
@ -471,7 +479,7 @@ let
|
|||
buildNodeDependencies =
|
||||
{ name
|
||||
, packageName
|
||||
, version
|
||||
, version ? null
|
||||
, src
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
|
|
@ -489,7 +497,7 @@ let
|
|||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "node-dependencies-${name}-${version}";
|
||||
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
|
||||
|
||||
buildInputs = [ tarWrapper python nodejs ]
|
||||
++ lib.optional (stdenv.isLinux) utillinux
|
||||
|
|
@ -519,6 +527,7 @@ let
|
|||
if [ -f ${src}/package-lock.json ]
|
||||
then
|
||||
cp ${src}/package-lock.json .
|
||||
chmod 644 package-lock.json
|
||||
fi
|
||||
''}
|
||||
|
||||
|
|
@ -541,7 +550,7 @@ let
|
|||
buildNodeShell =
|
||||
{ name
|
||||
, packageName
|
||||
, version
|
||||
, version ? null
|
||||
, src
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
|
|
@ -557,9 +566,10 @@ let
|
|||
|
||||
let
|
||||
nodeDependencies = buildNodeDependencies args;
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "node-shell-${name}-${version}";
|
||||
stdenv.mkDerivation ({
|
||||
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
|
||||
|
||||
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
|
||||
buildCommand = ''
|
||||
|
|
@ -578,7 +588,7 @@ let
|
|||
export NODE_PATH=${nodeDependencies}/lib/node_modules
|
||||
export PATH="${nodeDependencies}/bin:$PATH"
|
||||
'';
|
||||
};
|
||||
} // extraArgs);
|
||||
in
|
||||
{
|
||||
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@
|
|||
, "flood"
|
||||
, "forever"
|
||||
, "fx"
|
||||
, "ganache-cli"
|
||||
, "ganache"
|
||||
, "gatsby-cli"
|
||||
, "generator-code"
|
||||
, "get-graphql-schema"
|
||||
|
|
@ -223,7 +223,6 @@
|
|||
, "npm"
|
||||
, "npm-check-updates"
|
||||
, "npm-merge-driver"
|
||||
, {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"}
|
||||
, "nrm"
|
||||
, "ocaml-language-server"
|
||||
, "parcel-bundler"
|
||||
|
|
|
|||
6982
pkgs/development/node-packages/node-packages.nix
generated
6982
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gtts";
|
||||
version = "2.2.3";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pndurette";
|
||||
repo = "gTTS";
|
||||
rev = "v${version}";
|
||||
sha256 = "1pj7lyd1r72nxs3sgd78awpbsz41g4idjvbsjjp4chfq4qnsq0ji";
|
||||
sha256 = "sha256-hQnFHi85Rifco0afLF8kKNOy9oPxKoupfmdm+fht6Cg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jwcrypto";
|
||||
version = "1.0";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f88816eb0a41b8f006af978ced5f171f33782525006cdb055b536a40f4d46ac9";
|
||||
sha256 = "sha256-7fQwkyFyHlFhzvzN1ksEUJ4Dkk/q894IW0d4B2WYmuM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,36 +1,59 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, dataclasses
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, typer
|
||||
, smart-open
|
||||
, mock
|
||||
, fetchpatch
|
||||
, google-cloud-storage
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, smart-open
|
||||
, typer
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pathy";
|
||||
version = "0.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "838624441f799a06b446a657e4ecc9ebc3fdd05234397e044a7c87e8f6e76b1c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ smart-open typer google-cloud-storage ];
|
||||
propagatedBuildInputs = [
|
||||
smart-open
|
||||
typer
|
||||
google-cloud-storage
|
||||
] ++ lib.optionals (pythonOlder "3.7") [
|
||||
dataclasses
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "smart-open>=2.2.0,<4.0.0" "smart-open>=2.2.0"
|
||||
'';
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook mock ];
|
||||
patches = [
|
||||
# Support for smart-open >= 6.0.0, https://github.com/justindujardin/pathy/pull/71
|
||||
(fetchpatch {
|
||||
name = "support-later-smart-open.patch";
|
||||
url = "https://github.com/justindujardin/pathy/commit/ba1c23df6ee5d1e57bdfe845ff6a9315cba3df6a.patch";
|
||||
sha256 = "sha256-V1i4tx73Xkdqb/wZhQIv4p6FVpF9SEfDhlBkwaaRE3w=";
|
||||
})
|
||||
];
|
||||
|
||||
# Exclude tests that require provider credentials
|
||||
pytestFlagsArray = [
|
||||
"--ignore=pathy/_tests/test_clients.py"
|
||||
"--ignore=pathy/_tests/test_gcs.py"
|
||||
"--ignore=pathy/_tests/test_s3.py"
|
||||
disabledTestPaths = [
|
||||
# Exclude tests that require provider credentials
|
||||
"pathy/_tests/test_clients.py"
|
||||
"pathy/_tests/test_gcs.py"
|
||||
"pathy/_tests/test_s3.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pathy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-smarttub";
|
||||
version = "0.0.31";
|
||||
version = "0.0.32";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "mdz";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-tyE50HzwnrxXGWJ0+YRxCmSxtqrPnYmJzBH2ZDFJDZ4=";
|
||||
sha256 = "sha256-3qAs0vL6YGFDsMFC3KAhSc/axxVOll/SOswaJgVi9Hc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scikit-survival";
|
||||
version = "0.17.1";
|
||||
version = "0.17.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Sx+reZKBbahjkVgo8hC8EP5vMsRhnprwGjKumQqH83k=";
|
||||
sha256 = "sha256-eP58TcFxNG0J32YgnaGhWkkjAC08F3ooPLwMv4ZUA1U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,21 +9,21 @@
|
|||
, google-cloud-storage
|
||||
, requests
|
||||
, moto
|
||||
, parameterizedtestcase
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "smart-open";
|
||||
version = "5.2.1";
|
||||
version = "6.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RaRe-Technologies";
|
||||
repo = "smart_open";
|
||||
rev = "v${version}";
|
||||
sha256 = "13a1qsb4vwrhx45hz4qcl0d7bgv20ai5vsy7cq0q6qbj212nff19";
|
||||
sha256 = "sha256-FEIJ1DBW0mz7n+J03C1Lg8uAs2ZxI0giM7+mvuNPyGg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -37,35 +37,17 @@ buildPythonPackage rec {
|
|||
|
||||
checkInputs = [
|
||||
moto
|
||||
parameterizedtestcase
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "smart_open" ];
|
||||
|
||||
disabledTestPaths = [
|
||||
"smart_open/tests/test_http.py"
|
||||
"smart_open/tests/test_s3.py"
|
||||
"smart_open/tests/test_s3_version.py"
|
||||
"smart_open/tests/test_sanity.py"
|
||||
pytestFlagsArray = [
|
||||
"smart_open"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_compression_invalid"
|
||||
"test_gs_uri_contains_question_mark"
|
||||
"test_gzip_compress_sanity"
|
||||
"test_http"
|
||||
"test_ignore_ext"
|
||||
"test_initialize_write"
|
||||
"test_read_explicit"
|
||||
"test_s3_handles_querystring"
|
||||
"test_s3_uri_contains_question_mark"
|
||||
"test_webhdfs"
|
||||
"test_write"
|
||||
pythonImportsCheck = [
|
||||
"smart_open"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "smart_open" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for efficient streaming of very large file";
|
||||
homepage = "https://github.com/RaRe-Technologies/smart_open";
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "snowflake-sqlalchemy";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d1c087ce0a90bbce77f2308b9c4aeb14efeb26a3ae9da7c3d5a153341cd8ef34";
|
||||
sha256 = "sha256-nXTPnWChj/rIMmPoVZr1AhY7tHVRygmpNmh1oGR6W4A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, callPackage
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, dataclasses
|
||||
, pytorch
|
||||
, pythonOlder
|
||||
, spacy
|
||||
|
|
@ -13,30 +14,31 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "spacy-transformers";
|
||||
version = "1.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-nxbmnFyHptbe5M7rQi2ECGoBpxUuutdCtY20eHsGDPI=";
|
||||
hash = "sha256-nxbmnFyHptbe5M7rQi2ECGoBpxUuutdCtY20eHsGDPI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/transformers>=3.4.0,<4.13.0/transformers/' setup.cfg
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pytorch
|
||||
spacy
|
||||
spacy-alignments
|
||||
srsly
|
||||
transformers
|
||||
] ++ lib.optionals (pythonOlder "3.7") [
|
||||
dataclasses
|
||||
];
|
||||
|
||||
# Test fails due to missing arguments for trfs2arrays().
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "spacy_transformers" ];
|
||||
pythonImportsCheck = [
|
||||
"spacy_transformers"
|
||||
];
|
||||
|
||||
passthru.tests.annotation = callPackage ./annotation-test { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,43 +1,44 @@
|
|||
{ lib
|
||||
, blis
|
||||
, buildPythonPackage
|
||||
, callPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, pytest
|
||||
, blis
|
||||
, catalogue
|
||||
, cymem
|
||||
, fetchPypi
|
||||
, jinja2
|
||||
, jsonschema
|
||||
, langcodes
|
||||
, murmurhash
|
||||
, numpy
|
||||
, preshed
|
||||
, requests
|
||||
, setuptools
|
||||
, srsly
|
||||
, spacy-legacy
|
||||
, thinc
|
||||
, typer
|
||||
, wasabi
|
||||
, packaging
|
||||
, pathy
|
||||
, preshed
|
||||
, pydantic
|
||||
, pytest
|
||||
, python
|
||||
, tqdm
|
||||
, typing-extensions
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools
|
||||
, spacy-legacy
|
||||
, spacy-loggers
|
||||
, langcodes
|
||||
, srsly
|
||||
, thinc
|
||||
, tqdm
|
||||
, typer
|
||||
, typing-extensions
|
||||
, wasabi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spacy";
|
||||
version = "3.2.4";
|
||||
version = "3.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-PkxvKY1UBEWC2soRQrCC7jiDG7PXu5MdLuYB6Ljc5k8=";
|
||||
hash = "sha256-xJ1Q++NxWtxXQUGTZ7OaRo0lVmSEIvELb8Tt846uLLM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -46,6 +47,7 @@ buildPythonPackage rec {
|
|||
cymem
|
||||
jinja2
|
||||
jsonschema
|
||||
langcodes
|
||||
murmurhash
|
||||
numpy
|
||||
packaging
|
||||
|
|
@ -54,15 +56,16 @@ buildPythonPackage rec {
|
|||
pydantic
|
||||
requests
|
||||
setuptools
|
||||
srsly
|
||||
spacy-legacy
|
||||
spacy-loggers
|
||||
srsly
|
||||
thinc
|
||||
tqdm
|
||||
typer
|
||||
wasabi
|
||||
spacy-loggers
|
||||
langcodes
|
||||
] ++ lib.optional (pythonOlder "3.8") typing-extensions;
|
||||
] ++ lib.optional (pythonOlder "3.8") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
|
|
@ -78,12 +81,14 @@ buildPythonPackage rec {
|
|||
${python.interpreter} -m pytest spacy/tests --vectors --models --slow
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "spacy" ];
|
||||
pythonImportsCheck = [
|
||||
"spacy"
|
||||
];
|
||||
|
||||
passthru.tests.annotation = callPackage ./annotation-test { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython";
|
||||
description = "Industrial-strength Natural Language Processing (NLP)";
|
||||
homepage = "https://github.com/explosion/spaCy";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
|
|
|
|||
|
|
@ -10,24 +10,38 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-spelling";
|
||||
version = "7.3.2";
|
||||
version = "7.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9d66dc4990749c5ac52e7eaf17e82f4dc6b4aff6515d26bbf48821829d41bd02";
|
||||
hash = "sha256-OBnRJinZXgyQkiT6QLRipn4K2zIdUCg9f8DRFobIrH4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sphinx pyenchant pbr ]
|
||||
++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
|
||||
nativeBuildInputs = [
|
||||
pbr
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
sphinx
|
||||
pyenchant
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
# No tests included
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sphinxcontrib.spelling"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sphinx spelling extension";
|
||||
homepage = "https://bitbucket.org/dhellmann/sphinxcontrib-spelling";
|
||||
maintainers = with maintainers; [ ];
|
||||
homepage = "https://github.com/sphinx-contrib/spelling";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
57
pkgs/development/python-modules/yte/default.nix
Normal file
57
pkgs/development/python-modules/yte/default.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, plac
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yte";
|
||||
version = "1.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koesterlab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-x0CmPiV/6zTnawPW9lgrZ9NsUhmK8fhafwqOP9o3Mdc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
plac
|
||||
pyyaml
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"yte"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests.py"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# The CLI test need yte on the PATH
|
||||
export PATH=$out/bin:$PATH
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "YAML template engine with Python expressions";
|
||||
homepage = "https://github.com/koesterlab/yte";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -484,7 +484,6 @@ stdenv.mkDerivation rec {
|
|||
build --host_java_toolchain='${javaToolchain}'
|
||||
build --verbose_failures
|
||||
build --curses=no
|
||||
build --sandbox_debug
|
||||
EOF
|
||||
|
||||
# add the same environment vars to compile.sh
|
||||
|
|
@ -498,7 +497,6 @@ stdenv.mkDerivation rec {
|
|||
-e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \
|
||||
-e "/\$command \\\\$/a --verbose_failures \\\\" \
|
||||
-e "/\$command \\\\$/a --curses=no \\\\" \
|
||||
-e "/\$command \\\\$/a --sandbox_debug \\\\" \
|
||||
-i scripts/bootstrap/compile.sh
|
||||
|
||||
# This is necessary to avoid:
|
||||
|
|
|
|||
|
|
@ -453,7 +453,6 @@ stdenv.mkDerivation rec {
|
|||
build --extra_toolchains=@bazel_tools//tools/jdk:nonprebuilt_toolchain_definition
|
||||
build --verbose_failures
|
||||
build --curses=no
|
||||
build --sandbox_debug
|
||||
build --features=-layering_check
|
||||
EOF
|
||||
|
||||
|
|
@ -493,7 +492,6 @@ stdenv.mkDerivation rec {
|
|||
-e "/\$command \\\\$/a --verbose_failures \\\\" \
|
||||
-e "/\$command \\\\$/a --curses=no \\\\" \
|
||||
-e "/\$command \\\\$/a --features=-layering_check \\\\" \
|
||||
-e "/\$command \\\\$/a --sandbox_debug \\\\" \
|
||||
-i scripts/bootstrap/compile.sh
|
||||
|
||||
# This is necessary to avoid:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, nixosTests, which
|
||||
, pcre2
|
||||
, withPython2 ? false, python2
|
||||
, withPython3 ? true, python3, ncurses
|
||||
, withPHP74 ? false, php74
|
||||
, withPHP80 ? true, php80
|
||||
|
|
@ -42,7 +41,6 @@ in stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ which ];
|
||||
|
||||
buildInputs = [ pcre2.dev ]
|
||||
++ optional withPython2 python2
|
||||
++ optionals withPython3 [ python3 ncurses ]
|
||||
++ optional withPHP74 php74-unit
|
||||
++ optional withPHP80 php80-unit
|
||||
|
|
@ -66,7 +64,6 @@ in stdenv.mkDerivation rec {
|
|||
usedPhp80 = optionals withPHP80 php80-unit;
|
||||
|
||||
postConfigure = ''
|
||||
${optionalString withPython2 "./configure python --module=python2 --config=python2-config --lib-path=${python2}/lib"}
|
||||
${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"}
|
||||
${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"}
|
||||
${optionalString withPHP80 "./configure php --module=php80 --config=${php80-unit.unwrapped.dev}/bin/php-config --lib-path=${php80-unit}/lib"}
|
||||
|
|
|
|||
|
|
@ -37,8 +37,11 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
nixos = nixosTests.zookeeper;
|
||||
passthru = {
|
||||
tests = {
|
||||
nixos = nixosTests.zookeeper;
|
||||
};
|
||||
inherit jre;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, glib
|
||||
, gettext
|
||||
, xorg
|
||||
, pkg-config
|
||||
|
|
@ -11,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ibus-bamboo";
|
||||
version = "0.7.0";
|
||||
version = "0.7.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BambooEngine";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WKNDrm8PSU/F8MzpVsJ9oUkbolCxrwbjOZYYNiFr5Qs=";
|
||||
sha256 = "1qdkimq4n9bxqjlnd00dggvx09cf4wqwk0kpgj01jd0i6ahggns1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -28,6 +29,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
xorg.libX11
|
||||
xorg.xorgproto
|
||||
xorg.libXtst
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "yle-dl";
|
||||
version = "20220213";
|
||||
version = "20220425";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aajanki";
|
||||
repo = "yle-dl";
|
||||
rev = version;
|
||||
sha256 = "sha256-lFb8NwKg8GBgkVsg01rlGrP31APwhFaCFT7QdqiT6J0=";
|
||||
sha256 = "sha256-PIoJ+enbRwXiszh7BTkfeoA6IfDXoFOi9WitzQp3EQE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -1,20 +1,26 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, ffmpeg }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ytarchive";
|
||||
version = "unstable-2022-02-16";
|
||||
version = "unstable-2022-03-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kethsar";
|
||||
repo = "ytarchive";
|
||||
rev = "66a1ca003de7302c99bda943500257d5fd374199";
|
||||
sha256 = "sha256-6eLNyInqXB+LWbZ18DvXbTdpRpiCDMGwJaiyQfZZ4xM=";
|
||||
rev = "34825e8777637ca114a0ab394a4b4fead6ad7c88";
|
||||
sha256 = "sha256-/x6YcF2EyjOFnIHlsh+ZESF+7AYO3QRNaqbJgycQai4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-r9fDFSCDItQ7YSj9aTY1LXRrFE9T3XD0X36ywCfu0R8=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/ytarchive --prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Kethsar/ytarchive";
|
||||
description = "Garbage Youtube livestream downloader";
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slirp4netns";
|
||||
version = "1.1.12";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rootless-containers";
|
||||
repo = "slirp4netns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NhE5XxInNfGN6hTyZItc7+4HBjcyBLAFTpirEidcipk=";
|
||||
sha256 = "sha256-wVisE4YAK52yfeM2itnBqCmhRKlrKRs0NEppQzZPok8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,20 +1,29 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles
|
||||
, Foundation, Security, libiconv }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, Foundation
|
||||
, Security
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rage";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "str4d";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0OQnYc1IWYscvSw5YZH54Fh8cBasLlcVqrQcQ4MAsU8=";
|
||||
sha256 = "sha256-ra68q5gwcbod5iajPIWEIGQceMK8ikSq/UKUfIEYaGE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-31s70pgEQDw3uifmhv1iWQuzKQVc2q+f76PPnGKIYdc=";
|
||||
cargoSha256 = "sha256-o5HVMRWSIrCsbOEOeUvCvj+mkmjqRY3XaHx82IY73Cc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Foundation
|
||||
|
|
|
|||
|
|
@ -11154,6 +11154,8 @@ in {
|
|||
inherit (pkgs) jq;
|
||||
};
|
||||
|
||||
yte = callPackage ../development/python-modules/yte { };
|
||||
|
||||
ytmusicapi = callPackage ../development/python-modules/ytmusicapi { };
|
||||
|
||||
yubico-client = callPackage ../development/python-modules/yubico-client { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue