mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge master into haskell-updates
This commit is contained in:
commit
c1e7f2924f
|
@ -66,18 +66,13 @@ out/html/index.html: doc-support/result manual-full.xml style.css highlightjs
|
||||||
cp doc-support/result/xsl/docbook/images/callouts/*.svg out/html/images/callouts/
|
cp doc-support/result/xsl/docbook/images/callouts/*.svg out/html/images/callouts/
|
||||||
chmod u+w -R out/html/
|
chmod u+w -R out/html/
|
||||||
|
|
||||||
out/epub/manual.epub: manual-full.xml
|
out/epub/manual.epub: epub.xml
|
||||||
mkdir -p out/epub/scratch
|
mkdir -p out/epub/scratch
|
||||||
xsltproc --nonet \
|
xsltproc --nonet \
|
||||||
--output out/epub/scratch/ \
|
--output out/epub/scratch/ \
|
||||||
doc-support/result/epub.xsl \
|
doc-support/result/epub.xsl \
|
||||||
./manual-full.xml
|
./epub.xml
|
||||||
|
|
||||||
cp -r $(pandoc_media_dir) out/epub/scratch/OEBPS
|
|
||||||
cp ./overrides.css out/epub/scratch/OEBPS
|
|
||||||
cp ./style.css out/epub/scratch/OEBPS
|
|
||||||
mkdir -p out/epub/scratch/OEBPS/images/callouts/
|
|
||||||
cp doc-support/result/xsl/docbook/images/callouts/*.svg out/epub/scratch/OEBPS/images/callouts/
|
|
||||||
echo "application/epub+zip" > mimetype
|
echo "application/epub+zip" > mimetype
|
||||||
zip -0Xq "out/epub/manual.epub" mimetype
|
zip -0Xq "out/epub/manual.epub" mimetype
|
||||||
rm mimetype
|
rm mimetype
|
||||||
|
|
|
@ -20,7 +20,33 @@ in pkgs.stdenv.mkDerivation {
|
||||||
ln -s ${doc-support} ./doc-support/result
|
ln -s ${doc-support} ./doc-support/result
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
epub = ''
|
||||||
|
<book xmlns="http://docbook.org/ns/docbook"
|
||||||
|
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
|
version="5.0"
|
||||||
|
xml:id="nixpkgs-manual">
|
||||||
|
<info>
|
||||||
|
<title>Nixpkgs Manual</title>
|
||||||
|
<subtitle>Version ${pkgs.lib.version}</subtitle>
|
||||||
|
</info>
|
||||||
|
<chapter>
|
||||||
|
<title>Temporarily unavailable</title>
|
||||||
|
<para>
|
||||||
|
The Nixpkgs manual is currently not available in EPUB format,
|
||||||
|
please use the <link xlink:href="https://nixos.org/nixpkgs/manual">HTML manual</link>
|
||||||
|
instead.
|
||||||
|
</para>
|
||||||
|
<para>
|
||||||
|
If you've used the EPUB manual in the past and it has been useful to you, please
|
||||||
|
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/237234">let us know</link>.
|
||||||
|
</para>
|
||||||
|
</chapter>
|
||||||
|
</book>
|
||||||
|
'';
|
||||||
|
passAsFile = [ "epub" ];
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
|
cp $epubPath epub.xml
|
||||||
make -j$NIX_BUILD_CORES render-md
|
make -j$NIX_BUILD_CORES render-md
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -995,7 +995,7 @@ and in this case the `python3` interpreter is automatically used.
|
||||||
### Interpreters {#interpreters}
|
### Interpreters {#interpreters}
|
||||||
|
|
||||||
Versions 2.7, 3.8, 3.9, 3.10 and 3.11 of the CPython interpreter are available
|
Versions 2.7, 3.8, 3.9, 3.10 and 3.11 of the CPython interpreter are available
|
||||||
as respectively `python27`, python38`, `python39`, `python310` and `python311`.
|
as respectively `python27`, `python38`, `python39`, `python310` and `python311`.
|
||||||
The aliases `python2` and `python3` correspond to respectively `python27` and
|
The aliases `python2` and `python3` correspond to respectively `python27` and
|
||||||
`python310`. The attribute `python` maps to `python2`. The PyPy interpreters
|
`python310`. The attribute `python` maps to `python2`. The PyPy interpreters
|
||||||
compatible with Python 2.7 and 3 are available as `pypy27` and `pypy3`, with
|
compatible with Python 2.7 and 3 are available as `pypy27` and `pypy3`, with
|
||||||
|
|
|
@ -9220,6 +9220,12 @@
|
||||||
fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49";
|
fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49";
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
|
liyangau = {
|
||||||
|
email = "d@aufomm.com";
|
||||||
|
github = "liyangau";
|
||||||
|
githubId = 71299093;
|
||||||
|
name = "Li Yang";
|
||||||
|
};
|
||||||
lizelive = {
|
lizelive = {
|
||||||
email = "nixpkgs@lize.live";
|
email = "nixpkgs@lize.live";
|
||||||
github = "lizelive";
|
github = "lizelive";
|
||||||
|
@ -17853,6 +17859,12 @@
|
||||||
githubId = 2189609;
|
githubId = 2189609;
|
||||||
name = "Zhaofeng Li";
|
name = "Zhaofeng Li";
|
||||||
};
|
};
|
||||||
|
zi3m5f = {
|
||||||
|
name = "zi3m5f";
|
||||||
|
email = "k7n3o3a6f@mozmail.com";
|
||||||
|
github = "zi3m5f";
|
||||||
|
githubId = 113244000;
|
||||||
|
};
|
||||||
ziguana = {
|
ziguana = {
|
||||||
name = "Zig Uana";
|
name = "Zig Uana";
|
||||||
email = "git@ziguana.dev";
|
email = "git@ziguana.dev";
|
||||||
|
|
|
@ -267,19 +267,41 @@ in rec {
|
||||||
|
|
||||||
manualEpub = runCommand "nixos-manual-epub"
|
manualEpub = runCommand "nixos-manual-epub"
|
||||||
{ nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin buildPackages.zip ];
|
{ nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin buildPackages.zip ];
|
||||||
|
doc = ''
|
||||||
|
<book xmlns="http://docbook.org/ns/docbook"
|
||||||
|
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
|
version="5.0"
|
||||||
|
xml:id="book-nixos-manual">
|
||||||
|
<info>
|
||||||
|
<title>NixOS Manual</title>
|
||||||
|
<subtitle>Version ${lib.version}</subtitle>
|
||||||
|
</info>
|
||||||
|
<chapter>
|
||||||
|
<title>Temporarily unavailable</title>
|
||||||
|
<para>
|
||||||
|
The NixOS manual is currently not available in EPUB format,
|
||||||
|
please use the <link xlink:href="https://nixos.org/nixos/manual">HTML manual</link>
|
||||||
|
instead.
|
||||||
|
</para>
|
||||||
|
<para>
|
||||||
|
If you've used the EPUB manual in the past and it has been useful to you, please
|
||||||
|
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/237234">let us know</link>.
|
||||||
|
</para>
|
||||||
|
</chapter>
|
||||||
|
</book>
|
||||||
|
'';
|
||||||
|
passAsFile = [ "doc" ];
|
||||||
}
|
}
|
||||||
''
|
''
|
||||||
# Generate the epub manual.
|
# Generate the epub manual.
|
||||||
dst=$out/share/doc/nixos
|
dst=$out/share/doc/nixos
|
||||||
|
|
||||||
xsltproc \
|
xsltproc \
|
||||||
${manualXsltprocOptions} \
|
--param chapter.autolabel 0 \
|
||||||
--nonet --xinclude --output $dst/epub/ \
|
--nonet --xinclude --output $dst/epub/ \
|
||||||
${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \
|
${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \
|
||||||
${manual-combined}/manual-combined.xml
|
$docPath
|
||||||
|
|
||||||
mkdir -p $dst/epub/OEBPS/images/callouts
|
|
||||||
cp -r ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */
|
|
||||||
echo "application/epub+zip" > mimetype
|
echo "application/epub+zip" > mimetype
|
||||||
manual="$dst/nixos-manual.epub"
|
manual="$dst/nixos-manual.epub"
|
||||||
zip -0Xq "$manual" mimetype
|
zip -0Xq "$manual" mimetype
|
||||||
|
|
|
@ -30,6 +30,8 @@
|
||||||
|
|
||||||
- `himalaya` has been updated to `0.8.0`, which drops the native TLS support (in favor of Rustls) and add OAuth 2.0 support. See the [release note](https://github.com/soywod/himalaya/releases/tag/v0.8.0) for more details.
|
- `himalaya` has been updated to `0.8.0`, which drops the native TLS support (in favor of Rustls) and add OAuth 2.0 support. See the [release note](https://github.com/soywod/himalaya/releases/tag/v0.8.0) for more details.
|
||||||
|
|
||||||
|
- The [services.caddy.acmeCA](#opt-services.caddy.acmeCA) option now defaults to `null` instead of `"https://acme-v02.api.letsencrypt.org/directory"`, to use all of Caddy's default ACME CAs and enable Caddy's automatic issuer fallback feature by default, as recommended by upstream.
|
||||||
|
|
||||||
- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
|
- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
|
||||||
|
|
||||||
- `fileSystems.<name>.autoFormat` now uses `systemd-makefs`, which does not accept formatting options. Therefore, `fileSystems.<name>.formatOptions` has been removed.
|
- `fileSystems.<name>.autoFormat` now uses `systemd-makefs`, which does not accept formatting options. Therefore, `fileSystems.<name>.formatOptions` has been removed.
|
||||||
|
|
|
@ -85,7 +85,7 @@ sub debug {
|
||||||
|
|
||||||
|
|
||||||
# nixpkgs.system
|
# nixpkgs.system
|
||||||
push @attrs, "nixpkgs.hostPlatform = lib.mkDefault \"@system@\";";
|
push @attrs, "nixpkgs.hostPlatform = lib.mkDefault \"@hostPlatformSystem@\";";
|
||||||
|
|
||||||
|
|
||||||
my $cpuinfo = read_file "/proc/cpuinfo";
|
my $cpuinfo = read_file "/proc/cpuinfo";
|
||||||
|
|
|
@ -35,7 +35,7 @@ let
|
||||||
name = "nixos-generate-config";
|
name = "nixos-generate-config";
|
||||||
src = ./nixos-generate-config.pl;
|
src = ./nixos-generate-config.pl;
|
||||||
perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl";
|
perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl";
|
||||||
system = pkgs.stdenv.hostPlatform.system;
|
hostPlatformSystem = pkgs.stdenv.hostPlatform.system;
|
||||||
detectvirt = "${config.systemd.package}/bin/systemd-detect-virt";
|
detectvirt = "${config.systemd.package}/bin/systemd-detect-virt";
|
||||||
btrfs = "${pkgs.btrfs-progs}/bin/btrfs";
|
btrfs = "${pkgs.btrfs-progs}/bin/btrfs";
|
||||||
inherit (config.system.nixos-generate-config) configuration desktopConfiguration;
|
inherit (config.system.nixos-generate-config) configuration desktopConfiguration;
|
||||||
|
|
|
@ -328,6 +328,8 @@
|
||||||
./services/audio/spotifyd.nix
|
./services/audio/spotifyd.nix
|
||||||
./services/audio/squeezelite.nix
|
./services/audio/squeezelite.nix
|
||||||
./services/audio/tts.nix
|
./services/audio/tts.nix
|
||||||
|
./services/audio/wyoming/faster-whisper.nix
|
||||||
|
./services/audio/wyoming/piper.nix
|
||||||
./services/audio/ympd.nix
|
./services/audio/ympd.nix
|
||||||
./services/backup/automysqlbackup.nix
|
./services/backup/automysqlbackup.nix
|
||||||
./services/backup/bacula.nix
|
./services/backup/bacula.nix
|
||||||
|
|
186
nixos/modules/services/audio/wyoming/faster-whisper.nix
Normal file
186
nixos/modules/services/audio/wyoming/faster-whisper.nix
Normal file
|
@ -0,0 +1,186 @@
|
||||||
|
{ config
|
||||||
|
, lib
|
||||||
|
, pkgs
|
||||||
|
, ...
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.wyoming.faster-whisper;
|
||||||
|
|
||||||
|
inherit (lib)
|
||||||
|
escapeShellArgs
|
||||||
|
mkOption
|
||||||
|
mdDoc
|
||||||
|
mkEnableOption
|
||||||
|
mkPackageOptionMD
|
||||||
|
types
|
||||||
|
;
|
||||||
|
|
||||||
|
inherit (builtins)
|
||||||
|
toString
|
||||||
|
;
|
||||||
|
|
||||||
|
in
|
||||||
|
|
||||||
|
{
|
||||||
|
options.services.wyoming.faster-whisper = with types; {
|
||||||
|
package = mkPackageOptionMD pkgs "wyoming-faster-whisper" { };
|
||||||
|
|
||||||
|
servers = mkOption {
|
||||||
|
default = {};
|
||||||
|
description = mdDoc ''
|
||||||
|
Attribute set of faster-whisper instances to spawn.
|
||||||
|
'';
|
||||||
|
type = types.attrsOf (types.submodule (
|
||||||
|
{ ... }: {
|
||||||
|
options = {
|
||||||
|
enable = mkEnableOption (mdDoc "Wyoming faster-whisper server");
|
||||||
|
|
||||||
|
model = mkOption {
|
||||||
|
type = enum [
|
||||||
|
"tiny"
|
||||||
|
"tiny-int8"
|
||||||
|
"base"
|
||||||
|
"base-int8"
|
||||||
|
"small"
|
||||||
|
"small-int8"
|
||||||
|
"medium"
|
||||||
|
"medium-int8"
|
||||||
|
];
|
||||||
|
default = "tiny-int8";
|
||||||
|
example = "medium-int8";
|
||||||
|
description = mdDoc ''
|
||||||
|
Name of the voice model to use.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
uri = mkOption {
|
||||||
|
type = strMatching "^(tcp|unix)://.*$";
|
||||||
|
example = "tcp://0.0.0.0:10300";
|
||||||
|
description = mdDoc ''
|
||||||
|
URI to bind the wyoming server to.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
device = mkOption {
|
||||||
|
# https://opennmt.net/CTranslate2/python/ctranslate2.models.Whisper.html#
|
||||||
|
type = types.enum [
|
||||||
|
"cpu"
|
||||||
|
"cuda"
|
||||||
|
"auto"
|
||||||
|
];
|
||||||
|
default = "cpu";
|
||||||
|
description = mdDoc ''
|
||||||
|
Id of a speaker in a multi-speaker model.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
language = mkOption {
|
||||||
|
type = enum [
|
||||||
|
# https://github.com/home-assistant/addons/blob/master/whisper/config.yaml#L20
|
||||||
|
"auto" "af" "am" "ar" "as" "az" "ba" "be" "bg" "bn" "bo" "br" "bs" "ca" "cs" "cy" "da" "de" "el" "en" "es" "et" "eu" "fa" "fi" "fo" "fr" "gl" "gu" "ha" "haw" "he" "hi" "hr" "ht" "hu" "hy" "id" "is" "it" "ja" "jw" "ka" "kk" "km" "kn" "ko" "la" "lb" "ln" "lo" "lt" "lv" "mg" "mi" "mk" "ml" "mn" "mr" "ms" "mt" "my" "ne" "nl" "nn" "no" "oc" "pa" "pl" "ps" "pt" "ro" "ru" "sa" "sd" "si" "sk" "sl" "sn" "so" "sq" "sr" "su" "sv" "sw" "ta" "te" "tg" "th" "tk" "tl" "tr" "tt" "uk" "ur" "uz" "vi" "yi" "yo" "zh"
|
||||||
|
];
|
||||||
|
example = "en";
|
||||||
|
description = mdDoc ''
|
||||||
|
The language used to to parse words and sentences.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
beamSize = mkOption {
|
||||||
|
type = ints.unsigned;
|
||||||
|
default = 1;
|
||||||
|
example = 5;
|
||||||
|
description = mdDoc ''
|
||||||
|
The number of beams to use in beam search.
|
||||||
|
'';
|
||||||
|
apply = toString;
|
||||||
|
};
|
||||||
|
|
||||||
|
extraArgs = mkOption {
|
||||||
|
type = listOf str;
|
||||||
|
default = [ ];
|
||||||
|
description = mdDoc ''
|
||||||
|
Extra arguments to pass to the server commandline.
|
||||||
|
'';
|
||||||
|
apply = escapeShellArgs;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
));
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = let
|
||||||
|
inherit (lib)
|
||||||
|
mapAttrs'
|
||||||
|
mkIf
|
||||||
|
nameValuePair
|
||||||
|
;
|
||||||
|
in mkIf (cfg.servers != {}) {
|
||||||
|
systemd.services = mapAttrs' (server: options:
|
||||||
|
nameValuePair "wyoming-faster-whisper-${server}" {
|
||||||
|
description = "Wyoming faster-whisper server instance ${server}";
|
||||||
|
after = [
|
||||||
|
"network-online.target"
|
||||||
|
];
|
||||||
|
wantedBy = [
|
||||||
|
"multi-user.target"
|
||||||
|
];
|
||||||
|
serviceConfig = {
|
||||||
|
DynamicUser = true;
|
||||||
|
User = "wyoming-faster-whisper";
|
||||||
|
StateDirectory = "wyoming/faster-whisper";
|
||||||
|
# https://github.com/home-assistant/addons/blob/master/whisper/rootfs/etc/s6-overlay/s6-rc.d/whisper/run
|
||||||
|
ExecStart = ''
|
||||||
|
${cfg.package}/bin/wyoming-faster-whisper \
|
||||||
|
--data-dir $STATE_DIRECTORY \
|
||||||
|
--download-dir $STATE_DIRECTORY \
|
||||||
|
--uri ${options.uri} \
|
||||||
|
--model ${options.model} \
|
||||||
|
--language ${options.language} \
|
||||||
|
--beam-size ${options.beamSize} ${options.extraArgs}
|
||||||
|
'';
|
||||||
|
CapabilityBoundingSet = "";
|
||||||
|
DeviceAllow = if builtins.elem options.device [ "cuda" "auto" ] then [
|
||||||
|
# https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf
|
||||||
|
"/dev/nvidia1"
|
||||||
|
"/dev/nvidia2"
|
||||||
|
"/dev/nvidia3"
|
||||||
|
"/dev/nvidia4"
|
||||||
|
"/dev/nvidia-caps/nvidia-cap1"
|
||||||
|
"/dev/nvidia-caps/nvidia-cap2"
|
||||||
|
"/dev/nvidiactl"
|
||||||
|
"/dev/nvidia-modeset"
|
||||||
|
"/dev/nvidia-uvm"
|
||||||
|
"/dev/nvidia-uvm-tools"
|
||||||
|
] else "";
|
||||||
|
DevicePolicy = "closed";
|
||||||
|
LockPersonality = true;
|
||||||
|
MemoryDenyWriteExecute = true;
|
||||||
|
PrivateDevices = true;
|
||||||
|
PrivateUsers = true;
|
||||||
|
ProtectHome = true;
|
||||||
|
ProtectHostname = true;
|
||||||
|
ProtectKernelLogs = true;
|
||||||
|
ProtectKernelModules = true;
|
||||||
|
ProtectKernelTunables = true;
|
||||||
|
ProtectControlGroups = true;
|
||||||
|
ProtectProc = "invisible";
|
||||||
|
ProcSubset = "pid";
|
||||||
|
RestrictAddressFamilies = [
|
||||||
|
"AF_INET"
|
||||||
|
"AF_INET6"
|
||||||
|
"AF_UNIX"
|
||||||
|
];
|
||||||
|
RestrictNamespaces = true;
|
||||||
|
RestrictRealtime = true;
|
||||||
|
SystemCallArchitectures = "native";
|
||||||
|
SystemCallFilter = [
|
||||||
|
"@system-service"
|
||||||
|
"~@privileged"
|
||||||
|
];
|
||||||
|
UMask = "0077";
|
||||||
|
};
|
||||||
|
}) cfg.servers;
|
||||||
|
};
|
||||||
|
}
|
174
nixos/modules/services/audio/wyoming/piper.nix
Normal file
174
nixos/modules/services/audio/wyoming/piper.nix
Normal file
|
@ -0,0 +1,174 @@
|
||||||
|
{ config
|
||||||
|
, lib
|
||||||
|
, pkgs
|
||||||
|
, ...
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.wyoming.piper;
|
||||||
|
|
||||||
|
inherit (lib)
|
||||||
|
escapeShellArgs
|
||||||
|
mkOption
|
||||||
|
mdDoc
|
||||||
|
mkEnableOption
|
||||||
|
mkPackageOptionMD
|
||||||
|
types
|
||||||
|
;
|
||||||
|
|
||||||
|
inherit (builtins)
|
||||||
|
toString
|
||||||
|
;
|
||||||
|
|
||||||
|
in
|
||||||
|
|
||||||
|
{
|
||||||
|
meta.buildDocsInSandbox = false;
|
||||||
|
|
||||||
|
options.services.wyoming.piper = with types; {
|
||||||
|
package = mkPackageOptionMD pkgs "wyoming-piper" { };
|
||||||
|
|
||||||
|
servers = mkOption {
|
||||||
|
default = {};
|
||||||
|
description = mdDoc ''
|
||||||
|
Attribute set of piper instances to spawn.
|
||||||
|
'';
|
||||||
|
type = types.attrsOf (types.submodule (
|
||||||
|
{ ... }: {
|
||||||
|
options = {
|
||||||
|
enable = mkEnableOption (mdDoc "Wyoming Piper server");
|
||||||
|
|
||||||
|
piper = mkPackageOptionMD pkgs "piper-tts" { };
|
||||||
|
|
||||||
|
voice = mkOption {
|
||||||
|
type = str;
|
||||||
|
example = "en-us-ryan-medium";
|
||||||
|
description = mdDoc ''
|
||||||
|
Name of the voice model to use. See the following website for samples:
|
||||||
|
https://rhasspy.github.io/piper-samples/
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
uri = mkOption {
|
||||||
|
type = strMatching "^(tcp|unix)://.*$";
|
||||||
|
example = "tcp://0.0.0.0:10200";
|
||||||
|
description = mdDoc ''
|
||||||
|
URI to bind the wyoming server to.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
speaker = mkOption {
|
||||||
|
type = ints.unsigned;
|
||||||
|
default = 0;
|
||||||
|
description = mdDoc ''
|
||||||
|
ID of a specific speaker in a multi-speaker model.
|
||||||
|
'';
|
||||||
|
apply = toString;
|
||||||
|
};
|
||||||
|
|
||||||
|
noiseScale = mkOption {
|
||||||
|
type = float;
|
||||||
|
default = 0.667;
|
||||||
|
description = mdDoc ''
|
||||||
|
Generator noise value.
|
||||||
|
'';
|
||||||
|
apply = toString;
|
||||||
|
};
|
||||||
|
|
||||||
|
noiseWidth = mkOption {
|
||||||
|
type = float;
|
||||||
|
default = 0.333;
|
||||||
|
description = mdDoc ''
|
||||||
|
Phoneme width noise value.
|
||||||
|
'';
|
||||||
|
apply = toString;
|
||||||
|
};
|
||||||
|
|
||||||
|
lengthScale = mkOption {
|
||||||
|
type = float;
|
||||||
|
default = 1.0;
|
||||||
|
description = mdDoc ''
|
||||||
|
Phoneme length value.
|
||||||
|
'';
|
||||||
|
apply = toString;
|
||||||
|
};
|
||||||
|
|
||||||
|
extraArgs = mkOption {
|
||||||
|
type = listOf str;
|
||||||
|
default = [ ];
|
||||||
|
description = mdDoc ''
|
||||||
|
Extra arguments to pass to the server commandline.
|
||||||
|
'';
|
||||||
|
apply = escapeShellArgs;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
));
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = let
|
||||||
|
inherit (lib)
|
||||||
|
mapAttrs'
|
||||||
|
mkIf
|
||||||
|
nameValuePair
|
||||||
|
;
|
||||||
|
in mkIf (cfg.servers != {}) {
|
||||||
|
systemd.services = mapAttrs' (server: options:
|
||||||
|
nameValuePair "wyoming-piper-${server}" {
|
||||||
|
description = "Wyoming Piper server instance ${server}";
|
||||||
|
after = [
|
||||||
|
"network-online.target"
|
||||||
|
];
|
||||||
|
wantedBy = [
|
||||||
|
"multi-user.target"
|
||||||
|
];
|
||||||
|
serviceConfig = {
|
||||||
|
DynamicUser = true;
|
||||||
|
User = "wyoming-piper";
|
||||||
|
StateDirectory = "wyoming/piper";
|
||||||
|
# https://github.com/home-assistant/addons/blob/master/piper/rootfs/etc/s6-overlay/s6-rc.d/piper/run
|
||||||
|
ExecStart = ''
|
||||||
|
${cfg.package}/bin/wyoming-piper \
|
||||||
|
--data-dir $STATE_DIRECTORY \
|
||||||
|
--download-dir $STATE_DIRECTORY \
|
||||||
|
--uri ${options.uri} \
|
||||||
|
--piper ${options.piper}/bin/piper \
|
||||||
|
--voice ${options.voice} \
|
||||||
|
--speaker ${options.speaker} \
|
||||||
|
--length-scale ${options.lengthScale} \
|
||||||
|
--noise-scale ${options.noiseScale} \
|
||||||
|
--noise-w ${options.noiseWidth} ${options.extraArgs}
|
||||||
|
'';
|
||||||
|
CapabilityBoundingSet = "";
|
||||||
|
DeviceAllow = "";
|
||||||
|
DevicePolicy = "closed";
|
||||||
|
LockPersonality = true;
|
||||||
|
MemoryDenyWriteExecute = true;
|
||||||
|
PrivateDevices = true;
|
||||||
|
PrivateUsers = true;
|
||||||
|
ProtectHome = true;
|
||||||
|
ProtectHostname = true;
|
||||||
|
ProtectKernelLogs = true;
|
||||||
|
ProtectKernelModules = true;
|
||||||
|
ProtectKernelTunables = true;
|
||||||
|
ProtectControlGroups = true;
|
||||||
|
ProtectProc = "invisible";
|
||||||
|
ProcSubset = "pid";
|
||||||
|
RestrictAddressFamilies = [
|
||||||
|
"AF_INET"
|
||||||
|
"AF_INET6"
|
||||||
|
"AF_UNIX"
|
||||||
|
];
|
||||||
|
RestrictNamespaces = true;
|
||||||
|
RestrictRealtime = true;
|
||||||
|
SystemCallArchitectures = "native";
|
||||||
|
SystemCallFilter = [
|
||||||
|
"@system-service"
|
||||||
|
"~@privileged"
|
||||||
|
];
|
||||||
|
UMask = "0077";
|
||||||
|
};
|
||||||
|
}) cfg.servers;
|
||||||
|
};
|
||||||
|
}
|
|
@ -648,7 +648,7 @@ in
|
||||||
'';
|
'';
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
Configuration for Nix, see
|
Configuration for Nix, see
|
||||||
<https://nixos.org/manual/nix/stable/#sec-conf-file> or
|
<https://nixos.org/manual/nix/stable/command-ref/conf-file.html> or
|
||||||
{manpage}`nix.conf(5)` for available options.
|
{manpage}`nix.conf(5)` for available options.
|
||||||
The value declared here will be translated directly to the key-value pairs Nix expects.
|
The value declared here will be translated directly to the key-value pairs Nix expects.
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
caddy.enable = mkEnableOption (lib.mdDoc "exposing lemmy with the caddy reverse proxy");
|
caddy.enable = mkEnableOption (lib.mdDoc "exposing lemmy with the caddy reverse proxy");
|
||||||
|
nginx.enable = mkEnableOption (lib.mdDoc "exposing lemmy with the nginx reverse proxy");
|
||||||
|
|
||||||
database.createLocally = mkEnableOption (lib.mdDoc "creation of database on the instance");
|
database.createLocally = mkEnableOption (lib.mdDoc "creation of database on the instance");
|
||||||
|
|
||||||
|
@ -140,6 +141,41 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.nginx = mkIf cfg.nginx.enable {
|
||||||
|
enable = mkDefault true;
|
||||||
|
virtualHosts."${cfg.settings.hostname}".locations = let
|
||||||
|
ui = "http://127.0.0.1:${toString cfg.ui.port}";
|
||||||
|
backend = "http://127.0.0.1:${toString cfg.settings.port}";
|
||||||
|
in {
|
||||||
|
"~ ^/(api|pictrs|feeds|nodeinfo|.well-known)" = {
|
||||||
|
# backend requests
|
||||||
|
proxyPass = backend;
|
||||||
|
proxyWebsockets = true;
|
||||||
|
recommendedProxySettings = true;
|
||||||
|
};
|
||||||
|
"/" = {
|
||||||
|
# mixed frontend and backend requests, based on the request headers
|
||||||
|
proxyPass = "$proxpass";
|
||||||
|
recommendedProxySettings = true;
|
||||||
|
extraConfig = ''
|
||||||
|
set $proxpass "${ui}";
|
||||||
|
if ($http_accept = "application/activity+json") {
|
||||||
|
set $proxpass "${backend}";
|
||||||
|
}
|
||||||
|
if ($http_accept = "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"") {
|
||||||
|
set $proxpass "${backend}";
|
||||||
|
}
|
||||||
|
if ($request_method = POST) {
|
||||||
|
set $proxpass "${backend}";
|
||||||
|
}
|
||||||
|
|
||||||
|
# Cuts off the trailing slash on URLs to make them valid
|
||||||
|
rewrite ^(.+)/+$ $1 permanent;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
assertions = [{
|
assertions = [{
|
||||||
assertion = cfg.database.createLocally -> cfg.settings.database.host == "localhost" || cfg.settings.database.host == "/run/postgresql";
|
assertion = cfg.database.createLocally -> cfg.settings.database.host == "localhost" || cfg.settings.database.host == "/run/postgresql";
|
||||||
message = "if you want to create the database locally, you need to use a local database";
|
message = "if you want to create the database locally, you need to use a local database";
|
||||||
|
|
|
@ -356,7 +356,8 @@ in {
|
||||||
ExecStart = "${pixelfed-manage}/bin/pixelfed-manage schedule:run";
|
ExecStart = "${pixelfed-manage}/bin/pixelfed-manage schedule:run";
|
||||||
User = user;
|
User = user;
|
||||||
Group = group;
|
Group = group;
|
||||||
StateDirectory = cfg.dataDir;
|
StateDirectory =
|
||||||
|
lib.mkIf (cfg.dataDir == "/var/lib/pixelfed") "pixelfed";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -391,6 +392,9 @@ in {
|
||||||
rsync -av --no-perms ${pixelfed}/storage-static/ ${cfg.dataDir}/storage
|
rsync -av --no-perms ${pixelfed}/storage-static/ ${cfg.dataDir}/storage
|
||||||
chmod -R +w ${cfg.dataDir}/storage
|
chmod -R +w ${cfg.dataDir}/storage
|
||||||
|
|
||||||
|
chmod g+x ${cfg.dataDir}/storage ${cfg.dataDir}/storage/app
|
||||||
|
chmod -R g+rX ${cfg.dataDir}/storage/app/public
|
||||||
|
|
||||||
# Link the app.php in the runtime folder.
|
# Link the app.php in the runtime folder.
|
||||||
# We cannot link the cache folder only because bootstrap folder needs to be writeable.
|
# We cannot link the cache folder only because bootstrap folder needs to be writeable.
|
||||||
ln -sf ${pixelfed}/bootstrap-static/app.php ${cfg.runtimeDir}/app.php
|
ln -sf ${pixelfed}/bootstrap-static/app.php ${cfg.runtimeDir}/app.php
|
||||||
|
@ -441,7 +445,7 @@ in {
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable NGINX to access our phpfpm-socket.
|
# Enable NGINX to access our phpfpm-socket.
|
||||||
users.users."${config.services.nginx.group}".extraGroups = [ cfg.group ];
|
users.users."${config.services.nginx.user}".extraGroups = [ cfg.group ];
|
||||||
services.nginx = mkIf (cfg.nginx != null) {
|
services.nginx = mkIf (cfg.nginx != null) {
|
||||||
enable = true;
|
enable = true;
|
||||||
virtualHosts."${cfg.domain}" = mkMerge [
|
virtualHosts."${cfg.domain}" = mkMerge [
|
||||||
|
|
|
@ -14,7 +14,7 @@ let
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
${hostOpts.hostName} ${concatStringsSep " " hostOpts.serverAliases} {
|
${hostOpts.hostName} ${concatStringsSep " " hostOpts.serverAliases} {
|
||||||
bind ${concatStringsSep " " hostOpts.listenAddresses}
|
${optionalString (hostOpts.listenAddresses != [ ]) "bind ${concatStringsSep " " hostOpts.listenAddresses}"}
|
||||||
${optionalString (hostOpts.useACMEHost != null) "tls ${sslCertDir}/cert.pem ${sslCertDir}/key.pem"}
|
${optionalString (hostOpts.useACMEHost != null) "tls ${sslCertDir}/cert.pem ${sslCertDir}/key.pem"}
|
||||||
log {
|
log {
|
||||||
${hostOpts.logFormat}
|
${hostOpts.logFormat}
|
||||||
|
@ -245,15 +245,23 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
acmeCA = mkOption {
|
acmeCA = mkOption {
|
||||||
default = "https://acme-v02.api.letsencrypt.org/directory";
|
default = null;
|
||||||
example = "https://acme-staging-v02.api.letsencrypt.org/directory";
|
example = "https://acme-v02.api.letsencrypt.org/directory";
|
||||||
type = with types; nullOr str;
|
type = with types; nullOr str;
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
The URL to the ACME CA's directory. It is strongly recommended to set
|
::: {.note}
|
||||||
this to Let's Encrypt's staging endpoint for testing or development.
|
Sets the [`acme_ca` option](https://caddyserver.com/docs/caddyfile/options#acme-ca)
|
||||||
|
in the global options block of the resulting Caddyfile.
|
||||||
|
:::
|
||||||
|
|
||||||
Set it to `null` if you want to write a more
|
The URL to the ACME CA's directory. It is strongly recommended to set
|
||||||
fine-grained configuration manually.
|
this to `https://acme-staging-v02.api.letsencrypt.org/directory` for
|
||||||
|
Let's Encrypt's [staging endpoint](https://letsencrypt.org/docs/staging-environment/)
|
||||||
|
while testing or in development.
|
||||||
|
|
||||||
|
Value `null` should be prefered for production setups,
|
||||||
|
as it omits the `acme_ca` option to enable
|
||||||
|
[automatic issuer fallback](https://caddyserver.com/docs/automatic-https#issuer-fallback).
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ let
|
||||||
(assertOnlyFields [
|
(assertOnlyFields [
|
||||||
"Boot" "ProcessTwo" "Parameters" "Environment" "User" "WorkingDirectory"
|
"Boot" "ProcessTwo" "Parameters" "Environment" "User" "WorkingDirectory"
|
||||||
"PivotRoot" "Capability" "DropCapability" "NoNewPrivileges" "KillSignal"
|
"PivotRoot" "Capability" "DropCapability" "NoNewPrivileges" "KillSignal"
|
||||||
"Personality" "MachineId" "PrivateUsers" "NotifyReady" "SystemCallFilter"
|
"Personality" "MachineID" "PrivateUsers" "NotifyReady" "SystemCallFilter"
|
||||||
"LimitCPU" "LimitFSIZE" "LimitDATA" "LimitSTACK" "LimitCORE" "LimitRSS"
|
"LimitCPU" "LimitFSIZE" "LimitDATA" "LimitSTACK" "LimitCORE" "LimitRSS"
|
||||||
"LimitNOFILE" "LimitAS" "LimitNPROC" "LimitMEMLOCK" "LimitLOCKS"
|
"LimitNOFILE" "LimitAS" "LimitNPROC" "LimitMEMLOCK" "LimitLOCKS"
|
||||||
"LimitSIGPENDING" "LimitMSGQUEUE" "LimitNICE" "LimitRTPRIO" "LimitRTTIME"
|
"LimitSIGPENDING" "LimitMSGQUEUE" "LimitNICE" "LimitRTPRIO" "LimitRTTIME"
|
||||||
|
|
|
@ -744,6 +744,7 @@ in {
|
||||||
systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {};
|
systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {};
|
||||||
systemd-no-tainted = handleTest ./systemd-no-tainted.nix {};
|
systemd-no-tainted = handleTest ./systemd-no-tainted.nix {};
|
||||||
systemd-nspawn = handleTest ./systemd-nspawn.nix {};
|
systemd-nspawn = handleTest ./systemd-nspawn.nix {};
|
||||||
|
systemd-nspawn-configfile = handleTest ./systemd-nspawn-configfile.nix {};
|
||||||
systemd-oomd = handleTest ./systemd-oomd.nix {};
|
systemd-oomd = handleTest ./systemd-oomd.nix {};
|
||||||
systemd-portabled = handleTest ./systemd-portabled.nix {};
|
systemd-portabled = handleTest ./systemd-portabled.nix {};
|
||||||
systemd-repart = handleTest ./systemd-repart.nix {};
|
systemd-repart = handleTest ./systemd-repart.nix {};
|
||||||
|
|
128
nixos/tests/systemd-nspawn-configfile.nix
Normal file
128
nixos/tests/systemd-nspawn-configfile.nix
Normal file
|
@ -0,0 +1,128 @@
|
||||||
|
import ./make-test-python.nix ({ lib, ... }:
|
||||||
|
let
|
||||||
|
execOptions = [
|
||||||
|
"Boot"
|
||||||
|
"ProcessTwo"
|
||||||
|
"Parameters"
|
||||||
|
"Environment"
|
||||||
|
"User"
|
||||||
|
"WorkingDirectory"
|
||||||
|
"PivotRoot"
|
||||||
|
"Capability"
|
||||||
|
"DropCapability"
|
||||||
|
"NoNewPrivileges"
|
||||||
|
"KillSignal"
|
||||||
|
"Personality"
|
||||||
|
"MachineID"
|
||||||
|
"PrivateUsers"
|
||||||
|
"NotifyReady"
|
||||||
|
"SystemCallFilter"
|
||||||
|
"LimitCPU"
|
||||||
|
"LimitFSIZE"
|
||||||
|
"LimitDATA"
|
||||||
|
"LimitSTACK"
|
||||||
|
"LimitCORE"
|
||||||
|
"LimitRSS"
|
||||||
|
"LimitNOFILE"
|
||||||
|
"LimitAS"
|
||||||
|
"LimitNPROC"
|
||||||
|
"LimitMEMLOCK"
|
||||||
|
"LimitLOCKS"
|
||||||
|
"LimitSIGPENDING"
|
||||||
|
"LimitMSGQUEUE"
|
||||||
|
"LimitNICE"
|
||||||
|
"LimitRTPRIO"
|
||||||
|
"LimitRTTIME"
|
||||||
|
"OOMScoreAdjust"
|
||||||
|
"CPUAffinity"
|
||||||
|
"Hostname"
|
||||||
|
"ResolvConf"
|
||||||
|
"Timezone"
|
||||||
|
"LinkJournal"
|
||||||
|
"Ephemeral"
|
||||||
|
"AmbientCapability"
|
||||||
|
];
|
||||||
|
|
||||||
|
filesOptions = [
|
||||||
|
"ReadOnly"
|
||||||
|
"Volatile"
|
||||||
|
"Bind"
|
||||||
|
"BindReadOnly"
|
||||||
|
"TemporaryFileSystem"
|
||||||
|
"Overlay"
|
||||||
|
"OverlayReadOnly"
|
||||||
|
"PrivateUsersChown"
|
||||||
|
"BindUser"
|
||||||
|
"Inaccessible"
|
||||||
|
"PrivateUsersOwnership"
|
||||||
|
];
|
||||||
|
|
||||||
|
networkOptions = [
|
||||||
|
"Private"
|
||||||
|
"VirtualEthernet"
|
||||||
|
"VirtualEthernetExtra"
|
||||||
|
"Interface"
|
||||||
|
"MACVLAN"
|
||||||
|
"IPVLAN"
|
||||||
|
"Bridge"
|
||||||
|
"Zone"
|
||||||
|
"Port"
|
||||||
|
];
|
||||||
|
|
||||||
|
optionsToConfig = opts: builtins.listToAttrs (map (n: lib.nameValuePair n "testdata") opts);
|
||||||
|
|
||||||
|
grepForOptions = opts: ''node.succeed(
|
||||||
|
"for o in ${builtins.concatStringsSep " " opts} ; do grep --quiet $o ${configFile} || exit 1 ; done"
|
||||||
|
)'';
|
||||||
|
|
||||||
|
unitName = "options-test";
|
||||||
|
configFile = "/etc/systemd/nspawn/${unitName}.nspawn";
|
||||||
|
|
||||||
|
in
|
||||||
|
{
|
||||||
|
name = "systemd-nspawn-configfile";
|
||||||
|
|
||||||
|
nodes = {
|
||||||
|
node = { pkgs, ... }: {
|
||||||
|
systemd.nspawn."${unitName}" = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
execConfig = optionsToConfig execOptions // {
|
||||||
|
Boot = true;
|
||||||
|
ProcessTwo = true;
|
||||||
|
NotifyReady = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
filesConfig = optionsToConfig filesOptions // {
|
||||||
|
ReadOnly = true;
|
||||||
|
Volatile = "state";
|
||||||
|
PrivateUsersChown = true;
|
||||||
|
PrivateUsersOwnership = "auto";
|
||||||
|
};
|
||||||
|
|
||||||
|
networkConfig = optionsToConfig networkOptions // {
|
||||||
|
Private = true;
|
||||||
|
VirtualEthernet = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
testScript = ''
|
||||||
|
start_all()
|
||||||
|
|
||||||
|
node.wait_for_file("${configFile}")
|
||||||
|
|
||||||
|
with subtest("Test for presence of all specified options in config file"):
|
||||||
|
${grepForOptions execOptions}
|
||||||
|
${grepForOptions filesOptions}
|
||||||
|
${grepForOptions networkOptions}
|
||||||
|
|
||||||
|
with subtest("Test for absence of misspelled option 'MachineId' (instead of 'MachineID')"):
|
||||||
|
node.fail("grep --quiet MachineId ${configFile}")
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta.maintainers = [
|
||||||
|
lib.maintainers.zi3m5f
|
||||||
|
];
|
||||||
|
})
|
|
@ -61,13 +61,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "audacity";
|
pname = "audacity";
|
||||||
version = "3.3.2";
|
version = "3.3.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "Audacity-${version}";
|
rev = "Audacity-${version}";
|
||||||
hash = "sha256-/DjTmanPzkShNoMFNbnQzzwEzk/a2uUYvVW9dsvl5uY=";
|
hash = "sha256-m38Awdv2ew+MKqd68x/ZsRBwidM2KJ3BRykIKgnFSx4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "hydrogen";
|
pname = "hydrogen";
|
||||||
version = "1.1.1";
|
version = "1.2.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hydrogen-music";
|
owner = "hydrogen-music";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-to24PB9cs4vun93uXEWNVsmSLFRuLGfC4hCh7+mbvIo=";
|
sha256 = "sha256-09zN6OVqVohk153gqXy6C0uHcBhZX2JJL4d6f4BU4Lg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||||
|
|
|
@ -16,16 +16,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "ncspot";
|
pname = "ncspot";
|
||||||
version = "0.13.2";
|
version = "0.13.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hrkfdn";
|
owner = "hrkfdn";
|
||||||
repo = "ncspot";
|
repo = "ncspot";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-DdJa4ax/v86OgO+IAsiFA8/u6pEGcCw+N/3MLXzz8DM=";
|
hash = "sha256-AXe/ysNYSWC4cuzvN4fLmDyeBxpzciDo8PFjXdzFMl0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-HkpFboXgHbJMYJFabJ58Syy1ag+InwqkeJAw8MxAr0A=";
|
cargoHash = "sha256-y7Vaf4jp2Zds0KsYqF0JBWsbq9IQVu6n0TMo3oGL14A=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ]
|
nativeBuildInputs = [ pkg-config ]
|
||||||
++ lib.optional withClipboard python3;
|
++ lib.optional withClipboard python3;
|
||||||
|
@ -56,6 +56,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes";
|
description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes";
|
||||||
homepage = "https://github.com/hrkfdn/ncspot";
|
homepage = "https://github.com/hrkfdn/ncspot";
|
||||||
|
changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}";
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
maintainers = [ maintainers.marsam ];
|
maintainers = [ maintainers.marsam ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "snd";
|
pname = "snd";
|
||||||
version = "23.3";
|
version = "23.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
|
url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
|
||||||
sha256 = "sha256-YuvTgpa006n+WlQHEtVRfoJl7IBoyevzURz0Suis5sE=";
|
sha256 = "sha256-1D/j/im1Xlx689k8zgnaRzJJYWHNviVhxyVzmLlfJps=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
|
@ -23,15 +23,15 @@
|
||||||
, withDiscordRPC ? false
|
, withDiscordRPC ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "tauon";
|
pname = "tauon";
|
||||||
version = "7.6.4";
|
version = "7.6.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Taiko2k";
|
owner = "Taiko2k";
|
||||||
repo = "TauonMusicBox";
|
repo = "TauonMusicBox";
|
||||||
rev = "v${version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-xMUQ2LabxuvCdd7dsoXPN3tjkDxfXIQ8UrJcsGQ+EEU=";
|
hash = "sha256-+K+sX6JbVB7qCRlwlIHMHFR76GwZZrHFh6Jjn8xlMmg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
|
@ -133,9 +133,9 @@ stdenv.mkDerivation rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "The Linux desktop music player from the future";
|
description = "The Linux desktop music player from the future";
|
||||||
homepage = "https://tauonmusicbox.rocks/";
|
homepage = "https://tauonmusicbox.rocks/";
|
||||||
changelog = "https://github.com/Taiko2k/TauonMusicBox/releases/tag/v${version}";
|
changelog = "https://github.com/Taiko2k/TauonMusicBox/releases/tag/v${finalAttrs.version}";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
maintainers = with maintainers; [ jansol ];
|
maintainers = with maintainers; [ jansol ];
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
@ -22,11 +22,11 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "clightning";
|
pname = "clightning";
|
||||||
version = "23.05";
|
version = "23.05.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
|
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
|
||||||
sha256 = "sha256-6QbgK16godxnpIBHpykbblS10JAFZvxSeEpwnmdTrAo=";
|
sha256 = "sha256-q0ZPsuvDgXbhxebBIRkGTE7sH7K6c96Iu6RqeBT3NEk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# when building on darwin we need dawin.cctools to provide the correct libtool
|
# when building on darwin we need dawin.cctools to provide the correct libtool
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, ncurses5
|
, ncurses5
|
||||||
, nspr
|
, nspr
|
||||||
, nss
|
, nss_latest
|
||||||
, pciutils
|
, pciutils
|
||||||
, pkgsi686Linux
|
, pkgsi686Linux
|
||||||
, ps
|
, ps
|
||||||
|
@ -146,7 +146,7 @@ let
|
||||||
libXfixes
|
libXfixes
|
||||||
libGL
|
libGL
|
||||||
nspr
|
nspr
|
||||||
nss
|
nss_latest
|
||||||
systemd
|
systemd
|
||||||
|
|
||||||
# For GTKLookAndFeel
|
# For GTKLookAndFeel
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
{ pname ? "emacs"
|
{ pname
|
||||||
, version
|
, version
|
||||||
, versionModifier ? ""
|
|
||||||
, name ? "emacs-${version}${versionModifier}"
|
|
||||||
, variant
|
, variant
|
||||||
, src
|
, src
|
||||||
, patches ? _: [ ]
|
, patches ? _: [ ]
|
||||||
|
@ -74,7 +72,11 @@
|
||||||
, WebKit
|
, WebKit
|
||||||
|
|
||||||
# Boolean flags
|
# Boolean flags
|
||||||
, nativeComp ? true
|
, nativeComp ? null
|
||||||
|
, withNativeCompilation ?
|
||||||
|
if nativeComp != null
|
||||||
|
then lib.warn "nativeComp option is deprecated and will be removed; use withNativeCompilation instead" nativeComp
|
||||||
|
else true
|
||||||
, noGui ? false
|
, noGui ? false
|
||||||
, srcRepo ? true
|
, srcRepo ? true
|
||||||
, withAcl ? false
|
, withAcl ? false
|
||||||
|
@ -96,7 +98,7 @@
|
||||||
, withWebP ? lib.versionAtLeast version "29"
|
, withWebP ? lib.versionAtLeast version "29"
|
||||||
, withX ? !(stdenv.isDarwin || noGui || withPgtk)
|
, withX ? !(stdenv.isDarwin || noGui || withPgtk)
|
||||||
, withXinput2 ? withX && lib.versionAtLeast version "29"
|
, withXinput2 ? withX && lib.versionAtLeast version "29"
|
||||||
, withXwidgets ? false
|
, withXwidgets ? !noGui && (withGTK3 || withPgtk)
|
||||||
|
|
||||||
# Options
|
# Options
|
||||||
, siteStart ? ./site-start.el
|
, siteStart ? ./site-start.el
|
||||||
|
@ -120,7 +122,7 @@ assert withGconf -> withX;
|
||||||
assert withGpm -> stdenv.isLinux;
|
assert withGpm -> stdenv.isLinux;
|
||||||
assert withNS -> stdenv.isDarwin && !(withX || variant == "macport");
|
assert withNS -> stdenv.isDarwin && !(withX || variant == "macport");
|
||||||
assert withPgtk -> withGTK3 && !withX;
|
assert withPgtk -> withGTK3 && !withX;
|
||||||
assert withXwidgets -> withGTK3;
|
assert withXwidgets -> !noGui && (withGTK3 || withPgtk);
|
||||||
|
|
||||||
let
|
let
|
||||||
libGccJitLibraryPaths = [
|
libGccJitLibraryPaths = [
|
||||||
|
@ -134,7 +136,7 @@ let
|
||||||
then llvmPackages_6.stdenv
|
then llvmPackages_6.stdenv
|
||||||
else stdenv) mkDerivation;
|
else stdenv) mkDerivation;
|
||||||
in
|
in
|
||||||
mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
|
mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation {
|
||||||
env = {
|
env = {
|
||||||
NATIVE_FULL_AOT = "1";
|
NATIVE_FULL_AOT = "1";
|
||||||
LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths;
|
LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths;
|
||||||
|
@ -142,6 +144,7 @@ mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
|
||||||
} // {
|
} // {
|
||||||
pname = pname
|
pname = pname
|
||||||
+ (if noGui then "-nox"
|
+ (if noGui then "-nox"
|
||||||
|
else if variant == "macport" then "-macport"
|
||||||
else if withPgtk then "-pgtk"
|
else if withPgtk then "-pgtk"
|
||||||
else if withGTK3 then "-gtk3"
|
else if withGTK3 then "-gtk3"
|
||||||
else if withGTK2 then "-gtk2"
|
else if withGTK2 then "-gtk2"
|
||||||
|
@ -150,7 +153,7 @@ mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
|
||||||
|
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
||||||
patches = patches fetchpatch ++ lib.optionals nativeComp [
|
patches = patches fetchpatch ++ lib.optionals withNativeCompilation [
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = if lib.versionOlder finalAttrs.version "29"
|
src = if lib.versionOlder finalAttrs.version "29"
|
||||||
then ./native-comp-driver-options-28.patch
|
then ./native-comp-driver-options-28.patch
|
||||||
|
@ -242,8 +245,7 @@ mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
|
||||||
motif
|
motif
|
||||||
] ++ lib.optionals (withX && withXwidgets) [
|
] ++ lib.optionals (withX && withXwidgets) [
|
||||||
glib-networking
|
glib-networking
|
||||||
webkitgtk
|
] ++ lib.optionals withNativeCompilation [
|
||||||
] ++ lib.optionals nativeComp [
|
|
||||||
libgccjit
|
libgccjit
|
||||||
] ++ lib.optionals withImageMagick [
|
] ++ lib.optionals withImageMagick [
|
||||||
imagemagick
|
imagemagick
|
||||||
|
@ -266,7 +268,6 @@ mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
|
||||||
] ++ lib.optionals withX [
|
] ++ lib.optionals withX [
|
||||||
Xaw3d
|
Xaw3d
|
||||||
cairo
|
cairo
|
||||||
|
|
||||||
giflib
|
giflib
|
||||||
libXaw
|
libXaw
|
||||||
libXpm
|
libXpm
|
||||||
|
@ -274,6 +275,8 @@ mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
|
||||||
libpng
|
libpng
|
||||||
librsvg
|
librsvg
|
||||||
libtiff
|
libtiff
|
||||||
|
] ++ lib.optionals withXwidgets [
|
||||||
|
webkitgtk
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
sigtool
|
sigtool
|
||||||
] ++ lib.optionals withNS [
|
] ++ lib.optionals withNS [
|
||||||
|
@ -325,7 +328,7 @@ mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
|
||||||
]
|
]
|
||||||
++ (lib.optional stdenv.isDarwin (lib.withFeature withNS "ns"))
|
++ (lib.optional stdenv.isDarwin (lib.withFeature withNS "ns"))
|
||||||
++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars"
|
++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars"
|
||||||
++ lib.optional nativeComp "--with-native-compilation"
|
++ lib.optional withNativeCompilation "--with-native-compilation"
|
||||||
++ lib.optional withImageMagick "--with-imagemagick"
|
++ lib.optional withImageMagick "--with-imagemagick"
|
||||||
++ lib.optional withTreeSitter "--with-tree-sitter"
|
++ lib.optional withTreeSitter "--with-tree-sitter"
|
||||||
++ lib.optional withXinput2 "--with-xinput2"
|
++ lib.optional withXinput2 "--with-xinput2"
|
||||||
|
@ -356,9 +359,9 @@ mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
|
||||||
'' + lib.optionalString withNS ''
|
'' + lib.optionalString withNS ''
|
||||||
mkdir -p $out/Applications
|
mkdir -p $out/Applications
|
||||||
mv nextstep/Emacs.app $out/Applications
|
mv nextstep/Emacs.app $out/Applications
|
||||||
'' + lib.optionalString (nativeComp && (withNS || variant == "macport")) ''
|
'' + lib.optionalString (withNativeCompilation && (withNS || variant == "macport")) ''
|
||||||
ln -snf $out/lib/emacs/*/native-lisp $out/Applications/Emacs.app/Contents/native-lisp
|
ln -snf $out/lib/emacs/*/native-lisp $out/Applications/Emacs.app/Contents/native-lisp
|
||||||
'' + lib.optionalString nativeComp ''
|
'' + lib.optionalString withNativeCompilation ''
|
||||||
echo "Generating native-compiled trampolines..."
|
echo "Generating native-compiled trampolines..."
|
||||||
# precompile trampolines in parallel, but avoid spawning one process per trampoline.
|
# precompile trampolines in parallel, but avoid spawning one process per trampoline.
|
||||||
# 1000 is a rough lower bound on the number of trampolines compiled.
|
# 1000 is a rough lower bound on the number of trampolines compiled.
|
||||||
|
@ -379,8 +382,8 @@ mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit nativeComp;
|
inherit withNativeCompilation;
|
||||||
treeSitter = withTreeSitter;
|
inherit withTreeSitter;
|
||||||
pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
|
pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
|
||||||
tests = { inherit (nixosTests) emacs-daemon; };
|
tests = { inherit (nixosTests) emacs-daemon; };
|
||||||
};
|
};
|
||||||
|
|
|
@ -9,8 +9,11 @@
|
||||||
, python3Packages
|
, python3Packages
|
||||||
, writeText
|
, writeText
|
||||||
, wrapNeovimUnstable
|
, wrapNeovimUnstable
|
||||||
|
, runCommand
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
inherit (vimUtils) toVimPlugin;
|
||||||
|
|
||||||
/* returns everything needed for the caller to wrap its own neovim:
|
/* returns everything needed for the caller to wrap its own neovim:
|
||||||
- the generated content of the future init.vim
|
- the generated content of the future init.vim
|
||||||
- the arguments to wrap neovim with
|
- the arguments to wrap neovim with
|
||||||
|
@ -193,14 +196,43 @@ let
|
||||||
in
|
in
|
||||||
lib.concatStringsSep ";" hostProviderLua;
|
lib.concatStringsSep ";" hostProviderLua;
|
||||||
|
|
||||||
|
buildNeovimPlugin = callPackage ./build-neovim-plugin.nix {
|
||||||
|
inherit (vimUtils) toVimPlugin;
|
||||||
|
inherit lua;
|
||||||
|
};
|
||||||
|
|
||||||
|
grammarToPlugin = grammar:
|
||||||
|
let
|
||||||
|
name = lib.pipe grammar [
|
||||||
|
lib.getName
|
||||||
|
|
||||||
|
# added in buildGrammar
|
||||||
|
(lib.removeSuffix "-grammar")
|
||||||
|
|
||||||
|
# grammars from tree-sitter.builtGrammars
|
||||||
|
(lib.removePrefix "tree-sitter-")
|
||||||
|
(lib.replaceStrings [ "-" ] [ "_" ])
|
||||||
|
];
|
||||||
|
in
|
||||||
|
|
||||||
|
toVimPlugin (runCommand "vimplugin-treesitter-grammar-${name}"
|
||||||
|
{
|
||||||
|
meta = {
|
||||||
|
platforms = lib.platforms.all;
|
||||||
|
} // grammar.meta;
|
||||||
|
}
|
||||||
|
''
|
||||||
|
mkdir -p $out/parser
|
||||||
|
ln -s ${grammar}/parser $out/parser/${name}.so
|
||||||
|
'');
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
inherit makeNeovimConfig;
|
inherit makeNeovimConfig;
|
||||||
inherit generateProviderRc;
|
inherit generateProviderRc;
|
||||||
inherit legacyWrapper;
|
inherit legacyWrapper;
|
||||||
|
inherit grammarToPlugin;
|
||||||
|
|
||||||
buildNeovimPluginFrom2Nix = callPackage ./build-neovim-plugin.nix {
|
inherit buildNeovimPlugin;
|
||||||
inherit (vimUtils) toVimPlugin;
|
buildNeovimPluginFrom2Nix = lib.warn "buildNeovimPluginFrom2Nix was renamed to buildNeovimPlugin" buildNeovimPlugin;
|
||||||
inherit lua;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,11 +27,16 @@ mkDerivation rec {
|
||||||
--replace '$$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm' ""
|
--replace '$$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm' ""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||||
|
mv $out/bin $out/Applications
|
||||||
|
rm -fr $out/share
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/dail8859/NotepadNext";
|
homepage = "https://github.com/dail8859/NotepadNext";
|
||||||
description = "Notepad++-like editor for the Linux desktop";
|
description = "A cross-platform, reimplementation of Notepad++";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.sebtm ];
|
maintainers = [ maintainers.sebtm ];
|
||||||
broken = stdenv.isAarch64;
|
broken = stdenv.isAarch64;
|
||||||
};
|
};
|
||||||
|
|
|
@ -15,7 +15,7 @@ let
|
||||||
|
|
||||||
plugins = callPackage ./generated.nix {
|
plugins = callPackage ./generated.nix {
|
||||||
inherit buildVimPluginFrom2Nix;
|
inherit buildVimPluginFrom2Nix;
|
||||||
inherit (neovimUtils) buildNeovimPluginFrom2Nix;
|
inherit (neovimUtils) buildNeovimPlugin;
|
||||||
};
|
};
|
||||||
|
|
||||||
# TL;DR
|
# TL;DR
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!
|
# GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!
|
||||||
{ lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }:
|
{ lib, buildVimPluginFrom2Nix, buildNeovimPlugin, fetchFromGitHub, fetchgit }:
|
||||||
|
|
||||||
final: prev:
|
final: prev:
|
||||||
{
|
{
|
||||||
|
@ -3598,7 +3598,7 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";
|
meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
gitsigns-nvim = buildNeovimPluginFrom2Nix {
|
gitsigns-nvim = buildNeovimPlugin {
|
||||||
pname = "gitsigns.nvim";
|
pname = "gitsigns.nvim";
|
||||||
version = "2023-06-07";
|
version = "2023-06-07";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -3861,7 +3861,7 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
|
meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
|
||||||
};
|
};
|
||||||
|
|
||||||
haskell-tools-nvim = buildNeovimPluginFrom2Nix {
|
haskell-tools-nvim = buildNeovimPlugin {
|
||||||
pname = "haskell-tools.nvim";
|
pname = "haskell-tools.nvim";
|
||||||
version = "2023-06-05";
|
version = "2023-06-05";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -5013,7 +5013,7 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/alvarosevilla95/luatab.nvim/";
|
meta.homepage = "https://github.com/alvarosevilla95/luatab.nvim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
lush-nvim = buildNeovimPluginFrom2Nix {
|
lush-nvim = buildNeovimPlugin {
|
||||||
pname = "lush.nvim";
|
pname = "lush.nvim";
|
||||||
version = "2023-06-08";
|
version = "2023-06-08";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -6369,7 +6369,7 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/roxma/nvim-cm-racer/";
|
meta.homepage = "https://github.com/roxma/nvim-cm-racer/";
|
||||||
};
|
};
|
||||||
|
|
||||||
nvim-cmp = buildNeovimPluginFrom2Nix {
|
nvim-cmp = buildNeovimPlugin {
|
||||||
pname = "nvim-cmp";
|
pname = "nvim-cmp";
|
||||||
version = "2023-06-10";
|
version = "2023-06-10";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -7605,7 +7605,7 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/nvim-treesitter/playground/";
|
meta.homepage = "https://github.com/nvim-treesitter/playground/";
|
||||||
};
|
};
|
||||||
|
|
||||||
plenary-nvim = buildNeovimPluginFrom2Nix {
|
plenary-nvim = buildNeovimPlugin {
|
||||||
pname = "plenary.nvim";
|
pname = "plenary.nvim";
|
||||||
version = "2023-06-10";
|
version = "2023-06-10";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -7943,7 +7943,7 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/filipdutescu/renamer.nvim/";
|
meta.homepage = "https://github.com/filipdutescu/renamer.nvim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
rest-nvim = buildNeovimPluginFrom2Nix {
|
rest-nvim = buildNeovimPlugin {
|
||||||
pname = "rest.nvim";
|
pname = "rest.nvim";
|
||||||
version = "2023-06-07";
|
version = "2023-06-07";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -9016,7 +9016,7 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/";
|
meta.homepage = "https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
telescope-manix = buildNeovimPluginFrom2Nix {
|
telescope-manix = buildNeovimPlugin {
|
||||||
pname = "telescope-manix";
|
pname = "telescope-manix";
|
||||||
version = "2023-06-05";
|
version = "2023-06-05";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -9149,7 +9149,7 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/";
|
meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/";
|
||||||
};
|
};
|
||||||
|
|
||||||
telescope-nvim = buildNeovimPluginFrom2Nix {
|
telescope-nvim = buildNeovimPlugin {
|
||||||
pname = "telescope.nvim";
|
pname = "telescope.nvim";
|
||||||
version = "2023-06-10";
|
version = "2023-06-10";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
with import <localpkgs> {};
|
with import <localpkgs> {};
|
||||||
let
|
let
|
||||||
inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
|
inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
|
||||||
inherit (neovimUtils) buildNeovimPluginFrom2Nix;
|
inherit (neovimUtils) buildNeovimPlugin;
|
||||||
|
|
||||||
generated = callPackage <localpkgs/pkgs/applications/editors/vim/plugins/generated.nix> {
|
generated = callPackage <localpkgs/pkgs/applications/editors/vim/plugins/generated.nix> {
|
||||||
inherit buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix;
|
inherit buildNeovimPlugin buildVimPluginFrom2Nix;
|
||||||
} {} {};
|
} {} {};
|
||||||
hasChecksum = value:
|
hasChecksum = value:
|
||||||
lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;
|
lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
{ lib, callPackage, tree-sitter, neovim, runCommand }:
|
{ lib, callPackage, tree-sitter, neovim, neovimUtils, runCommand }:
|
||||||
|
|
||||||
self: super:
|
self: super:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
inherit (neovimUtils) grammarToPlugin;
|
||||||
generatedGrammars = callPackage ./generated.nix {
|
generatedGrammars = callPackage ./generated.nix {
|
||||||
inherit (tree-sitter) buildGrammar;
|
inherit (tree-sitter) buildGrammar;
|
||||||
};
|
};
|
||||||
|
@ -27,31 +28,6 @@ let
|
||||||
})
|
})
|
||||||
generatedDerivations;
|
generatedDerivations;
|
||||||
|
|
||||||
grammarToPlugin = grammar:
|
|
||||||
let
|
|
||||||
name = lib.pipe grammar [
|
|
||||||
lib.getName
|
|
||||||
|
|
||||||
# added in buildGrammar
|
|
||||||
(lib.removeSuffix "-grammar")
|
|
||||||
|
|
||||||
# grammars from tree-sitter.builtGrammars
|
|
||||||
(lib.removePrefix "tree-sitter-")
|
|
||||||
(lib.replaceStrings [ "-" ] [ "_" ])
|
|
||||||
];
|
|
||||||
in
|
|
||||||
|
|
||||||
runCommand "nvim-treesitter-grammar-${name}"
|
|
||||||
{
|
|
||||||
meta = {
|
|
||||||
platforms = lib.platforms.all;
|
|
||||||
} // grammar.meta;
|
|
||||||
}
|
|
||||||
''
|
|
||||||
mkdir -p $out/parser
|
|
||||||
ln -s ${grammar}/parser $out/parser/${name}.so
|
|
||||||
'';
|
|
||||||
|
|
||||||
allGrammars = lib.attrValues generatedDerivations;
|
allGrammars = lib.attrValues generatedDerivations;
|
||||||
|
|
||||||
# Usage:
|
# Usage:
|
||||||
|
|
|
@ -74,7 +74,7 @@ class VimEditor(pluginupdate.Editor):
|
||||||
with open(outfile, "w+") as f:
|
with open(outfile, "w+") as f:
|
||||||
f.write(HEADER)
|
f.write(HEADER)
|
||||||
f.write(textwrap.dedent("""
|
f.write(textwrap.dedent("""
|
||||||
{ lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }:
|
{ lib, buildVimPluginFrom2Nix, buildNeovimPlugin, fetchFromGitHub, fetchgit }:
|
||||||
|
|
||||||
final: prev:
|
final: prev:
|
||||||
{
|
{
|
||||||
|
@ -103,7 +103,7 @@ class VimEditor(pluginupdate.Editor):
|
||||||
}};
|
}};
|
||||||
|
|
||||||
""".format(
|
""".format(
|
||||||
buildFn="buildNeovimPluginFrom2Nix" if isNeovim else "buildVimPluginFrom2Nix", plugin=plugin, src_nix=src_nix, repo=repo)
|
buildFn="buildNeovimPlugin" if isNeovim else "buildVimPluginFrom2Nix", plugin=plugin, src_nix=src_nix, repo=repo)
|
||||||
log.debug(content)
|
log.debug(content)
|
||||||
return content
|
return content
|
||||||
|
|
||||||
|
|
|
@ -14,13 +14,13 @@
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "vpv";
|
pname = "vpv";
|
||||||
version = "0.8.1";
|
version = "0.8.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kidanger";
|
owner = "kidanger";
|
||||||
repo = "vpv";
|
repo = "vpv";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
sha256 = "0cphgq1pqmwrjdmq524j5y522iaq6yhp2dpjdv0a3f9558dayxix";
|
sha256 = "sha256-mlBceYMfsAE7MI6J7xnkJHBJ8RInePooXH5YW9I47YM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoRoot = "src/fuzzy-finder";
|
cargoRoot = "src/fuzzy-finder";
|
||||||
|
|
|
@ -14,13 +14,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "albert";
|
pname = "albert";
|
||||||
version = "0.20.13";
|
version = "0.20.14";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "albertlauncher";
|
owner = "albertlauncher";
|
||||||
repo = "albert";
|
repo = "albert";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-zG6XlFOzSpUSswG4kvKf2lgwUSZkzEVslgQBjzVTLYQ=";
|
sha256 = "sha256-c1Bp7rIloXuWv/kUzWGJJ+bh9656vpuqADy77zYZjqk=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -11,11 +11,11 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "4.4.0";
|
version = "4.4.4";
|
||||||
|
|
||||||
libsecp256k1_name =
|
libsecp256k1_name =
|
||||||
if stdenv.isLinux then "libsecp256k1.so.0"
|
if stdenv.isLinux then "libsecp256k1.so.{v}"
|
||||||
else if stdenv.isDarwin then "libsecp256k1.0.dylib"
|
else if stdenv.isDarwin then "libsecp256k1.{v}.dylib"
|
||||||
else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}";
|
else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||||
|
|
||||||
libzbar_name =
|
libzbar_name =
|
||||||
|
@ -28,7 +28,7 @@ let
|
||||||
owner = "spesmilo";
|
owner = "spesmilo";
|
||||||
repo = "electrum";
|
repo = "electrum";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-lXMz0U7zgtCApBCGZcpOHvLcyOeGG0yJE/gr7Gv+yBQ=";
|
sha256 = "sha256-R5jFxqaKnqQ+WNp4l0u34wMFxlbIsQ+9qDQxiQEu6kM=";
|
||||||
|
|
||||||
postFetch = ''
|
postFetch = ''
|
||||||
mv $out ./all
|
mv $out ./all
|
||||||
|
@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
|
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
|
||||||
sha256 = "sha256-SHV+fCDhfgIh7s8L7eDbKj8bkHSVm7J2PPQ4CQpp6cI=";
|
sha256 = "sha256-a0In9PARV3xSJCXggKicgmBBWjiUxGF/LbP4jLZTvxc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
|
|
|
@ -45,9 +45,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ungoogled-chromium": {
|
"ungoogled-chromium": {
|
||||||
"version": "114.0.5735.90",
|
"version": "114.0.5735.106",
|
||||||
"sha256": "1n16fp0zf38n7i8zb86ilx8g62xjnahf7q0c3zwj6n8pnqh8c6h7",
|
"sha256": "0jihf4gv7n2kkp78n42ha4ick8mzixb4xrfdk84iqazmifrb066z",
|
||||||
"sha256bin64": "1dgz21ycc41nxz8y5fqz73ll96vvlrf8vxfn65vy654jw7dsdpw6",
|
"sha256bin64": "1zlw9gjb2fmjf1d952adqg07cyq60yck0aarz20lcvv2jzb7s46i",
|
||||||
"deps": {
|
"deps": {
|
||||||
"gn": {
|
"gn": {
|
||||||
"version": "2023-04-19",
|
"version": "2023-04-19",
|
||||||
|
@ -56,8 +56,8 @@
|
||||||
"sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
|
"sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
|
||||||
},
|
},
|
||||||
"ungoogled-patches": {
|
"ungoogled-patches": {
|
||||||
"rev": "114.0.5735.90-1",
|
"rev": "114.0.5735.106-1",
|
||||||
"sha256": "1g4wjpxvzrdmm5cnc94s1j13hh2n6cq6vdw1hy53lr7nqkpsj1jb"
|
"sha256": "1aac1711mbr3jwxbnjkl5kxvb64bhwnw0ls1wj7w7pmka5gmardv"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,11 +51,11 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "opera";
|
pname = "opera";
|
||||||
version = "99.0.4788.31";
|
version = "99.0.4788.65";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||||
hash = "sha256-73A47Yl454ZyOkglLvnp10zjoE1bf8v5tm4Rng3UBac=";
|
hash = "sha256-B57yTunq6wQTjYMYvocy1A3//I22w0TTUcK1bohpp2U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
unpackPhase = "dpkg-deb -x $src .";
|
unpackPhase = "dpkg-deb -x $src .";
|
||||||
|
|
|
@ -2,17 +2,17 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "argocd";
|
pname = "argocd";
|
||||||
version = "2.7.3";
|
version = "2.7.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "argoproj";
|
owner = "argoproj";
|
||||||
repo = "argo-cd";
|
repo = "argo-cd";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-vUidpBiCxHzCwveOrLfNpwVePQZMgX+K8qpVR0h58p0=";
|
sha256 = "sha256-9S30m4iA5qrcXFWk3QiDSuhHebhWYOpVfKSE6mz0mig=";
|
||||||
};
|
};
|
||||||
|
|
||||||
proxyVendor = true; # darwin/linux hash mismatch
|
proxyVendor = true; # darwin/linux hash mismatch
|
||||||
vendorHash = "sha256-+thdFvd4cxvWxi+j4awBqfQ6jq6puFYbwoWsIsbMIZI=";
|
vendorHash = "sha256-Ec2v9BehSvbx3phA1JrZnsZ4BObFTTOs2Ee+5pKsAGs=";
|
||||||
|
|
||||||
# Set target as ./cmd per cli-local
|
# Set target as ./cmd per cli-local
|
||||||
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
|
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
|
||||||
|
@ -59,6 +59,6 @@ buildGoModule rec {
|
||||||
downloadPage = "https://github.com/argoproj/argo-cd";
|
downloadPage = "https://github.com/argoproj/argo-cd";
|
||||||
homepage = "https://argo-cd.readthedocs.io/en/stable/";
|
homepage = "https://argo-cd.readthedocs.io/en/stable/";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ shahrukh330 bryanasdev000 ];
|
maintainers = with maintainers; [ shahrukh330 bryanasdev000 qjoly ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "arkade";
|
pname = "arkade";
|
||||||
version = "0.9.19";
|
version = "0.9.22";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "alexellis";
|
owner = "alexellis";
|
||||||
repo = "arkade";
|
repo = "arkade";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-JJFfUndoyFn2J0ktT/JJLi4tDjEkv+DX8vAZ5Jdn99Q=";
|
sha256 = "sha256-+PfJ8U/ulFaXZvz1Z5uN0/PJ+NV8dh9FdKi/d0rLb2g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
CGO_ENABLED = 0;
|
CGO_ENABLED = 0;
|
||||||
|
|
|
@ -1,23 +1,37 @@
|
||||||
{ lib, buildGoModule, fetchFromGitHub }:
|
{ lib, buildGoModule, fetchFromGitHub, testers, eks-node-viewer }:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "eks-node-viewer";
|
pname = "eks-node-viewer";
|
||||||
version = "0.2.1";
|
version = "0.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "awslabs";
|
owner = "awslabs";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-XRt9a//0mYKZKsMs2dlcsBt5ikC9ZBMeQ3Vas0eT8a8=";
|
sha256 = "sha256-p0n7ocoMBgM6i7e6yX+NDIkZBcJ3dT6VNWPihCheeC0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-28TKZYZM2kddXAusxmjhrKFy+ATU7kZM4Ad7zvP/F3A=";
|
vendorHash = "sha256-L1lG+b7MiJQvLqZuLdSjh5zAaApvWdi9SZSDPvObW5w=";
|
||||||
|
|
||||||
|
ldflags = [
|
||||||
|
"-s"
|
||||||
|
"-w"
|
||||||
|
"-X=main.builtBy=nixpkgs"
|
||||||
|
"-X=main.commit=${src.rev}"
|
||||||
|
"-X=main.version=${version}"
|
||||||
|
];
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
version = testers.testVersion {
|
||||||
|
package = eks-node-viewer;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Tool to visualize dynamic node usage within a cluster";
|
description = "Tool to visualize dynamic node usage within a cluster";
|
||||||
homepage = "https://github.com/awslabs/eks-node-viewer";
|
homepage = "https://github.com/awslabs/eks-node-viewer";
|
||||||
changelog = "https://github.com/awslabs/eks-node-viewer/releases/tag/${version}";
|
changelog = "https://github.com/awslabs/eks-node-viewer/releases/tag/${src.rev}";
|
||||||
license = licenses.afl20;
|
license = licenses.asl20;
|
||||||
maintainers = [ maintainers.ivankovnatsky ];
|
maintainers = [ maintainers.ivankovnatsky ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
|
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.0.0-rc.3";
|
version = "2.0.0-rc.5";
|
||||||
sha256 = "1ag3w97kzgqkpkw2lipv9x7wccr69zq47giffliya4sayj1y371y";
|
sha256 = "1akxmnbldsm7h4wf40jxsn56njdd5srkr6a3gsi223anl9c43gpx";
|
||||||
manifestsSha256 = "0gg6n5d3a7sypms540k4ycnrbg6nqlwymphszwbcjahdsjcmi40p";
|
manifestsSha256 = "1vra1vqw38r17fdkcj5a5rmifpdzi29z5qggzy4h9bqsqhxy488f";
|
||||||
|
|
||||||
manifests = fetchzip {
|
manifests = fetchzip {
|
||||||
url =
|
url =
|
||||||
|
@ -23,7 +23,7 @@ in buildGoModule rec {
|
||||||
inherit sha256;
|
inherit sha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-PFutjxDYwe9C52L3MfjFz9CJHbh77ADICaKXlKCuwuo=";
|
vendorSha256 = "sha256-kw1V2eFoqrTB+1dBQYqOopr7+AMY1OB80vM8UN4rsso=";
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
cp -r ${manifests} source/cmd/flux/manifests
|
cp -r ${manifests} source/cmd/flux/manifests
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "glooctl";
|
pname = "glooctl";
|
||||||
version = "1.14.6";
|
version = "1.14.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "solo-io";
|
owner = "solo-io";
|
||||||
repo = "gloo";
|
repo = "gloo";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-rALTZUztLZXBlKA3y9mUe/h9diGD6kOpLcD0nOIHr0w=";
|
hash = "sha256-nd7/B3GQzcnOn8rWQi8ZzxYa0CBFfacBFtctgpJYKLs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
subPackages = [ "projects/gloo/cli/cmd" ];
|
subPackages = [ "projects/gloo/cli/cmd" ];
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "helm-dashboard";
|
pname = "helm-dashboard";
|
||||||
version = "1.3.1";
|
version = "1.3.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "komodorio";
|
owner = "komodorio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-D9da40+DbU1EMdR/a4ahLtqlzwPdcHOiAJtPjKZ2Ehc=";
|
sha256 = "sha256-ukapQRTn19sNTnJ0PHc8sp8x+k1qFb3ioHZHvVtToVU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-LJVL20CsDxaAJ/qS+2P7Pv/jhyRO6WAmhGLCR9CmQKE=";
|
vendorHash = "sha256-ROffm1SGYnhUcp46nzQ951eaeQdO1pb+f8AInm0eSq0=";
|
||||||
|
|
||||||
# tests require internet access
|
# tests require internet access
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
(callPackage ./generic.nix { }) {
|
(callPackage ./generic.nix { }) {
|
||||||
channel = "stable";
|
channel = "stable";
|
||||||
version = "2.13.3";
|
version = "2.13.4";
|
||||||
sha256 = "080ay0qqb98m208rzj3jnv4jprcfg60b46dbv594i9ps6vhb4ndc";
|
sha256 = "094i9a5l5nmygja1q73ipi01m6w1jsnr6l04g5629na72568zh6w";
|
||||||
vendorSha256 = "sha256-5T3YrYr7xeRkAADeE24BPu4PYU4mHFspqAiBpS8n4Y0=";
|
vendorSha256 = "sha256-5T3YrYr7xeRkAADeE24BPu4PYU4mHFspqAiBpS8n4Y0=";
|
||||||
}
|
}
|
||||||
|
|
|
@ -166,9 +166,9 @@ rec {
|
||||||
mkTerraform = attrs: pluggable (generic attrs);
|
mkTerraform = attrs: pluggable (generic attrs);
|
||||||
|
|
||||||
terraform_1 = mkTerraform {
|
terraform_1 = mkTerraform {
|
||||||
version = "1.4.6";
|
version = "1.5.0";
|
||||||
hash = "sha256-V5sI8xmGASBZrPFtsnnfMEHapjz4BH3hvl0+DGjUSxQ=";
|
hash = "sha256-QLCmA4u0br9EyQ244VcpLW5GkZm+bhq2/vvxSbYolCY=";
|
||||||
vendorHash = "sha256-OW/aS6aBoHABxfdjDxMJEdHwLuHHtPR2YVW4l0sHPjE=";
|
vendorHash = "sha256-tfCfJj39VP+P4qhJTpEIAi4XB+6VYtVKkV/bTrtnFA0=";
|
||||||
patches = [ ./provider-path-0_15.patch ];
|
patches = [ ./provider-path-0_15.patch ];
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit plugins;
|
inherit plugins;
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "terragrunt";
|
pname = "terragrunt";
|
||||||
version = "0.45.18";
|
version = "0.46.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gruntwork-io";
|
owner = "gruntwork-io";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-J4edaMLvL9Bs1bwF+m0LMGiGmEKa7Xcb3SgOiDldTyY=";
|
hash = "sha256-2SC1HPmAQYUNrLMvtp87EaZ/K1dYD5LHhH+jB0si+Hs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA=";
|
vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA=";
|
||||||
|
@ -38,6 +38,6 @@ buildGoModule rec {
|
||||||
changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${version}";
|
changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${version}";
|
||||||
description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices";
|
description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ jk ];
|
maintainers = with maintainers; [ jk qjoly ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "tfupdate";
|
pname = "tfupdate";
|
||||||
version = "0.6.7";
|
version = "0.6.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "minamijoyo";
|
owner = "minamijoyo";
|
||||||
repo = "tfupdate";
|
repo = "tfupdate";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-zDrmzubk5ScqZapp58U8NsyKl9yZ48VtWafamDdlWK0=";
|
sha256 = "sha256-zL2zUd9wwX6oHeROxgLWNlrFYRQaah/r9k3DePdYikU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-nhAeN/UXLR0QBb7PT9hdtNSz1whfXxt6SYejpLJbDbk=";
|
vendorHash = "sha256-FnrcK990xL2FpFzIdb5ABBeeg5jjP22dBu7dOEeqG9c=";
|
||||||
|
|
||||||
# Tests start http servers which need to bind to local addresses:
|
# Tests start http servers which need to bind to local addresses:
|
||||||
# panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted
|
# panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted
|
||||||
|
@ -22,6 +22,6 @@ buildGoModule rec {
|
||||||
homepage = "https://github.com/minamijoyo/tfupdate";
|
homepage = "https://github.com/minamijoyo/tfupdate";
|
||||||
changelog = "https://github.com/minamijoyo/tfupdate/blob/${src.rev}/CHANGELOG.md";
|
changelog = "https://github.com/minamijoyo/tfupdate/blob/${src.rev}/CHANGELOG.md";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ Intuinewin ];
|
maintainers = with maintainers; [ Intuinewin qjoly ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "vcluster";
|
pname = "vcluster";
|
||||||
version = "0.12.3";
|
version = "0.15.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "loft-sh";
|
owner = "loft-sh";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-7yyOpF/eIeJinTe0sHPWLLBUbKYDhphmW8qkOdYOdXM=";
|
sha256 = "sha256-RsaEeWK8jEDolHH0FNFKGrvRDPreAu2/rkXqqYIxH1s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
@ -40,6 +40,6 @@ buildGoModule rec {
|
||||||
downloadPage = "https://github.com/loft-sh/vcluster";
|
downloadPage = "https://github.com/loft-sh/vcluster";
|
||||||
homepage = "https://www.vcluster.com/";
|
homepage = "https://www.vcluster.com/";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ peterromfeldhk berryp ];
|
maintainers = with maintainers; [ peterromfeldhk berryp qjoly ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,16 +10,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "werf";
|
pname = "werf";
|
||||||
version = "1.2.239";
|
version = "1.2.240";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "werf";
|
owner = "werf";
|
||||||
repo = "werf";
|
repo = "werf";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-1yLa5AYrKz1utArvw/225b2J/79L3Tnj2LcHUpaIhrs=";
|
hash = "sha256-xqL/p+SMYX1fnalb33063McMyFS3AK8CdiRkO8tYEyI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-GFWQterwrZonVMLNHtEKapr4QrU6NXK4xjvmNJ3VeA0=";
|
vendorHash = "sha256-fp+AbmkCieJuy+cY2eOf1qtZdm3IdH7X73CEEVVr8G4=";
|
||||||
|
|
||||||
proxyVendor = true;
|
proxyVendor = true;
|
||||||
|
|
||||||
|
|
39
pkgs/applications/networking/deck/default.nix
Normal file
39
pkgs/applications/networking/deck/default.nix
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
{ buildGoModule, lib, installShellFiles, fetchFromGitHub }:
|
||||||
|
let
|
||||||
|
short_hash = "7447a09";
|
||||||
|
in buildGoModule rec {
|
||||||
|
pname = "deck";
|
||||||
|
version = "1.22.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "Kong";
|
||||||
|
repo = "deck";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-BCx4bw+FrnH291sp52Dz+dc6cYtoLAt8fmdF6YbmgOE=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
CGO_ENABLED = 0;
|
||||||
|
|
||||||
|
ldflags = [
|
||||||
|
"-s -w -X github.com/kong/deck/cmd.VERSION=${version}"
|
||||||
|
"-X github.com/kong/deck/cmd.COMMIT=${short_hash}"
|
||||||
|
];
|
||||||
|
|
||||||
|
vendorSha256 = "sha256-rir8z1IwQenTvihHWaA7dx6Nn45M82ulCNRJuQlUhEM=";
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
installShellCompletion --cmd deck \
|
||||||
|
--bash <($out/bin/deck completion bash) \
|
||||||
|
--fish <($out/bin/deck completion fish) \
|
||||||
|
--zsh <($out/bin/deck completion zsh)
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A configuration management and drift detection tool for Kong";
|
||||||
|
homepage = "https://github.com/Kong/deck";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ liyangau ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
|
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
|
||||||
pname = "signalbackup-tools";
|
pname = "signalbackup-tools";
|
||||||
version = "20230607";
|
version = "20230612-1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bepaald";
|
owner = "bepaald";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-K38rrwTfKq2JG3jeFUV+yRNEXovf5Ucz8aSx2B8buEQ=";
|
hash = "sha256-w34MPTzDlYxYc1iZIreui7R5RwQvav2d8mSwZ9wXnqM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -21,13 +21,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "qv2ray";
|
pname = "qv2ray";
|
||||||
version = "unstable-2022-09-25";
|
version = "unstable-2023-06-09";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Qv2ray";
|
owner = "Qv2ray";
|
||||||
repo = "Qv2ray";
|
repo = "Qv2ray";
|
||||||
rev = "fb44fb1421941ab192229ff133bc28feeb4a8ce5";
|
rev = "aea9981cc28fe25de55207b93d86036b30d467d2";
|
||||||
sha256 = "sha256-TngDgLXKyAoQFnXpBNaz4QjfkVwfZyuQwatdhEiI57U=";
|
hash = "sha256-ySXAF6fkkKsafuSa3DxkOuRjSyiCDUZRevcfJRp7LPM=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "soju";
|
pname = "soju";
|
||||||
version = "0.6.1";
|
version = "0.6.2";
|
||||||
|
|
||||||
src = fetchFromSourcehut {
|
src = fetchFromSourcehut {
|
||||||
owner = "~emersion";
|
owner = "~emersion";
|
||||||
repo = "soju";
|
repo = "soju";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-e3yA8gXuLxRzJIQQIjhajIOWVtikd+gNVxbhzfy56b0=";
|
hash = "sha256-Icz6oIXLnLe75zuB8Q862I1ado5GpGZBJezrH7F7EJs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-iT/QMm6RM6kvw69Az+aLTtBuaCX7ELAiYlj5wXAtBd4=";
|
vendorHash = "sha256-iT/QMm6RM6kvw69Az+aLTtBuaCX7ELAiYlj5wXAtBd4=";
|
||||||
|
|
|
@ -13,11 +13,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "appflowy";
|
pname = "appflowy";
|
||||||
version = "0.1.5";
|
version = "0.2.1";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz";
|
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz";
|
||||||
sha256 = "sha256-fuA3/suJ9F3mHtNAxlefFGLX0+PHgFZpQycPpxztsPI=";
|
sha256 = "sha256-8+zT/CVG40y63Q0hjrgpuYrhWPFp6W4DaR4d+X0FMlU=";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "5.8.7";
|
version = "5.9.0";
|
||||||
pname = "timeular";
|
pname = "timeular";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage";
|
url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage";
|
||||||
sha256 = "sha256-IQb++L6bQCZ22sIC5fjBFlL2PPNUpbzOpl1yQIib0H0=";
|
sha256 = "sha256-RbP//rrKgvChIbBVwC8ElMUe+XsGMgHxowSdw6tRWNI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
appimageContents = appimageTools.extractType2 {
|
appimageContents = appimageTools.extractType2 {
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gut";
|
pname = "gut";
|
||||||
version = "0.2.7";
|
version = "0.2.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "julien040";
|
owner = "julien040";
|
||||||
repo = "gut";
|
repo = "gut";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-qmp6QWmyharyTzUVXlX/oJZWbeyegX/u8/vzi/pTSaA=";
|
sha256 = "sha256-18Tqgl84QPCsFNyV2oGQnLRI7WPK24X+4Mxk8Eh3FIQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-E4jr+dskBdVXj/B5RW1AKyxxr+f/+ZW42OTO9XbCLuw=";
|
vendorSha256 = "sha256-E4jr+dskBdVXj/B5RW1AKyxxr+f/+ZW42OTO9XbCLuw=";
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "srvc";
|
pname = "srvc";
|
||||||
version = "0.19.0";
|
version = "0.19.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "insilica";
|
owner = "insilica";
|
||||||
repo = "rs-srvc";
|
repo = "rs-srvc";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-ymDQJjD/7uY0nC0eJhSkT/X/oBSwVt6nAOOb81IKOQ4=";
|
hash = "sha256-o6BX8NnBdHQ5FMD3Dm8gfHHtzvG+irn1wWAwswKKXQY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-OMw/n8STqjT1e3iWwJU4R1UzhhctF6gLkAddy5EWapc=";
|
cargoHash = "sha256-WXHgJPOgGC8+/kgekiUmQv+1Z1+Y3mPw5MaaMVZlToA=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [
|
buildInputs = lib.optionals stdenv.isDarwin [
|
||||||
darwin.apple_sdk.frameworks.CoreServices
|
darwin.apple_sdk.frameworks.CoreServices
|
||||||
|
|
|
@ -1,33 +1,37 @@
|
||||||
{ lib
|
{ alsa-lib
|
||||||
, stdenv
|
|
||||||
, fetchFromGitHub
|
|
||||||
, asio
|
, asio
|
||||||
, cmake
|
, cmake
|
||||||
, curl
|
, curl
|
||||||
|
, fetchFromGitHub
|
||||||
|
, lib
|
||||||
|
, libremidi
|
||||||
, obs-studio
|
, obs-studio
|
||||||
, opencv
|
, opencv
|
||||||
, procps
|
, procps
|
||||||
, qtbase
|
, qtbase
|
||||||
|
, stdenv
|
||||||
, websocketpp
|
, websocketpp
|
||||||
, xorg
|
, xorg
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "advanced-scene-switcher";
|
pname = "advanced-scene-switcher";
|
||||||
version = "1.21.1";
|
version = "1.22.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "WarmUpTill";
|
owner = "WarmUpTill";
|
||||||
repo = "SceneSwitcher";
|
repo = "SceneSwitcher";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1p6fl1fy39hrm7yasjhv6z79bnjk2ib3yg9dvf1ahwzkd9bpyfyl";
|
hash = "sha256-SV5hnTIRJ6ZruA5t/G6zRAC/+oalTABor3h66eF+KHM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
alsa-lib
|
||||||
asio
|
asio
|
||||||
curl
|
curl
|
||||||
|
libremidi
|
||||||
obs-studio
|
obs-studio
|
||||||
opencv
|
opencv
|
||||||
procps
|
procps
|
||||||
|
@ -38,6 +42,10 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
|
|
||||||
|
postUnpack = ''
|
||||||
|
cp -r ${libremidi.src}/* $sourceRoot/deps/libremidi
|
||||||
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mkdir $out/lib $out/share
|
mkdir $out/lib $out/share
|
||||||
mv $out/obs-plugins/64bit $out/lib/obs-plugins
|
mv $out/obs-plugins/64bit $out/lib/obs-plugins
|
||||||
|
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "obs-teleport";
|
pname = "obs-teleport";
|
||||||
version = "0.6.5";
|
version = "0.6.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fzwoch";
|
owner = "fzwoch";
|
||||||
repo = "obs-teleport";
|
repo = "obs-teleport";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-J3Q0AQV21jh+Pth5wXbGbryrx7Mg65rAQVapyGBls7Y=";
|
sha256 = "sha256-fDLe1GbLZb/rXLiTtvcMqfQo2cG1guDCwLOEf3piPcU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-2rlEMkdcD+46EpQhUpLIGMzqvlyMFYK/XQYV9DJZxao=";
|
vendorHash = "sha256-GhIFGnGnwDmuDobMlOWCRFpHTbQlRtJrqXSFwxFydG0=";
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libjpeg
|
libjpeg
|
||||||
|
|
|
@ -16,11 +16,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "subtitleedit";
|
pname = "subtitleedit";
|
||||||
version = "3.6.12";
|
version = "3.6.13";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip";
|
url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip";
|
||||||
sha256 = "08p67krgcignjisbq7nmnb3nga2sad4vl739ak4a5rp3b49l1dmb";
|
sha256 = "sha256-LoACcpeK1s6EyM5svnsncTENLAEuRqonNLaQ2q4UFxM=";
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2,32 +2,25 @@
|
||||||
|
|
||||||
{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }:
|
{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }:
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
{ pname
|
{ pname
|
||||||
, version ? null
|
, version ? null
|
||||||
|
|
||||||
, buildInputs ? []
|
, buildInputs ? []
|
||||||
, packageRequires ? []
|
, packageRequires ? []
|
||||||
|
|
||||||
, meta ? {}
|
, meta ? {}
|
||||||
|
|
||||||
, ...
|
, ...
|
||||||
}@args:
|
}@args:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
defaultMeta = {
|
defaultMeta = {
|
||||||
broken = false;
|
broken = false;
|
||||||
platforms = emacs.meta.platforms;
|
platforms = emacs.meta.platforms;
|
||||||
} // optionalAttrs ((args.src.meta.homepage or "") != "") {
|
} // lib.optionalAttrs ((args.src.meta.homepage or "") != "") {
|
||||||
homepage = args.src.meta.homepage;
|
homepage = args.src.meta.homepage;
|
||||||
};
|
};
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation ({
|
stdenv.mkDerivation ({
|
||||||
name = "emacs-${pname}${optionalString (version != null) "-${version}"}";
|
name = "emacs-${pname}${lib.optionalString (version != null) "-${version}"}";
|
||||||
|
|
||||||
unpackCmd = ''
|
unpackCmd = ''
|
||||||
case "$curSrc" in
|
case "$curSrc" in
|
||||||
|
@ -68,7 +61,7 @@ stdenv.mkDerivation ({
|
||||||
meta = defaultMeta // meta;
|
meta = defaultMeta // meta;
|
||||||
}
|
}
|
||||||
|
|
||||||
// lib.optionalAttrs (emacs.nativeComp or false) {
|
// lib.optionalAttrs (emacs.withNativeCompilation or false) {
|
||||||
|
|
||||||
LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib";
|
LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib";
|
||||||
|
|
||||||
|
@ -90,6 +83,4 @@ stdenv.mkDerivation ({
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
||||||
// removeAttrs args [ "buildInputs" "packageRequires"
|
// removeAttrs args [ "buildInputs" "packageRequires" "meta" ])
|
||||||
"meta"
|
|
||||||
])
|
|
||||||
|
|
|
@ -32,34 +32,25 @@ in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ])
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
{ lib, lndir, makeWrapper, runCommand, gcc }: self:
|
{ lib, lndir, makeWrapper, runCommand, gcc }:
|
||||||
|
self:
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
inherit (self) emacs;
|
inherit (self) emacs;
|
||||||
|
withNativeCompilation = emacs.withNativeCompilation or false;
|
||||||
nativeComp = emacs.nativeComp or false;
|
withTreeSitter = emacs.withTreeSitter or false;
|
||||||
|
|
||||||
treeSitter = emacs.treeSitter or false;
|
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
packagesFun: # packages explicitly requested by the user
|
packagesFun: # packages explicitly requested by the user
|
||||||
|
|
||||||
let
|
let
|
||||||
explicitRequires =
|
explicitRequires =
|
||||||
if lib.isFunction packagesFun
|
if lib.isFunction packagesFun
|
||||||
then packagesFun self
|
then packagesFun self
|
||||||
else packagesFun;
|
else packagesFun;
|
||||||
in
|
in
|
||||||
|
|
||||||
runCommand
|
runCommand
|
||||||
(appendToName "with-packages" emacs).name
|
(lib.appendToName "with-packages" emacs).name
|
||||||
{
|
{
|
||||||
nativeBuildInputs = [ emacs lndir makeWrapper ];
|
|
||||||
inherit emacs explicitRequires;
|
inherit emacs explicitRequires;
|
||||||
|
nativeBuildInputs = [ emacs lndir makeWrapper ];
|
||||||
|
|
||||||
preferLocalBuild = true;
|
preferLocalBuild = true;
|
||||||
allowSubstitutes = false;
|
allowSubstitutes = false;
|
||||||
|
@ -69,8 +60,8 @@ runCommand
|
||||||
deps = runCommand "emacs-packages-deps"
|
deps = runCommand "emacs-packages-deps"
|
||||||
({
|
({
|
||||||
inherit explicitRequires lndir emacs;
|
inherit explicitRequires lndir emacs;
|
||||||
nativeBuildInputs = lib.optional nativeComp gcc;
|
nativeBuildInputs = lib.optional withNativeCompilation gcc;
|
||||||
} // lib.optionalAttrs nativeComp {
|
} // lib.optionalAttrs withNativeCompilation {
|
||||||
inherit (emacs) LIBRARY_PATH;
|
inherit (emacs) LIBRARY_PATH;
|
||||||
})
|
})
|
||||||
''
|
''
|
||||||
|
@ -110,10 +101,10 @@ runCommand
|
||||||
}
|
}
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
mkdir -p $out/share/emacs/site-lisp
|
mkdir -p $out/share/emacs/site-lisp
|
||||||
${optionalString nativeComp ''
|
${lib.optionalString withNativeCompilation ''
|
||||||
mkdir -p $out/share/emacs/native-lisp
|
mkdir -p $out/share/emacs/native-lisp
|
||||||
''}
|
''}
|
||||||
${optionalString treeSitter ''
|
${lib.optionalString withTreeSitter ''
|
||||||
mkdir -p $out/lib
|
mkdir -p $out/lib
|
||||||
''}
|
''}
|
||||||
|
|
||||||
|
@ -137,10 +128,10 @@ runCommand
|
||||||
linkEmacsPackage() {
|
linkEmacsPackage() {
|
||||||
linkPath "$1" "bin" "bin"
|
linkPath "$1" "bin" "bin"
|
||||||
linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp"
|
linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp"
|
||||||
${optionalString nativeComp ''
|
${lib.optionalString withNativeCompilation ''
|
||||||
linkPath "$1" "share/emacs/native-lisp" "share/emacs/native-lisp"
|
linkPath "$1" "share/emacs/native-lisp" "share/emacs/native-lisp"
|
||||||
''}
|
''}
|
||||||
${optionalString treeSitter ''
|
${lib.optionalString withTreeSitter ''
|
||||||
linkPath "$1" "lib" "lib"
|
linkPath "$1" "lib" "lib"
|
||||||
''}
|
''}
|
||||||
}
|
}
|
||||||
|
@ -171,10 +162,10 @@ runCommand
|
||||||
(load-file "$emacs/share/emacs/site-lisp/site-start.el"))
|
(load-file "$emacs/share/emacs/site-lisp/site-start.el"))
|
||||||
(add-to-list 'load-path "$out/share/emacs/site-lisp")
|
(add-to-list 'load-path "$out/share/emacs/site-lisp")
|
||||||
(add-to-list 'exec-path "$out/bin")
|
(add-to-list 'exec-path "$out/bin")
|
||||||
${optionalString nativeComp ''
|
${lib.optionalString withNativeCompilation ''
|
||||||
(add-to-list 'native-comp-eln-load-path "$out/share/emacs/native-lisp/")
|
(add-to-list 'native-comp-eln-load-path "$out/share/emacs/native-lisp/")
|
||||||
''}
|
''}
|
||||||
${optionalString treeSitter ''
|
${lib.optionalString withTreeSitter ''
|
||||||
(add-to-list 'treesit-extra-load-path "$out/lib/")
|
(add-to-list 'treesit-extra-load-path "$out/lib/")
|
||||||
''}
|
''}
|
||||||
EOF
|
EOF
|
||||||
|
@ -189,7 +180,7 @@ runCommand
|
||||||
# Byte-compiling improves start-up time only slightly, but costs nothing.
|
# Byte-compiling improves start-up time only slightly, but costs nothing.
|
||||||
$emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs"
|
$emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs"
|
||||||
|
|
||||||
${optionalString nativeComp ''
|
${lib.optionalString withNativeCompilation ''
|
||||||
$emacs/bin/emacs --batch \
|
$emacs/bin/emacs --batch \
|
||||||
--eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \
|
--eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \
|
||||||
-f batch-native-compile "$siteStart" "$subdirs"
|
-f batch-native-compile "$siteStart" "$subdirs"
|
||||||
|
|
|
@ -326,6 +326,10 @@
|
||||||
"panel-date-format": [
|
"panel-date-format": [
|
||||||
"panel-date-format@keiii.github.com",
|
"panel-date-format@keiii.github.com",
|
||||||
"panel-date-format@atareao.es"
|
"panel-date-format@atareao.es"
|
||||||
|
],
|
||||||
|
"battery-time": [
|
||||||
|
"batime@martin.zurowietz.de",
|
||||||
|
"batterytime@typeof.pw"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,9 +6,8 @@
|
||||||
# - Make a separate section for each GNOME version. Collisions will come back eventually
|
# - Make a separate section for each GNOME version. Collisions will come back eventually
|
||||||
# as the extensions are updated.
|
# as the extensions are updated.
|
||||||
{
|
{
|
||||||
# ############################################################################
|
|
||||||
# These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
|
# ####### GNOME 44 #######
|
||||||
# Make sure to move them up once they are updated
|
|
||||||
|
|
||||||
"apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
|
"apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
|
||||||
"Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
|
"Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
|
||||||
|
@ -28,6 +27,13 @@
|
||||||
"panel-date-format@keiii.github.com" = "panel-date-format";
|
"panel-date-format@keiii.github.com" = "panel-date-format";
|
||||||
"panel-date-format@atareao.es" = "panel-date-format-2";
|
"panel-date-format@atareao.es" = "panel-date-format-2";
|
||||||
|
|
||||||
|
"batime@martin.zurowietz.de" = "battery-time";
|
||||||
|
"batterytime@typeof.pw" = "battery-time-2";
|
||||||
|
|
||||||
|
# ############################################################################
|
||||||
|
# These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
|
||||||
|
# Make sure to move them up once they are updated
|
||||||
|
|
||||||
# ####### GNOME 43 #######
|
# ####### GNOME 43 #######
|
||||||
|
|
||||||
# DEPRECATED: Use "Caffeine" instead
|
# DEPRECATED: Use "Caffeine" instead
|
||||||
|
@ -37,9 +43,6 @@
|
||||||
"noannoyance@sindex.com" = "noannoyance";
|
"noannoyance@sindex.com" = "noannoyance";
|
||||||
"noannoyance@daase.net" = "noannoyance-2";
|
"noannoyance@daase.net" = "noannoyance-2";
|
||||||
|
|
||||||
"batime@martin.zurowietz.de" = "battery-time";
|
|
||||||
"batterytime@typeof.pw" = "battery-time-2";
|
|
||||||
|
|
||||||
"volume_scroller@trflynn89.pm.me" = "volume-scroller";
|
"volume_scroller@trflynn89.pm.me" = "volume-scroller";
|
||||||
"volume_scroller@francislavoie.github.io" = "volume-scroller-2";
|
"volume_scroller@francislavoie.github.io" = "volume-scroller-2";
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -9,11 +9,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "computecpp";
|
pname = "computecpp";
|
||||||
version = "2.3.0";
|
version = "2.11.0";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz";
|
url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz";
|
||||||
hash = "sha256-AUHSls4BOX20PVKzDAp3RqpeRDwgbgYzz6CRvRN+kdk=";
|
hash = "sha256-xHOPuijx5TZeHzRHPXcll0WqoBzHBryIoe3BnOxBVVY=";
|
||||||
stripRoot = true;
|
stripRoot = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,24 +1,24 @@
|
||||||
let version = "3.0.0"; in
|
let version = "3.0.4"; in
|
||||||
{ fetchurl }: {
|
{ fetchurl }: {
|
||||||
versionUsed = version;
|
versionUsed = version;
|
||||||
"${version}-x86_64-darwin" = fetchurl {
|
"${version}-x86_64-darwin" = fetchurl {
|
||||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
|
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
|
||||||
sha256 = "0aav696x5p6zq6vfmv7zpy9v701dpbk0xwkyv2c2qdmrbb8wljb0";
|
sha256 = "07p2fjk4jhnzhwqlmfjrlx9i11cj389fyk6kj6ri4ygpcfy3933k";
|
||||||
};
|
};
|
||||||
"${version}-aarch64-darwin" = fetchurl {
|
"${version}-aarch64-darwin" = fetchurl {
|
||||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
|
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
|
||||||
sha256 = "1l06qk4w03qrrmnflb7a9jcm8ssx0p7b95jkhyvdg878d79zrpb7";
|
sha256 = "1p1b4vqcrgw6bvxpr5f1mvbkxq3nqbdj6maq4svhkd8rwrwp7g8h";
|
||||||
};
|
};
|
||||||
"${version}-aarch64-linux" = fetchurl {
|
"${version}-aarch64-linux" = fetchurl {
|
||||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
|
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
|
||||||
sha256 = "0p15njnry0kp9878lmg86p01bbvin8xm6131r8barzclcj5v3msd";
|
sha256 = "1hagjgh991kqghm7ffwx3wlq1ija20h1dmd2g8py1pvw167fwkfh";
|
||||||
};
|
};
|
||||||
"${version}-x86_64-linux" = fetchurl {
|
"${version}-x86_64-linux" = fetchurl {
|
||||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
|
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
|
||||||
sha256 = "0r96frjcqinhyzq809hv9yggm09clyc712ln3caqxfybcr552mm2";
|
sha256 = "19gw8nkh77m009jwj92wcqjdp7xxp5p7aw4psf2ghbbl5mrmimzy";
|
||||||
};
|
};
|
||||||
"${version}-i686-linux" = fetchurl {
|
"${version}-i686-linux" = fetchurl {
|
||||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
|
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
|
||||||
sha256 = "16qdcc6ssgh3158fpqld6sai3lxvyimvasjmgqrhfh7h8p0inzfw";
|
sha256 = "1phbaqq9lfq60bbf2pr38vngszrrd4931qzkd8772226ha79fsr0";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,12 @@ mkCoqDerivation {
|
||||||
pname = "cheerios";
|
pname = "cheerios";
|
||||||
owner = "uwplse";
|
owner = "uwplse";
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = if lib.versions.range "8.6" "8.16" coq.version then "20200201" else null;
|
defaultVersion = with lib.versions; lib.switch coq.version [
|
||||||
|
{ case = range "8.14" "8.17"; out = "20230107"; }
|
||||||
|
{ case = range "8.6" "8.16"; out = "20200201"; }
|
||||||
|
] null;
|
||||||
|
release."20230107".rev = "bad8ad2476e14df6b5a819b7aaddc27a7c53fb69";
|
||||||
|
release."20230107".sha256 = "sha256-G7a+6h4VDk7seKvFr6wy7vYqYmhUje78TYCj98wXrr8=";
|
||||||
release."20200201".rev = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d";
|
release."20200201".rev = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d";
|
||||||
release."20200201".sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1";
|
release."20200201".sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1";
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,12 @@ mkCoqDerivation {
|
||||||
pname = "InfSeqExt";
|
pname = "InfSeqExt";
|
||||||
owner = "DistributedComponents";
|
owner = "DistributedComponents";
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = if lib.versions.range "8.5" "8.16" coq.version then "20200131" else null;
|
defaultVersion = with lib.versions; lib.switch coq.version [
|
||||||
|
{ case = range "8.9" "8.17"; out = "20230107"; }
|
||||||
|
{ case = range "8.5" "8.16"; out = "20200131"; }
|
||||||
|
] null;
|
||||||
|
release."20230107".rev = "601e89ec019501c48c27fcfc14b9a3c70456e408";
|
||||||
|
release."20230107".sha256 = "sha256-YMBzVIsLkIC+w2TeyHrKe29eWLIxrH3wIMZqhik8p9I=";
|
||||||
release."20200131".rev = "203d4c20211d6b17741f1fdca46dbc091f5e961a";
|
release."20200131".rev = "203d4c20211d6b17741f1fdca46dbc091f5e961a";
|
||||||
release."20200131".sha256 = "0xylkdmb2dqnnqinf3pigz4mf4zmczcbpjnn59g5g76m7f2cqxl0";
|
release."20200131".sha256 = "0xylkdmb2dqnnqinf3pigz4mf4zmczcbpjnn59g5g76m7f2cqxl0";
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
|
|
@ -5,9 +5,12 @@ mkCoqDerivation {
|
||||||
owner = "uwplse";
|
owner = "uwplse";
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||||
|
{ case = range "8.9" "8.17"; out = "20230107"; }
|
||||||
{ case = range "8.6" "8.16"; out = "20210328"; }
|
{ case = range "8.6" "8.16"; out = "20210328"; }
|
||||||
{ case = range "8.5" "8.13"; out = "20181102"; }
|
{ case = range "8.5" "8.13"; out = "20181102"; }
|
||||||
] null;
|
] null;
|
||||||
|
release."20230107".rev = "2f2ff253be29bb09f36cab96d036419b18a95b00";
|
||||||
|
release."20230107".sha256 = "sha256-4mWdnWD8m1ddgqWHqzjqclhinXJaB/YoLlmLeeL0yZA=";
|
||||||
release."20210328".rev = "179bd5312e9d8b63fc3f4071c628cddfc496d741";
|
release."20210328".rev = "179bd5312e9d8b63fc3f4071c628cddfc496d741";
|
||||||
release."20210328".sha256 = "sha256:1y5r1zm3hli10ah6lnj7n8hxad6rb6rgldd0g7m2fjibzvwqzhdg";
|
release."20210328".sha256 = "sha256:1y5r1zm3hli10ah6lnj7n8hxad6rb6rgldd0g7m2fjibzvwqzhdg";
|
||||||
release."20181102".rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
|
release."20181102".rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
|
||||||
|
|
|
@ -6,11 +6,14 @@ mkCoqDerivation {
|
||||||
owner = "uwplse";
|
owner = "uwplse";
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||||
|
{ case = range "8.9" "8.17"; out = "20230503"; }
|
||||||
{ case = range "8.7" "8.16"; out = "20211026"; }
|
{ case = range "8.7" "8.16"; out = "20211026"; }
|
||||||
{ case = range "8.7" "8.14"; out = "20210524"; }
|
{ case = range "8.7" "8.14"; out = "20210524"; }
|
||||||
{ case = range "8.7" "8.13"; out = "20200131"; }
|
{ case = range "8.7" "8.13"; out = "20200131"; }
|
||||||
{ case = "8.6"; out = "20181102"; }
|
{ case = "8.6"; out = "20181102"; }
|
||||||
] null;
|
] null;
|
||||||
|
release."20230503".rev = "76833a7b2188e99e358b8439ea6b4f38401c962a";
|
||||||
|
release."20230503".sha256 = "sha256-g59adl/FLMlk9vZciz2I1ZX4PDCElNOgVPCwML8E4DU=";
|
||||||
release."20211026".rev = "064cc4fb2347453bf695776ed820ffb5fbc1d804";
|
release."20211026".rev = "064cc4fb2347453bf695776ed820ffb5fbc1d804";
|
||||||
release."20211026".sha256 = "sha256:13xrcyzay5sjszf5lg4s44wl9nrcz22n6gi4h95pkpj0ni5clinx";
|
release."20211026".sha256 = "sha256:13xrcyzay5sjszf5lg4s44wl9nrcz22n6gi4h95pkpj0ni5clinx";
|
||||||
release."20210524".rev = "54597d8ac7ab7dd4dae683f651237644bf77701e";
|
release."20210524".rev = "54597d8ac7ab7dd4dae683f651237644bf77701e";
|
||||||
|
|
|
@ -4,14 +4,14 @@
|
||||||
, cmake
|
, cmake
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "wamr";
|
pname = "wamr";
|
||||||
version = "1.2.2";
|
version = "1.2.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bytecodealliance";
|
owner = "bytecodealliance";
|
||||||
repo = "wasm-micro-runtime";
|
repo = "wasm-micro-runtime";
|
||||||
rev = "WAMR-${version}";
|
rev = "WAMR-${finalAttrs.version}";
|
||||||
hash = "sha256-jpT42up9HAVJpo03cFrffQQk2JiHEAEepBGlU4RUfNU=";
|
hash = "sha256-jpT42up9HAVJpo03cFrffQQk2JiHEAEepBGlU4RUfNU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -28,4 +28,4 @@ stdenv.mkDerivation rec {
|
||||||
# more platforms.
|
# more platforms.
|
||||||
broken = !stdenv.isLinux;
|
broken = !stdenv.isLinux;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "aravis";
|
pname = "aravis";
|
||||||
version = "0.8.26";
|
version = "0.8.27";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "AravisProject";
|
owner = "AravisProject";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-24FSq9qe8tAFGB4BOjD52BQiy8Rw6ZDE5Sq+VS5S638=";
|
sha256 = "sha256-QxI/+2mtX9d4UTkbFFVh5N4JqTMqygGUgz08XWxAQac=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "bin" "dev" "out" "lib" ];
|
outputs = [ "bin" "dev" "out" "lib" ];
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
|
||||||
|
|
||||||
callPackage ./generic.nix (args // rec {
|
|
||||||
version = "1.68.0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
|
|
||||||
# SHA256 from http://www.boost.org/users/history/version_1_68_0.html
|
|
||||||
sha256 = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7";
|
|
||||||
};
|
|
||||||
})
|
|
|
@ -1,13 +0,0 @@
|
||||||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
|
||||||
|
|
||||||
callPackage ./generic.nix (args // rec {
|
|
||||||
version = "1.69.0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
|
|
||||||
# SHA256 from http://www.boost.org/users/history/version_1_69_0.html
|
|
||||||
sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [ ./pthread-stack-min-fix.patch ];
|
|
||||||
})
|
|
|
@ -1,13 +0,0 @@
|
||||||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
|
||||||
|
|
||||||
callPackage ./generic.nix (args // rec {
|
|
||||||
version = "1.70.0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
|
|
||||||
# SHA256 from http://www.boost.org/users/history/version_1_70_0.html
|
|
||||||
sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [ ./pthread-stack-min-fix.patch ];
|
|
||||||
})
|
|
|
@ -1,17 +0,0 @@
|
||||||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
|
||||||
|
|
||||||
callPackage ./generic.nix (args // rec {
|
|
||||||
version = "1.72.0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
urls = [
|
|
||||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
|
||||||
"https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
|
||||||
];
|
|
||||||
# SHA256 from http://www.boost.org/users/history/version_1_72_0.html
|
|
||||||
sha256 = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [ ./pthread-stack-min-fix.patch ];
|
|
||||||
})
|
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
|
||||||
|
|
||||||
callPackage ./generic.nix (args // rec {
|
|
||||||
version = "1.73.0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
urls = [
|
|
||||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
|
||||||
"https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
|
||||||
];
|
|
||||||
# SHA256 from http://www.boost.org/users/history/version_1_73_0.html
|
|
||||||
sha256 = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
|
||||||
|
|
||||||
callPackage ./generic.nix (args // rec {
|
|
||||||
version = "1.74.0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
urls = [
|
|
||||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
|
||||||
"https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
|
||||||
];
|
|
||||||
# SHA256 from http://www.boost.org/users/history/version_1_74_0.html
|
|
||||||
sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam
|
|
||||||
index ad19f7b55..ec6bf57ff 100644
|
|
||||||
--- a/tools/boost_install/boost-install.jam
|
|
||||||
+++ b/tools/boost_install/boost-install.jam
|
|
||||||
@@ -587,6 +587,7 @@ rule generate-cmake-config- ( target : sources * : properties * )
|
|
||||||
"# Compute the include and library directories relative to this file."
|
|
||||||
""
|
|
||||||
"get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)"
|
|
||||||
+ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)"
|
|
||||||
: true ;
|
|
||||||
|
|
||||||
if [ path.is-rooted $(cmakedir) ]
|
|
||||||
@@ -607,6 +608,8 @@ rule generate-cmake-config- ( target : sources * : properties * )
|
|
||||||
" unset(_BOOST_CMAKEDIR_ORIGINAL)"
|
|
||||||
"endif()"
|
|
||||||
""
|
|
||||||
+ "# Assume that the installer actually did know where the libs were to be installed"
|
|
||||||
+ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)"
|
|
||||||
: true ;
|
|
||||||
}
|
|
||||||
|
|
|
@ -16,12 +16,6 @@ let
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
in {
|
in {
|
||||||
boost168 = makeBoost ./1.68.nix;
|
|
||||||
boost169 = makeBoost ./1.69.nix;
|
|
||||||
boost170 = makeBoost ./1.70.nix;
|
|
||||||
boost172 = makeBoost ./1.72.nix;
|
|
||||||
boost173 = makeBoost ./1.73.nix;
|
|
||||||
boost174 = makeBoost ./1.74.nix;
|
|
||||||
boost175 = makeBoost ./1.75.nix;
|
boost175 = makeBoost ./1.75.nix;
|
||||||
boost177 = makeBoost ./1.77.nix;
|
boost177 = makeBoost ./1.77.nix;
|
||||||
boost178 = makeBoost ./1.78.nix;
|
boost178 = makeBoost ./1.78.nix;
|
||||||
|
|
|
@ -31,9 +31,6 @@ assert enableShared || enableStatic;
|
||||||
|
|
||||||
assert enableNumpy -> enablePython;
|
assert enableNumpy -> enablePython;
|
||||||
|
|
||||||
# Boost <1.69 can't be built on linux with clang >8, because pth was removed
|
|
||||||
assert with lib; (stdenv.isLinux && toolset == "clang" && versionAtLeast stdenv.cc.version "8.0.0") -> versionAtLeast version "1.69";
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
variant = lib.concatStringsSep ","
|
variant = lib.concatStringsSep ","
|
||||||
|
@ -107,22 +104,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
patches = patches
|
patches = patches
|
||||||
++ lib.optional stdenv.isDarwin ./darwin-no-system-python.patch
|
++ lib.optional stdenv.isDarwin ./darwin-no-system-python.patch
|
||||||
# Fix boost-context segmentation faults on ppc64 due to ABI violation
|
++ [ ./cmake-paths-173.patch ]
|
||||||
++ lib.optional (lib.versionOlder version "1.71") (fetchpatch {
|
|
||||||
url = "https://github.com/boostorg/context/commit/2354eca9b776a6739112833f64754108cc0d1dc5.patch";
|
|
||||||
sha256 = "067m4bjpmcanqvg28djax9a10avmdwhlpfx6gn73kbqqq70dnz29";
|
|
||||||
stripLen = 1;
|
|
||||||
extraPrefix = "libs/context/";
|
|
||||||
})
|
|
||||||
++ lib.optional (lib.versionOlder version "1.70") (fetchpatch {
|
|
||||||
# support for Mips64n64 appeared in boost-context 1.70
|
|
||||||
url = "https://github.com/boostorg/context/commit/e3f744a1862164062d579d1972272d67bdaa9c39.patch";
|
|
||||||
sha256 = "sha256-qjQy1b4jDsIRrI+UYtcguhvChrMbGWO0UlEzEJHYzRI=";
|
|
||||||
stripLen = 1;
|
|
||||||
extraPrefix = "libs/context/";
|
|
||||||
})
|
|
||||||
++ lib.optional (lib.versionAtLeast version "1.70" && lib.versionOlder version "1.73") ./cmake-paths.patch
|
|
||||||
++ lib.optional (lib.versionAtLeast version "1.73") ./cmake-paths-173.patch
|
|
||||||
++ lib.optional (version == "1.77.0") (fetchpatch {
|
++ lib.optional (version == "1.77.0") (fetchpatch {
|
||||||
url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch";
|
url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch";
|
||||||
relative = "include";
|
relative = "include";
|
||||||
|
@ -134,7 +116,6 @@ stdenv.mkDerivation {
|
||||||
description = "Collection of C++ libraries";
|
description = "Collection of C++ libraries";
|
||||||
license = licenses.boost;
|
license = licenses.boost;
|
||||||
platforms = platforms.unix ++ platforms.windows;
|
platforms = platforms.unix ++ platforms.windows;
|
||||||
badPlatforms = optionals (versionOlder version "1.73") platforms.riscv;
|
|
||||||
maintainers = with maintainers; [ hjones2199 ];
|
maintainers = with maintainers; [ hjones2199 ];
|
||||||
|
|
||||||
broken =
|
broken =
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
Taken from https://github.com/conan-io/conan-center-index/pull/361/files
|
|
||||||
|
|
||||||
diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
|
|
||||||
index aefbeb4..bc9b136 100644
|
|
||||||
--- a/boost/thread/pthread/thread_data.hpp
|
|
||||||
+++ b/boost/thread/pthread/thread_data.hpp
|
|
||||||
@@ -57,7 +57,7 @@ namespace boost
|
|
||||||
#else
|
|
||||||
std::size_t page_size = ::sysconf( _SC_PAGESIZE);
|
|
||||||
#endif
|
|
||||||
-#if PTHREAD_STACK_MIN > 0
|
|
||||||
+#ifdef PTHREAD_STACK_MIN
|
|
||||||
if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
|
|
||||||
#endif
|
|
||||||
size = ((size+page_size-1)/page_size)*page_size;
|
|
|
@ -13,104 +13,74 @@
|
||||||
, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ]
|
, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ]
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
# This is now over 3GB, to allow hydra caching we separate it
|
pname = "composable_kernel";
|
||||||
ck = stdenv.mkDerivation (finalAttrs: {
|
version = "unstable-2023-01-16";
|
||||||
pname = "composable_kernel";
|
|
||||||
version = "unstable-2023-01-16";
|
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
] ++ lib.optionals buildTests [
|
] ++ lib.optionals buildTests [
|
||||||
"test"
|
"test"
|
||||||
] ++ lib.optionals buildExamples [
|
] ++ lib.optionals buildExamples [
|
||||||
"example"
|
"example"
|
||||||
];
|
];
|
||||||
|
|
||||||
# ROCm 5.6 should release composable_kernel as stable with a tag in the future
|
# ROCm 5.6 should release composable_kernel as stable with a tag in the future
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ROCmSoftwarePlatform";
|
owner = "ROCmSoftwarePlatform";
|
||||||
repo = "composable_kernel";
|
repo = "composable_kernel";
|
||||||
rev = "80e05267417f948e4f7e63c0fe807106d9a0c0ef";
|
rev = "80e05267417f948e4f7e63c0fe807106d9a0c0ef";
|
||||||
hash = "sha256-+c0E2UtlG/abweLwCWWjNHDO5ZvSIVKwwwettT9mqR4=";
|
hash = "sha256-+c0E2UtlG/abweLwCWWjNHDO5ZvSIVKwwwettT9mqR4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
rocm-cmake
|
rocm-cmake
|
||||||
hip
|
hip
|
||||||
clang-tools-extra
|
clang-tools-extra
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
openmp
|
openmp
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DCMAKE_C_COMPILER=hipcc"
|
"-DCMAKE_C_COMPILER=hipcc"
|
||||||
"-DCMAKE_CXX_COMPILER=hipcc"
|
"-DCMAKE_CXX_COMPILER=hipcc"
|
||||||
] ++ lib.optionals (gpuTargets != [ ]) [
|
] ++ lib.optionals (gpuTargets != [ ]) [
|
||||||
"-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
|
"-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
|
||||||
"-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
|
"-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
|
||||||
] ++ lib.optionals buildTests [
|
] ++ lib.optionals buildTests [
|
||||||
"-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names
|
"-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names
|
||||||
];
|
];
|
||||||
|
|
||||||
# No flags to build selectively it seems...
|
# No flags to build selectively it seems...
|
||||||
postPatch = lib.optionalString (!buildTests) ''
|
postPatch = lib.optionalString (!buildTests) ''
|
||||||
substituteInPlace CMakeLists.txt \
|
substituteInPlace CMakeLists.txt \
|
||||||
--replace "add_subdirectory(test)" ""
|
--replace "add_subdirectory(test)" ""
|
||||||
'' + lib.optionalString (!buildExamples) ''
|
'' + lib.optionalString (!buildExamples) ''
|
||||||
substituteInPlace CMakeLists.txt \
|
substituteInPlace CMakeLists.txt \
|
||||||
--replace "add_subdirectory(example)" ""
|
--replace "add_subdirectory(example)" ""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = lib.optionalString buildTests ''
|
postInstall = lib.optionalString buildTests ''
|
||||||
mkdir -p $test/bin
|
mkdir -p $test/bin
|
||||||
mv $out/bin/test_* $test/bin
|
mv $out/bin/test_* $test/bin
|
||||||
'' + lib.optionalString buildExamples ''
|
|
||||||
mkdir -p $example/bin
|
|
||||||
mv $out/bin/example_* $example/bin
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru.updateScript = unstableGitUpdater { };
|
|
||||||
|
|
||||||
# Times out otherwise
|
|
||||||
requiredSystemFeatures = [ "big-parallel" ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Performance portable programming model for machine learning tensor operators";
|
|
||||||
homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel";
|
|
||||||
license = with licenses; [ mit ];
|
|
||||||
maintainers = teams.rocm.members;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
in stdenv.mkDerivation {
|
|
||||||
inherit (ck) pname version outputs src passthru requiredSystemFeatures meta;
|
|
||||||
|
|
||||||
dontUnpack = true;
|
|
||||||
dontPatch = true;
|
|
||||||
dontConfigure = true;
|
|
||||||
dontBuild = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
mkdir -p $out
|
|
||||||
cp -an ${ck}/* $out
|
|
||||||
'' + lib.optionalString buildTests ''
|
|
||||||
cp -a ${ck.test} $test
|
|
||||||
'' + lib.optionalString buildExamples ''
|
'' + lib.optionalString buildExamples ''
|
||||||
cp -a ${ck.example} $example
|
mkdir -p $example/bin
|
||||||
'' + ''
|
mv $out/bin/example_* $example/bin
|
||||||
runHook postInstall
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Fix paths
|
passthru.updateScript = unstableGitUpdater { };
|
||||||
preFixup = ''
|
|
||||||
substituteInPlace $out/lib/cmake/composable_kernel/*.cmake \
|
# Times out otherwise
|
||||||
--replace "${ck}" "$out"
|
requiredSystemFeatures = [ "big-parallel" ];
|
||||||
'';
|
|
||||||
}
|
meta = with lib; {
|
||||||
|
description = "Performance portable programming model for machine learning tensor operators";
|
||||||
|
homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel";
|
||||||
|
license = with licenses; [ mit ];
|
||||||
|
maintainers = teams.rocm.members;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
59
pkgs/development/libraries/ctranslate2/default.nix
Normal file
59
pkgs/development/libraries/ctranslate2/default.nix
Normal file
|
@ -0,0 +1,59 @@
|
||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, darwin # Accelerate
|
||||||
|
, llvmPackages # openmp
|
||||||
|
, oneDNN
|
||||||
|
, openblas
|
||||||
|
, withMkl ? false, mkl
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
cmakeBool = b: if b then "ON" else "OFF";
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "ctranslate2";
|
||||||
|
version = "3.15.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "OpenNMT";
|
||||||
|
repo = "CTranslate2";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-lh4j53+LQj09tq3qiHrL2YrACzWY1V/HX8Ixnq0TTyY=";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
# https://opennmt.net/CTranslate2/installation.html#build-options
|
||||||
|
"-DWITH_DNNL=OFF" # requires oneDNN>=3.0
|
||||||
|
"-DWITH_OPENBLAS=ON"
|
||||||
|
"-DWITH_MKL=${cmakeBool withMkl}"
|
||||||
|
]
|
||||||
|
++ lib.optional stdenv.isDarwin "-DWITH_ACCELERATE=ON";
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
llvmPackages.openmp
|
||||||
|
openblas
|
||||||
|
oneDNN
|
||||||
|
] ++ lib.optional withMkl [
|
||||||
|
mkl
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
darwin.apple_sdk.frameworks.Accelerate
|
||||||
|
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||||
|
darwin.apple_sdk.frameworks.CoreGraphics
|
||||||
|
darwin.apple_sdk.frameworks.CoreVideo
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Fast inference engine for Transformer models";
|
||||||
|
homepage = "https://github.com/OpenNMT/CTranslate2";
|
||||||
|
changelog = "https://github.com/OpenNMT/CTranslate2/blob/${src.rev}/CHANGELOG.md";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ hexa ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -19,24 +19,26 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-qFgCLV7sgGxlL18sThqpl+vyXL68GXcbYqMG7mXhsB4=";
|
sha256 = "sha256-qFgCLV7sgGxlL18sThqpl+vyXL68GXcbYqMG7mXhsB4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
doxygen
|
doxygen
|
||||||
graphviz
|
graphviz
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeCheckInputs = [
|
checkInputs = [
|
||||||
gbenchmark
|
|
||||||
gtest
|
gtest
|
||||||
|
gbenchmark
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DFTXUI_BUILD_EXAMPLES=OFF"
|
"-DFTXUI_BUILD_EXAMPLES=OFF"
|
||||||
"-DFTXUI_BUILD_DOCS=ON"
|
"-DFTXUI_BUILD_DOCS=ON"
|
||||||
"-DFTXUI_BUILD_TESTS=ON"
|
"-DFTXUI_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/ArthurSonzogni/FTXUI";
|
homepage = "https://github.com/ArthurSonzogni/FTXUI";
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
, pango
|
, pango
|
||||||
, libsecret
|
, libsecret
|
||||||
, openssh
|
, openssh
|
||||||
, systemd
|
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, gi-docgen
|
, gi-docgen
|
||||||
|
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||||
pango
|
pango
|
||||||
libsecret
|
libsecret
|
||||||
openssh
|
openssh
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
] ++ lib.optionals (systemdSupport) [
|
||||||
systemd
|
systemd
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
||||||
# We are still using ssh-agent from gnome-keyring.
|
# We are still using ssh-agent from gnome-keyring.
|
||||||
# https://github.com/NixOS/nixpkgs/issues/140824
|
# https://github.com/NixOS/nixpkgs/issues/140824
|
||||||
"-Dssh_agent=false"
|
"-Dssh_agent=false"
|
||||||
] ++ lib.optionals (!stdenv.isLinux) [
|
] ++ lib.optionals (!systemdSupport) [
|
||||||
"-Dsystemd=disabled"
|
"-Dsystemd=disabled"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
|
||||||
fitting. There are over 1000 functions in total with an
|
fitting. There are over 1000 functions in total with an
|
||||||
extensive test suite.
|
extensive test suite.
|
||||||
'';
|
'';
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libmilter";
|
pname = "libmilter";
|
||||||
version = "8.17.1";
|
version = "8.17.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${version}.tar.gz";
|
url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${version}.tar.gz";
|
||||||
sha256 = "sha256-BLx2tsiG5tERvn/Y2qMrjOABKKKItrUuBnvCnzhUpuY=";
|
sha256 = "sha256-kPWudMNahICIYZM7oJQgG5AbcMaykDaE3POb2uiloaI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [ avahi ];
|
buildInputs = [ avahi ];
|
||||||
|
|
||||||
unpackPhase = ''
|
unpackPhase = ''
|
||||||
unpackFile ${src}
|
unpackFile $src
|
||||||
echo y | ./${installerName}.sh
|
echo y | ./${installerName}.sh
|
||||||
sourceRoot="NDI SDK for Linux";
|
sourceRoot="NDI SDK for Linux";
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "brev-cli";
|
pname = "brev-cli";
|
||||||
version = "0.6.229";
|
version = "0.6.236";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "brevdev";
|
owner = "brevdev";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-DZ1WLuGoMndnLuvvoOQTkSG0v5Vd5z0zDAs5YLymT18=";
|
sha256 = "sha256-QfdIGCuXMxrTfeGBf3O9+/OjrFhxNzN6ZGH7cHbcxkw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";
|
vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";
|
||||||
|
|
|
@ -214,7 +214,6 @@
|
||||||
, "lua-fmt"
|
, "lua-fmt"
|
||||||
, "lv_font_conv"
|
, "lv_font_conv"
|
||||||
, "madoko"
|
, "madoko"
|
||||||
, "mailwind"
|
|
||||||
, "markdownlint-cli"
|
, "markdownlint-cli"
|
||||||
, "markdownlint-cli2"
|
, "markdownlint-cli2"
|
||||||
, "markdown-link-check"
|
, "markdown-link-check"
|
||||||
|
|
1308
pkgs/development/node-packages/node-packages.nix
generated
1308
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -4,14 +4,13 @@
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "functoria";
|
pname = "functoria";
|
||||||
version = "4.3.4";
|
version = "4.3.6";
|
||||||
|
|
||||||
duneVersion = "3";
|
|
||||||
minimalOCamlVersion = "4.08";
|
minimalOCamlVersion = "4.08";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz";
|
url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz";
|
||||||
hash = "sha256-ZN8La2+N19wVo/vBUfIj17JU6FSp0jX7h2nDoIpR1XY=";
|
hash = "sha256-i/5sZHfxECoKYMdGje+U21GWxJ6dDZreVcQGtbuo4SE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ];
|
propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ];
|
||||||
|
|
|
@ -2,17 +2,15 @@
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "minisat";
|
pname = "minisat";
|
||||||
version = "0.4";
|
version = "0.5";
|
||||||
|
|
||||||
useDune2 = true;
|
minimalOCamlVersion = "4.05";
|
||||||
|
|
||||||
minimumOCamlVersion = "4.05";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "c-cube";
|
owner = "c-cube";
|
||||||
repo = "ocaml-minisat";
|
repo = "ocaml-minisat";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "009jncrvnl9synxx6jnm6gp0cs7zlj71z22zz7bs1750b0jrfm2r";
|
hash = "sha256-hqGSHxhT+Z2slRCIXnfYuasG1K3tVG/tsM0IXxmy9hQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "odoc";
|
pname = "odoc";
|
||||||
version = "2.1.1";
|
version = "2.2.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz";
|
url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz";
|
||||||
sha256 = "sha256-9XTb0ozQ/DorlVJcS7ld320fZAi7T+EhV/pTeIT5h/0=";
|
sha256 = "sha256-aBjJcfwMPu2dPRQzifgHObFhivcLn9tEOzW9fwEhdAw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
duneVersion = "3";
|
duneVersion = "3";
|
||||||
|
|
|
@ -11,6 +11,10 @@ buildDunePackage rec {
|
||||||
sha256 = "sha256-YCPhZCYx8I9njrVyWCCHnte7Wj/+53fN7evCjB+F+ts=";
|
sha256 = "sha256-YCPhZCYx8I9njrVyWCCHnte7Wj/+53fN7evCjB+F+ts=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
substituteInPlace src/dune --replace "bytes)" ")"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Extensible Markdown library and tool in OCaml";
|
description = "Extensible Markdown library and tool in OCaml";
|
||||||
homepage = "https://github.com/ocaml/omd";
|
homepage = "https://github.com/ocaml/omd";
|
||||||
|
|
|
@ -4,8 +4,6 @@ buildDunePackage rec {
|
||||||
pname = "qtest";
|
pname = "qtest";
|
||||||
version = "2.11.2";
|
version = "2.11.2";
|
||||||
|
|
||||||
duneVersion = "3";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vincent-hugot";
|
owner = "vincent-hugot";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
|
@ -13,6 +11,12 @@ buildDunePackage rec {
|
||||||
sha256 = "sha256-VLY8+Nu6md0szW4RVxTFwlSQ9kyrgUqf7wQEA6GW8BE=";
|
sha256 = "sha256-VLY8+Nu6md0szW4RVxTFwlSQ9kyrgUqf7wQEA6GW8BE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
substituteInPlace src/dune \
|
||||||
|
--replace "(libraries bytes)" "" \
|
||||||
|
--replace "libraries qcheck ounit2 bytes" "libraries qcheck ounit2"
|
||||||
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [ qcheck ];
|
propagatedBuildInputs = [ qcheck ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -11,14 +11,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "awkward-cpp";
|
pname = "awkward-cpp";
|
||||||
version = "15";
|
version = "16";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "f6c825db2db981f852903d9574a07015c5d53ef8e4630772f18c7f167045aa0d";
|
hash = "sha256-yE1dWFaw4kL6g38NtggIfZWJVheb1VN36jk/E5wbm4Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue