mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-26 06:44:06 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
c73c2c8019
@ -221,6 +221,7 @@ with lib.maintainers; {
|
||||
|
||||
docs = {
|
||||
members = [
|
||||
asymmetric
|
||||
ryantm
|
||||
];
|
||||
scope = "Maintain nixpkgs/NixOS documentation and tools for building it.";
|
||||
|
||||
@ -22,6 +22,6 @@ in
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.udev.packages = [ pkgs.nitrokey-udev-rules ];
|
||||
services.udev.packages = [ pkgs.libnitrokey ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1063,6 +1063,7 @@
|
||||
./services/search/opensearch.nix
|
||||
./services/search/qdrant.nix
|
||||
./services/security/aesmd.nix
|
||||
./services/security/authelia.nix
|
||||
./services/security/certmgr.nix
|
||||
./services/security/cfssl.nix
|
||||
./services/security/clamav.nix
|
||||
@ -1210,7 +1211,6 @@
|
||||
./services/web-apps/zabbix.nix
|
||||
./services/web-servers/agate.nix
|
||||
./services/web-servers/apache-httpd/default.nix
|
||||
./services/web-servers/authelia.nix
|
||||
./services/web-servers/caddy/default.nix
|
||||
./services/web-servers/darkhttpd.nix
|
||||
./services/web-servers/fcgiwrap.nix
|
||||
|
||||
@ -184,6 +184,22 @@ in
|
||||
.tar.gz files.
|
||||
'';
|
||||
};
|
||||
environmentFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
Environment file (see {manpage}`systemd.exec(5)`
|
||||
"EnvironmentFile=" section for the syntax) which sets config options
|
||||
for mattermost (see [the mattermost documentation](https://docs.mattermost.com/configure/configuration-settings.html#environment-variables)).
|
||||
|
||||
Settings defined in the environment file will overwrite settings
|
||||
set via nix or via the {option}`services.mattermost.extraConfig`
|
||||
option.
|
||||
|
||||
Useful for setting config options without their value ending up in the
|
||||
(world-readable) nix store, e.g. for a database password.
|
||||
'';
|
||||
};
|
||||
|
||||
localDatabaseCreate = mkOption {
|
||||
type = types.bool;
|
||||
@ -321,6 +337,7 @@ in
|
||||
Restart = "always";
|
||||
RestartSec = "10";
|
||||
LimitNOFILE = "49152";
|
||||
EnvironmentFile = cfg.environmentFile;
|
||||
};
|
||||
unitConfig.JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service";
|
||||
};
|
||||
|
||||
@ -60,7 +60,7 @@ in
|
||||
|
||||
package = mkOption {
|
||||
# TODO: when 23.05 is released and if Garage 0.9 is the default, put a stateVersion check.
|
||||
default = if versionAtLeast stateVersion "23.05" then pkgs.garage_0_8_0
|
||||
default = if versionAtLeast config.system.stateVersion "23.05" then pkgs.garage_0_8
|
||||
else pkgs.garage_0_7;
|
||||
defaultText = literalExpression "pkgs.garage_0_7";
|
||||
type = types.package;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Test Authelia as an auth server for Traefik as a reverse proxy of a local web service
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
import ./make-test-python.nix ({ lib, ... }: {
|
||||
name = "authelia";
|
||||
meta.maintainers = with lib.maintainers; [ jk ];
|
||||
|
||||
|
||||
@ -50,6 +50,13 @@ in
|
||||
mutableConfig = false;
|
||||
extraConfig.SupportSettings.HelpLink = "https://search.nixos.org";
|
||||
};
|
||||
environmentFile = makeMattermost {
|
||||
mutableConfig = false;
|
||||
extraConfig.SupportSettings.AboutLink = "https://example.org";
|
||||
environmentFile = pkgs.writeText "mattermost-env" ''
|
||||
MM_SUPPORTSETTINGS_ABOUTLINK=https://nixos.org
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
testScript = let
|
||||
@ -69,6 +76,7 @@ in
|
||||
rm -f $mattermostConfig
|
||||
echo "$newConfig" > "$mattermostConfig"
|
||||
'';
|
||||
|
||||
in
|
||||
''
|
||||
start_all()
|
||||
@ -120,5 +128,13 @@ in
|
||||
|
||||
# Our edits should be ignored on restart
|
||||
immutable.succeed("${expectConfig ''.AboutLink == "https://nixos.org" and .HelpLink == "https://search.nixos.org"''}")
|
||||
|
||||
|
||||
## Environment File node tests ##
|
||||
environmentFile.wait_for_unit("mattermost.service")
|
||||
environmentFile.wait_for_open_port(8065)
|
||||
|
||||
# Settings in the environment file should override settings set otherwise
|
||||
environmentFile.succeed("${expectConfig ''.AboutLink == "https://nixos.org"''}")
|
||||
'';
|
||||
})
|
||||
|
||||
@ -12,6 +12,7 @@ let
|
||||
then pkgs.zfsUnstable.latestCompatibleLinuxPackages
|
||||
else pkgs.linuxPackages
|
||||
, enableUnstable ? false
|
||||
, enableSystemdStage1 ? false
|
||||
, extraTest ? ""
|
||||
}:
|
||||
makeTest {
|
||||
@ -36,6 +37,7 @@ let
|
||||
boot.kernelPackages = kernelPackage;
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
boot.zfs.enableUnstable = enableUnstable;
|
||||
boot.initrd.systemd.enable = enableSystemdStage1;
|
||||
|
||||
environment.systemPackages = [ pkgs.parted ];
|
||||
|
||||
@ -176,6 +178,11 @@ in {
|
||||
enableUnstable = true;
|
||||
};
|
||||
|
||||
unstableWithSystemdStage1 = makeZfsTest "unstable" {
|
||||
enableUnstable = true;
|
||||
enableSystemdStage1 = true;
|
||||
};
|
||||
|
||||
installer = (import ./installer.nix { }).zfsroot;
|
||||
|
||||
expand-partitions = makeTest {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -27,12 +27,12 @@
|
||||
};
|
||||
arduino = buildGrammar {
|
||||
language = "arduino";
|
||||
version = "0.0.0+rev=257efff";
|
||||
version = "0.0.0+rev=833b53d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ObserverOfTime";
|
||||
repo = "tree-sitter-arduino";
|
||||
rev = "257efffa387da3283a37816b71dedfecf4af5222";
|
||||
hash = "sha256-Yc3oFzOMyQwW2URyEzSIe6wBNAu9J2vPFIXk43sVUv8=";
|
||||
rev = "833b53df97143bc46e014608dee9f64f78d7473c";
|
||||
hash = "sha256-M3mAZ5CORunUEIxy4+yQ8qTSbpmEgEmHgTB98niTbXo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
|
||||
};
|
||||
@ -49,12 +49,12 @@
|
||||
};
|
||||
awk = buildGrammar {
|
||||
language = "awk";
|
||||
version = "0.0.0+rev=e559793";
|
||||
version = "0.0.0+rev=b8e81f6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Beaglefoot";
|
||||
repo = "tree-sitter-awk";
|
||||
rev = "e559793754c60c2cdf00cbb0409842d75f0a41dc";
|
||||
hash = "sha256-qLY8lpeP0jKqhNxoSLwBTOfulK79/0KOjgq/rKWUBSA=";
|
||||
rev = "b8e81f62109e65adca1ab51ab9d414411db5a37f";
|
||||
hash = "sha256-3fCaV/MxqOP9g6Ma/eTAerKL+HVweDjihgeUR6h4wY0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk";
|
||||
};
|
||||
@ -236,12 +236,12 @@
|
||||
};
|
||||
cpp = buildGrammar {
|
||||
language = "cpp";
|
||||
version = "0.0.0+rev=03fa93d";
|
||||
version = "0.0.0+rev=0b6d0eb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-cpp";
|
||||
rev = "03fa93db133d6048a77d4de154a7b17ea8b9d076";
|
||||
hash = "sha256-0KYGEgAWmKFialuCy2zTfadDYezaftRRWjnr7sua9/c=";
|
||||
rev = "0b6d0eb9abdf7cea31961cd903eeed5bbd0aae74";
|
||||
hash = "sha256-rsxRiZCrsEB/ixAP4YmxFtnCoDQrLAp75c74DFR0/nk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
|
||||
};
|
||||
@ -258,12 +258,12 @@
|
||||
};
|
||||
cuda = buildGrammar {
|
||||
language = "cuda";
|
||||
version = "0.0.0+rev=91c3ca3";
|
||||
version = "0.0.0+rev=967e7d7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-cuda";
|
||||
rev = "91c3ca3e42326e0f7b83c82765940bbf7f91c847";
|
||||
hash = "sha256-0jDO8Wkqkn9ol4mfga/h/9yMMWkMF9Z/33rTxB8n1dg=";
|
||||
rev = "967e7d74a1a04a680674199e12141963a8dd6336";
|
||||
hash = "sha256-3rkmxnf1YzshBUEOXBXj9Zpg9IHh2uS0QzdncOU99IQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
|
||||
};
|
||||
@ -456,6 +456,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/travonted/tree-sitter-fennel";
|
||||
};
|
||||
firrtl = buildGrammar {
|
||||
language = "firrtl";
|
||||
version = "0.0.0+rev=58e9655";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-firrtl";
|
||||
rev = "58e9655caa6b6d0ef8dc0e6bd3d8e060beb6b40d";
|
||||
hash = "sha256-yvfB5xFBeBP8iFXpeKeD86kCVdu/hxAEw7lQ7ghuKGY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-firrtl";
|
||||
};
|
||||
fish = buildGrammar {
|
||||
language = "fish";
|
||||
version = "0.0.0+rev=f917690";
|
||||
@ -601,12 +612,12 @@
|
||||
};
|
||||
glimmer = buildGrammar {
|
||||
language = "glimmer";
|
||||
version = "0.0.0+rev=bc1c685";
|
||||
version = "0.0.0+rev=16c3786";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexlafroscia";
|
||||
repo = "tree-sitter-glimmer";
|
||||
rev = "bc1c685aa6a7caf9e58c5746ab386a1e673eb9af";
|
||||
hash = "sha256-CDXyynCsnmOvOs1rs9e29tNHosywTvGM0UyWVtwMqZ8=";
|
||||
rev = "16c3786e1a2c87a236c823d1a8859574778a3436";
|
||||
hash = "sha256-fLRA4Rm92hVezbAdMxmrXPb5ax6wNaaBYIo+U64nD+8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer";
|
||||
};
|
||||
@ -711,12 +722,12 @@
|
||||
};
|
||||
haskell = buildGrammar {
|
||||
language = "haskell";
|
||||
version = "0.0.0+rev=fb3c19e";
|
||||
version = "0.0.0+rev=98fc7f5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-haskell";
|
||||
rev = "fb3c19e8e307acaf9336ab88330fd386ce731638";
|
||||
hash = "sha256-2nXKC7rQYbY2Sr0GVYETR83KYza1HKqpmjFkkgP80rI=";
|
||||
rev = "98fc7f59049aeb713ab9b72a8ff25dcaaef81087";
|
||||
hash = "sha256-BDvzmFIGABtkWEUbi74o3vPLsiwNWsQDNura867vYpU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
|
||||
};
|
||||
@ -766,12 +777,12 @@
|
||||
};
|
||||
hlsl = buildGrammar {
|
||||
language = "hlsl";
|
||||
version = "0.0.0+rev=306d485";
|
||||
version = "0.0.0+rev=fce5ea2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-hlsl";
|
||||
rev = "306d48516a6b3dbb18a184692e8edffa8403018f";
|
||||
hash = "sha256-PvraHZYbTF3FFIQoooRr1Lx4ZrBLzzxWd5YoqibBQfM=";
|
||||
rev = "fce5ea2e842404ce1af13fffdcf0daa02240c3dd";
|
||||
hash = "sha256-7/HJPPLUwwnxgmNP0Vzm+nTJ1YfnUYbqMcOEZZj5uRA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
|
||||
};
|
||||
@ -942,12 +953,12 @@
|
||||
};
|
||||
kotlin = buildGrammar {
|
||||
language = "kotlin";
|
||||
version = "0.0.0+rev=e463703";
|
||||
version = "0.0.0+rev=826ef28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fwcd";
|
||||
repo = "tree-sitter-kotlin";
|
||||
rev = "e4637037a5fe6f25fe66c305669faa0855f35692";
|
||||
hash = "sha256-Xoj9RJqtyNtwag5tXRfu5iJpTnajRk1g7ClflBbFZyI=";
|
||||
rev = "826ef28d605d0925a86a99022cd222c96f2d0952";
|
||||
hash = "sha256-7fDwzt9BXs1h+2D9APAG/ruA81ZyAL4LOElXLdz8wyE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
|
||||
};
|
||||
@ -1008,12 +1019,12 @@
|
||||
};
|
||||
luadoc = buildGrammar {
|
||||
language = "luadoc";
|
||||
version = "0.0.0+rev=40a67ee";
|
||||
version = "0.0.0+rev=5c9572f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-luadoc";
|
||||
rev = "40a67ee798eb3c989fffde0277ff6de740ebaf34";
|
||||
hash = "sha256-vhiUaZms4Je/TBTTepQiuddl0sKodrHcrBCauBPgu7Y=";
|
||||
rev = "5c9572faf56d1fa0f7e0740c94de1c4f67c6af5e";
|
||||
hash = "sha256-90FXGhzTpPVVBPpAdAvfqdIOVCPKTUtRC0WWQyCR0Eg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-luadoc";
|
||||
};
|
||||
@ -1245,12 +1256,12 @@
|
||||
};
|
||||
perl = buildGrammar {
|
||||
language = "perl";
|
||||
version = "0.0.0+rev=ff1f0ac";
|
||||
version = "0.0.0+rev=3d3a95e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ganezdragon";
|
||||
repo = "tree-sitter-perl";
|
||||
rev = "ff1f0ac0f1c678a23f68d0140e75a0da8e11b7b5";
|
||||
hash = "sha256-RFSDtd8iJJEX7dawMzaGwJUB4t/nr11hmG2EdTp11s4=";
|
||||
rev = "3d3a95ee6645d7bcd993e77b252ffd33fd297c8e";
|
||||
hash = "sha256-YM4lxdcvkX2l4KkdktDSoNXaN2zCqAS4W0mXMh8GJOs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl";
|
||||
};
|
||||
@ -1309,6 +1320,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter";
|
||||
};
|
||||
pony = buildGrammar {
|
||||
language = "pony";
|
||||
version = "0.0.0+rev=9c6a4d9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-pony";
|
||||
rev = "9c6a4d98dea80772dbd7967fe556652a220469e5";
|
||||
hash = "sha256-fgPnDU58qfZfRmBA2hBQt23TjJqiU6XobBYzRD7ZFz0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-pony";
|
||||
};
|
||||
prisma = buildGrammar {
|
||||
language = "prisma";
|
||||
version = "0.0.0+rev=eca2596";
|
||||
@ -1674,12 +1696,12 @@
|
||||
};
|
||||
swift = buildGrammar {
|
||||
language = "swift";
|
||||
version = "0.0.0+rev=4cf4bb6";
|
||||
version = "0.0.0+rev=8c8412a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alex-pinkus";
|
||||
repo = "tree-sitter-swift";
|
||||
rev = "4cf4bb67c27f5c5a75f634fe941c588660e69ab3";
|
||||
hash = "sha256-dRXkUFaWMkFe0qWtNs3fkhct1+JLIbF/Z0VQdR0bjV4=";
|
||||
rev = "8c8412a54d97d6f96a4bf4ecb76cba4808952ed5";
|
||||
hash = "sha256-rt7pmmPuWn6eA8pYk4wRABmMql4jm0+4BtNwcRI2QRQ=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
|
||||
@ -1867,12 +1889,12 @@
|
||||
};
|
||||
v = buildGrammar {
|
||||
language = "v";
|
||||
version = "0.0.0+rev=66cf9d3";
|
||||
version = "0.0.0+rev=1828a1e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "vls";
|
||||
rev = "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6";
|
||||
hash = "sha256-/dNdUAmfG/HNMzeWi3PSSM9pwA60/zOjLi4NFXfn6YU=";
|
||||
rev = "1828a1e6611703371039fdefba955018ac570105";
|
||||
hash = "sha256-8gOvJQnoBdPw8er8sDL5wfhKaoibCvfC7XlZbMbg9QU=";
|
||||
};
|
||||
location = "tree_sitter_v";
|
||||
meta.homepage = "https://github.com/vlang/vls";
|
||||
|
||||
@ -213,8 +213,8 @@ let
|
||||
platforms = lua.meta.platforms;
|
||||
# add extra maintainer(s) to every package
|
||||
maintainers = (meta.maintainers or []) ++ [ ];
|
||||
broken = disabled;
|
||||
} // meta;
|
||||
}));
|
||||
in
|
||||
assert (disabled -> throw "${pname} not supported for interpreter ${lua.executable}");
|
||||
luarocksDrv
|
||||
|
||||
31
pkgs/development/libraries/cppcodec/default.nix
Normal file
31
pkgs/development/libraries/cppcodec/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cppcodec";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tplgy";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-k4EACtDOSkTXezTeFtVdM1EVJjvGga/IQSrvDzhyaXw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Header-only C++11 library for encode/decode functions as in RFC 4648";
|
||||
longDescription = ''
|
||||
Header-only C++11 library to encode/decode base64, base64url, base32,
|
||||
base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus
|
||||
Crockford's base32.
|
||||
'';
|
||||
homepage = "https://github.com/tplgy/cppcodec";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ panicgh raitobezarius ];
|
||||
};
|
||||
})
|
||||
41
pkgs/development/libraries/libnitrokey/default.nix
Normal file
41
pkgs/development/libraries/libnitrokey/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, hidapi
|
||||
, libusb1
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libnitrokey";
|
||||
version = "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nitrokey";
|
||||
repo = "libnitrokey";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-9ZMR1g04gNzslax6NpD6KykfUfjpKFIizaMMn06iJa0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DADD_GIT_INFO=OFF"
|
||||
"-DCMAKE_INSTALL_UDEVRULESDIR=etc/udev/rules.d"
|
||||
];
|
||||
|
||||
buildInputs = [ libusb1 ];
|
||||
|
||||
propagatedBuildInputs = [ hidapi ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Communicate with Nitrokey devices in a clean and easy manner";
|
||||
homepage = "https://github.com/Nitrokey/libnitrokey";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ panicgh raitobezarius ];
|
||||
};
|
||||
})
|
||||
@ -1,5 +1,6 @@
|
||||
{ absl-py
|
||||
, buildPythonPackage
|
||||
, cloudpickle
|
||||
, dm-tree
|
||||
, fetchFromGitHub
|
||||
, jax
|
||||
@ -24,6 +25,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
absl-py
|
||||
cloudpickle
|
||||
dm-tree
|
||||
jax
|
||||
numpy
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.2.11";
|
||||
version = "2023.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Nrq7Bc9Lzdle8/rINp/GPy+DWANgMe7WCLP48gHohIo=";
|
||||
hash = "sha256-ZclhJoJg80P0iysA0G7+gTg8S3qJaaAbHsr4v6DUGKQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "niapy";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "NiaOrg";
|
||||
repo = "NiaPy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bZ9bONFntNx5tcm/gR/uPS5CqicJX281WsvSno8aVlY=";
|
||||
hash = "sha256-qstTxUo4jZ8YKbEjtDtSZUvR67VNkBQJdXeERJPOMDw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydeconz";
|
||||
version = "110";
|
||||
version = "111";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "Kane610";
|
||||
repo = "deconz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2eHKFq+urzJS3K55O0hca0h4ElowJZD6nIkYkzyBFCM=";
|
||||
hash = "sha256-QBun9VT42W9EMvNuLZoe6VnXKXAKEXstDKCU7LXEvNQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, asynctest
|
||||
, bleak
|
||||
, click
|
||||
, buildPythonPackage
|
||||
@ -15,12 +14,12 @@ buildPythonPackage rec {
|
||||
version = "0.4.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emlove";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FNiq/dbh5PMTxnKCKDSHEvllehAEUYvWZS+OyP3lSW8=";
|
||||
};
|
||||
|
||||
@ -37,8 +36,6 @@ buildPythonPackage rec {
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
asynctest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "soxr";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
repo = "python-soxr";
|
||||
rev = "refs/tags/v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-g8YS5YgK1uK1kKtR/wn8x5DAUVY/hYmuMIgjgJAC8pM=";
|
||||
hash = "sha256-/NFGzOF1X9c0yccgtVNUO+1aIWoNdJqP/OKcNj+uKpk=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalexs-ble";
|
||||
version = "2.1.6";
|
||||
version = "2.1.10";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RNoh7Uo7I5kMveX74Gt8r9Mse6qdYOqc/UKrEfuNm18=";
|
||||
hash = "sha256-B1ncj/5Z+V+mXTW+bY7BXsKjwaH8SgZI6nDZn6Qc754=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
37
pkgs/development/tools/misc/rsonpath/default.nix
Normal file
37
pkgs/development/tools/misc/rsonpath/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, withSimd ? true
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rsonpath";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v0ldek";
|
||||
repo = "rsonpath";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ip8+Wy9rmTzFccmjYWb3Nk+gkq3g4e1ty/5+ldIOO10=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5V0H2FeHI1SByzLsviOR+qHwYhZGiNmMawCTYjk2P24=";
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
"default-optimizations"
|
||||
] ++ lib.optionals withSimd [
|
||||
"simd"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Blazing fast Rust JSONPath query engine";
|
||||
homepage = "https://github.com/v0ldek/rsonpath";
|
||||
changelog = "https://github.com/v0ldek/rsonpath/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
# build fails on platforms without simd support, even when withSimd = false
|
||||
broken = !stdenv.isx86_64;
|
||||
};
|
||||
}
|
||||
2
pkgs/development/tools/misc/texlab/Cargo.lock
generated
2
pkgs/development/tools/misc/texlab/Cargo.lock
generated
@ -1593,7 +1593,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "texlab"
|
||||
version = "5.4.0"
|
||||
version = "5.4.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"assert_unordered",
|
||||
|
||||
@ -15,13 +15,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "texlab";
|
||||
version = "5.4.0";
|
||||
version = "5.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = "texlab";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-2P+aidfYkO8l9VjqTstXbksyGTQ3porJhrBYod9oCYQ=";
|
||||
sha256 = "sha256-rTYcYq8SL404A/ke5Rb9QcCtwHKhs+84TQGNqRn11HM=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
37
pkgs/games/xgalaga++/default.nix
Normal file
37
pkgs/games/xgalaga++/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, libX11
|
||||
, libXpm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xgalaga++";
|
||||
version = "0.9";
|
||||
src = fetchurl {
|
||||
url = "https://marc.mongenet.ch/OSS/XGalaga/xgalaga++_${version}.tar.gz";
|
||||
sha256 = "sha256-yNtLuYCMHLvQAVM7CDGPardrh3q27TE9l31qhUbMf8k=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXpm
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
make all HIGH_SCORES_FILE=.xgalaga++.scores
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/man
|
||||
mv xgalaga++ $out/bin
|
||||
mv xgalaga++.6x $out/share/man
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://marc.mongenet.ch/OSS/XGalaga/";
|
||||
description = "XGalaga++ is a classic single screen vertical shoot ’em up. It is inspired by XGalaga and reuses most of its sprites.";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -256,5 +256,13 @@ in {
|
||||
sha256 = "sha256-CdPuyZMXFzANEdnsr/rB5ckkT8X5uziniY5vmRCKl1U=";
|
||||
|
||||
isUnstable = true;
|
||||
|
||||
# Necessary for 6.2.8+ and 6.3 compatibility, see https://github.com/openzfs/zfs/issues/14658
|
||||
extraPatches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openzfs/zfs/pull/14668.patch";
|
||||
hash = "sha256-PR7hxxdjLkjszADdw0R0JRmBPfDlsXG6D+VfC7QzEhk=";
|
||||
})
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchFromGitHub, buildGoModule, installShellFiles, callPackage }:
|
||||
{ lib, fetchFromGitHub, buildGoModule, installShellFiles, callPackage, nixosTests }:
|
||||
|
||||
let
|
||||
inherit (import ./sources.nix { inherit fetchFromGitHub; }) pname version src vendorHash;
|
||||
@ -56,6 +56,7 @@ buildGoModule rec {
|
||||
# if overriding replace the postPatch to put your web UI output in internal/server/public_html
|
||||
inherit web;
|
||||
updateScript = ./update.sh;
|
||||
tests = { inherit (nixosTests) authelia; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -8,10 +8,10 @@
|
||||
, plugins ? ps: [] }:
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
py = python3 // {
|
||||
pkgs = python3.pkgs.overrideScope (self: super: {
|
||||
django = super.django_4;
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
extraBuildInputs = plugins py.pkgs;
|
||||
|
||||
@ -1,17 +1,19 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3 }:
|
||||
{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, nixosTests, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wsdd";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "christgau";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9cwzkF2mg6yOIsurLMXTLoEIOsKbPIWMicpWBQ0XVhE=";
|
||||
hash = "sha256-xfZVGi3OxuRI+Zh6L3Ru4J4j5BB1EAN3fllRCVA/c5o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
@ -22,7 +24,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm0755 src/wsdd.py $out/bin/wsdd
|
||||
install -Dm0555 src/wsdd.py $out/bin/wsdd
|
||||
installManPage man/wsdd.8
|
||||
wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH"
|
||||
'';
|
||||
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.54.0";
|
||||
version = "0.55.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XphLzYdZg+aSk7fgDz61ADxb+sgsck6TuZ1++PGu/dE=";
|
||||
hash = "sha256-3MiKivewGl4J/yQJ+wLTwh8w6HO8XuX9/b6mwtbvW3o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-V7yPXSN+3H8NkD384MkvKbymNQ/O2Q9HoMO4M8mzVto=";
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "amass";
|
||||
version = "3.22.1";
|
||||
version = "3.22.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OWASP";
|
||||
repo = "Amass";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hkYN28M2t8SXmIrSEQEWM5ndCx1xgpHThNg0UFzQqLU=";
|
||||
hash = "sha256-q6neBDk/kcvAoih4urRTFmhH6N7Fh/hEJQtL//kqJiI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fZd++VsLcs3MzcM23zE3AVaDPXf+cuLdJp8hsCeEZ1Y=";
|
||||
|
||||
@ -1,5 +1,13 @@
|
||||
{ lib, stdenv, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkg-config
|
||||
, qtbase, qttranslations, qtsvg, wrapQtAppsHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, qttranslations
|
||||
, wrapQtAppsHook
|
||||
, libnitrokey
|
||||
, cppcodec
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nitrokey-app";
|
||||
@ -9,24 +17,25 @@ stdenv.mkDerivation rec {
|
||||
owner = "Nitrokey";
|
||||
repo = "nitrokey-app";
|
||||
rev = "v${version}";
|
||||
sha256 = "1k0w921hfrya4q2r7bqn7kgmwvwb7c15k9ymlbnksmfc9yyjyfcv";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-c6EC5uuMna07xVHDRFq0UDwuSeopZTmZGZ9ZD5zaq8Y=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
bash-completion
|
||||
hidapi
|
||||
libusb1
|
||||
qtbase
|
||||
qttranslations
|
||||
qtsvg
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
qttranslations
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DADD_GIT_INFO=OFF"
|
||||
"-DBASH_COMPLETION_PATH=share/bash-completion/completions"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libnitrokey
|
||||
cppcodec
|
||||
];
|
||||
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides extra functionality for the Nitrokey Pro and Storage";
|
||||
@ -37,6 +46,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://github.com/Nitrokey/nitrokey-app";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ kaiha ];
|
||||
maintainers = with maintainers; [ kaiha panicgh ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
{ lib, stdenv, nitrokey-app }:
|
||||
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}";
|
||||
|
||||
inherit (nitrokey-app) src;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/etc/udev/rules.d
|
||||
cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "udev rules for Nitrokeys";
|
||||
inherit (nitrokey-app.meta) homepage license maintainers;
|
||||
};
|
||||
}
|
||||
@ -1073,6 +1073,7 @@ mapAliases ({
|
||||
nfsUtils = throw "'nfsUtils' has been renamed to/replaced by 'nfs-utils'"; # Converted to throw 2022-02-22
|
||||
nginxUnstable = throw "'nginxUnstable' has been renamed to/replaced by 'nginxMainline'"; # Converted to throw 2022-02-22
|
||||
nilfs_utils = throw "'nilfs_utils' has been renamed to/replaced by 'nilfs-utils'"; # Converted to throw 2022-02-22
|
||||
nitrokey-udev-rules = libnitrokey; # Added 2023-03-25
|
||||
nix-direnv-flakes = nix-direnv;
|
||||
nix-review = nixpkgs-review; # Added 2019-12-22
|
||||
nixFlakes = nixVersions.stable; # Added 2021-05-21
|
||||
|
||||
@ -18733,6 +18733,8 @@ with pkgs;
|
||||
|
||||
rsass = callPackage ../development/tools/misc/rsass { };
|
||||
|
||||
rsonpath = callPackage ../development/tools/misc/rsonpath { };
|
||||
|
||||
rufo = callPackage ../development/tools/rufo { };
|
||||
|
||||
samurai = callPackage ../development/tools/build-managers/samurai { };
|
||||
@ -19608,6 +19610,8 @@ with pkgs;
|
||||
|
||||
cppcms = callPackage ../development/libraries/cppcms { };
|
||||
|
||||
cppcodec = callPackage ../development/libraries/cppcodec { };
|
||||
|
||||
cppunit = callPackage ../development/libraries/cppunit { };
|
||||
|
||||
cpputest = callPackage ../development/libraries/cpputest { };
|
||||
@ -21611,6 +21615,8 @@ with pkgs;
|
||||
|
||||
libnice = callPackage ../development/libraries/libnice { };
|
||||
|
||||
libnitrokey = callPackage ../development/libraries/libnitrokey { };
|
||||
|
||||
libnsl = callPackage ../development/libraries/libnsl { };
|
||||
|
||||
liboping = callPackage ../development/libraries/liboping { };
|
||||
@ -36402,6 +36408,8 @@ with pkgs;
|
||||
|
||||
xcowsay = callPackage ../games/xcowsay { };
|
||||
|
||||
xgalagapp = callPackage ../games/xgalaga++ { };
|
||||
|
||||
xjump = callPackage ../games/xjump { };
|
||||
|
||||
xmoto = callPackage ../games/xmoto { };
|
||||
@ -39309,7 +39317,6 @@ with pkgs;
|
||||
pynitrokey = callPackage ../tools/security/pynitrokey { };
|
||||
|
||||
nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };
|
||||
nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { };
|
||||
|
||||
fpm2 = callPackage ../tools/security/fpm2 { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user