Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
2692c2e427
@ -5,7 +5,7 @@ let
|
||||
inherit (builtins) head tail length;
|
||||
inherit (lib.trivial) and;
|
||||
inherit (lib.strings) concatStringsSep sanitizeDerivationName;
|
||||
inherit (lib.lists) fold concatMap concatLists;
|
||||
inherit (lib.lists) fold foldr concatMap concatLists;
|
||||
in
|
||||
|
||||
rec {
|
||||
@ -152,8 +152,8 @@ rec {
|
||||
=> { a = [ 2 3 ]; }
|
||||
*/
|
||||
foldAttrs = op: nul: list_of_attrs:
|
||||
fold (n: a:
|
||||
fold (name: o:
|
||||
foldr (n: a:
|
||||
foldr (name: o:
|
||||
o // { ${name} = op n.${name} (a.${name} or nul); }
|
||||
) a (attrNames n)
|
||||
) {} list_of_attrs;
|
||||
@ -455,7 +455,7 @@ rec {
|
||||
=> true
|
||||
*/
|
||||
matchAttrs = pattern: attrs: assert isAttrs pattern;
|
||||
fold and true (attrValues (zipAttrsWithNames (attrNames pattern) (n: values:
|
||||
foldr and true (attrValues (zipAttrsWithNames (attrNames pattern) (n: values:
|
||||
let pat = head values; val = head (tail values); in
|
||||
if length values == 1 then false
|
||||
else if isAttrs pat then isAttrs val && matchAttrs pat val
|
||||
|
||||
@ -77,11 +77,11 @@ rec {
|
||||
# Output : are reqs satisfied? It's asserted.
|
||||
checkReqs = attrSet: argList: condList:
|
||||
(
|
||||
fold lib.and true
|
||||
foldr lib.and true
|
||||
(map (x: let name = (head x); in
|
||||
|
||||
((checkFlag attrSet name) ->
|
||||
(fold lib.and true
|
||||
(foldr lib.and true
|
||||
(map (y: let val=(getValue attrSet argList y); in
|
||||
(val!=null) && (val!=false))
|
||||
(tail x))))) condList));
|
||||
@ -177,7 +177,7 @@ rec {
|
||||
# merge attributes with custom function handling the case that the attribute
|
||||
# exists in both sets
|
||||
mergeAttrsWithFunc = f: set1: set2:
|
||||
fold (n: set: if set ? ${n}
|
||||
foldr (n: set: if set ? ${n}
|
||||
then setAttr set n (f set.${n} set2.${n})
|
||||
else set )
|
||||
(set2 // set1) (attrNames set2);
|
||||
@ -196,7 +196,7 @@ rec {
|
||||
mergeAttrsNoOverride = { mergeLists ? ["buildInputs" "propagatedBuildInputs"],
|
||||
overrideSnd ? [ "buildPhase" ]
|
||||
}: attrs1: attrs2:
|
||||
fold (n: set:
|
||||
foldr (n: set:
|
||||
setAttr set n ( if set ? ${n}
|
||||
then # merge
|
||||
if elem n mergeLists # attribute contains list, merge them by concatenating
|
||||
@ -224,7 +224,7 @@ rec {
|
||||
mergeAttrBy2 = { mergeAttrBy = lib.mergeAttrs; }
|
||||
// (maybeAttr "mergeAttrBy" {} x)
|
||||
// (maybeAttr "mergeAttrBy" {} y); in
|
||||
fold lib.mergeAttrs {} [
|
||||
foldr lib.mergeAttrs {} [
|
||||
x y
|
||||
(mapAttrs ( a: v: # merge special names using given functions
|
||||
if x ? ${a}
|
||||
|
||||
@ -308,7 +308,7 @@ rec {
|
||||
|
||||
info = msg: builtins.trace "INFO: ${msg}";
|
||||
|
||||
showWarnings = warnings: res: lib.fold (w: x: warn w x) res warnings;
|
||||
showWarnings = warnings: res: lib.foldr (w: x: warn w x) res warnings;
|
||||
|
||||
## Function annotations
|
||||
|
||||
|
||||
@ -4939,6 +4939,12 @@
|
||||
fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0";
|
||||
}];
|
||||
};
|
||||
jgart = {
|
||||
email = "jgart@dismail.de";
|
||||
github = "jgarte";
|
||||
githubId = 47760695;
|
||||
name = "Jorge Gomez";
|
||||
};
|
||||
jgeerds = {
|
||||
email = "jascha@geerds.org";
|
||||
github = "jgeerds";
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
# E.g. if some `options` came from modules in ${pkgs.customModules}/nix,
|
||||
# you'd need to include `extraSources = [ pkgs.customModules ]`
|
||||
prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources);
|
||||
stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip;
|
||||
stripAnyPrefixes = lib.flip (lib.foldr lib.removePrefix) prefixesToStrip;
|
||||
|
||||
optionsDoc = buildPackages.nixosOptionsDoc {
|
||||
inherit options revision;
|
||||
|
||||
@ -396,7 +396,7 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }:
|
||||
idsAreUnique = set: idAttr: !(foldr (name: args@{ dup, acc }:
|
||||
let
|
||||
id = builtins.toString (builtins.getAttr idAttr (builtins.getAttr name set));
|
||||
exists = builtins.hasAttr id acc;
|
||||
|
||||
@ -39,7 +39,7 @@ let
|
||||
if c x then true
|
||||
else lib.traceSeqN 1 x false;
|
||||
in traceXIfNot isConfig;
|
||||
merge = args: fold (def: mergeConfig def.value) {};
|
||||
merge = args: foldr (def: mergeConfig def.value) {};
|
||||
};
|
||||
|
||||
overlayType = mkOptionType {
|
||||
|
||||
@ -279,7 +279,7 @@ let
|
||||
src_plan = plan;
|
||||
tsformat = timestampFormat;
|
||||
zend_delay = toString sendDelay;
|
||||
} // fold (a: b: a // b) {} (
|
||||
} // foldr (a: b: a // b) {} (
|
||||
map mkDestAttrs (builtins.attrValues destinations)
|
||||
);
|
||||
|
||||
|
||||
@ -194,7 +194,7 @@ let
|
||||
# We need to handle the last column specially here, because it's
|
||||
# open-ended (command + args).
|
||||
lines = [ labels labelDefaults ] ++ (map (l: init l ++ [""]) masterCf);
|
||||
in fold foldLine (genList (const 0) (length labels)) lines;
|
||||
in foldr foldLine (genList (const 0) (length labels)) lines;
|
||||
|
||||
# Pad a string with spaces from the right (opposite of fixedWidthString).
|
||||
pad = width: str: let
|
||||
@ -203,7 +203,7 @@ let
|
||||
in str + optionalString (padWidth > 0) padding;
|
||||
|
||||
# It's + 2 here, because that's the amount of spacing between columns.
|
||||
fullWidth = fold (width: acc: acc + width + 2) 0 maxWidths;
|
||||
fullWidth = foldr (width: acc: acc + width + 2) 0 maxWidths;
|
||||
|
||||
formatLine = line: concatStringsSep " " (zipListsWith pad maxWidths line);
|
||||
|
||||
|
||||
@ -79,7 +79,7 @@ in
|
||||
|
||||
systemd.services =
|
||||
|
||||
lib.fold ( s : acc : acc //
|
||||
lib.foldr ( s : acc : acc //
|
||||
{
|
||||
"autossh-${s.name}" =
|
||||
let
|
||||
|
||||
@ -160,7 +160,7 @@ in
|
||||
|
||||
users.groups.nylon.gid = config.ids.gids.nylon;
|
||||
|
||||
systemd.services = fold (a: b: a // b) {} nylonUnits;
|
||||
systemd.services = foldr (a: b: a // b) {} nylonUnits;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@ -87,7 +87,7 @@ with lib;
|
||||
};
|
||||
|
||||
config = mkIf (cfg != []) {
|
||||
systemd.services = fold (a: b: a // b) {} (
|
||||
systemd.services = foldr (a: b: a // b) {} (
|
||||
mapAttrsToList (name: qtcfg: {
|
||||
"quicktun-${name}" = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
@ -351,7 +351,7 @@ in
|
||||
|
||||
config = mkIf (cfg.networks != { }) {
|
||||
|
||||
environment.etc = fold (a: b: a // b) { }
|
||||
environment.etc = foldr (a: b: a // b) { }
|
||||
(flip mapAttrsToList cfg.networks (network: data:
|
||||
flip mapAttrs' data.hosts (host: text: nameValuePair
|
||||
("tinc/${network}/hosts/${host}")
|
||||
|
||||
@ -19,7 +19,7 @@ let
|
||||
${ethtool} -s ${interface} ${methodParameter {inherit method password;}}
|
||||
'';
|
||||
|
||||
concatStrings = fold (x: y: x + y) "";
|
||||
concatStrings = foldr (x: y: x + y) "";
|
||||
lines = concatStrings (map (l: line l) interfaces);
|
||||
|
||||
in
|
||||
|
||||
@ -125,7 +125,7 @@ let
|
||||
else showWarnings config.warnings baseSystem;
|
||||
|
||||
# Replace runtime dependencies
|
||||
system = fold ({ oldDependency, newDependency }: drv:
|
||||
system = foldr ({ oldDependency, newDependency }: drv:
|
||||
pkgs.replaceDependency { inherit oldDependency newDependency drv; }
|
||||
) baseSystemAssertWarn config.system.replaceRuntimeDependencies;
|
||||
|
||||
|
||||
@ -75,7 +75,7 @@ let
|
||||
else "${convertedFont}");
|
||||
});
|
||||
|
||||
bootDeviceCounters = fold (device: attr: attr // { ${device} = (attr.${device} or 0) + 1; }) {}
|
||||
bootDeviceCounters = foldr (device: attr: attr // { ${device} = (attr.${device} or 0) + 1; }) {}
|
||||
(concatMap (args: args.devices) cfg.mirroredBoots);
|
||||
|
||||
convertedFont = (pkgs.runCommand "grub-font-converted.pf2" {}
|
||||
|
||||
@ -8,7 +8,7 @@ let
|
||||
keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs;
|
||||
keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs;
|
||||
anyEncrypted =
|
||||
fold (j: v: v || j.encrypted.enable) false encDevs;
|
||||
foldr (j: v: v || j.encrypted.enable) false encDevs;
|
||||
|
||||
encryptedFSOptions = {
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, poppler_utils
|
||||
, pkg-config
|
||||
, libpng
|
||||
@ -94,7 +95,15 @@ mkDerivation rec {
|
||||
python
|
||||
regex
|
||||
sip
|
||||
zeroconf
|
||||
(zeroconf.overrideAttrs (oldAttrs: rec {
|
||||
version = "0.31.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jstasiak";
|
||||
repo = "python-zeroconf";
|
||||
rev = version;
|
||||
sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj";
|
||||
};
|
||||
}))
|
||||
# the following are distributed with calibre, but we use upstream instead
|
||||
odfpy
|
||||
] ++ lib.optional (unrarSupport) unrardll
|
||||
|
||||
33
pkgs/applications/misc/coregarage/default.nix
Normal file
33
pkgs/applications/misc/coregarage/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "coregarage";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cubocore/coreapps";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2pOQwSj+QKwpHVJp7VCyq6QpVW5wLUf/BE7ReXrJ78s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libcprime
|
||||
libarchive
|
||||
libarchive-qt
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A settings manager for the C Suite";
|
||||
homepage = "https://gitlab.com/cubocore/coreapps/coregarage";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ dan4ik605743 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notmuch-bower";
|
||||
version = "0.12";
|
||||
version = "0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wangp";
|
||||
repo = "bower";
|
||||
rev = version;
|
||||
sha256 = "0hvvlbvad6h73iiyn9xshlj073p2ddchgh0pyizh9gi8niir4fn5";
|
||||
sha256 = "0r5s16pc3ym5nd33lv9ljv1p1gpb7yysrdni4g7w7yvjrnwk35l6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gawk mercury pandoc ];
|
||||
@ -18,10 +18,12 @@ stdenv.mkDerivation rec {
|
||||
makeFlags = [ "PARALLEL=-j$(NIX_BUILD_CORES)" "bower" "man" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
mv bower $out/bin/
|
||||
mkdir -p $out/share/man/man1
|
||||
mv bower.1 $out/share/man/man1/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -29,8 +31,8 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/wangp/bower";
|
||||
description = "A curses terminal client for the Notmuch email system";
|
||||
maintainers = with maintainers; [ erictapen ];
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ jgart ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,7 +11,8 @@ let
|
||||
name = perl.name + "-wrapper-for-gnucash";
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ perl ] ++ (with perlPackages; [ FinanceQuote DateManip ]);
|
||||
phases = [ "installPhase" ];
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
for script in ${perl}/bin/*; do
|
||||
@ -40,10 +41,10 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ];
|
||||
nativeBuildInputs = [ pkg-config makeWrapper cmake gtest swig ];
|
||||
|
||||
buildInputs = [
|
||||
boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales
|
||||
boost icu libxml2 libxslt gettext isocodes gtk3 glibcLocales
|
||||
webkitgtk dconf libofx aqbanking gwenhywfar libdbi
|
||||
libdbiDrivers guile
|
||||
perlWrapper perl
|
||||
|
||||
@ -24,11 +24,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.53.1";
|
||||
version = "0.54.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "0hddq1nijxhr6kgf7gydw0nh07lh86fs8srkhm29ik4hmv8ch19p";
|
||||
sha256 = "16sv938sdbs01byqwngrfqmzb81zfhvk72ar53l68cg8qjvzs5ml";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
# builder for mrbayes - note: only builds on Unix
|
||||
|
||||
source $stdenv/setup
|
||||
|
||||
tar xvfz $src
|
||||
cd mrbayes-*
|
||||
make
|
||||
mkdir -p $out/bin
|
||||
cp -v mb $out/bin
|
||||
@ -1,15 +1,15 @@
|
||||
{lib, stdenv, fetchurl, readline}:
|
||||
{ lib, stdenv, fetchFromGitHub, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# FIXME: replace Makefile so we can build MPI & MAC support
|
||||
pname = "mrbayes";
|
||||
version = "3.2.7";
|
||||
|
||||
name = "mrbayes-3.1.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mrbayes/${name}.tar.gz";
|
||||
sha256 = "1x7j8ca5wjrqrxmcpvd375ydm3s2pbkzykv8xfhg1jc037g560n6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NBISweden";
|
||||
repo = "MrBayes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-J0r4CxxQuZ3exvfCMRbLmyEd8ROaXNQG4afwiAs6H+M=";
|
||||
};
|
||||
builder = ./builder.sh;
|
||||
buildInputs = [readline];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bayesian Inference of Phylogeny";
|
||||
@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
|
||||
MrBayes uses a simulation technique called Markov chain Monte Carlo (or
|
||||
MCMC) to approximate the posterior probabilities of trees.
|
||||
'';
|
||||
license = licenses.gpl2;
|
||||
homepage = "http://mrbayes.csit.fsu.edu/";
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.gpl2Plus;
|
||||
homepage = "https://nbisweden.github.io/MrBayes/";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ccextractor";
|
||||
version = "0.90";
|
||||
version = "0.91";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CCExtractor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NVFCwUZZVt8GrWXWyvoF8UrUZ/ix+GWubKtc3218k7o=";
|
||||
sha256 = "sha256-VqJQaYzH8psQJfnDariV4q7SkDiXRz9byR51C8DzVEs=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz
|
||||
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
|
||||
, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
|
||||
, ncurses
|
||||
, onlyLibVLC ? false
|
||||
, withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook
|
||||
, jackSupport ? false
|
||||
@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
|
||||
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
|
||||
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
|
||||
fluidsynth wayland wayland-protocols
|
||||
fluidsynth wayland wayland-protocols ncurses
|
||||
] ++ optional (!stdenv.hostPlatform.isAarch64) live555
|
||||
++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
|
||||
++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ])
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
|
||||
source $stdenv/setup
|
||||
|
||||
unpackPhase
|
||||
cd $sourceRoot
|
||||
|
||||
make 8086tiny
|
||||
|
||||
if [ $bios ]; then
|
||||
cd bios_source
|
||||
nasm -f bin bios.asm -o bios
|
||||
cd ..
|
||||
fi
|
||||
|
||||
mkdir -p $out/bin $out/share/$name $out/share/doc/$name/images
|
||||
|
||||
install -m 755 8086tiny $out/bin
|
||||
install -m 644 fd.img $out/share/$name/8086tiny-floppy.img
|
||||
install -m 644 bios_source/bios.asm $out/share/$name/8086tiny-bios-src.asm
|
||||
install -m 644 docs/8086tiny.css $out/share/doc/$name
|
||||
install -m 644 docs/doc.html $out/share/doc/$name
|
||||
for i in docs/images/*.gif
|
||||
do
|
||||
install -m 644 $i $out/share/doc/$name/images
|
||||
done
|
||||
if [ $bios ]; then
|
||||
install -m 644 bios_source/bios $out/share/$name/8086tiny-bios
|
||||
else
|
||||
install -m 644 bios $out/share/$name/8086tiny-bios
|
||||
fi
|
||||
@ -1,43 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, localBios ? true, nasm ? null
|
||||
, sdlSupport ? true, SDL ? null }:
|
||||
|
||||
assert sdlSupport -> (SDL != null);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "8086tiny";
|
||||
version = "1.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adriancable";
|
||||
repo = pname;
|
||||
rev = "c79ca2a34d96931d55ef724c815b289d0767ae3a";
|
||||
sha256 = "00aydg8f28sgy8l3rd2a7jvp56lx3b63hhak43p7g7vjdikv495w";
|
||||
};
|
||||
|
||||
buildInputs = with lib;
|
||||
optionals localBios [ nasm ]
|
||||
++ optionals sdlSupport [ SDL ];
|
||||
|
||||
bios = localBios;
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open-source small 8086 emulator";
|
||||
longDescription = ''
|
||||
8086tiny is a tiny, open-source (MIT), portable (little-endian hosts)
|
||||
Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS
|
||||
Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny
|
||||
emulates a "late 80's era" PC XT-type machine.
|
||||
|
||||
8086tiny is based on an IOCCC 2013 winning entry. In fact that is the
|
||||
"unobfuscated" version :)
|
||||
'';
|
||||
homepage = "https://github.com/adriancable/8086tiny";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
68
pkgs/applications/virtualization/tiny8086/default.nix
Normal file
68
pkgs/applications/virtualization/tiny8086/default.nix
Normal file
@ -0,0 +1,68 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, localBios ? true
|
||||
, nasm
|
||||
, sdlSupport ? true
|
||||
, SDL
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "8086tiny";
|
||||
version = "1.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adriancable";
|
||||
repo = pname;
|
||||
rev = "c79ca2a34d96931d55ef724c815b289d0767ae3a";
|
||||
sha256 = "00aydg8f28sgy8l3rd2a7jvp56lx3b63hhak43p7g7vjdikv495w";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional localBios nasm
|
||||
++ lib.optional sdlSupport SDL;
|
||||
|
||||
makeFlags = [ "8086tiny" ];
|
||||
|
||||
postBuild = lib.optionalString localBios ''
|
||||
(
|
||||
cd bios_source
|
||||
nasm -f bin bios.asm -o bios
|
||||
)
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images
|
||||
|
||||
install -m 755 8086tiny $out/bin
|
||||
install -m 644 fd.img $out/share/8086tiny/8086tiny-floppy.img
|
||||
install -m 644 bios_source/bios.asm $out/share/8086tiny/8086tiny-bios-src.asm
|
||||
install -m 644 docs/8086tiny.css $out/share/doc/8086tiny
|
||||
install -m 644 docs/doc.html $out/share/doc/$name
|
||||
|
||||
for i in docs/images/\*.gif; do
|
||||
install -m 644 $i $out/share/doc/8086tiny/images
|
||||
done
|
||||
|
||||
${if localBios then
|
||||
"install -m 644 bios_source/bios $out/share/8086tiny/8086tiny-bios"
|
||||
else
|
||||
"install -m 644 bios $out/share/8086tiny/8086tiny-bios"}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open-source small 8086 emulator";
|
||||
longDescription = ''
|
||||
8086tiny is a tiny, open-source (MIT), portable (little-endian hosts)
|
||||
Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS
|
||||
Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny
|
||||
emulates a "late 80's era" PC XT-type machine.
|
||||
|
||||
8086tiny is based on an IOCCC 2013 winning entry. In fact that is the
|
||||
"unobfuscated" version :)
|
||||
'';
|
||||
homepage = "https://github.com/adriancable/8086tiny";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,20 +1,22 @@
|
||||
{lib, stdenv, fetchurl, pkg-config, xorgproto}:
|
||||
{ lib, stdenv, fetchurl, pkg-config, xorgproto }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rgb";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2";
|
||||
url = "https://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2";
|
||||
sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [pkg-config];
|
||||
buildInputs = [xorgproto];
|
||||
meta = {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ xorgproto ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "X11 colorname to RGB mapping database";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.linux;
|
||||
homepage = "http://xorg.freedesktop.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.raskin ];
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://xorg.freedesktop.org/";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl, autoreconfHook, gettext
|
||||
, fetchurl, autoreconfHook, gettext, netbsd
|
||||
}:
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
|
||||
# on Darwin, so disable NLS for now.
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls";
|
||||
|
||||
nativeBuildInputs = [ gettext ]
|
||||
nativeBuildInputs =
|
||||
if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ]
|
||||
# Need to regenerate configure script with newer version in order to pass
|
||||
# "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper`
|
||||
# which doesn't work with the bootstrapTools bash, so can only do this
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wolfssl";
|
||||
version = "4.8.0";
|
||||
version = "4.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wolfSSL";
|
||||
@ -11,12 +15,25 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1w9gs9cq2yhj5s3diz3x1l15pgrc1pbm00jccizvcjyibmwyyf2h";
|
||||
};
|
||||
|
||||
# almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed
|
||||
configureFlags = [ "--enable-all" "--enable-reproducible-build" "--enable-pkcs11" "--enable-tls13" "--enable-base64encode" ];
|
||||
# Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed
|
||||
configureFlags = [
|
||||
"--enable-all"
|
||||
"--enable-base64encode"
|
||||
"--enable-pkcs11"
|
||||
"--enable-reproducible-build"
|
||||
"--enable-tls13"
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "doc" "lib" ];
|
||||
outputs = [
|
||||
"dev"
|
||||
"doc"
|
||||
"lib"
|
||||
"out"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# fix recursive cycle:
|
||||
@ -31,6 +48,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.wolfssl.com/";
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ mcmtroffaes ];
|
||||
maintainers = with maintainers; [ fab mcmtroffaes ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,17 +2,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "inotify-simple";
|
||||
version = "1.2.1";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "inotify_simple";
|
||||
inherit version;
|
||||
sha256 = "132craajflksgxxwjawj73nn1ssv8jn58j3k5vvyiq03avbz4sfv";
|
||||
sha256 = "0a61bh087cq5wfrvz680hg5pmykb9gmy26kwyn6ims2akkjgyh44";
|
||||
};
|
||||
|
||||
# The package has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "inotify_simple" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple Python wrapper around inotify";
|
||||
homepage = "https://github.com/chrisjbillington/inotify_simple";
|
||||
|
||||
@ -14,12 +14,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "prawcore";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bde42fad459c4dcfe0f22a18921ef4981ee7cd286ea1de3eb697ba91838c9123";
|
||||
sha256 = "0vgmhjddqxnz5vy70dyqvakak51fg1nk6j3xavkc83d8nzacrwfs";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrituals";
|
||||
version = "0.0.5";
|
||||
version = "0.0.6";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
owner = "milanmeu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-iWJhjAUXkoH3MMJ5PFj2rjIy2e0nn57cRoEF6KMfrQg=";
|
||||
sha256 = "0ynjz7khp67bwxjp580w3zijxr9yn44nmnbvkxjxq9scyb2mjf6g";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, lib
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, tokenize-rt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyupgrade";
|
||||
version = "2.21.0";
|
||||
disabled = isPy27;
|
||||
version = "2.23.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asottile";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-W0zaziTkXReEuLhcd6jEHH/dS1YSZNiWDro+tTH7Ftg=";
|
||||
sha256 = "0w1r9s3kr539vwfb7ld7jmr8q4jkr7jsnk51x50wji7jzs627a8i";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
@ -19,14 +19,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "ttp";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmulyalin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1fmg5gz297bpr550s4vfq6vs7j042bp1mrdmqz1b7nz29c2khbz6";
|
||||
sha256 = "sha256-dYjE+EMfCVHLRAqT1KM7o8VEopJ/TwAEMphYXuj38Wk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1r4z0z2c1drjd4ynpf36dklxs3hq1wdnzh63mk2yk4mmk75xg4mk";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -105,23 +105,23 @@ rec {
|
||||
headers = "0c7qms8vbirblg6z86s19p5l472p3h8lw1rj7ckgnwna4b68vn33";
|
||||
};
|
||||
|
||||
electron_12 = mkElectron "12.0.14" {
|
||||
x86_64-linux = "a75886b5aad27c64232ec0ec47d8c3c1d696ab968007cd8bfa5db87b33e8a5e7";
|
||||
x86_64-darwin = "03b30610f23be9ef835a78e9d4babc52ff32e29ff33c51218b1b8970c3bd6062";
|
||||
i686-linux = "0bb86208173da28250f261b162657c3614b859fb561df54cbd25b566d619c75c";
|
||||
armv7l-linux = "bd743c6eec434aedb80e7e5eef58dfe9f133bc48015d263dc12a119dd1276e32";
|
||||
aarch64-linux = "1f287496cc61c67db25339f8f79d09ace952edeaca47ea664766425ceaebc2a3";
|
||||
aarch64-darwin = "50171b32c927ab5b658da5b4459eca5ddb5df89cc655ae753cc6d02b4ed9b30d";
|
||||
headers = "1znhnily1gl2f58f0ny1fa3yilmm4xn5fcdvqkjh4czv5c12rrbg";
|
||||
electron_12 = mkElectron "12.0.15" {
|
||||
x86_64-linux = "0ba1803ba64f2c155dcfc5452a4b7c034390aaea6197395b6195693b5d0bf605";
|
||||
x86_64-darwin = "7da73a8e3eb82a035f0d720709dbbb44cac0166d52ad4858fca9f3d96e6a32ed";
|
||||
i686-linux = "597f5710e6e55e4fb75c769af6e3c7db1924f6795f417e3ff6b37c4da2ae39fc";
|
||||
armv7l-linux = "01138b036812e5461a5871c2f8912baf0adf316df6597eb5c4fd3df8d41fb95e";
|
||||
aarch64-linux = "fe24cf90e3768cafa9939a0107261a97b4f132f9dec24bf0d1d15b591cdad2d6";
|
||||
aarch64-darwin = "c48323f1fd6cd4ebc67a248a83bd7c460a640bf32613d4fecf6be705f3d6803c";
|
||||
headers = "1gbnjgf1pfbca2czn8j74rafiwmgc64nxi6drzm1b7qy2f6lxrl0";
|
||||
};
|
||||
|
||||
electron_13 = mkElectron "13.1.6" {
|
||||
x86_64-linux = "6f28af0a3ccb20b0d2e4f26ea4698d5b89b81e860cbd40a446c2a8223fdf0101";
|
||||
x86_64-darwin = "e2bde9b3b2ee092b80d18439780c4ecb4620da1ead9fcae00cc603f3a56fda3e";
|
||||
i686-linux = "7c266148fba83c3eb912c5ccd7cd7c24829bc93b380378cba0480b02c38f5d42";
|
||||
armv7l-linux = "8d54ec6babc06b118038d2d4f49cab84ec6d5617c645266b88dd829c02354e77";
|
||||
aarch64-linux = "d24ba0e3f8624ec611fb2e9165c08b227ba799196b0f2787cad8c60f1cc23b5b";
|
||||
aarch64-darwin = "0fa29c1ba89ab906c5ba20216c505b6d8d3fbccdc58cd397146783bddeff1dd4";
|
||||
headers = "122ppxayj1fijzfdpnh3wqyi636dq53j8imyf46ik8fkvgmrw2mz";
|
||||
electron_13 = mkElectron "13.1.7" {
|
||||
x86_64-linux = "0bb38a5e45609a8c46dd6173447a45477651f3c2ea58f724807d79c8e4a8876e";
|
||||
x86_64-darwin = "be8d05a7f853b9e7020c095c3d8075269832ccf821ca9785135884e6bc893df8";
|
||||
i686-linux = "2a1c84ca8fd2a5b10b918bda11c5e546f4b77f85484a32af24ed44d6f877587d";
|
||||
armv7l-linux = "3d4ed4cbd2ea9dd01d5ad09ed5b408762c69b5827be6fdae2e19681f2a159509";
|
||||
aarch64-linux = "68e174bee2a686926ec2da193831aefc16ff8ec43b46e423044918e6d25d5925";
|
||||
aarch64-darwin = "95489cc66c5638d95cde80189a5ae3477ce09c6cfa4c421b1e8bceea94f4dfba";
|
||||
headers = "0zsnkgixch0c6ihg4drdx9a7gsl35wwfsphgiz80mhbw84slvq0n";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "frugal";
|
||||
version = "3.14.6";
|
||||
version = "3.14.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Workiva";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MtQz/9+e2l4FQ1E299KtRzFpX67FynHdsvcMA4CqKUo=";
|
||||
sha256 = "sha256-mCfM2G+FhKDwPg0NqLIAe8F5MRZVJ0tcIY9FBuLpRpE=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-Y7lh+U4FKiht2PgACWSXwGTx+y8aJi22KEhqxHPooCw=";
|
||||
vendorSha256 = "sha256-onbvW3vjuAL+grLfvJR14jxVpoue+YZAeFMOS8ktS1A=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Thrift improved";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, python3, check }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsigrokdecode";
|
||||
@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib python3 libsigrok check ];
|
||||
buildInputs = [ glib python3 ];
|
||||
checkInputs = [ check ];
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Protocol decoding library for the sigrok signal analysis software suite";
|
||||
|
||||
@ -43,7 +43,8 @@ stdenv.mkDerivation {
|
||||
curlOpts = "-r ${dmgRange}";
|
||||
};
|
||||
|
||||
phases = [ "buildPhase" ];
|
||||
dontUnpack = true;
|
||||
dontInstall = true;
|
||||
|
||||
buildInputs = [ cpio xz ];
|
||||
|
||||
|
||||
@ -9,11 +9,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "cef3ce537d213e020af794cecf9de207e2882c375ceda39102eb6fa2580bad8d";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
DESTDIR="$out" ./install
|
||||
find $out \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -70,7 +70,7 @@ assert stdenv.isLinux;
|
||||
|
||||
let
|
||||
# Combine the `features' attribute sets of all the kernel patches.
|
||||
kernelFeatures = lib.fold (x: y: (x.features or {}) // y) ({
|
||||
kernelFeatures = lib.foldr (x: y: (x.features or {}) // y) ({
|
||||
iwlwifi = true;
|
||||
efiBootStub = true;
|
||||
needsCifsUtils = true;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.13.4";
|
||||
version = "5.13.5";
|
||||
suffix = "xanmod1-cacule";
|
||||
in
|
||||
buildLinux (args // rec {
|
||||
@ -12,7 +12,7 @@ buildLinux (args // rec {
|
||||
owner = "xanmod";
|
||||
repo = "linux";
|
||||
rev = modDirVersion;
|
||||
sha256 = "sha256-jSV5dL6myB4WeokYBwoBtQaOfLaUgvseYtReyjLGOhU=";
|
||||
sha256 = "sha256-Vhshu3mNkQ58TEOUBOuF7jLBlablxg/BioUyd96lI5g=";
|
||||
};
|
||||
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
mkdir -p $out/share/dictd/
|
||||
cd $out/share/dictd
|
||||
|
||||
python -O "$convert" "$src"
|
||||
dictzip wiktionary-en.dict
|
||||
echo en_US.UTF-8 > locale
|
||||
@ -1,23 +1,33 @@
|
||||
{ lib, stdenv, fetchurl, python2, dict, glibcLocales }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "20210201";
|
||||
pname = "dict-db-wiktionary";
|
||||
version = "20210201";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
|
||||
sha256 = "0dc34cbadsg0f6lhfcyx0np7zjnlg6837piqhlvnn0b45xnzn0cs";
|
||||
};
|
||||
|
||||
convert = ./wiktionary2dict.py;
|
||||
buildInputs = [ python2 dict glibcLocales ];
|
||||
builder = ./builder.sh;
|
||||
# script in nixpkgs does not support python2
|
||||
nativeBuildInputs = [ python2 dict glibcLocales ];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/dictd/
|
||||
cd $out/share/dictd
|
||||
|
||||
${python2.interpreter} -O ${./wiktionary2dict.py} "${src}"
|
||||
dictzip wiktionary-en.dict
|
||||
echo en_US.UTF-8 > locale
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "DICT version of English Wiktionary";
|
||||
homepage = "http://en.wiktionary.org/";
|
||||
homepage = "https://en.wiktionary.org/";
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
platforms = platforms.all;
|
||||
license = with licenses; [ cc-by-sa-30 fdl11Plus ];
|
||||
|
||||
@ -23,9 +23,7 @@ let
|
||||
++ lib.optional withLDAP "-lldap");
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
pname = "postfix";
|
||||
|
||||
version = "3.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib
|
||||
, python38
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
@ -10,26 +10,19 @@
|
||||
# $ tts-server --model_name tts_models/en/ljspeech/glow-tts --vocoder_name vocoder_models/universal/libri-tts/fullband-melgan
|
||||
#
|
||||
# If you upgrade from an old version you may have to delete old models from ~/.local/share/tts
|
||||
# Also note that your tts version might not support all available models so check:
|
||||
# https://github.com/coqui-ai/TTS/releases/tag/v0.1.2
|
||||
#
|
||||
# For now, for deployment check the systemd unit in the pull request:
|
||||
# https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136
|
||||
|
||||
let
|
||||
python3 = python38;
|
||||
in python3.pkgs.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "tts";
|
||||
version = "0.1.2";
|
||||
|
||||
# https://github.com/coqui-ai/TTS/issues/570
|
||||
disabled = python3.pythonAtLeast "3.9";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coqui-ai";
|
||||
repo = "TTS";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qgiaqn7iqxyf54qgnpmli69nw9s3gmi9qv874jsgycykc10hjg4";
|
||||
sha256 = "0akhiaaqz53bf5zyps3vgjifmgh5wvcc9r4lrq9hmj3dds03vkjq";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bdf2psf";
|
||||
version = "1.204";
|
||||
version = "1.205";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
|
||||
sha256 = "sha256-oyBkt52mWM2FiaM++s5Uoe7Wd0v1oLM7HjWKDjIonGE=";
|
||||
sha256 = "sha256-elFmsqtndo4ReR4IoyhC56k0PMqy5QrUxOGUQLGeu0I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "disfetch";
|
||||
version = "1.24";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "llathasa-veleth";
|
||||
repo = "disfetch";
|
||||
rev = version;
|
||||
sha256 = "sha256-Uoc5xSyLXXEqdyYn71NK8c8A/1wQ6djYn/HHJwGg5vc=";
|
||||
sha256 = "sha256-93nh1MDE2YO53lH2jDdKxgHh6v2KkAFo2Oyg+6ZpD+M=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -1,4 +1,12 @@
|
||||
{ mkDerivation, lib, fetchFromGitHub, qtbase, cmake, qttools, qtsvg }:
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qtbase
|
||||
, cmake
|
||||
, qttools
|
||||
, qtsvg
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "flameshot";
|
||||
@ -11,6 +19,12 @@ mkDerivation rec {
|
||||
sha256 = "1m0mx8qhy9ycsqh5dj6c7mwwpbhqxlds31dqdxxk0krwl750smi2";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake qttools qtsvg ];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
|
||||
39
pkgs/tools/misc/interactsh/default.nix
Normal file
39
pkgs/tools/misc/interactsh/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "interactsh";
|
||||
version = "0.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0a3jfdnhh5idf2j14gppjxmdhqnyymg42z7nlnbr2zaigkvgz487";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-hLnxtARre+7HqEtU7bB9SvEieOaAoBM6VFUnKvLCD60=";
|
||||
|
||||
modRoot = ".";
|
||||
subPackages = [
|
||||
"cmd/interactsh-client"
|
||||
"cmd/interactsh-server"
|
||||
];
|
||||
|
||||
# Test files are not part of the release tarball
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An Out of bounds interaction gathering server and client library";
|
||||
longDescription = ''
|
||||
Interactsh is an Open-Source Solution for Out of band Data Extraction,
|
||||
A tool designed to detect bugs that cause external interactions,
|
||||
For example - Blind SQLi, Blind CMDi, SSRF, etc.
|
||||
'';
|
||||
homepage = "https://github.com/projectdiscovery/interactsh";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hanemile ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-07-24";
|
||||
version = "2021-07-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-UMajZExQjrbXon/tNYt+xp9LM7QRVXefGHDYuu949AQ=";
|
||||
sha256 = "077y7rzvmv0kzwrhm592fsjd2lv839b5wzf59vq9cd3j313bdaab";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fido2luks";
|
||||
version = "0.2.17";
|
||||
version = "0.2.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shimunn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-rrtPMCgp2Xe8LXzFN57rzay2kyPaLT1+2m1NZQ9EsW4=";
|
||||
sha256 = "sha256-o21KdsAE9KznobdMMKfVmVnENsLW3cMZjssnrsoN+KY=";
|
||||
};
|
||||
|
||||
buildInputs = [ cryptsetup ];
|
||||
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-5CzQuzmKuEi4KTR1jNh4avwqA3qYzTj+rV/zbIeUjAM=";
|
||||
cargoSha256 = "sha256-8JFe3mivf2Ewu1nLMugeeK+9ZXAGPHaqCyKfWfwLOc8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fulcio";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-+HWzhg+LTKpr9VJ9mzQghwOuGgp3EBb4/zltaqp0zHw=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MvLQMGPyJYqYUljLqsr+qJeeYnxdH9aNGkWpDRvOeh8=";
|
||||
};
|
||||
vendorSha256 = "sha256-1tR1vUm5eFBS93kELQoKWEyFlfMF28GBI8VEHxTyeM4=";
|
||||
vendorSha256 = "sha256-pRL0et+UOi/tzuQz/Q7UmSA+pVhLJYR8lG8NAbPN9PU=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
@ -18,22 +18,23 @@ buildGoModule rec {
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd fulcio \
|
||||
--bash <($out/bin/fulcio completion bash) \
|
||||
--fish <($out/bin/fulcio completion fish) \
|
||||
--zsh <($out/bin/fulcio completion zsh)
|
||||
mv $out/bin/fulcio $out/bin/fulcio-server
|
||||
installShellCompletion --cmd fulcio-server \
|
||||
--bash <($out/bin/fulcio-server completion bash) \
|
||||
--fish <($out/bin/fulcio-server completion fish) \
|
||||
--zsh <($out/bin/fulcio-server completion zsh)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/fulcio --help
|
||||
$out/bin/fulcio-server --help
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sigstore/fulcio";
|
||||
changelog = "https://github.com/sigstore/fulcio/releases/tag/${version}";
|
||||
changelog = "https://github.com/sigstore/fulcio/releases/tag/v${version}";
|
||||
description = "A Root-CA for code signing certs - issuing certificates based on an OIDC email address";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lesuisse jk ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "angle-grinder";
|
||||
version = "0.16";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcoh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cGYhGcNalmc/Gr7mY1Fycs8cZYaIy622DFIL64LT+gE=";
|
||||
sha256 = "sha256-jG3jHFqFOrIT/e5oyLOEckw5C3LIs7amFAa4QDEI/EY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-LJ7zudUeso28zJqLhqWGWqf+L4o75rJjtTx9BpWKRIE=";
|
||||
cargoSha256 = "sha256-Rkex+fnnacV+DCRpX3Zh9J3vGuG4QfFhFezHTs33peY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Slice and dice logs on the command line";
|
||||
|
||||
@ -77,7 +77,7 @@ rec {
|
||||
in if fn != null then [{key = fn;}] ++ xs
|
||||
else xs;
|
||||
|
||||
in pkgs.lib.fold foundDeps [] deps;
|
||||
in pkgs.lib.foldr foundDeps [] deps;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -2931,6 +2931,8 @@ in
|
||||
|
||||
inklecate = callPackage ../development/compilers/inklecate {};
|
||||
|
||||
interactsh = callPackage ../tools/misc/interactsh { };
|
||||
|
||||
interlock = callPackage ../servers/interlock {};
|
||||
|
||||
iotools = callPackage ../tools/misc/iotools { };
|
||||
@ -3906,6 +3908,8 @@ in
|
||||
qtbase = qt5.qtbase;
|
||||
};
|
||||
|
||||
coregarage = libsForQt5.callPackage ../applications/misc/coregarage { };
|
||||
|
||||
c14 = callPackage ../applications/networking/c14 { };
|
||||
|
||||
corehunt = libsForQt5.callPackage ../applications/misc/corehunt { };
|
||||
@ -9359,7 +9363,7 @@ in
|
||||
|
||||
tinycbor = callPackage ../development/libraries/tinycbor { };
|
||||
|
||||
tiny8086 = callPackage ../applications/virtualization/8086tiny { };
|
||||
tiny8086 = callPackage ../applications/virtualization/tiny8086 { };
|
||||
|
||||
tinyemu = callPackage ../applications/virtualization/tinyemu { };
|
||||
|
||||
@ -13459,7 +13463,9 @@ in
|
||||
sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3";
|
||||
};
|
||||
|
||||
libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };
|
||||
libsigrokdecode = callPackage ../development/tools/libsigrokdecode {
|
||||
python3 = python38;
|
||||
};
|
||||
|
||||
# special forks used for dsview
|
||||
libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user