Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
6638d3f26e
@ -2571,6 +2571,12 @@
|
||||
githubId = 4708206;
|
||||
name = "Daniel Fox Franke";
|
||||
};
|
||||
dgliwka = {
|
||||
email = "dawid.gliwka@gmail.com";
|
||||
github = "dgliwka";
|
||||
githubId = 33262214;
|
||||
name = "Dawid Gliwka";
|
||||
};
|
||||
dgonyeo = {
|
||||
email = "derek@gonyeo.com";
|
||||
github = "dgonyeo";
|
||||
@ -7592,6 +7598,16 @@
|
||||
githubId = 3159451;
|
||||
name = "Nicolas Schneider";
|
||||
};
|
||||
nkje = {
|
||||
name = "Niels Kristian Lyshøj Jensen";
|
||||
email = "n@nk.je";
|
||||
github = "NKJe";
|
||||
githubId = 1102306;
|
||||
keys = [{
|
||||
longkeyid = "nistp256/0xDE3BADFECD31A89D";
|
||||
fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D";
|
||||
}];
|
||||
};
|
||||
nkpvk = {
|
||||
email = "niko.pavlinek@gmail.com";
|
||||
github = "nkpvk";
|
||||
@ -10878,6 +10894,16 @@
|
||||
githubId = 1607770;
|
||||
name = "Ulrik Strid";
|
||||
};
|
||||
unclechu = {
|
||||
name = "Viacheslav Lotsmanov";
|
||||
email = "lotsmanov89@gmail.com";
|
||||
github = "unclechu";
|
||||
githubId = 799353;
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0xD276FF7467007335";
|
||||
fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335";
|
||||
}];
|
||||
};
|
||||
unode = {
|
||||
email = "alves.rjc@gmail.com";
|
||||
github = "unode";
|
||||
|
||||
@ -20,6 +20,12 @@
|
||||
PHP now defaults to PHP 8.0, updated from 7.4.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
kOps now defaults to 1.21.0, which uses containerd as the
|
||||
default runtime.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-new-services">
|
||||
|
||||
@ -7,6 +7,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
## Highlights {#sec-release-21.11-highlights}
|
||||
|
||||
- PHP now defaults to PHP 8.0, updated from 7.4.
|
||||
- kOps now defaults to 1.21.0, which uses containerd as the default runtime.
|
||||
|
||||
## New Services {#sec-release-21.11-new-services}
|
||||
|
||||
|
||||
1
nixos/modules/installer/tools/nixos-option/default.nix
Normal file
1
nixos/modules/installer/tools/nixos-option/default.nix
Normal file
@ -0,0 +1 @@
|
||||
{ pkgs, ... }: pkgs.nixos-option
|
||||
@ -388,6 +388,7 @@
|
||||
./services/hardware/bluetooth.nix
|
||||
./services/hardware/bolt.nix
|
||||
./services/hardware/brltty.nix
|
||||
./services/hardware/ddccontrol.nix
|
||||
./services/hardware/fancontrol.nix
|
||||
./services/hardware/freefall.nix
|
||||
./services/hardware/fwupd.nix
|
||||
|
||||
36
nixos/modules/services/hardware/ddccontrol.nix
Normal file
36
nixos/modules/services/hardware/ddccontrol.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ config
|
||||
, lib
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.ddccontrol;
|
||||
in
|
||||
|
||||
{
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
services.ddccontrol = {
|
||||
enable = lib.mkEnableOption "ddccontrol for controlling displays";
|
||||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
# Give users access to the "gddccontrol" tool
|
||||
environment.systemPackages = [
|
||||
pkgs.ddccontrol
|
||||
];
|
||||
|
||||
services.dbus.packages = [
|
||||
pkgs.ddccontrol
|
||||
];
|
||||
|
||||
systemd.packages = [
|
||||
pkgs.ddccontrol
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -323,15 +323,13 @@ let
|
||||
HTTP username
|
||||
'';
|
||||
};
|
||||
password = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
HTTP password
|
||||
'';
|
||||
};
|
||||
password = mkOpt types.str "HTTP password";
|
||||
password_file = mkOpt types.str "HTTP password file";
|
||||
};
|
||||
}) ''
|
||||
Optional http login credentials for metrics scraping.
|
||||
Sets the `Authorization` header on every scrape request with the
|
||||
configured username and password.
|
||||
password and password_file are mutually exclusive.
|
||||
'';
|
||||
|
||||
bearer_token = mkOpt types.str ''
|
||||
|
||||
@ -54,6 +54,7 @@ in {
|
||||
|
||||
systemd.packages = [ pkgs.smartdns ];
|
||||
systemd.services.smartdns.wantedBy = [ "multi-user.target" ];
|
||||
systemd.services.smartdns.restartTriggers = [ confFile ];
|
||||
environment.etc."smartdns/smartdns.conf".source = confFile;
|
||||
environment.etc."default/smartdns".source =
|
||||
"${pkgs.smartdns}/etc/default/smartdns";
|
||||
|
||||
@ -755,7 +755,7 @@ in
|
||||
default = [];
|
||||
example = [ "d /tmp 1777 root root 10d" ];
|
||||
description = ''
|
||||
Rules for creating and cleaning up temporary files
|
||||
Rules for creation, deletion and cleaning of volatile and temporary files
|
||||
automatically. See
|
||||
<citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
||||
for the exact format.
|
||||
|
||||
@ -30,7 +30,10 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
|
||||
machine.imports = [ ./common/user-account.nix ./common/x11.nix ];
|
||||
machine.virtualisation.memorySize = 2047;
|
||||
machine.test-support.displayManager.auto.user = user;
|
||||
machine.environment.systemPackages = [ chromiumPkg ];
|
||||
machine.environment = {
|
||||
systemPackages = [ chromiumPkg ];
|
||||
variables."XAUTHORITY" = "/home/alice/.Xauthority";
|
||||
};
|
||||
|
||||
startupHTML = pkgs.writeText "chromium-startup.html" ''
|
||||
<!DOCTYPE html>
|
||||
@ -63,8 +66,8 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
|
||||
return "su - ${user} -c " + shlex.quote(cmd)
|
||||
|
||||
|
||||
def get_browser_call():
|
||||
"""Returns the name of the browser binary as well as CLI options."""
|
||||
def launch_browser():
|
||||
"""Launches the web browser with the correct options."""
|
||||
# Determine the name of the binary:
|
||||
pname = "${getName chromiumPkg.name}"
|
||||
if pname.find("chromium") != -1:
|
||||
@ -76,12 +79,19 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
|
||||
else: # For google-chrome-beta and as fallback:
|
||||
binary = pname
|
||||
# Add optional CLI options:
|
||||
options = ""
|
||||
options = []
|
||||
major_version = "${versions.major (getVersion chromiumPkg.name)}"
|
||||
if major_version > "91":
|
||||
# To avoid a GPU crash:
|
||||
options += "--use-gl=angle --use-angle=swiftshader"
|
||||
return f"{binary} {options}"
|
||||
options += ["--use-gl=angle", "--use-angle=swiftshader"]
|
||||
options.append("file://${startupHTML}")
|
||||
# Launch the process:
|
||||
machine.succeed(ru(f'ulimit -c unlimited; {binary} {shlex.join(options)} & disown'))
|
||||
if binary.startswith("google-chrome"):
|
||||
# Need to click away the first window:
|
||||
machine.wait_for_text("Make Google Chrome the default browser")
|
||||
machine.screenshot("google_chrome_default_browser_prompt")
|
||||
machine.send_key("ret")
|
||||
|
||||
|
||||
def create_new_win():
|
||||
@ -132,24 +142,32 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
|
||||
|
||||
|
||||
@contextmanager
|
||||
def test_new_win(description):
|
||||
def test_new_win(description, url, window_name):
|
||||
create_new_win()
|
||||
machine.wait_for_window("New Tab")
|
||||
machine.send_chars(f"{url}\n")
|
||||
machine.wait_for_window(window_name)
|
||||
machine.screenshot(description)
|
||||
machine.succeed(
|
||||
ru(
|
||||
"${xdo "copy-all" ''
|
||||
key --delay 1000 Ctrl+a Ctrl+c
|
||||
''}"
|
||||
)
|
||||
)
|
||||
clipboard = machine.succeed(
|
||||
ru("${pkgs.xclip}/bin/xclip -o")
|
||||
)
|
||||
print(f"{description} window content:\n{clipboard}")
|
||||
with machine.nested(description):
|
||||
yield
|
||||
yield clipboard
|
||||
# Close the newly created window:
|
||||
machine.send_key("ctrl-w")
|
||||
|
||||
|
||||
machine.wait_for_x()
|
||||
|
||||
url = "file://${startupHTML}"
|
||||
machine.succeed(ru(f'ulimit -c unlimited; {get_browser_call()} "{url}" & disown'))
|
||||
|
||||
if get_browser_call().startswith("google-chrome"):
|
||||
# Need to click away the first window:
|
||||
machine.wait_for_text("Make Google Chrome the default browser")
|
||||
machine.screenshot("google_chrome_default_browser_prompt")
|
||||
machine.send_key("ret")
|
||||
launch_browser()
|
||||
|
||||
machine.wait_for_text("startup done")
|
||||
machine.wait_until_succeeds(
|
||||
@ -172,49 +190,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
|
||||
|
||||
machine.screenshot("startup_done")
|
||||
|
||||
with test_new_win("check sandbox"):
|
||||
machine.succeed(
|
||||
ru(
|
||||
"${xdo "type-url" ''
|
||||
search --sync --onlyvisible --name "New Tab"
|
||||
windowfocus --sync
|
||||
type --delay 1000 "chrome://sandbox"
|
||||
''}"
|
||||
)
|
||||
)
|
||||
|
||||
machine.succeed(
|
||||
ru(
|
||||
"${xdo "submit-url" ''
|
||||
search --sync --onlyvisible --name "New Tab"
|
||||
windowfocus --sync
|
||||
key --delay 1000 Return
|
||||
''}"
|
||||
)
|
||||
)
|
||||
|
||||
machine.screenshot("sandbox_info")
|
||||
|
||||
machine.succeed(
|
||||
ru(
|
||||
"${xdo "find-window" ''
|
||||
search --sync --onlyvisible --name "Sandbox Status"
|
||||
windowfocus --sync
|
||||
''}"
|
||||
)
|
||||
)
|
||||
machine.succeed(
|
||||
ru(
|
||||
"${xdo "copy-sandbox-info" ''
|
||||
key --delay 1000 Ctrl+a Ctrl+c
|
||||
''}"
|
||||
)
|
||||
)
|
||||
|
||||
clipboard = machine.succeed(
|
||||
ru("${pkgs.xclip}/bin/xclip -o")
|
||||
)
|
||||
|
||||
with test_new_win("sandbox_info", "chrome://sandbox", "Sandbox Status") as clipboard:
|
||||
filters = [
|
||||
"layer 1 sandbox.*namespace",
|
||||
"pid namespaces.*yes",
|
||||
@ -261,6 +237,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
|
||||
|
||||
machine.screenshot("after_copy_from_chromium")
|
||||
|
||||
|
||||
with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"):
|
||||
pass
|
||||
|
||||
|
||||
machine.shutdown()
|
||||
'';
|
||||
}) channelMap
|
||||
|
||||
@ -131,6 +131,7 @@ in
|
||||
- Improve extensibility with a new plugin architecture
|
||||
'';
|
||||
homepage = "https://www.neovim.io";
|
||||
mainProgram = "nvim";
|
||||
# "Contributions committed before b17d96 by authors who did not sign the
|
||||
# Contributor License Agreement (CLA) remain under the Vim license.
|
||||
# Contributions committed after b17d96 are licensed under Apache 2.0 unless
|
||||
|
||||
@ -131,7 +131,6 @@ let
|
||||
hydraPlatforms = [];
|
||||
# prefer wrapper over the package
|
||||
priority = (neovim.meta.priority or 0) - 1;
|
||||
mainProgram = "nvim";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -53,11 +53,6 @@ rec {
|
||||
|
||||
mkKops = generic;
|
||||
|
||||
kops_1_18 = mkKops {
|
||||
version = "1.18.2";
|
||||
sha256 = "17na83j6sfhk69w9ssvicc0xd1904z952ad3zzbpha50lcy6nlhp";
|
||||
};
|
||||
|
||||
kops_1_19 = mkKops rec {
|
||||
version = "1.19.2";
|
||||
sha256 = "15csxih1xy8myky37n5dyzp5mc31pc4bq9asaw6zz51mgw8ad5r9";
|
||||
@ -69,4 +64,10 @@ rec {
|
||||
sha256 = "011ib3xkj6nn7qax8d0ns8y4jhkwwmry1qnzxklvzssaxhmzs557";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
kops_1_21 = mkKops rec {
|
||||
version = "1.21.0";
|
||||
sha256 = "sha256-T2i3qpg3GC7yaYCGrN1V5XXrUyT+Ce9Q4aV00gQJ7gM=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
}
|
||||
|
||||
@ -567,10 +567,10 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes-alpha",
|
||||
"repo": "terraform-provider-kubernetes-alpha",
|
||||
"rev": "v0.3.3",
|
||||
"sha256": "18i9yp0w6mmic95p6d6ah1hl3rmgkh264z1a05973yslpqhyx9yl",
|
||||
"rev": "v0.5.0",
|
||||
"sha256": "0yqm3wlya69w9g9kzgvm28mbbwp6wik51syjnbnj8dis5kspx8gd",
|
||||
"vendorSha256": null,
|
||||
"version": "0.3.3"
|
||||
"version": "0.5.0"
|
||||
},
|
||||
"launchdarkly": {
|
||||
"owner": "terraform-providers",
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
{ lib, python3Packages }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "FlexGet";
|
||||
version = "3.1.127";
|
||||
pname = "flexget";
|
||||
version = "3.1.131";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "25a973eb54f2f9ccd422d536b29038c570de3584b8174d993119e3c6b434cc54";
|
||||
pname = "FlexGet";
|
||||
inherit version;
|
||||
sha256 = "sha256-wjMtCrffRhk7NL+Z0PeljuDc3WjVWSMsjWLbqo8qUjU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -61,9 +62,9 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://flexget.com/";
|
||||
homepage = "https://flexget.com/";
|
||||
description = "Multipurpose automation tool for all of your media";
|
||||
license = licenses.mit;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -45,7 +45,7 @@ mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://psi-plus.com";
|
||||
description = "XMPP (Jabber) client";
|
||||
maintainers = with maintainers; [ orivej misuzu ];
|
||||
maintainers = with maintainers; [ orivej misuzu unclechu ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -41,6 +41,7 @@
|
||||
, pango
|
||||
, runtimeShell
|
||||
, writeScript
|
||||
, xdg-utils
|
||||
, xidel
|
||||
}:
|
||||
|
||||
@ -164,6 +165,7 @@ stdenv.mkDerivation {
|
||||
--set MOZ_LEGACY_PROFILES 1 \
|
||||
--set MOZ_ALLOW_DOWNGRADE 1 \
|
||||
--prefix PATH : "${lib.getBin gnupg}/bin" \
|
||||
--prefix PATH : "${lib.getBin xdg-utils}/bin" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib"
|
||||
'';
|
||||
|
||||
|
||||
@ -50,6 +50,7 @@
|
||||
, unzip
|
||||
, which
|
||||
, writeScript
|
||||
, xdg-utils
|
||||
, xidel
|
||||
, xorg
|
||||
, yasm
|
||||
@ -311,6 +312,7 @@ stdenv.mkDerivation rec {
|
||||
--set MOZ_LEGACY_PROFILES 1
|
||||
--set MOZ_ALLOW_DOWNGRADE 1
|
||||
--prefix PATH : "${lib.getBin gnupg}/bin"
|
||||
--prefix PATH : "${lib.getBin xdg-utils}/bin"
|
||||
--prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib"
|
||||
)
|
||||
'';
|
||||
|
||||
@ -2,8 +2,23 @@
|
||||
|
||||
with pythonPackages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
let
|
||||
# Watson is currently not compatible with Click 8. See the following
|
||||
# upstream issues / MRs:
|
||||
#
|
||||
# https://github.com/TailorDev/Watson/issues/430
|
||||
# https://github.com/TailorDev/Watson/pull/432
|
||||
#
|
||||
# Workaround the issue by providing click 7 explicitly.
|
||||
click7 = pythonPackages.callPackage ../../../development/python-modules/click/7.nix {};
|
||||
click7-didyoumean = click-didyoumean.override {
|
||||
click = click7;
|
||||
};
|
||||
in buildPythonApplication rec {
|
||||
pname = "watson";
|
||||
|
||||
# When you update Watson, please check whether the Click 7
|
||||
# workaround above can go away.
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -19,7 +34,7 @@ buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ];
|
||||
propagatedBuildInputs = [ arrow click click-didyoumean requests ];
|
||||
propagatedBuildInputs = [ arrow click7 click7-didyoumean requests ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib
|
||||
, future, psutil, setuptools
|
||||
, defusedxml, future, psutil, setuptools
|
||||
# Optional dependencies:
|
||||
, bottle, pysnmp
|
||||
, hddtemp
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "glances";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nicolargo";
|
||||
repo = "glances";
|
||||
rev = "v${version}";
|
||||
sha256 = "126xpx8i85giy3hkhqh0qcln9i1qj5bfciaqh9486rkl54xm8zsr";
|
||||
sha256 = "0m2cxmlyay2rr9hnc08s5q9xwdqy0nhzsl10by4f9ji0kiahnpl6";
|
||||
};
|
||||
|
||||
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
|
||||
@ -37,6 +37,7 @@ buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bottle
|
||||
defusedxml
|
||||
future
|
||||
netifaces
|
||||
psutil
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }:
|
||||
{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama }:
|
||||
|
||||
let
|
||||
rpath = lib.makeLibraryPath [ libXinerama libX11 ];
|
||||
rpathLibs = [ libXinerama libX11 ];
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -17,15 +17,16 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoSha256 = "sha256-2prRtdBxpYc2xI/bLZNlqs3mxESfO9GhNUSlKFF//eE=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ libX11 libXinerama ];
|
||||
buildInputs = rpathLibs;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}"
|
||||
wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}"
|
||||
wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}"
|
||||
for p in $out/bin/leftwm*; do
|
||||
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $p
|
||||
done
|
||||
'';
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tiling window manager for the adventurer";
|
||||
homepage = "https://github.com/leftwm/leftwm";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "matcha-gtk-theme";
|
||||
version = "2021-06-24";
|
||||
version = "2021-07-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-YEa84y7ZhLqmN0kNSJR2/Txm5pZvSwuqnmckL4XnyjM=";
|
||||
sha256 = "sha256-iTwPN31JvpFlCBWikOeSTda2wBEtg6ygy8o6ovqHPCw=";
|
||||
};
|
||||
|
||||
buildInputs = [ gdk-pixbuf librsvg ];
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gprolog-1.4.5";
|
||||
name = "gprolog-1.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"mirror://gnu/gprolog/${name}.tar.gz"
|
||||
"http://www.gprolog.org/${name}.tar.gz"
|
||||
];
|
||||
sha256 = "0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z";
|
||||
sha256 = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE=";
|
||||
};
|
||||
|
||||
hardeningDisable = lib.optional stdenv.isi686 "pic";
|
||||
|
||||
@ -10,8 +10,7 @@
|
||||
}:
|
||||
|
||||
let deps = import ./deps.nix { inherit fetchurl; };
|
||||
|
||||
version = "2020-10-08";
|
||||
version = "2021-05-20";
|
||||
|
||||
# Build the nuget source needed for the later build all by itself
|
||||
# since it's a time-consuming step that only depends on ./deps.nix.
|
||||
@ -49,8 +48,8 @@ stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "python-language-server";
|
||||
rev = "76a29da373a4bb1e81b052f25802f3ca872d0a67";
|
||||
sha256 = "16jb90lacdrhi4dpp084bqzx351mv23f4mhl4lz5h6rkfzj5jxgg";
|
||||
rev = "86825796eae15d4d46919bc6e32f1197196ba1b3";
|
||||
sha256 = "sha256-izDE7Oil9g47Jf3eHPtW5coNixF71t9i0oYSuelakCo=";
|
||||
};
|
||||
|
||||
buildInputs = [dotnet-sdk_3 openssl icu];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cgal";
|
||||
version = "5.2.2";
|
||||
version = "5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CGAL";
|
||||
repo = "releases";
|
||||
rev = "CGAL-${version}";
|
||||
sha256 = "sha256-DeTJAAY3OEu+pVazt5es1v3l1nGAfjvE0wQmYISRYoo=";
|
||||
sha256 = "sha256-ogY47Ggtj9k2U5pop1DNFkTusgQi2nNLc5OGN45SBCk=";
|
||||
};
|
||||
|
||||
# note: optional component libCGAL_ImageIO would need zlib and opengl;
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, fetchPypi
|
||||
, minikerberos
|
||||
, prompt_toolkit
|
||||
, pycryptodomex
|
||||
, pythonOlder
|
||||
, six
|
||||
, tqdm
|
||||
@ -14,12 +15,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiosmb";
|
||||
version = "0.2.48";
|
||||
version = "0.2.49";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f5518987e3d41d213a4ffc4dd38362465b5d2cf99417014cb5402f8ee8c5abac";
|
||||
sha256 = "sha256-XCaAaY7a6Gdddm9B0ET+rVzFra5W0GTI/HUMuvpyhzM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -27,6 +28,7 @@ buildPythonPackage rec {
|
||||
colorama
|
||||
minikerberos
|
||||
prompt_toolkit
|
||||
pycryptodomex
|
||||
six
|
||||
tqdm
|
||||
winacl
|
||||
@ -35,6 +37,7 @@ buildPythonPackage rec {
|
||||
|
||||
# Project doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "aiosmb" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-pNHz24YjB6FB9ZLC3LoXS+2qzhforflNXzG6OWFqCvk=";
|
||||
sha256 = "1va9138igcgbpsnzgr90qwprmhr9h8lryqslc22jxra4r56a502a";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
47
pkgs/development/python-modules/gruut-ipa/default.nix
Normal file
47
pkgs/development/python-modules/gruut-ipa/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pkgs
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gruut-ipa";
|
||||
version = "0.9.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhasspy";
|
||||
repo = pname;
|
||||
rev = "df74f7dff562d868ad8088b7251f9e7206271d37";
|
||||
sha256 = "0b2znvjngffxc0mlmqmcai8l22ff09kc39bj6f0lkjw735vclnzh";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs bin/speak-ipa
|
||||
substituteInPlace bin/speak-ipa \
|
||||
--replace '${"\${src_dir}:"}' "$out/lib/${python.libPrefix}/site-packages:" \
|
||||
--replace "do espeak" "do ${pkgs.espeak}/bin/espeak"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -m0755 bin/speak-ipa $out/bin/speak-ipa
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} -m unittest discover
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"gruut_ipa"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for manipulating pronunciations using the International Phonetic Alphabet (IPA)";
|
||||
homepage = "https://github.com/rhasspy/gruut-ipa";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
||||
74
pkgs/development/python-modules/gruut/default.nix
Normal file
74
pkgs/development/python-modules/gruut/default.nix
Normal file
@ -0,0 +1,74 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, callPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, Babel
|
||||
, gruut-ipa
|
||||
, jsonlines
|
||||
, num2words
|
||||
, python-crfsuite
|
||||
, dataclasses
|
||||
, python
|
||||
}:
|
||||
|
||||
let
|
||||
langPkgs = [
|
||||
"cs"
|
||||
"de"
|
||||
"es"
|
||||
"fr"
|
||||
"it"
|
||||
"nl"
|
||||
"pt"
|
||||
"ru"
|
||||
"sv"
|
||||
"sw"
|
||||
];
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "gruut";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhasspy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1763qmcd1gxap27jppqaywx03k5cagcl62z2p2qdiqigdksplm2g";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "Babel~=2.8.0" "Babel"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
Babel
|
||||
gruut-ipa
|
||||
jsonlines
|
||||
num2words
|
||||
python-crfsuite
|
||||
] ++ lib.optionals (pythonOlder "3.7") [
|
||||
dataclasses
|
||||
] ++ (map (lang: callPackage ./language-pack.nix {
|
||||
inherit lang version format src;
|
||||
}) langPkgs);
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} -m unittest discover
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"gruut"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tokenizer, text cleaner, and phonemizer for many human languages";
|
||||
homepage = "https://github.com/rhasspy/gruut";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
||||
30
pkgs/development/python-modules/gruut/language-pack.nix
Normal file
30
pkgs/development/python-modules/gruut/language-pack.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
|
||||
, lang
|
||||
, version
|
||||
, format
|
||||
, src
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gruut-lang-${lang}";
|
||||
inherit version format src;
|
||||
|
||||
prePatch = ''
|
||||
cd "${pname}"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"gruut_lang_${lang}"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Language files for gruut tokenizer/phonemizer";
|
||||
homepage = "https://github.com/rhasspy/gruut";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
||||
49
pkgs/development/python-modules/hypercorn/default.nix
Normal file
49
pkgs/development/python-modules/hypercorn/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitLab
|
||||
, pythonOlder
|
||||
, typing-extensions
|
||||
, wsproto
|
||||
, toml
|
||||
, h2
|
||||
, priority
|
||||
, mock
|
||||
, pytest-asyncio
|
||||
, pytest-cov
|
||||
, pytest-sugar
|
||||
, pytest-trio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Hypercorn";
|
||||
version = "0.11.2";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "pgjones";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0v80v6l2xqac5mgrmh2im7y23wpvz4yc2v4h9ryhvl88c2jk9mvh";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ wsproto toml h2 priority ]
|
||||
++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
|
||||
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytest-cov
|
||||
pytest-sugar
|
||||
pytest-trio
|
||||
pytestCheckHook
|
||||
] ++ lib.optionals (pythonOlder "3.8") [ mock ];
|
||||
|
||||
pythonImportsCheck = [ "hypercorn" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pgjones.gitlab.io/hypercorn/";
|
||||
description = "The ASGI web server inspired by Gunicorn";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dgliwka ];
|
||||
};
|
||||
}
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.2.10";
|
||||
version = "2.2.11";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "017xcwm8m42a1v3v0fs8v3m2sga97rx9a7vk0cb2g14777f4w4si";
|
||||
sha256 = "sha256-E95tUg1gglDXfeCTead2c1e0JOynKu+TBd4LKklrtAE=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nexia";
|
||||
version = "0.9.8";
|
||||
version = "0.9.9";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-KjA3AnrMg4ySKSY2FDHVo0Zh9GoLUWiQDuUzo8d5At8=";
|
||||
sha256 = "sha256-OamQ6p8o23lVeOB/KyNQI7G8xZaAaVNYacoRfbNKJtk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "poetry";
|
||||
version = "1.1.6";
|
||||
version = "1.1.7";
|
||||
format = "pyproject";
|
||||
disabled = isPy27;
|
||||
|
||||
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
owner = "python-poetry";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-3Nx9xuQMIho+oRjqskHL9eQGKDAWntEGZcWe7evnmNU=";
|
||||
sha256 = "03cbzjw0sb8rs85iq191ndk9523d6qpymh2nhw5bvcxfvsf9042d";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
36
pkgs/development/python-modules/python-crfsuite/default.nix
Normal file
36
pkgs/development/python-modules/python-crfsuite/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-crfsuite";
|
||||
version = "0.9.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1ryfcdfpqbrf8rcd2rlay2gfiba3px3q508543jf81shrv93hi9v";
|
||||
};
|
||||
|
||||
preCheck = ''
|
||||
# make sure import the built version, not the source one
|
||||
rm -r pycrfsuite
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pycrfsuite"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python binding for CRFsuite";
|
||||
homepage = "https://github.com/scrapinghub/python-crfsuite";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
||||
@ -1,16 +1,20 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, enum-compat
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, unicodecsv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-registry";
|
||||
version = "1.3.1";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "99185f67d5601be3e7843e55902d5769aea1740869b0882f34ff1bd4b43b1eb2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "williballenthin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0gwx5jcribgmmbz0ikhz8iphz7yj2d2nmk24nkdrjd3y5irly11s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -18,8 +22,13 @@ buildPythonPackage rec {
|
||||
unicodecsv
|
||||
];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"samples"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"Registry"
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyupgrade";
|
||||
version = "2.19.1";
|
||||
version = "2.20.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asottile";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zDT8VskHEX4uldMvxnb9A+FKMuvZbtEcmdVl5mghTs4=";
|
||||
sha256 = "sha256-Wq15JU6sbXPZSk/vAX6fTuc3vxZeRy9dSCNGGv2utY4=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.154.0";
|
||||
version = "0.155.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-QqTHhcEgMfq4+1G3aSAvcyU26kNKiFc3vOTyFRo8l40=";
|
||||
sha256 = "sha256-NMqglKpVrGgkxnrxSKKUeQ9RZ3eamlO6CDlaHjwKA3I=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "tfsec";
|
||||
version = "0.41.0";
|
||||
version = "0.45.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tfsec";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MK5cWRPGty7S4pkRZJRZF5qitoPM3im8JJW2J3yQqFo=";
|
||||
sha256 = "sha256-I0TOddYO++tw26gS/h15FSATqCjdQfQXVYSTkV+r5HM=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/tfsec/tfsec";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "doctl";
|
||||
version = "1.61.0";
|
||||
version = "1.62.0";
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -32,7 +32,7 @@ buildGoModule rec {
|
||||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z6G80Xg2DSoUj8vhxkDr3W/wh3fecRwxm0oly2GYDdg=";
|
||||
sha256 = "sha256-5YqGNuC1mmsIsEtnbgumaLuZGy3k6L9jZNbVwZln8WY=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -3,9 +3,11 @@
|
||||
, fetchurl
|
||||
, alsa-lib
|
||||
, dbus
|
||||
, ell
|
||||
, glib
|
||||
, json_c
|
||||
, libical
|
||||
, docutils
|
||||
, pkg-config
|
||||
, python3
|
||||
, readline
|
||||
@ -19,16 +21,17 @@
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "bluez";
|
||||
version = "5.58";
|
||||
version = "5.60";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz";
|
||||
sha256 = "1wgiv8cqya6n1w5fz24cb8q401bhn5aa6s7g95l26rzblmsmw1n8";
|
||||
sha256 = "sha256-cQmZWA0B7lnsWF5efAf9lO3e3AAaom/nRkxUb52UUwQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
dbus
|
||||
ell
|
||||
glib
|
||||
json_c
|
||||
libical
|
||||
@ -38,6 +41,7 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
docutils
|
||||
pkg-config
|
||||
python3.pkgs.wrapPython
|
||||
];
|
||||
@ -55,6 +59,7 @@ in stdenv.mkDerivation rec {
|
||||
"--enable-library"
|
||||
"--enable-cups"
|
||||
"--enable-pie"
|
||||
"--enable-external-ell"
|
||||
"--with-dbusconfdir=${placeholder "out"}/share"
|
||||
"--with-dbussystembusdir=${placeholder "out"}/share/dbus-1/system-services"
|
||||
"--with-dbussessionbusdir=${placeholder "out"}/share/dbus-1/services"
|
||||
@ -67,7 +72,6 @@ in stdenv.mkDerivation rec {
|
||||
"--enable-nfc"
|
||||
"--enable-sap"
|
||||
"--enable-sixaxis"
|
||||
"--enable-wiimote"
|
||||
];
|
||||
|
||||
# Work around `make install' trying to create /var/lib/bluetooth.
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "linuxptp";
|
||||
version = "3.1";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/linuxptp/${pname}-${version}.tgz";
|
||||
sha256 = "0zff502w3nlycgv2ad8cy8nd0hqf34kzpzcygi7prp0lrw8mp3zm";
|
||||
sha256 = "1nf0w4xyzg884v8blb81zkk6q8p6zbiq9lx61jdqwbbzkdgqbmll";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,26 +1,26 @@
|
||||
{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand
|
||||
, moreutils, jq, git, zip, rsync, pkg-config, yarn, python2
|
||||
, nodejs-12_x, libsecret, xorg, ripgrep
|
||||
, moreutils, jq, git, zip, rsync, pkg-config, yarn, python3
|
||||
, nodejs-14_x, libsecret, xorg, ripgrep
|
||||
, AppKit, Cocoa, Security, cctools }:
|
||||
|
||||
let
|
||||
system = stdenv.hostPlatform.system;
|
||||
|
||||
nodejs = nodejs-12_x;
|
||||
python = python2;
|
||||
nodejs = nodejs-14_x;
|
||||
python = python3;
|
||||
yarn' = yarn.override { inherit nodejs; };
|
||||
defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "code-server";
|
||||
version = "3.8.0";
|
||||
commit = "c4610f7829701aadb045d450013b84491c30580d";
|
||||
version = "3.9.0";
|
||||
commit = "fc6d123da59a4e5a675ac8e080f66e032ba01a1b";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdr";
|
||||
repo = "code-server";
|
||||
rev = "v${version}";
|
||||
sha256 = "1snc7dbqfz53337h6av2zhkrn54ypanxljs5by4jqczq96c2v6yk";
|
||||
sha256 = "0jgmf8d7hki1iv6yy1z0s5qjyxchxnwj8kv53jrwkllim08swbi3";
|
||||
};
|
||||
|
||||
cloudAgent = buildGoModule rec {
|
||||
@ -62,9 +62,9 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
# to get hash values use nix-build -A code-server.prefetchYarnCache
|
||||
outputHash = {
|
||||
x86_64-linux = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb";
|
||||
aarch64-linux = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb";
|
||||
x86_64-darwin = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb";
|
||||
x86_64-linux = "01nkqcfvx2qw9g60h8k9x221ibv3j58vdkjzcjnj7ph54a33ifih";
|
||||
aarch64-linux = "01nkqcfvx2qw9g60h8k9x221ibv3j58vdkjzcjnj7ph54a33ifih";
|
||||
x86_64-darwin = "01nkqcfvx2qw9g60h8k9x221ibv3j58vdkjzcjnj7ph54a33ifih";
|
||||
}.${system} or (throw "Unsupported system ${system}");
|
||||
};
|
||||
|
||||
@ -210,7 +210,7 @@ in stdenv.mkDerivation rec {
|
||||
ln -s "${cloudAgent}/bin/cloud-agent" $out/libexec/code-server/lib/coder-cloud-agent
|
||||
|
||||
# create wrapper
|
||||
makeWrapper "${nodejs-12_x}/bin/node" "$out/bin/code-server" \
|
||||
makeWrapper "${nodejs-14_x}/bin/node" "$out/bin/code-server" \
|
||||
--add-flags "$out/libexec/code-server/out/node/entry.js"
|
||||
'';
|
||||
|
||||
|
||||
26
pkgs/servers/headscale/default.nix
Normal file
26
pkgs/servers/headscale/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "headscale";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juanfont";
|
||||
repo = "headscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "0iij4hdbdplai5c8kvcwiw11idrk04xbpwb3njdhqcg6pdyx3216";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8MCSN8wn2Y9ejHAIEwTdIXGITaa+FqX7WUMJEr0RcIk=";
|
||||
|
||||
# Ldflags are same as build target in the project's Makefile
|
||||
# https://github.com/juanfont/headscale/blob/main/Makefile
|
||||
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An implementation of the Tailscale coordination server";
|
||||
homepage = "https://github.com/juanfont/headscale";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ nkje ];
|
||||
};
|
||||
}
|
||||
@ -12,25 +12,24 @@
|
||||
#
|
||||
# If you upgrade from an old version you may have to delete old models from ~/.local/share/tts
|
||||
# Also note that your tts version might not support all available models so check:
|
||||
# https://github.com/coqui-ai/TTS/releases/tag/v0.0.15.1
|
||||
# https://github.com/coqui-ai/TTS/releases/tag/v0.1.2
|
||||
#
|
||||
# For now, for deployment check the systemd unit in the pull request:
|
||||
# https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tts";
|
||||
version = "0.0.15.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coqui-ai";
|
||||
repo = "TTS";
|
||||
rev = "v${version}";
|
||||
sha256 = "0z6sbzspgmw5ja8r2zysyhdk4jzlv88a0ihkvxvvwxslkyncdb89";
|
||||
sha256 = "1qgiaqn7iqxyf54qgnpmli69nw9s3gmi9qv874jsgycykc10hjg4";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt
|
||||
sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt
|
||||
sed -i -e 's!numba==[^"]*!numba!' requirements.txt
|
||||
sed -i -e 's!numpy==[^"]*!numpy!' requirements.txt
|
||||
sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt
|
||||
@ -44,6 +43,7 @@ python3Packages.buildPythonApplication rec {
|
||||
anyascii
|
||||
coqpit
|
||||
flask
|
||||
gruut
|
||||
gdown
|
||||
inflect
|
||||
jieba
|
||||
|
||||
@ -34,6 +34,10 @@ stdenv.mkDerivation rec {
|
||||
ddccontrol-db
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
oldPath="\$""{datadir}/ddccontrol-db"
|
||||
newPath="${ddccontrol-db}/share/ddccontrol-db"
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ip2unix";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nixcloud";
|
||||
repo = "ip2unix";
|
||||
rev = "v${version}";
|
||||
sha256 = "19c449h60b2m1d8kawnhpi4y9y4ddm24jmlh8kilqmx8m5l2khr6";
|
||||
sha256 = "1pl8ayadxb0zzh5s26yschkjhr1xffbzzv347m88f9y0jv34d24r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-07-09";
|
||||
version = "2021-07-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FjiQ+L3eW+od41Vz00t/LhagS3SUT+PA5GvtZ6lhoFU=";
|
||||
sha256 = "sha256-xxlG8N6/WC/9bjY3fzopXIq0l7c81Rs0NdjVE4N5JNI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -5562,6 +5562,10 @@ in
|
||||
stdenv = stdenv_32bit;
|
||||
};
|
||||
|
||||
gruut = with python3.pkgs; toPythonApplication gruut;
|
||||
|
||||
gruut-ipa = with python3.pkgs; toPythonApplication gruut-ipa;
|
||||
|
||||
gx = callPackage ../tools/package-management/gx { };
|
||||
gx-go = callPackage ../tools/package-management/gx/go { };
|
||||
|
||||
@ -5759,6 +5763,8 @@ in
|
||||
|
||||
heimdall-gui = heimdall.override { enableGUI = true; };
|
||||
|
||||
headscale = callPackage ../servers/headscale { };
|
||||
|
||||
heisenbridge = callPackage ../servers/heisenbridge { };
|
||||
|
||||
helio-workstation = callPackage ../applications/audio/helio-workstation { };
|
||||
@ -30973,11 +30979,11 @@ in
|
||||
# Exceptions are versions that we need to keep to allow upgrades from older NixOS releases
|
||||
inherit (callPackage ../applications/networking/cluster/kops {})
|
||||
mkKops
|
||||
kops_1_18
|
||||
kops_1_19
|
||||
kops_1_20
|
||||
kops_1_21
|
||||
;
|
||||
kops = kops_1_20;
|
||||
kops = kops_1_21;
|
||||
|
||||
lguf-brightness = callPackage ../misc/lguf-brightness { };
|
||||
|
||||
|
||||
@ -3131,6 +3131,10 @@ in {
|
||||
|
||||
grpcio-tools = callPackage ../development/python-modules/grpcio-tools { };
|
||||
|
||||
gruut = callPackage ../development/python-modules/gruut { };
|
||||
|
||||
gruut-ipa = callPackage ../development/python-modules/gruut-ipa { };
|
||||
|
||||
gsd = callPackage ../development/python-modules/gsd { };
|
||||
|
||||
gspread = callPackage ../development/python-modules/gspread { };
|
||||
@ -3386,6 +3390,8 @@ in {
|
||||
|
||||
hypchat = callPackage ../development/python-modules/hypchat { };
|
||||
|
||||
hypercorn = callPackage ../development/python-modules/hypercorn { };
|
||||
|
||||
hyperframe = callPackage ../development/python-modules/hyperframe { };
|
||||
|
||||
hyperion-py = callPackage ../development/python-modules/hyperion-py { };
|
||||
@ -5377,6 +5383,8 @@ in {
|
||||
|
||||
python-codon-tables = callPackage ../development/python-modules/python-codon-tables { };
|
||||
|
||||
python-crfsuite = callPackage ../development/python-modules/python-crfsuite { };
|
||||
|
||||
python-csxcad = callPackage ../development/python-modules/python-csxcad { };
|
||||
|
||||
python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user