Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
1b5da764a7
93 changed files with 461 additions and 238 deletions
|
|
@ -262,6 +262,13 @@ checkConfigOutput true config.value.mkbefore ./types-anything/mk-mods.nix
|
|||
checkConfigOutput 1 config.value.nested.foo ./types-anything/mk-mods.nix
|
||||
checkConfigOutput baz config.value.nested.bar.baz ./types-anything/mk-mods.nix
|
||||
|
||||
## types.functionTo
|
||||
checkConfigOutput "input is input" config.result ./functionTo/trivial.nix
|
||||
checkConfigOutput "a b" config.result ./functionTo/merging-list.nix
|
||||
checkConfigError 'A definition for option .fun.\[function body\]. is not of type .string.. Definition values:\n- In .*wrong-type.nix' config.result ./functionTo/wrong-type.nix
|
||||
checkConfigOutput "b a" config.result ./functionTo/list-order.nix
|
||||
checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix
|
||||
|
||||
cat <<EOF
|
||||
====== module tests ======
|
||||
$pass Pass
|
||||
|
|
|
|||
25
lib/tests/modules/functionTo/list-order.nix
Normal file
25
lib/tests/modules/functionTo/list-order.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
|
||||
{ lib, config, ... }:
|
||||
let
|
||||
inherit (lib) types;
|
||||
in {
|
||||
options = {
|
||||
fun = lib.mkOption {
|
||||
type = types.functionTo (types.listOf types.str);
|
||||
};
|
||||
|
||||
result = lib.mkOption {
|
||||
type = types.str;
|
||||
default = toString (config.fun {
|
||||
a = "a";
|
||||
b = "b";
|
||||
c = "c";
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
config.fun = lib.mkMerge [
|
||||
(input: lib.mkAfter [ input.a ])
|
||||
(input: [ input.b ])
|
||||
];
|
||||
}
|
||||
27
lib/tests/modules/functionTo/merging-attrs.nix
Normal file
27
lib/tests/modules/functionTo/merging-attrs.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, config, ... }:
|
||||
let
|
||||
inherit (lib) types;
|
||||
in {
|
||||
options = {
|
||||
fun = lib.mkOption {
|
||||
type = types.functionTo (types.attrsOf types.str);
|
||||
};
|
||||
|
||||
result = lib.mkOption {
|
||||
type = types.str;
|
||||
default = toString (lib.attrValues (config.fun {
|
||||
a = "a";
|
||||
b = "b";
|
||||
c = "c";
|
||||
}));
|
||||
};
|
||||
};
|
||||
|
||||
config.fun = lib.mkMerge [
|
||||
(input: { inherit (input) a; })
|
||||
(input: { inherit (input) b; })
|
||||
(input: {
|
||||
b = lib.mkForce input.c;
|
||||
})
|
||||
];
|
||||
}
|
||||
24
lib/tests/modules/functionTo/merging-list.nix
Normal file
24
lib/tests/modules/functionTo/merging-list.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, config, ... }:
|
||||
let
|
||||
inherit (lib) types;
|
||||
in {
|
||||
options = {
|
||||
fun = lib.mkOption {
|
||||
type = types.functionTo (types.listOf types.str);
|
||||
};
|
||||
|
||||
result = lib.mkOption {
|
||||
type = types.str;
|
||||
default = toString (config.fun {
|
||||
a = "a";
|
||||
b = "b";
|
||||
c = "c";
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
config.fun = lib.mkMerge [
|
||||
(input: [ input.a ])
|
||||
(input: [ input.b ])
|
||||
];
|
||||
}
|
||||
17
lib/tests/modules/functionTo/trivial.nix
Normal file
17
lib/tests/modules/functionTo/trivial.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ lib, config, ... }:
|
||||
let
|
||||
inherit (lib) types;
|
||||
in {
|
||||
options = {
|
||||
fun = lib.mkOption {
|
||||
type = types.functionTo types.str;
|
||||
};
|
||||
|
||||
result = lib.mkOption {
|
||||
type = types.str;
|
||||
default = config.fun "input";
|
||||
};
|
||||
};
|
||||
|
||||
config.fun = input: "input is ${input}";
|
||||
}
|
||||
18
lib/tests/modules/functionTo/wrong-type.nix
Normal file
18
lib/tests/modules/functionTo/wrong-type.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
|
||||
{ lib, config, ... }:
|
||||
let
|
||||
inherit (lib) types;
|
||||
in {
|
||||
options = {
|
||||
fun = lib.mkOption {
|
||||
type = types.functionTo types.str;
|
||||
};
|
||||
|
||||
result = lib.mkOption {
|
||||
type = types.str;
|
||||
default = config.fun 0;
|
||||
};
|
||||
};
|
||||
|
||||
config.fun = input: input + 1;
|
||||
}
|
||||
|
|
@ -453,6 +453,16 @@ rec {
|
|||
functor = (defaultFunctor name) // { wrapped = elemType; };
|
||||
};
|
||||
|
||||
functionTo = elemType: mkOptionType {
|
||||
name = "function that evaluates to a(n) ${elemType.name}";
|
||||
check = isFunction;
|
||||
merge = loc: defs:
|
||||
fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue;
|
||||
getSubOptions = elemType.getSubOptions;
|
||||
getSubModules = elemType.getSubModules;
|
||||
substSubModules = m: functionTo (elemType.substSubModules m);
|
||||
};
|
||||
|
||||
# A submodule (like typed attribute set). See NixOS manual.
|
||||
submodule = modules: submoduleWith {
|
||||
shorthandOnlyDefinesConfig = true;
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ in {
|
|||
};
|
||||
|
||||
packages = mkOption {
|
||||
type = types.functionTo (types.listOf types.package);
|
||||
default = hp: [];
|
||||
defaultText = "hp: []";
|
||||
example = "hp: with hp; [ text lens ]";
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ let
|
|||
};
|
||||
|
||||
extraPackages = mkOption {
|
||||
type = types.functionTo (types.listOf types.package);
|
||||
default = self: [];
|
||||
example = literalExample ''
|
||||
haskellPackages: [
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ in
|
|||
};
|
||||
|
||||
extraPackages = mkOption {
|
||||
type = types.functionTo (types.listOf types.package);
|
||||
default = self: [];
|
||||
example = literalExample ''
|
||||
haskellPackages: [
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ in
|
|||
};
|
||||
|
||||
plugins = mkOption {
|
||||
type = types.functionTo (types.listOf types.package);
|
||||
default = plugins: [];
|
||||
defaultText = "plugins: []";
|
||||
example = literalExample "plugins: with plugins; [ themeify stlviewer ]";
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ in {
|
|||
'';
|
||||
};
|
||||
extraPackages = mkOption {
|
||||
type = types.functionTo (types.listOf types.package);
|
||||
default = ps: [];
|
||||
defaultText = "ps: []";
|
||||
example = literalExample ''
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ in
|
|||
};
|
||||
|
||||
extraPackages = mkOption {
|
||||
type = types.functionTo (types.listOf types.package);
|
||||
default = p: [];
|
||||
description = ''
|
||||
Extra Python packages available to supybot plugins. The
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ in
|
|||
description = "Enable an uncustomised exwm configuration.";
|
||||
};
|
||||
extraPackages = mkOption {
|
||||
type = types.functionTo (types.listOf types.package);
|
||||
default = self: [];
|
||||
example = literalExample ''
|
||||
epkgs: [
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ in {
|
|||
};
|
||||
|
||||
extraPackages = mkOption {
|
||||
type = types.functionTo (types.listOf types.package);
|
||||
default = self: [];
|
||||
defaultText = "self: []";
|
||||
example = literalExample ''
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
{
|
||||
name = "vault-postgresql";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ lnl7 roberth ];
|
||||
};
|
||||
machine = { lib, pkgs, ... }: {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, callPackage, vimUtils, buildEnv, makeWrapper }:
|
||||
{ lib, stdenv, callPackage, vimUtils, buildEnv, makeWrapper }:
|
||||
|
||||
let
|
||||
macvim = callPackage ./macvim.nix { inherit stdenv; };
|
||||
|
|
@ -12,7 +12,6 @@ let
|
|||
# sourcing of the user's vimrc. Use `customRC = "source $HOME/.vim/vimrc"`
|
||||
# if you want to preserve that behavior.
|
||||
configure = let
|
||||
inherit (stdenv) lib;
|
||||
doConfig = config: let
|
||||
vimrcConfig = config // {
|
||||
# always source the bundled system vimrc
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
{ stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw
|
||||
{ lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw
|
||||
, cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas
|
||||
, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid
|
||||
}:
|
||||
|
||||
let inherit (stdenv) lib; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "grass";
|
||||
version = "7.6.1";
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ python3.pkgs.buildPythonApplication {
|
|||
'';
|
||||
|
||||
passthru.updateScript = import ./update.nix {
|
||||
inherit (stdenv) lib;
|
||||
inherit lib;
|
||||
inherit
|
||||
writeScript
|
||||
common-updater-scripts
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv) lib;
|
||||
buildClient = monolithic || client;
|
||||
buildCore = monolithic || enableDaemon;
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more
|
||||
{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more
|
||||
, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome3, gtk2-x11, gtk3
|
||||
, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
|
||||
, gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
|
||||
|
|
@ -11,8 +11,6 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv) lib;
|
||||
|
||||
openssl' = symlinkJoin {
|
||||
name = "openssl-backwards-compat";
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@
|
|||
, csdp ? null
|
||||
, version, coq-version ? null,
|
||||
}@args:
|
||||
let lib = import ../../../../build-support/coq/extra-lib.nix {inherit (stdenv) lib;}; in
|
||||
let lib' = lib; in
|
||||
let lib = import ../../../../build-support/coq/extra-lib.nix {lib = lib';}; in
|
||||
with builtins; with lib;
|
||||
let
|
||||
release = {
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ let
|
|||
# NOTE: this may take a while since it has to update all packages in
|
||||
# nixpkgs.nodePackages
|
||||
passthru.updateScript = import ./update.nix {
|
||||
inherit (stdenv) lib;
|
||||
inherit lib;
|
||||
inherit (src.meta) homepage;
|
||||
inherit
|
||||
pname
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{stdenvNoCC, git, git-lfs, cacert}: let
|
||||
{lib, stdenvNoCC, git, git-lfs, cacert}: let
|
||||
urlToName = url: rev: let
|
||||
inherit (stdenvNoCC.lib) removeSuffix splitString last;
|
||||
inherit (lib) removeSuffix splitString last;
|
||||
base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));
|
||||
|
||||
matched = builtins.match "(.*).git" base;
|
||||
|
|
@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation {
|
|||
fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash.
|
||||
|
||||
nativeBuildInputs = [ git ]
|
||||
++ stdenvNoCC.lib.optionals fetchLFS [ git-lfs ];
|
||||
++ lib.optionals fetchLFS [ git-lfs ];
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
|
|
@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation {
|
|||
|
||||
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
|
||||
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
|
||||
"GIT_PROXY_COMMAND" "SOCKS_SERVER"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenvNoCC, mercurial }:
|
||||
{ lib, stdenvNoCC, mercurial }:
|
||||
{ name ? null
|
||||
, url
|
||||
, rev ? null
|
||||
|
|
@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
|
|||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [mercurial];
|
||||
|
||||
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
|
||||
subrepoClause = if fetchSubrepos then "S" else "";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# You can specify some extra mirrors and a cache DB via options
|
||||
{stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}:
|
||||
{lib, stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}:
|
||||
# dbs is a list of strings
|
||||
# each is an url for sync
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation {
|
|||
dbs = defaultDBMirrors ++ dbs;
|
||||
inherit branch cacheDB name selector;
|
||||
|
||||
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenvNoCC, gitRepo, cacert, copyPathsToStore }:
|
||||
{ lib, stdenvNoCC, gitRepo, cacert, copyPathsToStore }:
|
||||
|
||||
{ name, manifest, rev ? "HEAD", sha256
|
||||
# Optional parameters:
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
assert repoRepoRev != "" -> repoRepoURL != "";
|
||||
assert createMirror -> !useArchive;
|
||||
|
||||
with stdenvNoCC.lib;
|
||||
with lib;
|
||||
|
||||
let
|
||||
extraRepoInitFlags = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenvNoCC, runCommand, awscli }:
|
||||
{ lib, stdenvNoCC, runCommand, awscli }:
|
||||
|
||||
{ s3url
|
||||
, name ? builtins.baseNameOf s3url
|
||||
|
|
@ -16,7 +16,7 @@ let
|
|||
AWS_SESSION_TOKEN = session_token;
|
||||
};
|
||||
|
||||
credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) (mkCredentials credentials);
|
||||
credentialAttrs = lib.optionalAttrs (credentials != null) (mkCredentials credentials);
|
||||
in runCommand name ({
|
||||
nativeBuildInputs = [ awscli ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenvNoCC, buildPackages
|
||||
{ lib, stdenvNoCC, buildPackages
|
||||
, subversion, glibcLocales, sshSupport ? true, openssh ? null
|
||||
}:
|
||||
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
assert sshSupport -> openssh != null;
|
||||
|
||||
let
|
||||
repoName = with stdenvNoCC.lib;
|
||||
repoName = with lib;
|
||||
let
|
||||
fst = head;
|
||||
snd = l: head (tail l);
|
||||
|
|
@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation {
|
|||
name = name_;
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [ subversion glibcLocales ]
|
||||
++ stdenvNoCC.lib.optional sshSupport openssh;
|
||||
++ lib.optional sshSupport openssh;
|
||||
|
||||
SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null;
|
||||
|
||||
|
|
@ -49,6 +49,6 @@ stdenvNoCC.mkDerivation {
|
|||
|
||||
inherit url rev ignoreExternals ignoreKeywords;
|
||||
|
||||
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
inherit preferLocalBuild;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ in stdenvNoCC.mkDerivation rec {
|
|||
builder = ./make-initrd.sh;
|
||||
|
||||
nativeBuildInputs = [ perl cpio ]
|
||||
++ stdenvNoCC.lib.optional makeUInitrd ubootTools;
|
||||
++ lib.optional makeUInitrd ubootTools;
|
||||
|
||||
compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}";
|
||||
|
||||
|
|
|
|||
|
|
@ -229,26 +229,26 @@ class SPECTemplate(object):
|
|||
|
||||
@property
|
||||
def meta(self):
|
||||
out = ' meta = {\n'
|
||||
out = ' meta = with lib; {\n'
|
||||
out += ' homepage = ' + self.spec.sourceHeader['url'] + ';\n'
|
||||
out += ' description = "' + self.spec.sourceHeader['summary'] + '";\n'
|
||||
out += ' license = stdenv.lib.licenses.' + self.spec.sourceHeader['license'] + ';\n'
|
||||
out += ' license = lib.licenses.' + self.spec.sourceHeader['license'] + ';\n'
|
||||
out += ' platforms = [ "i686-linux" "x86_64-linux" ];\n'
|
||||
out += ' maintainers = with stdenv.lib.maintainers; [ ' + self.maintainer + ' ];\n'
|
||||
out += ' maintainers = with lib.maintainers; [ ' + self.maintainer + ' ];\n'
|
||||
out += ' };\n'
|
||||
out += '}\n'
|
||||
return out
|
||||
|
||||
|
||||
def __str__(self):
|
||||
head = '{stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'
|
||||
head = '{lib, stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'
|
||||
head += 'stdenv.mkDerivation {\n'
|
||||
body = [ self.name, self.src, self.patch, self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ]
|
||||
return head + '\n'.join(body)
|
||||
|
||||
|
||||
def getTemplate(self):
|
||||
head = '{stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'
|
||||
head = '{lib, stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'
|
||||
head += 'let\n'
|
||||
head += ' buildRootInput = (import "${buildRoot}/usr/share/buildroot/buildRootInput.nix") { fetchurl=fetchurl; buildRoot=buildRoot; };\n'
|
||||
head += 'in\n\n'
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Fetches a chicken egg from henrietta using `chicken-install -r'
|
||||
# See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html
|
||||
|
||||
{ stdenvNoCC, chicken }:
|
||||
{ lib, stdenvNoCC, chicken }:
|
||||
{ name, version, md5 ? "", sha256 ? "" }:
|
||||
|
||||
if md5 != "" then
|
||||
|
|
@ -20,6 +20,6 @@ stdenvNoCC.mkDerivation {
|
|||
|
||||
eggName = name;
|
||||
|
||||
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Fetches a chicken egg from henrietta using `chicken-install -r'
|
||||
# See: http://wiki.call-cc.org/chicken-projects/egg-index-5.html
|
||||
|
||||
{ stdenvNoCC, chicken }:
|
||||
{ lib, stdenvNoCC, chicken }:
|
||||
{ name, version, md5 ? "", sha256 ? "" }:
|
||||
|
||||
if md5 != "" then
|
||||
|
|
@ -20,6 +20,6 @@ stdenvNoCC.mkDerivation {
|
|||
|
||||
eggName = name;
|
||||
|
||||
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
inherit
|
||||
(import ../common/extra-target-flags.nix {
|
||||
inherit stdenv crossStageStatic libcCross threadsCross;
|
||||
inherit lib stdenv crossStageStatic libcCross threadsCross;
|
||||
})
|
||||
EXTRA_FLAGS_FOR_TARGET
|
||||
EXTRA_LDFLAGS_FOR_TARGET
|
||||
|
|
|
|||
|
|
@ -271,7 +271,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
inherit
|
||||
(import ../common/extra-target-flags.nix {
|
||||
inherit stdenv crossStageStatic libcCross threadsCross;
|
||||
inherit lib stdenv crossStageStatic libcCross threadsCross;
|
||||
})
|
||||
EXTRA_FLAGS_FOR_TARGET
|
||||
EXTRA_LDFLAGS_FOR_TARGET
|
||||
|
|
|
|||
|
|
@ -284,7 +284,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
inherit
|
||||
(import ../common/extra-target-flags.nix {
|
||||
inherit stdenv crossStageStatic libcCross threadsCross;
|
||||
inherit lib stdenv crossStageStatic libcCross threadsCross;
|
||||
})
|
||||
EXTRA_FLAGS_FOR_TARGET
|
||||
EXTRA_LDFLAGS_FOR_TARGET
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
inherit
|
||||
(import ../common/extra-target-flags.nix {
|
||||
inherit stdenv crossStageStatic libcCross threadsCross;
|
||||
inherit lib stdenv crossStageStatic libcCross threadsCross;
|
||||
})
|
||||
EXTRA_FLAGS_FOR_TARGET
|
||||
EXTRA_LDFLAGS_FOR_TARGET
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
inherit
|
||||
(import ../common/extra-target-flags.nix {
|
||||
inherit stdenv crossStageStatic libcCross threadsCross;
|
||||
inherit lib stdenv crossStageStatic libcCross threadsCross;
|
||||
})
|
||||
EXTRA_FLAGS_FOR_TARGET
|
||||
EXTRA_LDFLAGS_FOR_TARGET
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
inherit
|
||||
(import ../common/extra-target-flags.nix {
|
||||
inherit stdenv crossStageStatic libcCross threadsCross;
|
||||
inherit lib stdenv crossStageStatic libcCross threadsCross;
|
||||
})
|
||||
EXTRA_FLAGS_FOR_TARGET
|
||||
EXTRA_LDFLAGS_FOR_TARGET
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
inherit
|
||||
(import ../common/extra-target-flags.nix {
|
||||
inherit stdenv crossStageStatic langD libcCross threadsCross;
|
||||
inherit lib stdenv crossStageStatic langD libcCross threadsCross;
|
||||
})
|
||||
EXTRA_FLAGS_FOR_TARGET
|
||||
EXTRA_LDFLAGS_FOR_TARGET
|
||||
|
|
|
|||
|
|
@ -39,8 +39,7 @@ assert langJava -> lib.versionOlder version "7";
|
|||
|
||||
let
|
||||
inherit (stdenv)
|
||||
buildPlatform hostPlatform targetPlatform
|
||||
lib;
|
||||
buildPlatform hostPlatform targetPlatform;
|
||||
|
||||
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
|
||||
crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }:
|
||||
{ lib, stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }:
|
||||
|
||||
let
|
||||
inherit (stdenv) lib hostPlatform targetPlatform;
|
||||
inherit (stdenv) hostPlatform targetPlatform;
|
||||
in
|
||||
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }:
|
||||
{ lib, stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }:
|
||||
|
||||
let
|
||||
|
||||
|
|
@ -112,7 +112,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
meta = with stdenvNoCC.lib; {
|
||||
meta = with lib; {
|
||||
description = "A C/C++ Compiler (binary distribution)";
|
||||
homepage = "http://www.openwatcom.org/";
|
||||
license = licenses.watcom;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
|
||||
, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
|
||||
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
|
||||
, libXcursor, libXrandr, fontconfig, openjdk11
|
||||
, libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch
|
||||
, setJavaClassPath
|
||||
, headless ? false
|
||||
, enableJavaFX ? openjfx.meta.available, openjfx
|
||||
|
|
@ -44,6 +44,11 @@ let
|
|||
url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
|
||||
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
|
||||
})
|
||||
# Fix gnumake 4.3 incompatibility
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch";
|
||||
sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h";
|
||||
})
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
./swing-use-gtk-jdk10.patch
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
|
||||
, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
|
||||
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
|
||||
, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap
|
||||
, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch
|
||||
, setJavaClassPath
|
||||
, headless ? false
|
||||
, enableJavaFX ? openjfx.meta.available, openjfx
|
||||
|
|
@ -44,6 +44,11 @@ let
|
|||
url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
|
||||
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
|
||||
})
|
||||
# Fix gnumake 4.3 incompatibility
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch";
|
||||
sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h";
|
||||
})
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
./swing-use-gtk-jdk13.patch
|
||||
];
|
||||
|
|
|
|||
|
|
@ -65,9 +65,7 @@ let
|
|||
# Downloaded AWT jars differ by platform.
|
||||
outputHash = {
|
||||
x86_64-linux = "0hmyr5nnjgwyw3fcwqf0crqg9lny27jfirycg3xmkzbcrwqd6qkw";
|
||||
# The build-time dependencies don't currently build for i686, so no
|
||||
# reason to fetch this one correctly either...
|
||||
i686-linux = "0000000000000000000000000000000000000000000000000000";
|
||||
i686-linux = "0hx69p2z96p7jbyq4r20jykkb8gx6r8q2cj7m30pldlsw3650bqx";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenvNoLibs, buildPackages
|
||||
{ lib, stdenvNoLibs, buildPackages
|
||||
, gcc, glibc
|
||||
, libiberty
|
||||
}:
|
||||
|
|
@ -128,7 +128,7 @@ stdenvNoLibs.mkDerivation rec {
|
|||
"--disable-vtable-verify"
|
||||
|
||||
"--with-system-zlib"
|
||||
] ++ stdenvNoLibs.lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc")
|
||||
] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc")
|
||||
"--with-glibc-version=${glibc.version}";
|
||||
|
||||
configurePlatforms = [ "build" "host" ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchpatch
|
||||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
, autoreconfHook, libgpgerror, gnupg, pkg-config, glib, pth, libassuan
|
||||
, file, which, ncurses
|
||||
, texinfo
|
||||
|
|
@ -8,7 +8,6 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv) lib;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
in
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }:
|
||||
|
||||
let
|
||||
rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07";
|
||||
inherit (stdenv) lib;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "libsnark-pre${version}";
|
||||
version = lib.substring 0 8 rev;
|
||||
|
|
|
|||
|
|
@ -1,32 +1,39 @@
|
|||
{ lib, stdenv, fetchurl, gfortran, perl }:
|
||||
{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }:
|
||||
|
||||
let
|
||||
version = "4.3.4";
|
||||
version = "5.1.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "libxc";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz";
|
||||
sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "libxc";
|
||||
repo = "libxc";
|
||||
rev = version;
|
||||
sha256 = "0qbxh0lfx4cab1fk1qfnx72g4yvs376zqrq74jn224vy32nam2x7";
|
||||
};
|
||||
|
||||
buildInputs = [ gfortran ];
|
||||
nativeBuildInputs = [ perl ];
|
||||
nativeBuildInputs = [ perl cmake ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./
|
||||
'';
|
||||
|
||||
configureFlags = [ "--enable-shared" ];
|
||||
cmakeFlags = [ "-DENABLE_FORTRAN=ON" "-DBUILD_SHARED_LIBS=ON" ];
|
||||
|
||||
preCheck = ''
|
||||
export LD_LIBRARY_PATH=$(pwd)
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library of exchange-correlation functionals for density-functional theory";
|
||||
homepage = "https://octopus-code.org/wiki/Libxc";
|
||||
license = licenses.lgpl3;
|
||||
homepage = "https://www.tddft.org/programs/Libxc/";
|
||||
license = licenses.mpl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ markuskowa ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ let
|
|||
# to avoid cyclic dependencies between Qt modules.
|
||||
mkDerivation =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; }
|
||||
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
|
||||
stdenvActual.mkDerivation;
|
||||
}
|
||||
{ inherit self srcs patches; };
|
||||
|
|
|
|||
|
|
@ -123,12 +123,12 @@ let
|
|||
import ../qtModule.nix
|
||||
{
|
||||
inherit perl;
|
||||
inherit (stdenv) lib;
|
||||
inherit lib;
|
||||
# Use a variant of mkDerivation that does not include wrapQtApplications
|
||||
# to avoid cyclic dependencies between Qt modules.
|
||||
mkDerivation =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; }
|
||||
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
|
||||
stdenvActual.mkDerivation;
|
||||
}
|
||||
{ inherit self srcs patches; };
|
||||
|
|
@ -140,7 +140,7 @@ let
|
|||
|
||||
mkDerivationWith =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; };
|
||||
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
|
||||
|
||||
mkDerivation = mkDerivationWith stdenvActual.mkDerivation;
|
||||
|
||||
|
|
|
|||
|
|
@ -103,12 +103,12 @@ let
|
|||
import ../qtModule.nix
|
||||
{
|
||||
inherit perl;
|
||||
inherit (stdenv) lib;
|
||||
inherit lib;
|
||||
# Use a variant of mkDerivation that does not include wrapQtApplications
|
||||
# to avoid cyclic dependencies between Qt modules.
|
||||
mkDerivation =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; }
|
||||
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
|
||||
stdenvActual.mkDerivation;
|
||||
}
|
||||
{ inherit self srcs patches; };
|
||||
|
|
@ -120,7 +120,7 @@ let
|
|||
|
||||
mkDerivationWith =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; };
|
||||
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
|
||||
|
||||
mkDerivation = mkDerivationWith stdenvActual.mkDerivation;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenvNoCC, buildPackages, makeRustPlatform }:
|
||||
{ lib, stdenvNoCC, buildPackages, makeRustPlatform }:
|
||||
|
||||
let
|
||||
rpath = stdenvNoCC.lib.makeLibraryPath [
|
||||
rpath = lib.makeLibraryPath [
|
||||
buildPackages.stdenv.cc.libc
|
||||
"$out"
|
||||
];
|
||||
|
|
@ -30,7 +30,7 @@ let
|
|||
"{}" \;
|
||||
'';
|
||||
|
||||
meta.platforms = with stdenvNoCC.lib; platforms.redox ++ platforms.linux;
|
||||
meta.platforms = with lib; platforms.redox ++ platforms.linux;
|
||||
};
|
||||
|
||||
redoxRustPlatform = buildPackages.makeRustPlatform {
|
||||
|
|
@ -68,7 +68,7 @@ redoxRustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz";
|
||||
|
||||
meta = with stdenvNoCC.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.redox-os.org/redox-os/relibc";
|
||||
description = "C Library in Rust for Redox and Linux";
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, callPackage
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
|
|
@ -135,7 +136,7 @@ in stdenvNoCC.mkDerivation {
|
|||
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}
|
||||
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}
|
||||
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}
|
||||
'' + stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
|
||||
'' + lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
|
||||
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3"
|
||||
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3"
|
||||
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3"
|
||||
|
|
@ -145,7 +146,7 @@ in stdenvNoCC.mkDerivation {
|
|||
# fixDarwinDylibName fails for libmkl_cdft_core.dylib because the
|
||||
# larger updated load commands do not fit. Use install_name_tool
|
||||
# explicitly and ignore the error.
|
||||
postFixup = stdenvNoCC.lib.optionalString stdenvNoCC.isDarwin ''
|
||||
postFixup = lib.optionalString stdenvNoCC.isDarwin ''
|
||||
for f in $out/lib/*.dylib; do
|
||||
install_name_tool -id $out/lib/$(basename $f) $f || true
|
||||
done
|
||||
|
|
@ -160,7 +161,7 @@ in stdenvNoCC.mkDerivation {
|
|||
|
||||
passthru.tests.pkg-config = callPackage ./test { };
|
||||
|
||||
meta = with stdenvNoCC.lib; {
|
||||
meta = with lib; {
|
||||
description = "Intel Math Kernel Library";
|
||||
longDescription = ''
|
||||
Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, texinfo, texLive, perl}:
|
||||
{lib, stdenv, fetchurl, texinfo, texLive, perl}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
|
|
@ -31,11 +31,11 @@ stdenv.mkDerivation {
|
|||
cp -r doc/* "$out"/share/doc/asdf/
|
||||
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
|
||||
'';
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
inherit (s) version;
|
||||
description = "Standard software-system definition library for Common Lisp";
|
||||
license = stdenv.lib.licenses.mit ;
|
||||
maintainers = [stdenv.lib.maintainers.raskin];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.mit;
|
||||
maintainers = [maintainers.raskin];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, texinfo, texLive, perl}:
|
||||
{lib, stdenv, fetchurl, texinfo, texLive, perl}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
|
|
@ -30,11 +30,11 @@ stdenv.mkDerivation {
|
|||
cp -r doc/* "$out"/share/doc/asdf/
|
||||
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
|
||||
'';
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
inherit (s) version;
|
||||
description = "Standard software-system definition library for Common Lisp";
|
||||
license = stdenv.lib.licenses.mit ;
|
||||
maintainers = [stdenv.lib.maintainers.raskin];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = licenses.mit ;
|
||||
maintainers = [maintainers.raskin];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, texinfo, texLive, perl}:
|
||||
{lib, stdenv, fetchurl, texinfo, texLive, perl}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
|
|
@ -31,11 +31,11 @@ stdenv.mkDerivation {
|
|||
cp -r doc/* "$out"/share/doc/asdf/
|
||||
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
|
||||
'';
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
inherit (s) version;
|
||||
description = "Standard software-system definition library for Common Lisp";
|
||||
license = stdenv.lib.licenses.mit ;
|
||||
maintainers = [stdenv.lib.maintainers.raskin];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = licenses.mit ;
|
||||
maintainers = [maintainers.raskin];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, asdf, which, bash, lisp ? null}:
|
||||
{lib, stdenv, asdf, which, bash, lisp ? null}:
|
||||
stdenv.mkDerivation {
|
||||
name = "cl-wrapper-script";
|
||||
|
||||
|
|
@ -52,6 +52,6 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = {
|
||||
description = "Script used to wrap Common Lisp implementations";
|
||||
maintainers = [stdenv.lib.maintainers.raskin];
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
args @ {stdenv, clwrapper, baseName, packageName ? baseName
|
||||
args @ {lib, stdenv, clwrapper, baseName, packageName ? baseName
|
||||
, parasites ? []
|
||||
, buildSystems ? ([packageName] ++ parasites)
|
||||
, version ? "latest"
|
||||
|
|
@ -89,7 +89,7 @@ basePackage = {
|
|||
env -i \
|
||||
NIX_LISP="$NIX_LISP" \
|
||||
NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn
|
||||
${stdenv.lib.concatMapStrings (system: ''
|
||||
${lib.concatMapStrings (system: ''
|
||||
(asdf:compile-system :${system})
|
||||
(asdf:load-system :${system})
|
||||
(asdf:operate (quote asdf::compile-bundle-op) :${system})
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}:
|
||||
{lib, stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}:
|
||||
let lispPackages = rec {
|
||||
inherit pkgs clwrapper stdenv;
|
||||
inherit lib pkgs clwrapper stdenv;
|
||||
nixLib = pkgs.lib;
|
||||
callPackage = nixLib.callPackageWith lispPackages;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{stdenv, fetchurl, pkgs, clwrapper}:
|
||||
{lib, stdenv, fetchurl, pkgs, clwrapper}:
|
||||
let quicklisp-to-nix-packages = rec {
|
||||
inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;
|
||||
inherit lib stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;
|
||||
|
||||
callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages;
|
||||
buildLispPackage = callPackage ./define-package.nix;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenvNoCC, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
let
|
||||
mspgccVersion = "6_1_1_0";
|
||||
|
|
@ -19,7 +19,7 @@ in stdenvNoCC.mkDerivation rec {
|
|||
touch $out/lib/lib
|
||||
'';
|
||||
|
||||
meta = with stdenvNoCC.lib; {
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Development headers and linker scripts for TI MSP430 microcontrollers
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation ({
|
|||
packageBaseDir=$out/libexec/android-sdk/${package.path}
|
||||
mkdir -p $packageBaseDir
|
||||
cd $packageBaseDir
|
||||
cp -av $sourceRoot/* .
|
||||
cp -a $sourceRoot/* .
|
||||
${patchInstructions}
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ let
|
|||
buildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
for prog in bower2nix fetch-bower; do
|
||||
wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
|
||||
wrapProgram "$out/bin/$prog" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.git pkgs.nix ]}
|
||||
done
|
||||
'';
|
||||
};
|
||||
|
|
@ -91,7 +91,7 @@ let
|
|||
makam = super.makam.override {
|
||||
buildInputs = [ pkgs.nodejs pkgs.makeWrapper ];
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/makam" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nodejs ]}
|
||||
wrapProgram "$out/bin/makam" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nodejs ]}
|
||||
${
|
||||
if stdenv.isLinux
|
||||
then "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""
|
||||
|
|
@ -138,7 +138,7 @@ let
|
|||
node2nix = super.node2nix.override {
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
|
||||
wrapProgram "$out/bin/node2nix" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]}
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -168,7 +168,7 @@ let
|
|||
'';
|
||||
|
||||
postInstall = let
|
||||
pnpmLibPath = stdenv.lib.makeBinPath [
|
||||
pnpmLibPath = pkgs.lib.makeBinPath [
|
||||
nodejs.passthru.python
|
||||
nodejs
|
||||
];
|
||||
|
|
@ -185,7 +185,7 @@ let
|
|||
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/pulp" --suffix PATH : ${stdenv.lib.makeBinPath [
|
||||
wrapProgram "$out/bin/pulp" --suffix PATH : ${pkgs.lib.makeBinPath [
|
||||
pkgs.purescript
|
||||
]}
|
||||
'';
|
||||
|
|
@ -220,7 +220,7 @@ let
|
|||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/typescript-language-server" \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [ self.typescript ]}
|
||||
--prefix PATH : ${pkgs.lib.makeBinPath [ self.typescript ]}
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
52
pkgs/development/python-modules/pynndescent/default.nix
Normal file
52
pkgs/development/python-modules/pynndescent/default.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, nose
|
||||
, scikitlearn
|
||||
, scipy
|
||||
, numba
|
||||
, llvmlite
|
||||
, joblib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynndescent";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "74a05a54d13573a38878781d44812ac6df97d8762a56f9bb5dd87a99911820fe";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fixes tests, included in 0.5.2
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lmcinnes/pynndescent/commit/ef5d8c3c3bfe976063b6621e3e0734c0c22d813b.patch";
|
||||
sha256 = "sha256-49n3kevs3wpzd4FfZVKmNpF2o1V8pJs4KOx8zCAhR3s=";
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
scikitlearn
|
||||
scipy
|
||||
numba
|
||||
llvmlite
|
||||
joblib
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
nosetests
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nearest Neighbor Descent";
|
||||
homepage = "https://github.com/lmcinnes/pynndescent";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.mic92 ];
|
||||
};
|
||||
}
|
||||
33
pkgs/development/python-modules/pyworld/default.nix
Normal file
33
pkgs/development/python-modules/pyworld/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, numpy
|
||||
, cython
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyworld";
|
||||
version = "0.2.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "896c910696975855578d855f490f94d7a57119e0a75f7f15e11fdf58ba891627";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyworld" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "PyWorld is a Python wrapper for WORLD vocoder";
|
||||
homepage = https://github.com/JeremyCCHsu/Python-Wrapper-for-World-Vocoder;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.mic92 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,22 +6,25 @@
|
|||
, scikitlearn
|
||||
, scipy
|
||||
, numba
|
||||
, pynndescent
|
||||
, tensorflow
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "umap-learn";
|
||||
version = "0.4.5";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lmcinnes";
|
||||
repo = "umap";
|
||||
rev = version;
|
||||
sha256 = "080by8h4rxr5ijx8vp8kn952chiqz029j26c04k4js4g9s7201bq";
|
||||
sha256 = "sha256-2Z5RDi4bz8hh8zMwkcCQY9NrGaVd1DJEBOmrCl2oSvM=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
tensorflow
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
@ -30,8 +33,13 @@ buildPythonPackage rec {
|
|||
scikitlearn
|
||||
scipy
|
||||
numba
|
||||
pynndescent
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Plot functionality requires additional packages.
|
||||
# These test also fail with 'RuntimeError: cannot cache function' error.
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "wasabi";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "75fec6db6193c8615d7f398ae4aa2c4ad294e6e3e81c6a6dbbbd3864ee2223c3";
|
||||
sha256 = "6e5228a51f5550844ef5080e74759e7ecb6e344241989d018686ba968f0b4f5a";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchgit, pkg-config, gettext, runCommand, makeWrapper
|
||||
{ lib, fetchgit, pkg-config, gettext, runCommand, makeWrapper
|
||||
, elfutils, kernel, gnumake, python2, python2Packages
|
||||
}:
|
||||
|
||||
|
|
@ -10,7 +10,6 @@ let
|
|||
version = "4.1";
|
||||
|
||||
inherit (kernel) stdenv;
|
||||
inherit (stdenv) lib;
|
||||
|
||||
## stap binaries
|
||||
stapBuild = stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ in
|
|||
|
||||
passthru.updateScript = import ./update.nix {
|
||||
inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell;
|
||||
inherit (stdenv) lib;
|
||||
inherit lib;
|
||||
inherit majorVersion;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,56 +2,56 @@
|
|||
"x86_64-linux": {
|
||||
"alpha": {
|
||||
"experimental": {
|
||||
"name": "factorio_alpha_x64-1.1.16.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.19.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "000n19mm7xc1qvc93kakvayjd0j749hv5nrdmsp7vdixcd773vjn",
|
||||
"sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.16/alpha/linux64",
|
||||
"version": "1.1.16"
|
||||
"url": "https://factorio.com/get-download/1.1.19/alpha/linux64",
|
||||
"version": "1.1.19"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_alpha_x64-1.0.0.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.19.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464",
|
||||
"sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.0.0/alpha/linux64",
|
||||
"version": "1.0.0"
|
||||
"url": "https://factorio.com/get-download/1.1.19/alpha/linux64",
|
||||
"version": "1.1.19"
|
||||
}
|
||||
},
|
||||
"demo": {
|
||||
"experimental": {
|
||||
"name": "factorio_demo_x64-1.1.16.tar.xz",
|
||||
"name": "factorio_demo_x64-1.1.19.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "11nkpx8f3a30i06q7iqds12fiy1q67h64vh72y8x5l4mjg16j1js",
|
||||
"sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.16/demo/linux64",
|
||||
"version": "1.1.16"
|
||||
"url": "https://factorio.com/get-download/1.1.19/demo/linux64",
|
||||
"version": "1.1.19"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_demo_x64-1.0.0.tar.xz",
|
||||
"name": "factorio_demo_x64-1.1.19.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn",
|
||||
"sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.0.0/demo/linux64",
|
||||
"version": "1.0.0"
|
||||
"url": "https://factorio.com/get-download/1.1.19/demo/linux64",
|
||||
"version": "1.1.19"
|
||||
}
|
||||
},
|
||||
"headless": {
|
||||
"experimental": {
|
||||
"name": "factorio_headless_x64-1.1.16.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.19.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "02w92sgw4i3k1zywdg30mkr7nfylynsdn7sz5jzslyp0mkglrixi",
|
||||
"sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.16/headless/linux64",
|
||||
"version": "1.1.16"
|
||||
"url": "https://factorio.com/get-download/1.1.19/headless/linux64",
|
||||
"version": "1.1.19"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_headless_x64-1.0.0.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.19.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1",
|
||||
"sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.0.0/headless/linux64",
|
||||
"version": "1.0.0"
|
||||
"url": "https://factorio.com/get-download/1.1.19/headless/linux64",
|
||||
"version": "1.1.19"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{ stdenv, writeScript, fetchurl, requireFile, unzip, clang, mono, which,
|
||||
{ lib, stdenv, writeScript, fetchurl, requireFile, unzip, clang, mono, which,
|
||||
xorg, xdg-user-dirs }:
|
||||
|
||||
let
|
||||
inherit (stdenv) lib;
|
||||
deps = import ./cdn-deps.nix { inherit fetchurl; };
|
||||
linkDeps = writeScript "link-deps.sh" (lib.concatMapStringsSep "\n" (hash:
|
||||
let prefix = lib.concatStrings (lib.take 2 (lib.stringToCharacters hash));
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.9";
|
||||
suffix = "lqx1";
|
||||
version = "5.10.10";
|
||||
suffix = "lqx2";
|
||||
in
|
||||
|
||||
buildLinux (args // {
|
||||
|
|
@ -14,7 +14,7 @@ buildLinux (args // {
|
|||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
sha256 = "1j0rz4j1br7kzg9zb5l2xz60ccr4iwjndxq3f4gml8s3fb4cpp6f";
|
||||
sha256 = "1cjgx9qjfkiaalqkcdmibsrq2frwd621rwcg6w05ms4w9lnwi3af";
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.9";
|
||||
version = "5.10.10";
|
||||
suffix = "zen1";
|
||||
in
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ buildLinux (args // {
|
|||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
sha256 = "0p7w2ib8aac0cx16fksr8870kmijw86hbzdkjsq1ww07ifnb4qir";
|
||||
sha256 = "0jsi2q8k1w5zs5l6z1brm2mxpl9arv6n6linc8yj6xc75nydw6w4";
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
|
||||
|
||||
let
|
||||
inherit (stdenv) lib;
|
||||
baseVersion = "0.3.1";
|
||||
commit = "9ba85274dcc21bf8132cbe3b3dccfcb4aab57d9f";
|
||||
in
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ in rec {
|
|||
};
|
||||
|
||||
unifi6 = generic {
|
||||
version = "6.0.43";
|
||||
sha256 = "1d9pw4f20pr4jb1xb43p7ycafv13ld1h40r05qg82029ml1s7jky";
|
||||
version = "6.0.45";
|
||||
sha256 = "1mph22x2p26q76gh6s714xwsvc03cciy4gx00jv4vhcm28p6nlxy";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,15 +41,15 @@ let
|
|||
in
|
||||
{
|
||||
varnish60 = common {
|
||||
version = "6.0.5";
|
||||
sha256 = "11aw202s7zdp5qp66hii5nhgm2jk0d86pila7gqrnjgc7x8fs8a0";
|
||||
version = "6.0.7";
|
||||
sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a";
|
||||
};
|
||||
varnish62 = common {
|
||||
version = "6.2.2";
|
||||
sha256 = "10s3qdvb95pkwp3wxndrigb892h0109yqr8dw4smrhfi0knhnfk5";
|
||||
version = "6.2.3";
|
||||
sha256 = "02b6pqh5j1d4n362n42q42bfjzjrngd6x49b13q7wzsy6igd1jsy";
|
||||
};
|
||||
varnish63 = common {
|
||||
version = "6.3.1";
|
||||
sha256 = "0xa14pd68zpi5hxcax3arl14rcmh5d1cdwa8gv4l5f23mmynr8ni";
|
||||
version = "6.3.2";
|
||||
sha256 = "1f5ahzdh3am6fij5jhiybv3knwl11rhc5r3ig1ybzw55ai7788q8";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ abiCompat ? null,
|
||||
stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages,
|
||||
lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages,
|
||||
automake, autoconf, gettext, libiconv, libtool, intltool,
|
||||
freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge,
|
||||
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv) lib isDarwin;
|
||||
inherit (stdenv) isDarwin;
|
||||
inherit (lib) overrideDerivation;
|
||||
|
||||
malloc0ReturnsNullCrossFlag = lib.optional
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ rec {
|
|||
*/
|
||||
replaceMaintainersField = stdenv: pkgs: maintainers: stdenv //
|
||||
{ mkDerivation = args:
|
||||
stdenv.lib.recursiveUpdate
|
||||
pkgs.lib.recursiveUpdate
|
||||
(stdenv.mkDerivation args)
|
||||
{ meta.maintainers = maintainers; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,42 +1,13 @@
|
|||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3
|
||||
}:
|
||||
|
||||
#
|
||||
# Tested in the following setup:
|
||||
#
|
||||
# TTS model:
|
||||
# Tacotron2 DDC
|
||||
# https://drive.google.com/drive/folders/1Y_0PcB7W6apQChXtbt6v3fAiNwVf4ER5
|
||||
# Vocoder model:
|
||||
# Multi-Band MelGAN
|
||||
# https://drive.google.com/drive/folders/1XeRT0q4zm5gjERJqwmX5w84pMrD00cKD
|
||||
#
|
||||
# Arrange /tmp/tts like this:
|
||||
# scale_stats.npy
|
||||
# tts
|
||||
# tts/checkpoint_130000.pth.tar
|
||||
# tts/checkpoint_130000_tf.pkl
|
||||
# tts/checkpoint_130000_tf_2.3rc0.tflite
|
||||
# tts/config.json
|
||||
# tts/scale_stats.npy
|
||||
# vocoder
|
||||
# vocoder/checkpoint_1450000.pth.tar
|
||||
# vocoder/checkpoint_2750000_tf.pkl
|
||||
# vocoder/checkpoint_2750000_tf_v2.3rc.tflite
|
||||
# vocoder/config.json
|
||||
# vocoder/scale_stats.npy
|
||||
#
|
||||
# Start like this:
|
||||
# cd /tmp/tts
|
||||
# tts-server \
|
||||
# --vocoder_config ./tts/vocoder/config.json \
|
||||
# --vocoder_checkpoint ./tts/vocoder/checkpoint_1450000.pth.tar \
|
||||
# --tts_config ./tts/config.json \
|
||||
# --tts_checkpoint ./tts/checkpoint_130000.pth.tar
|
||||
# USAGE:
|
||||
# $ tts-server --list_models
|
||||
# # pick your favorite vocoder/tts model
|
||||
# $ tts-server --model_name tts_models/en/ljspeech/glow-tts --vocoder_name vocoder_models/universal/libri-tts/fullband-melgan
|
||||
#
|
||||
# For now, for deployment check the systemd unit in the pull request:
|
||||
# https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136
|
||||
|
|
@ -47,35 +18,31 @@ python3Packages.buildPythonApplication rec {
|
|||
# until https://github.com/mozilla/TTS/issues/424 is resolved
|
||||
# we treat released models as released versions:
|
||||
# https://github.com/mozilla/TTS/wiki/Released-Models
|
||||
version = "unstable-2020-06-17";
|
||||
version = "0.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "TTS";
|
||||
rev = "72a6ac54c8cfaa407fc64b660248c6a788bdd381";
|
||||
sha256 = "1wvs264if9n5xzwi7ryxvwj1j513szp6sfj6n587xk1fphi0921f";
|
||||
rev = "df5899daf4ba4ec89544edf94f9c2e105c544461";
|
||||
sha256 = "sha256-lklG8DqG04LKJY93z2axeYhW8gtpbRG41o9ow2gJjuA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mozilla/TTS/commit/36fee428b9f3f4ec1914b090a2ec9d785314d9aa.patch";
|
||||
sha256 = "sha256-pP0NxiyrsvQ0A7GEleTdT87XO08o7WxPEpb6Bmj66dc=";
|
||||
})
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# numba jit tries to write to its cache directory
|
||||
export HOME=$TMPDIR
|
||||
sed -i -e 's!tensorflow==.*!tensorflow!' requirements.txt
|
||||
# we only support pytorch models right now
|
||||
sed -i -e '/tensorflow/d' requirements.txt
|
||||
|
||||
sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt setup.py
|
||||
sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt setup.py
|
||||
sed -i -e 's!bokeh==[^"]*!bokeh!' requirements.txt setup.py
|
||||
sed -i -e 's!numba==[^"]*!numba!' requirements.txt setup.py
|
||||
# Not required for building/installation but for their development/ci workflow
|
||||
sed -i -e '/pylint/d' requirements.txt setup.py
|
||||
sed -i -e '/pylint/d' requirements.txt
|
||||
sed -i -e '/cardboardlint/d' requirements.txt setup.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ python3Packages.cython ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
matplotlib
|
||||
|
|
@ -88,17 +55,23 @@ python3Packages.buildPythonApplication rec {
|
|||
tqdm
|
||||
librosa
|
||||
unidecode
|
||||
umap-learn
|
||||
phonemizer
|
||||
tensorboardx
|
||||
fuzzywuzzy
|
||||
tensorflow_2
|
||||
inflect
|
||||
gdown
|
||||
pysbd
|
||||
pyworld
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server
|
||||
# cython modules are not installed for some reasons
|
||||
(
|
||||
cd TTS/tts/layers/glow_tts/monotonic_align
|
||||
${python3Packages.python.interpreter} setup.py install --prefix=$out
|
||||
)
|
||||
'';
|
||||
|
||||
checkInputs = with python3Packages; [ pytestCheckHook ];
|
||||
|
|
@ -114,6 +87,18 @@ python3Packages.buildPythonApplication rec {
|
|||
"test_parametrized_gan_dataset"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# use the installed TTS in $PYTHONPATH instead of the one from source to also have cython modules.
|
||||
mv TTS{,.old}
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [
|
||||
# requires tensorflow
|
||||
"--ignore=tests/test_tacotron2_tf_model.py"
|
||||
"--ignore=tests/test_vocoder_tf_melgan_generator.py"
|
||||
"--ignore=tests/test_vocoder_tf_pqmf.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mozilla/TTS";
|
||||
description = "Deep learning for Text to Speech";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
meta = let inherit (stdenv) lib; in {
|
||||
meta = with lib; {
|
||||
description = "A graphical application for configuring displays in Wayland compositors";
|
||||
homepage = "https://github.com/cyclopsian/wdisplays";
|
||||
maintainers = with lib.maintainers; [ lheckemann ma27 ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, gettext, vim, bc, screen }:
|
||||
|
||||
let
|
||||
inherit (stdenv) lib;
|
||||
pythonEnv = python3.withPackages (ps: with ps; [ snack ]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
stdenv_32bit.mkDerivation rec {
|
||||
name = "loadlibrary-${version}";
|
||||
version = "20170525-${stdenv_32bit.lib.strings.substring 0 7 rev}";
|
||||
version = "20170525-${lib.strings.substring 0 7 rev}";
|
||||
rev = "721b084c088d779075405b7f20c77c2578e2a961";
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
, libXdamage, expat }:
|
||||
|
||||
let
|
||||
inherit (stdenv) lib;
|
||||
LD_LIBRARY_PATH = lib.makeLibraryPath
|
||||
[ glib gtk2 gdk-pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ];
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, wrapQtAppsHook
|
||||
, pcsclite
|
||||
|
|
@ -16,8 +17,6 @@
|
|||
, yubikey-personalization
|
||||
}:
|
||||
|
||||
let inherit (stdenv) lib; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yubikey-manager-qt";
|
||||
version = "1.1.5";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, skawarePackages
|
||||
{ lib, stdenv, skawarePackages
|
||||
|
||||
# Whether to build the TLS/SSL tools and what library to use
|
||||
# acceptable values: "libressl", false
|
||||
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
with skawarePackages;
|
||||
let
|
||||
inherit (stdenv) lib;
|
||||
sslSupportEnabled = sslSupport != false;
|
||||
sslLibs = {
|
||||
libressl = libressl;
|
||||
|
|
|
|||
|
|
@ -79,7 +79,9 @@ let
|
|||
# lsof must be in PATH for proper operation
|
||||
wrapProgram $out/bin/Enpass \
|
||||
--set LD_LIBRARY_PATH "${libPath}" \
|
||||
--prefix PATH : ${lsof}/bin
|
||||
--prefix PATH : ${lsof}/bin \
|
||||
--unset QML2_IMPORT_PATH \
|
||||
--unset QT_PLUGIN_PATH
|
||||
'';
|
||||
};
|
||||
updater = {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "masscan";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robertdavidgraham";
|
||||
repo = "masscan";
|
||||
rev = version;
|
||||
sha256 = "04nlnficybgxa16kq9fwrrfjsbyiaps4mikfqgdr206fkqk9i05y";
|
||||
owner = "robertdavidgraham";
|
||||
repo = "masscan";
|
||||
rev = version;
|
||||
sha256 = "sha256-gH0zOf2kl6cqws1nB3QPtaAjpvNAgbawXRx77bqJTIc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -34,9 +34,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Fast scan of the Internet";
|
||||
homepage = "https://github.com/robertdavidgraham/masscan";
|
||||
license = licenses.agpl3;
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://github.com/robertdavidgraham/masscan";
|
||||
changelog = "https://github.com/robertdavidgraham/masscan/releases/tag/${version}";
|
||||
license = licenses.agpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ rnhmjoj ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5
|
||||
{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5
|
||||
, readline
|
||||
|
||||
, hardwarePlatform ? "PM3RDV4"
|
||||
|
|
@ -29,7 +29,7 @@ mkDerivation rec {
|
|||
install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Client for proxmark3, powerful general purpose RFID tool";
|
||||
homepage = "https://rfidresearchgroup.com/";
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
|
|||
passthru = {
|
||||
tests.tor = nixosTests.tor;
|
||||
updateScript = import ./update.nix {
|
||||
inherit (stdenv) lib;
|
||||
inherit lib;
|
||||
inherit
|
||||
writeScript
|
||||
common-updater-scripts
|
||||
|
|
|
|||
|
|
@ -10177,6 +10177,7 @@ in
|
|||
headless = true;
|
||||
inherit (gnome2) GConf gnome_vfs;
|
||||
openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix {
|
||||
stdenv = gcc8Stdenv; /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */
|
||||
openjfx = openjfx11; /* need this despite next line :-( */
|
||||
enableJavaFX = false;
|
||||
headless = true;
|
||||
|
|
@ -25270,7 +25271,7 @@ in
|
|||
}).overrideAttrs (oldAttrs: rec {
|
||||
pname = "vim-darwin";
|
||||
meta = {
|
||||
platforms = stdenv.lib.platforms.darwin;
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -4867,6 +4867,8 @@ in {
|
|||
|
||||
pkuseg = callPackage ../development/python-modules/pkuseg { };
|
||||
|
||||
pynndescent = callPackage ../development/python-modules/pynndescent { };
|
||||
|
||||
pysbd = callPackage ../development/python-modules/pysbd { };
|
||||
|
||||
python-codon-tables = callPackage ../development/python-modules/python-codon-tables { };
|
||||
|
|
@ -6505,6 +6507,8 @@ in {
|
|||
});
|
||||
in if isPy3k then pyxattr' else pyxattr_2;
|
||||
|
||||
pyworld = callPackage ../development/python-modules/pyworld { };
|
||||
|
||||
pyx = callPackage ../development/python-modules/pyx { };
|
||||
|
||||
pyxdg = callPackage ../development/python-modules/pyxdg { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue