mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-17 18:34:38 +00:00
Merge staging-next into staging
This commit is contained in:
commit
45c3df25d7
@ -9469,6 +9469,12 @@
|
||||
fingerprint = "97A0 AE5E 03F3 499B 7D7A 65C6 76A4 1432 37EF 5817";
|
||||
}];
|
||||
};
|
||||
lukaswrz = {
|
||||
email = "lukas@wrz.one";
|
||||
github = "lukaswrz";
|
||||
githubId = 84395723;
|
||||
name = "Lukas Wurzinger";
|
||||
};
|
||||
lukeadams = {
|
||||
email = "luke.adams@belljar.io";
|
||||
github = "lukeadams";
|
||||
|
@ -375,6 +375,13 @@ in
|
||||
<https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67>
|
||||
'';
|
||||
};
|
||||
StrictModes = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Whether sshd should check file modes and ownership of directories
|
||||
'';
|
||||
};
|
||||
Ciphers = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [
|
||||
|
@ -193,6 +193,4 @@ in
|
||||
(mkRemovedOptionModule [ "services" "unifi" "dataDir" ] "You should move contents of dataDir to /var/lib/unifi/data" )
|
||||
(mkRenamedOptionModule [ "services" "unifi" "openPorts" ] [ "services" "unifi" "openFirewall" ])
|
||||
];
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ pennae ];
|
||||
}
|
||||
|
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocenaudio";
|
||||
version = "3.11.25";
|
||||
version = "3.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
|
||||
sha256 = "sha256-B14xM4/E6TQZGLZifvIFA4JxLPo0hNah9PIyquS9TzI=";
|
||||
sha256 = "sha256-AzQAEU5o3m1cFCxeyT32AzX4WUk3DliBPdw+cfQPyKU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -4,14 +4,14 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "nano-wallet";
|
||||
version = "21.3";
|
||||
version = "25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nanocurrency";
|
||||
repo = "nano-node";
|
||||
rev = "V${version}";
|
||||
sha256 = "0f6chl5vrzdr4w8g3nivfxk3qm6m11js401998afnhz0xaysm4pm";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-VHefXHUj08k53+8mAAhbR31F5uDmIxBFR1hfGfrrugM=";
|
||||
};
|
||||
|
||||
cmakeFlags = let
|
||||
@ -34,11 +34,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make nano_wallet
|
||||
runHook postBuild
|
||||
'';
|
||||
makeFlags = [ "nano_wallet" ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
864
pkgs/applications/misc/pot/Cargo.lock
generated
864
pkgs/applications/misc/pot/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pot";
|
||||
version = "0.5.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pot-app";
|
||||
repo = "pot-desktop";
|
||||
rev = version;
|
||||
hash = "sha256-sAAdw7gYUQTHZYmxSAk2LByR+iMT836sQolk2NOgWD0=";
|
||||
hash = "sha256-MDBIChljWlztzjdyrdkzvrLuuJ0PAUonHj1hCJkqYCc=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src-tauri";
|
||||
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
dontFixup = true;
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-lqGskG1MWbZKEmqJf4b9dGltmFHw/qOo/Sh7JIFS4IQ=";
|
||||
outputHash = "sha256-2kQuhlQnt1gGajPWXG9rj/T/SYkJStql1h4rgkZFhXc=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
@ -79,6 +79,7 @@ stdenv.mkDerivation rec {
|
||||
"tauri-plugin-single-instance-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U=";
|
||||
"tauri-plugin-autostart-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U=";
|
||||
"enigo-0.1.2" = "sha256-99VJ0WYD8jV6CYUZ1bpYJBwIE2iwOZ9SjOvyA2On12Q=";
|
||||
"selection-0.1.0" = "sha256-xHLMkxYWsvnxTwchwrga8eizmSP730rE+MC8hOinMC8=";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ticker";
|
||||
version = "4.5.13";
|
||||
version = "4.5.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "achannarasappa";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0T4Cl9o21Tt4ZFeY7kUe4Obu4IY9JMLBwUqgs4rZx1U=";
|
||||
hash = "sha256-WpU0fxkdNqr8zF6eGOlbaV9dp6sZyNZ1J7Uq+yGBnUs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-c7wU9LLRlS9kOhE4yAiKAs/npQe8lvSwPcd+/D8o9rk=";
|
||||
@ -30,6 +30,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/achannarasappa/ticker";
|
||||
changelog = "https://github.com/achannarasappa/ticker/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
maintainers = with maintainers; [ siraben sarcasticadmin ];
|
||||
};
|
||||
}
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
xmrig.overrideAttrs (oldAttrs: rec {
|
||||
pname = "xmrig-mo";
|
||||
version = "6.19.2-mo1";
|
||||
version = "6.19.3-mo1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MoneroOcean";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L2upscNOTEQTbJ9ZnbXIpqPNmQDv56/7UYzlKndEulc=";
|
||||
sha256 = "sha256-0yH+EFhzhDS/75AIjMiFbkQuHfPaJRzdr7n4/WBkeNM=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, cmake
|
||||
, pkg-config
|
||||
@ -26,6 +27,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-DpgCxnwkNP2mZNYygxFLMufEijYoLr4qor0DYCmbps8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fixes `lagrange-tui`
|
||||
# remove when 1.64.4 comes out
|
||||
(fetchpatch {
|
||||
name = "tui-fixed-build-after-changes-to-text-init.patch";
|
||||
url = "https://github.com/skyjake/lagrange/commit/1c811221acc5b8eb47210fba90dc3a789a093e9b.patch";
|
||||
hash = "sha256-K0njCcEOOYAwo3FI8eBg53Qo8J/iNBqCn3WCKQb0cgk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config zip ];
|
||||
|
||||
buildInputs = [ the-foundation ]
|
||||
|
@ -7,20 +7,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.9.17";
|
||||
version = "0.9.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "sha256-SwiRw/JtY1BnosHrSMy7VkhH71sX+mq0vI5UlLwSL1I=";
|
||||
sha256 = "sha256-Pu5kWvIbIYKnjv9p6atsrmjUnnaeX6E0Wkk/HSIfW8g=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-ftImsWmHicwL6xyV1WYcWIeJuJ76/GbeJ6dIvDiW2xc=";
|
||||
vendorHash = "sha256-r3bhqTI+DXSw21sjNJkO8cNA5JJitB+UcUwm/u5I0tY=";
|
||||
|
||||
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
|
||||
subPackages = [
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zarf";
|
||||
version = "0.27.0";
|
||||
version = "0.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "defenseunicorns";
|
||||
repo = "zarf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AHS9V0vPTA1ltBo6TynZfWjg5eCY1tB7wn4z8WG2EtQ=";
|
||||
hash = "sha256-R9naPTipxok29wRwVNEV66tKDykGyVQPXoWs80+MyGc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6hd1OEmEQ6bYdYa1UCSXfNDFM1aAiBF6tvPmAMulRyc=";
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ircdog";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goshuirc";
|
||||
repo = "ircdog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-uqqgXmEpGEJHnd1mtgpp13jFhKP5fbhE5wtcZNZL8t4=";
|
||||
hash = "sha256-3fOui17ZederpnB7jZh7GsYa12VKvhb3wwOnVFi23wM=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ecs-agent";
|
||||
version = "1.71.1";
|
||||
version = "1.71.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
hash = "sha256-v3sICXijHStJDPYJq0VHd3CY1G1dlPwSdyPzpEHpc90=";
|
||||
hash = "sha256-RCLBQgqbpNVqKiXP/gKP1iOn23A/poFUjFH8KxYbPCc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -9,31 +9,31 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.15.1";
|
||||
version = "0.16.0";
|
||||
|
||||
dist = {
|
||||
aarch64-darwin = rec {
|
||||
archSuffix = "Darwin-arm64";
|
||||
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
|
||||
sha256 = "eb5dee5f96f87c2bd8046a6e5f6acb4ffe0c07b15b2863156b1427be904a4437";
|
||||
sha256 = "092d586426f85c61263bd4822c22538b1585dc84d0369dccac936db758a17ce1";
|
||||
};
|
||||
|
||||
x86_64-darwin = rec {
|
||||
archSuffix = "Darwin-x86_64";
|
||||
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
|
||||
sha256 = "471f7d58080031745ac88e1560a550895b89caaee1bb66162a084a5ca7a8a563";
|
||||
sha256 = "6c6278ddc2db080b4ad6a2f39ae36e6258efd6c696fbe599a5d389cfb9232aa1";
|
||||
};
|
||||
|
||||
aarch64-linux = rec {
|
||||
archSuffix = "Linux-aarch64";
|
||||
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
|
||||
sha256 = "a7e1ce0a5ac9d5b3807dd43e491282d16aafb2f4260ae5f6fbf20737d23b928d";
|
||||
sha256 = "e33301878082cb73eb9bc4f267b91eb4895ac3c8303d56d4b86c1264563bfcff";
|
||||
};
|
||||
|
||||
x86_64-linux = rec {
|
||||
archSuffix = "Linux-x86_64";
|
||||
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
|
||||
sha256 = "bfe9e41ed7a718143cbfc7b797c764ca23297a031a2645c4f8bb4be6bf0b8388";
|
||||
sha256 = "be6093c2a9b0aa3c39cc5a5e39e79223c6d03f0e07ebadf70c3c128143672a84";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
@ -47,11 +47,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.19.9";
|
||||
version = "1.19.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${version}.src.tar.gz";
|
||||
hash = "sha256-ExGQpGl6cMWx0jLfXT9Vo/nsDnjkBRYZb/s/Ca5qV0Q=";
|
||||
hash = "sha256-E3VbzOUpdH1fKTDe4DRzDIbQK9PlIas+K77eVI07lT8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
|
||||
--prefix QUARTO_PANDOC : ${pandoc}/bin/pandoc \
|
||||
--prefix QUARTO_ESBUILD : ${esbuild}/bin/esbuild \
|
||||
--prefix QUARTO_DART_SASS : ${nodePackages.sass}/bin/sass \
|
||||
--prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown ] ++ extraRPackages; }}/bin/R \
|
||||
--prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ] ++ (extraPythonPackages ps))}/bin/python3
|
||||
${lib.optionalString (rWrapper != null) "--prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown ] ++ extraRPackages; }}/bin/R"} \
|
||||
${lib.optionalString (python3 != null) "--prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ] ++ (extraPythonPackages ps))}/bin/python3"}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://quarto.org/";
|
||||
changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${version}";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ mrtarantoga ];
|
||||
maintainers = with maintainers; [ minijackson mrtarantoga ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
|
||||
};
|
||||
|
@ -24,11 +24,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "genymotion";
|
||||
version = "3.3.3";
|
||||
version = "3.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://dl.genymotion.com/releases/genymotion-${version}/genymotion-${version}-linux_x64.bin";
|
||||
name = "genymotion-${version}-linux_x64.bin";
|
||||
sha256 = "sha256-8NJgYILOR63tWZc3tHDie79uM1hBnAwJNwGp/h2RHCo=";
|
||||
sha256 = "sha256-2pYnjjskmIxQXLXwQpSz/HxoCqvK0TuRDBoh/KrVTpM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
27
pkgs/development/ocaml-modules/ppx_show/default.nix
Normal file
27
pkgs/development/ocaml-modules/ppx_show/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib, buildDunePackage, fetchFromGitHub
|
||||
, stdcompat, ppxlib
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ppx_show";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thierry-martinez";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YwWAdOtb0zg2hqNkGRiigz/Pci8Jy/QD+WyUEohEsns=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
stdcompat
|
||||
ppxlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/thierry-martinez/${pname}";
|
||||
description = "OCaml PPX deriver for deriving show based on ppxlib";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ niols ];
|
||||
};
|
||||
}
|
28
pkgs/development/ocaml-modules/tdigest/default.nix
Normal file
28
pkgs/development/ocaml-modules/tdigest/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib, fetchFromGitHub, buildDunePackage
|
||||
, core
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "tdigest";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SGrondin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-R1uaCN/6NiW+jdGQiflwfihaidngvaWjJM7UFyR4vxs=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
core
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/SGrondin/${pname}";
|
||||
description = "OCaml implementation of the T-Digest algorithm";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ niols ];
|
||||
};
|
||||
}
|
@ -5,21 +5,26 @@
|
||||
, requests
|
||||
, click
|
||||
, pythonOlder
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deep-translator";
|
||||
version = "1.10.1";
|
||||
format = "setuptools";
|
||||
version = "1.11.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "deep_translator";
|
||||
inherit version;
|
||||
hash = "sha256-6ZQ42rcOO+vNqTLj9ehv09MrQ/h9Zu2fi2gW2xRvHZ8=";
|
||||
hash = "sha256-Q73sKqin8R8dUsMS9EjYXlxWDCSQb9R8wvvh4OXl6GY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
beautifulsoup4
|
||||
requests
|
||||
@ -38,7 +43,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python tool to translate between different languages by using multiple translators";
|
||||
homepage = "https://deep-translator.readthedocs.io";
|
||||
changelog = "https://github.com/nidhaloff/deep-translator/releases/tag/v1.10.0";
|
||||
changelog = "https://github.com/nidhaloff/deep-translator/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
};
|
||||
|
@ -12,16 +12,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylast";
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pylast";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LRZYLo9h7Z8WXemLgKR5qzAmtL4x/AQQJpta3e0WHcc=";
|
||||
hash = "sha256-6yxsqruosSOJ5LeIBbvuEko4s9qU/ObNZiJD5YH/hvY=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
@ -3,32 +3,19 @@
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, rtl-sdr
|
||||
, m2r
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrtlsdr";
|
||||
version = "0.2.7";
|
||||
version = "0.2.93";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7942fe2e7821d09206002ea7e820e694094b3f964885123eb6eee1167f39b8da";
|
||||
sha256 = "sha256-LeKbtOQDcIinjokBK8LMhLc9xFxgYIsot9kD9ikjuiY=";
|
||||
};
|
||||
|
||||
# Replace pypandoc dependency by m2r
|
||||
# See https://github.com/roger-/pyrtlsdr/pull/78
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "${meta.homepage}/commit/2b7df0b.patch";
|
||||
sha256 = "04h5z80969jgdgrf98b9ps56sybms09xacvmj6rwcfrmanli8rgf";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "${meta.homepage}/commit/97dc3d0.patch";
|
||||
sha256 = "1v1j0n91jwpsiam2j34yj71z4h39cvk4gi4565zgjrzsq6xr93i0";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ m2r ];
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
|
||||
postPatch = ''
|
||||
sed "s|driver_files =.*|driver_files = ['${rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
|
||||
|
@ -30,14 +30,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tempest";
|
||||
version = "34.1.0";
|
||||
version = "34.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-VLcTyiJ+ce2VqhD1OYRUa+ep34ry/mb61qntiqVsTCQ=";
|
||||
hash = "sha256-450LDibTnlLnce4u1aNKmSVfHnHWz5S9kt6X6wFPrl8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "azure-storage-azcopy";
|
||||
version = "10.18.1";
|
||||
version = "10.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-storage-azcopy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Yy6A2lNxF3aHD6Jw/dnLt1MFiFQ9+U+cB4wVK/dWbmE=";
|
||||
sha256 = "sha256-NmiLNkecd5u8r1L6e3jdAGP4HCP1udWxM2jRZkFe1qI=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-F+tUsChcknI4j5/IM1FqMKsFmGHEKjthjzSitMPyc44=";
|
||||
vendorHash = "sha256-XurlmsKblDCX3ldFEmYmK24NEfdw9ahiUWgsxYGwz48=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -10,22 +10,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buf";
|
||||
version = "1.20.0";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Tr8vsa7PfjoShep2/qhMFLWd4H9xXm9G2YwDS3RenSE=";
|
||||
hash = "sha256-7aS48tfONrDdE+NoTpoz+5TOBDQfEgCwKKkoBnrUTW8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NnN0MvcyMdIc7vCTTz8yHdRu0SzmmO0DgyYR2k9NPdk=";
|
||||
vendorHash = "sha256-zk7cj3DwfaZg7PRS50qw0tS8lguX4yWcCiPk+2HYah8=";
|
||||
|
||||
patches = [
|
||||
# Skip a test that requires networking to be available to work.
|
||||
./skip_test_requiring_network.patch
|
||||
# Skip TestWorkspaceGit which requires .git and commits.
|
||||
./skip_test_requiring_dotgit.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@ -40,8 +38,6 @@ buildGoModule rec {
|
||||
preCheck = ''
|
||||
# The tests need access to some of the built utilities
|
||||
export PATH="$PATH:$GOPATH/bin"
|
||||
# To skip TestCloneBranchAndRefToBucket
|
||||
export CI=true
|
||||
'';
|
||||
|
||||
# Allow tests that bind or connect to localhost on macOS.
|
||||
|
@ -1,14 +0,0 @@
|
||||
diff --git a/private/buf/cmd/buf/workspace_test.go b/private/buf/cmd/buf/workspace_test.go
|
||||
index 25e33dd..f593beb 100644
|
||||
--- a/private/buf/cmd/buf/workspace_test.go
|
||||
+++ b/private/buf/cmd/buf/workspace_test.go
|
||||
@@ -340,6 +340,9 @@ func TestWorkspaceNestedArchive(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestWorkspaceGit(t *testing.T) {
|
||||
+ // Requires .git directory which we do not retain due to
|
||||
+ // `leaveDotGit` non-determinism
|
||||
+ t.Skip()
|
||||
t.Skip("skip until the move to private/buf is merged")
|
||||
// Directory paths specified as a git reference within a workspace.
|
||||
t.Parallel()
|
@ -8,30 +8,23 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nc4nix";
|
||||
version = "unstable-2023-06-05";
|
||||
version = "unstable-2023-06-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helsinki-systems";
|
||||
repo = "nc4nix";
|
||||
rev = "b7fa87cb9b21aceaf0cb0f9b612dde4f91ca6655";
|
||||
sha256 = "sha256-fVB8l1HyBL7Xq99MgsnnlU4a+ZM7R1ImsAg4czajwCA=";
|
||||
rev = "3e015450726533770fd00e2771530cbe90f40517";
|
||||
sha256 = "sha256-i3lx5Q+EswtimdRMZ0OPMWh01kBK9q+UI1pY6j/ZhuY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Switch hash calculation method
|
||||
# https://github.com/helsinki-systems/nc4nix/pull/3
|
||||
(fetchpatch {
|
||||
url = "https://github.com/helsinki-systems/nc4nix/commit/88c182fbdddef148e086fa86438dcd72208efd75.patch";
|
||||
sha256 = "sha256-zAF0+t9wHrKhhyD0+/d58BiaavLHfxO8X5J6vNlEWx0=";
|
||||
url = "https://github.com/helsinki-systems/nc4nix/commit/a7bca4793cc12e87d381f12f6f8c00ae2ca02893.patch";
|
||||
sha256 = "sha256-0JxyhSQLtlgLtsMv82wMjQHGdmOoQ2dcPPNAw2cFByE=";
|
||||
name = "switch_hash_calculation_method.patch";
|
||||
})
|
||||
# Add package selection command line argument
|
||||
# https://github.com/helsinki-systems/nc4nix/pull/2
|
||||
(fetchpatch {
|
||||
url = "https://github.com/helsinki-systems/nc4nix/pull/2/commits/449eec89538df4e92106d06046831202eb84a1db.patch";
|
||||
sha256 = "sha256-qAAbR1G748+2vwwfAhpe8luVEIKNGifqXqTV9QqaUFc=";
|
||||
name = "add_package_selection_command_line_arg.patch";
|
||||
})
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-uhINWxFny/OY7M2vV3ehFzP90J6Z8cn5IZHWOuEg91M=";
|
||||
|
24
pkgs/servers/hiraeth/default.nix
Normal file
24
pkgs/servers/hiraeth/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "hiraeth";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lukaswrz";
|
||||
repo = "hiraeth";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IjHQAJH6Kv65iDkVtJaVeAiMXCEyTTpUTTbW7I2Gxrc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tyFAd5S1RUn1AA5DbUGsAuvwtLgOgTE6LUzW3clQE9I=";
|
||||
|
||||
meta = {
|
||||
description = "Share files with an expiration date";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = [ lib.maintainers.lukaswrz ];
|
||||
};
|
||||
}
|
@ -12,20 +12,20 @@ in
|
||||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.84.1";
|
||||
version = "1.85.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6cUy3fAQoIFD7iL24vvlMj4S6s+68plemzH6GKkTGo0=";
|
||||
hash = "sha256-I/InjuTJOwYXw98qW7zT+fTnyLUo96xsVkFGSL+x+5k=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-Rd2BJe4M3NVQJdkYDaiDhqKf4lXIKQyFwqMqVyMHog4=";
|
||||
hash = "sha256-KE56crjZDM1cJnVS7MvObIQ7NvH7+fUm1Mlb6HcT9+U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mediamtx";
|
||||
version = "0.23.3";
|
||||
version = "0.23.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aler9";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-z9fqR2iK7HOpWNFnrIkNzy0peY6v9QLOyUYbVXp1aNU=";
|
||||
hash = "sha256-dQT5vMwGQyeOYywHhLuXH2dQpkHm9IZztuS+Xv4uLSI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-az2jHhd3YzI7phRRXBWRcAsISgipPN20SRncsfu58fM=";
|
||||
vendorHash = "sha256-MwSGOoG6OkHBgoabS6mXj92q2g9B9wHAZOWWB0P1PhQ=";
|
||||
|
||||
# Tests need docker
|
||||
doCheck = false;
|
||||
|
@ -1,13 +1,13 @@
|
||||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
buildGoModule rec {
|
||||
pname = "vmagent";
|
||||
version = "1.90.0";
|
||||
version = "1.91.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VictoriaMetrics";
|
||||
repo = "VictoriaMetrics";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XENouirZ8d92h+4KNI3K7k7e2kF3sah5DAZjlC2pVds=";
|
||||
sha256 = "sha256-+xc3XhHHHe8JdHhEcAEGf6hkzlhSLYjG4C9znONPYzw=";
|
||||
};
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];
|
||||
|
@ -38,7 +38,7 @@ let
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ globin patryk27 pennae ];
|
||||
maintainers = with maintainers; [ globin patryk27 ];
|
||||
};
|
||||
});
|
||||
|
||||
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "zigbee2mqtt";
|
||||
version = "1.31.0";
|
||||
version = "1.31.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Koenkk";
|
||||
repo = "zigbee2mqtt";
|
||||
rev = version;
|
||||
hash = "sha256-9GCpHd8MHpL2XF0uNHVTznsdLDnQAplnZmNCNxckd74=";
|
||||
hash = "sha256-L2Jd9vr4b0zxTO4G4VhAPLcissi6E4g0Nqlpzg4o30E=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-iONKkA0J1LFPbCi12Q1kxLIS2GBxKY7XvHOZIYWpsd8=";
|
||||
npmDepsHash = "sha256-2z9TNPZObCd4+ZYMaSIoKWxalso2zE6ooUWfm8gtnqM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
37
pkgs/tools/admin/simplotask/default.nix
Normal file
37
pkgs/tools/admin/simplotask/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "simplotask";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "umputun";
|
||||
repo = "spot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aacG/s/zo4gMBsRug2i7vUyu1WUg3s+F8wtLsSVt7HQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [
|
||||
"-s -w"
|
||||
"-X main.revision=v${version}"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/{secrets,spot-secrets}
|
||||
installManPage *.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for effortless deployment and configuration management";
|
||||
homepage = "https://simplotask.com/";
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
license = licenses.mit;
|
||||
mainProgram = "spot";
|
||||
};
|
||||
}
|
@ -44,6 +44,8 @@ buildGoModule rec {
|
||||
|
||||
vendorHash = "sha256-O6OjBbrVAxDQd27ar2mmFkU1XyVM2C8SJWJ54rgaf2s=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
40
pkgs/tools/text/djot-js/default.nix
Normal file
40
pkgs/tools/text/djot-js/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "djot-js";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jgm";
|
||||
repo = "djot.js";
|
||||
rev = "@djot/djot@${version}";
|
||||
hash = "sha256-W/ZQXJXvFEIgj5PeI+jvw4nIkNP4qa1NyQCOv0unIuA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-WOsStvm7UC2Jnb803mHoJxDUs1I8dDT7HRPdpIXQne8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage doc/djot.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "JavaScript implementation of djot";
|
||||
homepage = "https://github.com/jgm/djot.js";
|
||||
changelog = "https://github.com/jgm/djot.js/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "djot";
|
||||
};
|
||||
}
|
5556
pkgs/tools/text/djot-js/package-lock.json
generated
Normal file
5556
pkgs/tools/text/djot-js/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = ''
|
||||
sed -i "s|/usr/bin/env python.*|${python3}/bin/${python3.executable}|" "$out/bin/unoconv"
|
||||
wrapProgram "$out/bin/unoconv" --set UNO_PATH "${libreoffice-unwrapped}/lib/libreoffice/program/"
|
||||
wrapProgram "$out/bin/unoconv" \
|
||||
--set-default UNO_PATH "${libreoffice-unwrapped}/lib/libreoffice/program/"
|
||||
'' + lib.optionalString installSymlinks ''
|
||||
make install-links prefix="$out"
|
||||
'';
|
||||
|
@ -4,13 +4,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "guest-agent";
|
||||
version = "20230510.00";
|
||||
version = "20230601.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-gYmmQzSFP/Ik4m+iYHJZyUyZil9+IXWZ3p0Pl58Uq40=";
|
||||
sha256 = "sha256-kmep4pIxqFq8/EcdbimiIuQVm0HEIXY0dFqooPornBI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ULGpgygBVC4SRLhPiUlZgBH93w84WlNbvq3S7cVHLaQ=";
|
||||
|
@ -4694,6 +4694,8 @@ with pkgs;
|
||||
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
|
||||
};
|
||||
|
||||
djot-js = callPackage ../tools/text/djot-js { };
|
||||
|
||||
djv = callPackage ../applications/graphics/djv { };
|
||||
|
||||
dnschef = python3Packages.callPackage ../tools/networking/dnschef { };
|
||||
@ -12422,6 +12424,8 @@ with pkgs;
|
||||
|
||||
simple-mtpfs = callPackage ../tools/filesystems/simple-mtpfs { };
|
||||
|
||||
simplotask = callPackage ../tools/admin/simplotask { };
|
||||
|
||||
simpleproxy = callPackage ../tools/networking/simpleproxy { };
|
||||
|
||||
simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { };
|
||||
@ -23725,6 +23729,8 @@ with pkgs;
|
||||
|
||||
quarto = callPackage ../development/libraries/quarto { };
|
||||
|
||||
quartoMinimal = callPackage ../development/libraries/quarto { rWrapper = null; python3 = null; };
|
||||
|
||||
qt4 = qt48;
|
||||
|
||||
qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
|
||||
@ -25558,6 +25564,8 @@ with pkgs;
|
||||
|
||||
hiawatha = callPackage ../servers/http/hiawatha { };
|
||||
|
||||
hiraeth = callPackage ../servers/hiraeth { };
|
||||
|
||||
hoard = callPackage ../tools/misc/hoard { inherit (darwin) Security; };
|
||||
|
||||
home-assistant = callPackage ../servers/home-assistant { };
|
||||
@ -26034,7 +26042,6 @@ with pkgs;
|
||||
inherit (darwin) cctools developer_cmds DarwinTools;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
boost = boost177; # Configure checks for specific version.
|
||||
protobuf = protobuf3_19;
|
||||
icu = icu69;
|
||||
};
|
||||
|
||||
@ -35834,9 +35841,7 @@ with pkgs;
|
||||
|
||||
### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS
|
||||
|
||||
aeon = callPackage ../applications/blockchains/aeon {
|
||||
boost = boost172;
|
||||
};
|
||||
aeon = callPackage ../applications/blockchains/aeon { };
|
||||
|
||||
alfis = callPackage ../applications/blockchains/alfis {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit;
|
||||
@ -36019,8 +36024,7 @@ with pkgs;
|
||||
|
||||
napari = with python3Packages; toPythonApplication napari;
|
||||
|
||||
nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet
|
||||
{ stdenv = gcc10StdenvCompat; boost = boost172; };
|
||||
nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };
|
||||
|
||||
namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; };
|
||||
namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; };
|
||||
|
@ -1375,6 +1375,8 @@ let
|
||||
|
||||
ppx_repr = callPackage ../development/ocaml-modules/repr/ppx.nix { };
|
||||
|
||||
ppx_show = callPackage ../development/ocaml-modules/ppx_show { };
|
||||
|
||||
ppx_tools =
|
||||
if lib.versionAtLeast ocaml.version "4.02"
|
||||
then callPackage ../development/ocaml-modules/ppx_tools {}
|
||||
@ -1579,6 +1581,8 @@ let
|
||||
|
||||
tcslib = callPackage ../development/ocaml-modules/tcslib { };
|
||||
|
||||
tdigest = callPackage ../development/ocaml-modules/tdigest { };
|
||||
|
||||
telegraml = callPackage ../development/ocaml-modules/telegraml { };
|
||||
|
||||
terminal = callPackage ../development/ocaml-modules/terminal { };
|
||||
|
Loading…
Reference in New Issue
Block a user