Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
10af23a180
42 changed files with 315 additions and 123 deletions
|
|
@ -21,7 +21,8 @@ in
|
|||
../virtualisation/nixos-containers.nix
|
||||
../services/x11/desktop-managers/xterm.nix
|
||||
];
|
||||
config = { };
|
||||
# swraid's default depends on stateVersion
|
||||
config.boot.swraid.enable = false;
|
||||
options.boot.isContainer = lib.mkOption { default = false; internal = true; };
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv
|
||||
, craftos-pc
|
||||
, grep
|
||||
, gnugrep
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "craftos-pc-test-eval-hello-world";
|
||||
meta.timeout = 60;
|
||||
nativeBuildInputs = [ craftos-pc grep ];
|
||||
nativeBuildInputs = [ craftos-pc gnugrep ];
|
||||
buildCommand = ''
|
||||
export HOME=$(pwd)
|
||||
mkdir $HOME/.local $HOME/.config
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv
|
||||
, craftos-pc
|
||||
, grep
|
||||
, gnugrep
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "craftos-pc-test-eval-periphemu";
|
||||
meta.timeout = 60;
|
||||
nativeBuildInputs = [ craftos-pc grep ];
|
||||
nativeBuildInputs = [ craftos-pc gnugrep ];
|
||||
buildCommand = ''
|
||||
export HOME=$(pwd)
|
||||
mkdir $HOME/.local $HOME/.config
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shotwell";
|
||||
version = "0.32.1";
|
||||
version = "0.32.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-SsRRdBatiqI7ROdcNL1uFrq3Nj+iCZG7CbrN+rP3Y84=";
|
||||
sha256 = "sha256-pd5T6HMhbfj1mWyWgnvtlj1sY1TgReF5bf0ybGGIwmM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "vieb";
|
||||
version = "10.1.0";
|
||||
version = "10.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jelmerro";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-g3TW3hl2D9pulEPpbcP1s536yY1o+dMv6nuMrVjgxGI=";
|
||||
hash = "sha256-fEnBsxhRl8SmyTV82SPza5jv5GkCyVpfymeq5k48oxk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/"electron"/d' package.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-P3VdG8JQ0JVbjdhOIfx8CxwSiWr0pYUJ4e2oOgAgtU0=";
|
||||
npmDepsHash = "sha256-iCuRPC5p7XzKpVjkGYLoZfOySYvO+uL71/qW9rDxI2M=";
|
||||
dontNpmBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "civo";
|
||||
version = "1.0.60";
|
||||
version = "1.0.61";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "civo";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-f6r82rZ5PMjBLdeuz1vbyWuCMy73NAYt4+0w7fICTQ0=";
|
||||
sha256 = "sha256-Q3GIAbQ1I1qsMc5Is9SkYxc+nGuC6z8zu9cW2shwC6c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ER7QcDlts/Dt8FimDu87IE3hihMRNGHpyuvAXRI3QR8=";
|
||||
vendorHash = "sha256-Ye01MmYHK2YGFsbELLVaXBeQbFGABS6WQUoH8AldRW0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -436,13 +436,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"gitlab": {
|
||||
"hash": "sha256-3Ph+Z4RI4K+OLc7c7f3JQH4UYRRVV6dM6R0TgkJf+yQ=",
|
||||
"hash": "sha256-uKImp0kcsLZL1SOAygd/ssJ7pxclUbAcDcEB3ko9Mio=",
|
||||
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
|
||||
"owner": "gitlabhq",
|
||||
"repo": "terraform-provider-gitlab",
|
||||
"rev": "v16.1.1",
|
||||
"rev": "v16.2.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc="
|
||||
"vendorHash": "sha256-AVTWTS16d8QsPLLAJeAfgcVDzUBMp+b2oAphaCBqhS0="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-kv9DjEPFDeH2Cag2LAmn4GLbPkKXXij3nPRB2rpTizk=",
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnote";
|
||||
version = "44.0";
|
||||
version = "44.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-3DvXkmj+mdTtVmeawHbMnZqq9ieWE403HPCIFffmSS0=";
|
||||
hash = "sha256-aWelUGgiMguuGcHrC8dFFmRPnp61TtwslCU+rhDHYE0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, sqlite, wxGTK32, libusb1, soapysdr
|
||||
, mesa_glu, libX11, gnuplot, fltk
|
||||
, GLUT
|
||||
, withGui ? true
|
||||
, withGui ? !stdenv.isDarwin # withGui transitively depends on mesa, which is broken on darwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "44.0";
|
||||
version = "44.1";
|
||||
pname = "gpaste";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Keruspe";
|
||||
repo = "GPaste";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mYbyu3IIF6pQz1oEqEWLe7jdR99M3LxiMiRR9x7qFh8=";
|
||||
sha256 = "sha256-c/q8VTzFOz8nzidPB3qnYw9+AkdKfTdUD4AcxyHKrqo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
let
|
||||
base = (callPackage ./generic.nix (_args // {
|
||||
version = "8.3.0alpha3";
|
||||
version = "8.3.0beta1";
|
||||
hash = null;
|
||||
})).overrideAttrs (oldAttrs: {
|
||||
src = fetchurl {
|
||||
url = "https://downloads.php.net/~jakub/php-8.3.0alpha3.tar.xz";
|
||||
hash = "sha256-Ko0SR5ZIsdMyEmeM65zFU4bCU7f7xpiDBMf0od/kv8k=";
|
||||
url = "https://downloads.php.net/~eric/php-8.3.0beta1.tar.xz";
|
||||
hash = "sha256-eZjhwqkP1RkyzpV5uMUxUWkXiPERBgGtmaX65WhDdl8=";
|
||||
};
|
||||
});
|
||||
in
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdmapsharing";
|
||||
version = "3.9.12";
|
||||
version = "3.9.13";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = "${lib.toUpper pname}_${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "tnQ25RR/bAZJKa8vTwzkGK1iPc7CMGFbyX8mBf6TKr4=";
|
||||
sha256 = "oR9lpOFxgGfrtzncFT6dbmhKQfcuH/NvhOR/USHAHQc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libshumate";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "devdoc"; # demo app
|
||||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "GNOME";
|
||||
repo = "libshumate";
|
||||
rev = version;
|
||||
sha256 = "yiPHrI0QU6AcyPWlJoMlI3GvGZU+7+3mFcyR3ViJGzc=";
|
||||
sha256 = "mHfhCKzLfP1BkqM+FiLUlo/I0TCe3G8C0lmO6007pMY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsvm";
|
||||
version = "3.31";
|
||||
version = "3.32";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz";
|
||||
sha256 = "sha256-AKtWH0jfX8kqhCCa2P5Rmery5Rmzwnm6z8k1l4p1zx8=";
|
||||
sha256 = "sha256-hkTMZRjKiLvFDYyOrRc08aubbxcBcEXvmuOHc6plPa0=";
|
||||
};
|
||||
|
||||
patches = lib.optionals withOpenMP [ ./openmp.patch ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
qtModule rec {
|
||||
pname = "qtmqtt";
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "qt";
|
||||
repo = "qtmqtt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tXCLb4ZWgdPSfnlGKsKNW9kJ57cm8+d8y416O42NZvk=";
|
||||
hash = "sha256-yyerVzz+nGT5kjNo24zYqZcJmrE50KCp38s3+samjd0=";
|
||||
};
|
||||
qtInputs = [ qtbase ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, curl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xerces-c";
|
||||
|
|
@ -9,8 +13,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-PY7Bx/lOOP7g5Mpa0eHZ2yPL86ELumJva0r6Le2v5as=";
|
||||
};
|
||||
|
||||
# Disable SSE2 extensions on platforms for which they are not enabled by default
|
||||
configureFlags = [ "--disable-sse2" ];
|
||||
buildInputs = [
|
||||
curl
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
# Disable SSE2 extensions on platforms for which they are not enabled by default
|
||||
"--disable-sse2"
|
||||
"--enable-netaccessor-curl"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
# wrapped to be able to find aioconsole and any other packages.
|
||||
buildPythonPackage rec {
|
||||
pname = "aioconsole";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "vxgmichel";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XR79o65jZFR9jr9ubw7wdxCWNH8ANMrBDTVpLnetsuU=";
|
||||
hash = "sha256-axUJLh7yg2A+HB0fxBueuNT/rohHVq6svQUZvR2LKzo=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "androidtv";
|
||||
version = "0.0.70";
|
||||
version = "0.0.71";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "JeffLIrion";
|
||||
repo = "python-androidtv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LKV5aO3sptHz48UYpP+zPk6pPhyHAZWAxiTTIWKHiSg=";
|
||||
hash = "sha256-vFEMOGxkt4zfOeKTKwr2tcBUSYRPSWNlaKUVcPIM34w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "androidtvremote2";
|
||||
version = "0.0.11";
|
||||
version = "0.0.12";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tronikos";
|
||||
repo = "androidtvremote2";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mjhohkAC6g2UJgPbq/29Awyy6c4M8SnLqr5v5g7+IeE=";
|
||||
hash = "sha256-A/1zNBrYo9oPAVexq/W2G9mqBeTsUvF5/T2db6g9AGk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
77
pkgs/development/python-modules/circus/default.nix
Normal file
77
pkgs/development/python-modules/circus/default.nix
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, psutil
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, pyzmq
|
||||
, tornado
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "circus";
|
||||
version = "0.18.0";
|
||||
format = "flit";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-GTzoIk4GjO1mckz0gxBvtmdLUaV1g6waDn7Xp+6Mcas=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
psutil
|
||||
pyzmq
|
||||
tornado
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pyyaml
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# these tests raise circus.tests.support.TimeoutException
|
||||
"test_reload1"
|
||||
"test_reload2"
|
||||
"test_reload_sequential"
|
||||
"test_reload_uppercase"
|
||||
"test_reload_wid_1_worker"
|
||||
"test_reload_wid_4_workers"
|
||||
"test_add"
|
||||
"test_add_start"
|
||||
"test_command_already_running"
|
||||
"test_launch_cli"
|
||||
"test_handler"
|
||||
"test_resource_watcher_max_cpu"
|
||||
"test_resource_watcher_max_mem"
|
||||
"test_resource_watcher_max_mem_abs"
|
||||
"test_resource_watcher_min_cpu"
|
||||
"test_resource_watcher_min_mem"
|
||||
"test_resource_watcher_min_mem_abs"
|
||||
"test_full_stats"
|
||||
"test_watchdog_discovery_found"
|
||||
"test_watchdog_discovery_not_found"
|
||||
"test_dummy"
|
||||
"test_handler"
|
||||
"test_stdin_socket"
|
||||
"test_stop_and_restart"
|
||||
"test_stream"
|
||||
"test_inherited"
|
||||
"test_set_before_launch"
|
||||
"test_set_by_arbiter"
|
||||
"test_max_age"
|
||||
"test_signal"
|
||||
"test_exits_within_graceful_timeout"
|
||||
"test_kills_after_graceful_timeout"
|
||||
# this test requires socket communication
|
||||
"test_plugins"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "circus" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A process and socket manager";
|
||||
homepage = "https://github.com/circus-tent/circus";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
|
@ -3,7 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, freezegun
|
||||
, gettext
|
||||
, importlib-metadata
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, hatch-vcs
|
||||
|
|
@ -12,16 +11,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "humanize";
|
||||
version = "4.6.0";
|
||||
version = "4.7.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-humanize";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-sI773uzh+yMiyu1ebsk6zutfyt+tfx/zT/X2AdH5Fyg=";
|
||||
hash = "sha256-ofRdrFVxIxAtv8WopJDX8Te8yaaJTnDbRM56V7pm/NM=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
@ -32,10 +31,6 @@ buildPythonPackage rec {
|
|||
gettext
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
scripts/generate-translation-binaries.sh
|
||||
'';
|
||||
|
|
|
|||
38
pkgs/development/python-modules/mkdocs-linkcheck/default.nix
Normal file
38
pkgs/development/python-modules/mkdocs-linkcheck/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pythonPackages
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-linkcheck";
|
||||
version = "unstable-2021-08-24";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "byrnereese";
|
||||
repo = "linkchecker-mkdocs";
|
||||
rev = "a75d765b0ec564e5ed0218880ed0b5ab4b973917" ;
|
||||
hash = "sha256-z59F7zUKZKIQSiTlE6wGbGDecPMeruNgltWUYfDf8jY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
aiohttp
|
||||
requests
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mkdocs_linkcheck" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Validate links in Markdown files for static site generators like MkDocs, Hugo or Jekyll";
|
||||
longDescription = ''
|
||||
This is not a MkDocs plugin, but a companion tool that is useful to validate links in Markdown files for
|
||||
static site generators like MkDocs, Hugo or Jekyll. It can be used with any text files containing links.
|
||||
'';
|
||||
homepage = "https://github.com/byrnereese/mkdocs-linkcheck";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ totoroot ];
|
||||
};
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "notifications-python-client";
|
||||
version = "8.0.0";
|
||||
version = "8.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "alphagov";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-feATZS7PG9IKY6ooPztA49WykQ/Bt67frSe3PpbiCLc=";
|
||||
hash = "sha256-ZDqUJljCZnGmm0TRclv23I+I9egFdF25P0wIYAQkOVI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -42,7 +42,7 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'" ""
|
||||
--replace "pytest-runner" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plaid-python";
|
||||
version = "15.0.0";
|
||||
version = "15.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vNOIMZce2PwH108KKaUIp1tadNH7HIKjzbm7rxZqLO8=";
|
||||
hash = "sha256-BFouiIBQ2HwZ+7Qp2ULam3DW/pwsxIkOejLtTelhWd4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlite-utils";
|
||||
version = "3.33";
|
||||
version = "3.34";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vneZNtrbnezvURpG8oC9lGg9OFYl9pplcw+24A5fJlY=";
|
||||
hash = "sha256-RgdoPLsyz9TzxjkpBF6qAgqwIhxQNvm7QbeyW8dVzSM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "1.19.0";
|
||||
version = "1.19.1";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "sqlc";
|
||||
|
|
@ -11,11 +11,11 @@ buildGoModule {
|
|||
owner = "kyleconroy";
|
||||
repo = "sqlc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/6CqzkdZMog0ldoMN0PH8QhL1QsOBaDAnqTHlgtHdP8=";
|
||||
sha256 = "sha256-xZogHQ44amdhFewovFd1TWrul0wlofUqo46Ay13Mnig=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-AsOm86apA5EiZ9Ss7RPgVn/b2/O6wPj/ur0zG91JoJo=";
|
||||
vendorHash = "sha256-owH+Gd6K+RzBRhWEs99qQLXV3UWysEkLinEFvzSzXIU=";
|
||||
|
||||
subPackages = [ "cmd/sqlc" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.18.15";
|
||||
version = "0.18.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JvGtLz9YqRQdCY2jff7T9xUeQ2+GCA/coI4MIBPupDc=";
|
||||
hash = "sha256-Oilz8X2tR90EfYq089NgqApoFtqNxDFs0zyxnOyS/9I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lazygit";
|
||||
version = "0.38.2";
|
||||
version = "0.39.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesseduffield";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HxOM2M2EoeM0IHCrFQqLdP9Rai6DbC1uRG0CiQyqRdE=";
|
||||
sha256 = "sha256-VIWNuCHO41Wf6KM6Fz6BGzl/nS/SFprZpJUz7ZxaoJc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "re-flex";
|
||||
version = "3.3.6";
|
||||
version = "3.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = "RE-flex";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SFcb3lfvhR9BbpwM79pBs3cwKPR9KakEMcI/Thm1plo=";
|
||||
sha256 = "sha256-YLWMVsfmb1cSYWtxCkTkANYRiUenkNZ7n2QFEI6SU1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ boost autoconf automake ];
|
||||
|
|
|
|||
|
|
@ -71,18 +71,18 @@ let
|
|||
# To compute the commit when upgrading this derivation, do:
|
||||
# `$ git rev-parse <git-rev>` where <git-rev> is the git revision of the `src`
|
||||
# Example: `$ git rev-parse v4.14.1`
|
||||
commit = "5c199629305a0b935b4388b7db549f77eae82b5a";
|
||||
commit = "5c511237970f4be0f1e5785feaa254da951bc367";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "code-server";
|
||||
version = "4.14.1";
|
||||
version = "4.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coder";
|
||||
repo = "code-server";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-j7pFh731C8HUGT+M/JvnJoDZoPH9AdfA9TxxSx1vuBM=";
|
||||
hash = "sha256-2/zIfeCROPrlwHuKk0ySPMLdI504aNLNZge+XUSrZB8=";
|
||||
};
|
||||
|
||||
yarnCache = stdenv.mkDerivation {
|
||||
|
|
@ -92,6 +92,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [ yarn' git cacert ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$PWD
|
||||
export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt"
|
||||
|
||||
|
|
@ -106,11 +108,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
find ./lib/vscode -name "yarn.lock" -printf "%h\n" | \
|
||||
xargs -I {} yarn --cwd {} \
|
||||
--ignore-scripts --ignore-engines
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-J5ME9Nc7GWVoKeV908BR9ib9yH5KNmBOtltRvJcpZIY=";
|
||||
outputHash = "sha256-vkju+oxEYrEXFAnjz/Mf1g0ZhxBALLAaRuWE0swSWwM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keycloak";
|
||||
version = "21.1.2";
|
||||
version = "22.0.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
|
||||
hash = "sha256-yux9LyGkdwQekNWKAx3Oara0D5Qca8g7fgPGeTiF2n4=";
|
||||
hash = "sha256-I0tmCcXqS1nfA7ZQd0qUsSWEUYvNa/caCZU8AYWSO7Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper jre ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keycloak-metrics-spi";
|
||||
version = "3.0.0";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/aerogear/keycloak-metrics-spi/releases/download/${version}/keycloak-metrics-spi-${version}.jar";
|
||||
sha256 = "1r06xjnvd7wxl64jqpms6jnl4csfwigb9n9lxcjpkgh2jzfs43sp";
|
||||
sha256 = "sha256-D0NNBuc9YBiywGoq5hG4dcoiunyG/C2ZX73p4lS5v4s=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.32.4.7195-7c8f9d3b6";
|
||||
version = "1.32.5.7328-2632c9d3a";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "sha256-Qb684Mm080QudeLG111cLCSRh1CAJ31IjNOO62XkFTs=";
|
||||
sha256 = "sha256-Xyk73UW3LQqLpvtwvzpixKlrCJyOcDuq9oQkOd/jsLc=";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "sha256-lnkhjzBW9DENCVJNP+4h8fVVUh4LhnJ1XjrCjF3ngKE=";
|
||||
sha256 = "sha256-p2BynQfAW9FDrdy+KxcnJADwwli7jm2FXGzKjTQPfOE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
|
|
|||
32
pkgs/tools/X11/xssstate/default.nix
Normal file
32
pkgs/tools/X11/xssstate/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, libX11
|
||||
, libXScrnSaver
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xssstate";
|
||||
#
|
||||
# Use the date of the last commit, since there were bug fixes after the 1.1
|
||||
# release.
|
||||
#
|
||||
version = "unstable-2022-09-24";
|
||||
src = fetchgit {
|
||||
url = "https://git.suckless.org/xssstate/";
|
||||
rev = "5d8e9b49ce2970f786f1e5aa12bbaae83900453f";
|
||||
hash = "sha256-Aor12tU1I/qNZCdBhZcvNK1FWFh0HYK8CEI29X5yoeA=";
|
||||
};
|
||||
|
||||
makeFlags = [ "VERSION=${version}" ];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
buildInputs = [ libX11 libXScrnSaver ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple tool to retrieve the X screensaver state";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ onemoresuza ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
38
pkgs/tools/llm/gorilla-cli/default.nix
Normal file
38
pkgs/tools/llm/gorilla-cli/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gorilla-cli";
|
||||
version = "0.0.9";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gorilla-llm";
|
||||
repo = "gorilla-cli";
|
||||
rev = version;
|
||||
hash = "sha256-3h3QtBDKswTDL7zNM2C4VWiGCqknm/bxhP9sw4ieIcQ=";
|
||||
};
|
||||
|
||||
disabled = python3.pythonOlder "3.6";
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
requests
|
||||
halo
|
||||
prompt-toolkit
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "LLMs for your CLI";
|
||||
homepage = "https://github.com/gorilla-llm/gorilla-cli";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "shell_gpt";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-g7zQ9ii38jBMUT0n8SjkccnGlkpCO4817GZ2yidxpMU=";
|
||||
sha256 = "sha256-R4rhATuM0VL/N5+dXf3r9bF2/AVEcQhB2J4KYnxdHbk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
|
@ -45,6 +45,10 @@ rustPlatform.buildRustPackage {
|
|||
hash = "sha256-+ATOHx+LQLQV4nMdj1FRRvDTqGCTbX9kl290AbY9Vw0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./rust-1.71-unnecessary-mut.diff
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
|
|
|
|||
22
pkgs/tools/misc/vector/rust-1.71-unnecessary-mut.diff
Normal file
22
pkgs/tools/misc/vector/rust-1.71-unnecessary-mut.diff
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
diff --git a/lib/vector-core/src/tls/incoming.rs b/lib/vector-core/src/tls/incoming.rs
|
||||
index 5d2fd1cdb..7992f2c2b 100644
|
||||
--- a/lib/vector-core/src/tls/incoming.rs
|
||||
+++ b/lib/vector-core/src/tls/incoming.rs
|
||||
@@ -263,7 +263,7 @@ impl MaybeTlsIncomingStream<TcpStream> {
|
||||
where
|
||||
F: FnOnce(Pin<&mut MaybeTlsStream<TcpStream>>, &mut Context) -> Poll<io::Result<T>>,
|
||||
{
|
||||
- let mut this = self.get_mut();
|
||||
+ let this = self.get_mut();
|
||||
loop {
|
||||
return match &mut this.state {
|
||||
StreamState::Accepted(stream) => poll_fn(Pin::new(stream), cx),
|
||||
@@ -307,7 +307,7 @@ impl AsyncWrite for MaybeTlsIncomingStream<TcpStream> {
|
||||
}
|
||||
|
||||
fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
|
||||
- let mut this = self.get_mut();
|
||||
+ let this = self.get_mut();
|
||||
match &mut this.state {
|
||||
StreamState::Accepted(stream) => match Pin::new(stream).poll_shutdown(cx) {
|
||||
Poll::Ready(Ok(())) => {
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
{ lib, python3, fetchPypi }:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
tornado = super.tornado_4;
|
||||
};
|
||||
};
|
||||
|
||||
inherit (python.pkgs) buildPythonApplication iowait psutil pyzmq tornado mock six;
|
||||
in
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "circus";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0paccmqwgard2l0z7swcc3nwc418l9b4mfaddb4s31bpnqg02z6x";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# relax version restrictions to fix build
|
||||
substituteInPlace setup.py \
|
||||
--replace "pyzmq>=13.1.0,<17.0" "pyzmq>13.1.0"
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ mock ];
|
||||
|
||||
doCheck = false; # weird error
|
||||
|
||||
propagatedBuildInputs = [ iowait psutil pyzmq tornado six ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A process and socket manager";
|
||||
homepage = "https://github.com/circus-tent/circus";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,21 +5,22 @@
|
|||
, pkg-config
|
||||
, nettle
|
||||
, openssl
|
||||
, sqlite
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sequoia-chameleon-gnupg";
|
||||
version = "0.2.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sequoia-pgp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8aKT39gq6o7dnbhKbDxewd4R2e2IsbYU8vaDwYemes8=";
|
||||
hash = "sha256-sxjWd02INP2Dr5RQR7+dHHIQkGoCx6CZmvrq9x9zVC8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Z6cXCHLrK+BcIeVCKH2l8n9SivZsZPhXGhaMObn6rjo=";
|
||||
cargoHash = "sha256-+0MLfq2Gjs4oh9bC8OEQsx0RHxlzB/HlIgyXtwzvGUY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
|
|
@ -29,6 +30,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [
|
||||
nettle
|
||||
openssl
|
||||
sqlite
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
|
|
|||
|
|
@ -5356,6 +5356,8 @@ with pkgs;
|
|||
|
||||
gorilla-bin = callPackage ../tools/security/gorilla-bin { };
|
||||
|
||||
gorilla-cli = callPackage ../tools/llm/gorilla-cli { };
|
||||
|
||||
godu = callPackage ../tools/misc/godu { };
|
||||
|
||||
goss = callPackage ../tools/misc/goss { };
|
||||
|
|
@ -6575,7 +6577,7 @@ with pkgs;
|
|||
|
||||
circleci-cli = callPackage ../development/tools/misc/circleci-cli { };
|
||||
|
||||
circus = callPackage ../tools/networking/circus { };
|
||||
circus = with python3Packages; toPythonApplication circus;
|
||||
|
||||
cirrus-cli = callPackage ../development/tools/continuous-integration/cirrus-cli { };
|
||||
|
||||
|
|
@ -14330,6 +14332,8 @@ with pkgs;
|
|||
|
||||
xprintidle-ng = callPackage ../tools/X11/xprintidle-ng { };
|
||||
|
||||
xssstate = callPackage ../tools/X11/xssstate { };
|
||||
|
||||
xscast = callPackage ../applications/video/xscast { };
|
||||
|
||||
xsettingsd = callPackage ../tools/X11/xsettingsd { };
|
||||
|
|
@ -34751,7 +34755,7 @@ with pkgs;
|
|||
|
||||
shavee = callPackage ../applications/misc/shavee { };
|
||||
|
||||
shell_gpt = callPackage ../tools/misc/shell_gpt { };
|
||||
shell_gpt = callPackage ../tools/llm/shell_gpt { };
|
||||
|
||||
shfmt = callPackage ../tools/text/shfmt { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1879,6 +1879,8 @@ self: super: with self; {
|
|||
|
||||
circuitbreaker = callPackage ../development/python-modules/circuitbreaker { };
|
||||
|
||||
circus = callPackage ../development/python-modules/circus { };
|
||||
|
||||
cirq = callPackage ../development/python-modules/cirq { };
|
||||
|
||||
cirq-aqt = callPackage ../development/python-modules/cirq-aqt { };
|
||||
|
|
@ -6494,6 +6496,7 @@ self: super: with self; {
|
|||
mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { };
|
||||
mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { };
|
||||
mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { };
|
||||
mkdocs-linkcheck = callPackage ../development/python-modules/mkdocs-linkcheck { };
|
||||
mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { };
|
||||
mkdocs-material = callPackage ../development/python-modules/mkdocs-material { };
|
||||
mkdocs-material-extensions = callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue