Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
85724d692e
@ -78,7 +78,7 @@ rec {
|
||||
isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];
|
||||
|
||||
isEfi = map (family: { cpu.family = family; })
|
||||
[ "x86" "arm" "aarch64" ];
|
||||
[ "x86" "arm" "aarch64" "riscv" ];
|
||||
};
|
||||
|
||||
matchAnyAttrs = patterns:
|
||||
|
||||
@ -7,7 +7,7 @@ let
|
||||
|
||||
runtime' = filter (f: f.enable) (attrValues cfg.runtime);
|
||||
|
||||
runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = x.target; path = x.source; }) runtime');
|
||||
runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = "etc/${x.target}"; path = x.source; }) runtime');
|
||||
|
||||
in {
|
||||
options.programs.neovim = {
|
||||
|
||||
@ -40,6 +40,7 @@ let
|
||||
|
||||
gitalyToml = pkgs.writeText "gitaly.toml" ''
|
||||
socket_path = "${lib.escape ["\""] gitalySocket}"
|
||||
runtime_dir = "/run/gitaly"
|
||||
bin_dir = "${cfg.packages.gitaly}/bin"
|
||||
prometheus_listen_addr = "localhost:9236"
|
||||
|
||||
@ -1353,6 +1354,7 @@ in {
|
||||
TimeoutSec = "infinity";
|
||||
Restart = "on-failure";
|
||||
WorkingDirectory = gitlabEnv.HOME;
|
||||
RuntimeDirectory = "gitaly";
|
||||
ExecStart = "${cfg.packages.gitaly}/bin/gitaly ${gitalyToml}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "ripes";
|
||||
version = "2.2.5";
|
||||
version = "2.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mortbopet";
|
||||
repo = "Ripes";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-HdvLi3OKJmr+U/dxCGmq6JR91dWpUL3uoPumH2/B46k=";
|
||||
sha256 = "sha256-fRkab0G2zjK1VYzH21yhL7Cr0rS4I8ir8gwH9ALy60A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -27,6 +27,7 @@
|
||||
, libpng
|
||||
, librsvg
|
||||
, libtiff
|
||||
, libjxl
|
||||
, openexr_3
|
||||
, osm-gps-map
|
||||
, pkg-config
|
||||
@ -57,12 +58,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.0.0";
|
||||
version = "4.2.0";
|
||||
pname = "darktable";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
|
||||
sha256 = "0bfcag6bj5vcmg4z4xjirs43iafcx89al6jl41i5mrhpjzszh5hl";
|
||||
sha256 = "18b0917fdfe9b09f66c279a681cc3bd52894a566852bbf04b2e179ecfdb11af9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ];
|
||||
@ -83,6 +84,7 @@ stdenv.mkDerivation rec {
|
||||
libpng
|
||||
librsvg
|
||||
libtiff
|
||||
libjxl
|
||||
openexr_3
|
||||
sqlite
|
||||
libxslt
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vhs";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wcOLUA/U+xRwo7slnACCURQO7D0F3pFP2/SHDfEHeTA=";
|
||||
hash = "sha256-t6n4uID7KTu/BqsmndJOft0ifxZNfv9lfqlzFX0ApKw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-f8EHDxu+NWAFJx9ujzsiDhNymdEzExmdreP11gV56AI=";
|
||||
vendorHash = "sha256-9nkRr5Jh1nbI+XXbPj9KB0ZbLybv5JUVovpB311fO38=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
buildInputs = [ ttyd ffmpeg ];
|
||||
|
||||
@ -1,30 +1,31 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, asciidoc
|
||||
, pkg-config
|
||||
, boost17x
|
||||
, cmark
|
||||
, coeurl
|
||||
, curl
|
||||
, libevent
|
||||
, libsecret
|
||||
, lmdb
|
||||
, lmdbxx
|
||||
, libsecret
|
||||
, mkDerivation
|
||||
, mtxclient
|
||||
, nlohmann_json
|
||||
, olm
|
||||
, qtbase
|
||||
, qtgraphicaleffects
|
||||
, qtimageformats
|
||||
, qtkeychain
|
||||
, qtmacextras
|
||||
, qtmultimedia
|
||||
, qtimageformats
|
||||
, qttools
|
||||
, qtquickcontrols2
|
||||
, qtgraphicaleffects
|
||||
, mtxclient
|
||||
, boost17x
|
||||
, qttools
|
||||
, re2
|
||||
, spdlog
|
||||
, olm
|
||||
, pkg-config
|
||||
, nlohmann_json
|
||||
, coeurl
|
||||
, libevent
|
||||
, curl
|
||||
, voipSupport ? true
|
||||
, gst_all_1
|
||||
, libnice
|
||||
@ -32,49 +33,50 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "nheko";
|
||||
version = "0.10.2";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nheko-Reborn";
|
||||
repo = "nheko";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gid8XOZ1/hMDGNbse4GYfcAdqHiySWyy4isBgcpekIQ=";
|
||||
hash = "sha256-4Xe3eRnDkgyYB+hUP8TBWTt+m29HVtgcqVEQUUsIpCY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
lmdbxx
|
||||
cmake
|
||||
pkg-config
|
||||
asciidoc
|
||||
cmake
|
||||
lmdbxx
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
nlohmann_json
|
||||
mtxclient
|
||||
olm
|
||||
boost17x
|
||||
cmark
|
||||
coeurl
|
||||
curl
|
||||
libevent
|
||||
libsecret
|
||||
lmdb
|
||||
spdlog
|
||||
cmark
|
||||
mtxclient
|
||||
nlohmann_json
|
||||
olm
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtimageformats
|
||||
qttools
|
||||
qtquickcontrols2
|
||||
qtgraphicaleffects
|
||||
qtimageformats
|
||||
qtkeychain
|
||||
coeurl
|
||||
libevent
|
||||
curl
|
||||
qtmultimedia
|
||||
qtquickcontrols2
|
||||
qttools
|
||||
re2
|
||||
spdlog
|
||||
] ++ lib.optional stdenv.isDarwin qtmacextras
|
||||
++ lib.optionals voipSupport (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
(gst-plugins-good.override { qt5Support = true; })
|
||||
gst-plugins-bad
|
||||
libnice
|
||||
]);
|
||||
++ lib.optionals voipSupport (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
(gst-plugins-good.override { qt5Support = true; })
|
||||
gst-plugins-bad
|
||||
libnice
|
||||
]);
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
|
||||
@ -88,11 +90,11 @@ mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Desktop client for the Matrix protocol";
|
||||
homepage = "https://github.com/Nheko-Reborn/nheko";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ekleog fpletz ];
|
||||
platforms = platforms.all;
|
||||
# Should be fixable if a higher clang version is used, see:
|
||||
# https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177
|
||||
broken = stdenv.targetPlatform.isDarwin;
|
||||
license = licenses.gpl3Plus;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -27,11 +27,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.60.1";
|
||||
version = "0.60.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "sha256-Lyo/T8df7tIc+h8MFh6yL+I+2W6On/C5PguNZfQAu9s=";
|
||||
hash = "sha256-jSRZZufGi1wmdT7LeNutkO74bqln8uJ5TSEDCJyfPB4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "z3";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Z3Prover";
|
||||
repo = "z3";
|
||||
rev = "7f6ef0b6c0813f2e9e8f993d45722c0e5b99e152";
|
||||
sha256 = "1xllvq9fcj4cz34biq2a9dn2sj33bdgrzyzkj26hqw70wkzv1kzx";
|
||||
};
|
||||
|
||||
buildInputs = [ python ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
CXXFLAGS = if stdenv.isDarwin then "-std=gnu++98" else null;
|
||||
|
||||
configurePhase = "python scripts/mk_make.py --prefix=$out && cd build";
|
||||
|
||||
# z3's install phase is stupid because it tries to calculate the
|
||||
# python package store location itself, meaning it'll attempt to
|
||||
# write files into the nix store, and fail.
|
||||
soext = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include
|
||||
cp ../src/api/z3*.h $out/include
|
||||
cp ../src/api/c++/z3*.h $out/include
|
||||
cp z3 $out/bin
|
||||
cp libz3${soext} $out/lib
|
||||
cp libz3${soext} $out/lib/${python.libPrefix}/site-packages
|
||||
cp z3*.pyc $out/lib/${python.libPrefix}/site-packages
|
||||
cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A high-performance theorem prover and SMT solver";
|
||||
homepage = "https://github.com/Z3Prover/z3";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.x86_64;
|
||||
maintainers = with lib.maintainers; [ thoughtpolice ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -92,8 +92,4 @@ in
|
||||
version = "4.8.15";
|
||||
sha256 = "0xkwqz0y5d1lfb6kfqy8wn8n2dqalzf4c8ghmjsajc1bpdl70yc5";
|
||||
};
|
||||
z3_4_7 = common {
|
||||
version = "4.7.1";
|
||||
sha256 = "1s850r6qifwl83zzgvrb5l0jigvmymzpv18ph71hg2bcpk7kjw3d";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v2ray-geoip";
|
||||
version = "202301050046";
|
||||
version = "202301120046";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "6bb07558ac223b3decdff985d5737f4384b34238";
|
||||
sha256 = "sha256-KXLIIs1W+8TC2GtW3m/YA5WQ13Pq5kxC5Zc9jDzW/tU=";
|
||||
rev = "c308361f47373772d1a3b9d486cd7dded7165d8e";
|
||||
sha256 = "sha256-GhCEsMDeMapWpJckMWS+3azuNjMdiN4cjDyq8aSJINA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
# https://www.aquamaniac.de/rdm/projects/gwenhywfar/files
|
||||
gwenhywfar = {
|
||||
version = "5.9.0";
|
||||
hash = "sha256-6Ix9M4Ojy75Gyzsimfcd+55vpWX1oWaLQpc5HIdLDhI=";
|
||||
releaseId = "415";
|
||||
version = "5.10.1";
|
||||
hash = "sha256-ovYKnd5don5X4OXvX4kx9JXB1UGtkKhB4rYjFWVUcWA=";
|
||||
releaseId = "465";
|
||||
};
|
||||
|
||||
# https://www.aquamaniac.de/rdm/projects/libchipcard/files
|
||||
|
||||
@ -11,17 +11,18 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "coeurl";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "nheko.im";
|
||||
owner = "nheko-reborn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+FIxi019+jnjpo4NhBQ4tb3ObLrEStMN5YD+MrTLa2E=";
|
||||
hash = "sha256-sN+YSddUOdnJLcnHyWdjNm1PpxCwnkwiqSvyrwUrg6w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ninja pkg-config meson ];
|
||||
|
||||
buildInputs = [ libevent curl spdlog ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }:
|
||||
|
||||
let
|
||||
version = "0.3.95";
|
||||
version = "0.3.3";
|
||||
pname = "lensfun";
|
||||
|
||||
# Fetch a more recent version of the repo containing a more recent lens
|
||||
@ -9,8 +9,8 @@ let
|
||||
lensfunDatabase = fetchFromGitHub {
|
||||
owner = "lensfun";
|
||||
repo = "lensfun";
|
||||
rev = "4672d765a17bfef7bc994ca7008cb717c61045d5";
|
||||
sha256 = "00x35xhpn55j7f8qzakb6wl1ccbljg1gqjb93jl9w3mha2bzsr41";
|
||||
rev = "ec9412d27d5fa8f377848a59c768b12c243cb80d";
|
||||
sha256 = "sha256-/u/3oQzac/dQrgFaiYvzT5uQ108XarkXnA2DByA5sic=";
|
||||
};
|
||||
|
||||
in
|
||||
@ -21,16 +21,26 @@ stdenv.mkDerivation {
|
||||
owner = "lensfun";
|
||||
repo = "lensfun";
|
||||
rev = "v${version}";
|
||||
sha256 = "0isli0arns8bmxqpbr1jnbnqh5wvspixdi51adm671f9ngng7x5r";
|
||||
sha256 = "0ixf0f7qv0mc7zrw9w1sb60w833g4rqrfj8cjxwzv2vimqcksccz";
|
||||
};
|
||||
|
||||
# replace database with a more recent snapshot
|
||||
# the mastr branch uses version 2 profiles, while 0.3.3 requires version 1 profiles,
|
||||
# so we run the conversion tool the project provides,
|
||||
# then untar the verson 1 profiles into the source dir before we build
|
||||
prePatch = ''
|
||||
rm -R ./data/db
|
||||
cp -R ${lensfunDatabase}/data/db ./data
|
||||
rm -R data/db
|
||||
python3 ${lensfunDatabase}/tools/lensfun_convert_db_v2_to_v1.py $TMPDIR ${lensfunDatabase}/data/db
|
||||
mkdir -p data/db
|
||||
tar xvf $TMPDIR/db/version_1.tar -C data/db
|
||||
date +%s > data/db/timestamp.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
cmake pkg-config
|
||||
python3 python3.pkgs.lxml # For the db converison
|
||||
];
|
||||
|
||||
buildInputs = [ glib zlib libpng ];
|
||||
|
||||
cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ];
|
||||
|
||||
@ -1,26 +1,28 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, openssl
|
||||
, olm
|
||||
, spdlog
|
||||
, nlohmann_json
|
||||
, coeurl
|
||||
, libevent
|
||||
, curl
|
||||
, libevent
|
||||
, nlohmann_json
|
||||
, olm
|
||||
, openssl
|
||||
, re2
|
||||
, spdlog
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mtxclient";
|
||||
version = "0.8.2";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nheko-Reborn";
|
||||
repo = "mtxclient";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-x2c+wZWAWYoKxSqEezoInw3SwcGo9dQNDvuq7racLBA=";
|
||||
hash = "sha256-39tdTY2emN3/FxZxwl6dcQn1bOgybws166wqFPJl68M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -39,14 +41,16 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
spdlog
|
||||
nlohmann_json
|
||||
openssl
|
||||
olm
|
||||
coeurl
|
||||
libevent
|
||||
curl
|
||||
libevent
|
||||
nlohmann_json
|
||||
olm
|
||||
openssl
|
||||
re2
|
||||
spdlog
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Scaling, colorspace conversion and dithering library";
|
||||
homepage = "https://github.com/sekrit-twc/zimg";
|
||||
license = licenses.wtfpl;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
platforms = with platforms; unix ++ windows;
|
||||
maintainers = with maintainers; [ rnhmjoj ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "maestro";
|
||||
version = "1.18.3";
|
||||
version = "1.18.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
|
||||
sha256 = "13kv6ydd2xka0lnnpcn5jv12pw9n6p7nljdlgkimwvsqsh1z5kfc";
|
||||
sha256 = "1wmcvkhhb9ksy35dpp7qa6vk4726pblza869xjx56qmadd6nrrax";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "confection";
|
||||
version = "0.0.3";
|
||||
version = "0.0.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "explosion";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3qxB94CYCMZN+sKqbmDfkRyAs6HJkFLE/5yJx1DKqYM=";
|
||||
hash = "sha256-JZQ9D5+UAobywlj8eiyw15wXKYhUKz6+lf9hikMV6x0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -37,6 +37,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library that offers a configuration system";
|
||||
homepage = "https://github.com/explosion/confection";
|
||||
changelog = "https://github.com/explosion/confection/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cyclonedx-python-lib";
|
||||
version = "3.1.2";
|
||||
version = "3.1.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "CycloneDX";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/CJQHcjXZBarHHIndXkCPOHL8OANG8RJgTX3tTZEYLA=";
|
||||
hash = "sha256-4lA8OdmvQD94jTeDf+Iz7ZyEQ9fZzCxnXQG9Ir8FKhk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dataproc";
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0SFlDmAxvgZCJSFIrXXEjpJ4D0GRJQ0nkBv9D9EpC2g=";
|
||||
hash = "sha256-44HADoHz0ITGolvZtB1wlFDEMWBwyOZ2HazJMl/SXn0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-redis";
|
||||
version = "2.10.0";
|
||||
version = "2.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-byppjhrBLentcRwMSbuaf3L7wU+rkP2Z92j2zzEPdY0=";
|
||||
hash = "sha256-dWpsiitG58iCw8z8Hd10eAXXfRRBlq90m0cs1YjeMqE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-tasks";
|
||||
version = "2.11.0";
|
||||
version = "2.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TC2uDnD95NUx1LLLLotZK9tJd6JWZa4MjipcE6k07Mo=";
|
||||
hash = "sha256-8dhYoj3/EXwMZLRduwskoAn7NSjA4N8xhIw8UbAAhnY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-texttospeech";
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-jpDwERTLRmS1mO2O2OboZa6AAUh3k/Dyg77TCVTqLok=";
|
||||
hash = "sha256-q4OD37ryZqg40L89BNZdLCNeC1QPwVhUaT4S5tO88Jk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hwi";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitcoin-core";
|
||||
repo = "HWI";
|
||||
rev = version;
|
||||
sha256 = "sha256-jsJjGezf2JrPYr3YNZGx23Jo14DbmM1S6bu7+xgZh58=";
|
||||
sha256 = "sha256-mLavlJHYU6gUqqc83uHMZfOglrKDIiRNN7Nf2i3fXzE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kustomize-sops";
|
||||
version = "3.0.2";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "viaduct-ai";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6mLfMbYbdsjWHpfUHP3Q5nsqdMXo/82+A9PV8xWZBM0=";
|
||||
sha256 = "sha256-sufP/+YixgrOCJJ4P1SjmZpRlSaufRmnVDiv6H+RCyQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aRS+MwME72qIMyhnnIRqmrx5hcQ1V0pLIBJqSoR+Fkk=";
|
||||
vendorHash = "sha256-WZb8VsFKpvvMys1iK3irEsWCnvKaKDzuyFertVswpdE=";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brillo";
|
||||
version = "1.4.11";
|
||||
version = "1.4.12";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner= "cameronnemo";
|
||||
repo= "brillo";
|
||||
rev= "v${version}";
|
||||
sha256 = "sha256-R83Zx0dw9bmCF5kHTNYoNzCmJZK3cVzXNb30qAUexFc=";
|
||||
sha256 = "sha256-dKGNioWGVAFuB4kySO+QGTnstyAD0bt4/6FBVwuRxJo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -51,13 +51,13 @@ rec {
|
||||
# Vulkan developer beta driver
|
||||
# See here for more information: https://developer.nvidia.com/vulkan-driver
|
||||
vulkan_beta = generic rec {
|
||||
version = "515.49.25";
|
||||
persistencedVersion = "515.48.07";
|
||||
settingsVersion = "515.48.07";
|
||||
sha256_64bit = "sha256-5j+YtKaPhDxd9bcPX10ViugLMCTXEYJfod+ecn3SHWc=";
|
||||
openSha256 = "sha256-EnZXEvic9GdcNbcvpmbDkq6YPYqypBKyEXxFJJJJpKk=";
|
||||
settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU=";
|
||||
persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY=";
|
||||
version = "525.47.04";
|
||||
persistencedVersion = "525.78.01";
|
||||
settingsVersion = "525.78.01";
|
||||
sha256_64bit = "sha256-PcDRM39s4vh5++4TocIJKI3wsxWxJdy3p3KAenpdIc0=";
|
||||
openSha256 = "sha256-jH7mwSpasOdWMvN1xuPkO33g0XJjObzA45aqHwKoD4w=";
|
||||
settingsSha256 = "sha256-1d3Cn+7Gm1ORQxmTKr18GFmYHVb8t050XVLler1dCtw=";
|
||||
persistencedSha256 = "sha256-t6dViuvA2fw28w4kh4koIoxh9pQ8f7KI1PIUFJcGlYA=";
|
||||
url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";
|
||||
};
|
||||
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.30.0.6486-629d58034";
|
||||
version = "1.30.1.6562-915986d62";
|
||||
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-7blNvNx18sazfff6yIlRXp9vKWiRVISccx/8wjxWz34=";
|
||||
sha256 = "sha256-fUt8fh4jeZiUbDoc8ivuSpx0Hf4ShYYcfJUJjU+GCxQ=";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "sha256-ol0WSYwk0Cmz6xJYe3mqaPDjgi4VPiH+vHnP0BIwVBU=";
|
||||
sha256 = "sha256-ho/r/ouaFsdCH0xcFuy4TWamu0c/ZBZDJO6cYQK/pW0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "outline";
|
||||
version = "0.67.0";
|
||||
version = "0.67.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "outline";
|
||||
repo = "outline";
|
||||
rev = "v${version}";
|
||||
sha256 = "l7EJkmH/ctP8P937bV5gUqmeKeuH2mjby7Mj/USaCcA=";
|
||||
sha256 = "sha256-oc9rG1dHi5YEU8VdwldHDv1qporMk8K7wpXOrCgcc0w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ];
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -25,6 +25,8 @@ let
|
||||
x86_64-linux.target = "x86_64";
|
||||
armv7l-linux.target = "arm";
|
||||
aarch64-linux.target = "aarch64";
|
||||
riscv32-linux.target = "riscv32";
|
||||
riscv64-linux.target = "riscv64";
|
||||
};
|
||||
|
||||
# For aarch64, we need to use '--target=aarch64-efi' when building,
|
||||
@ -34,6 +36,8 @@ let
|
||||
x86_64-linux.target = "x86_64";
|
||||
armv7l-linux.target = "arm";
|
||||
aarch64-linux.target = "arm64";
|
||||
riscv32-linux.target = "riscv32";
|
||||
riscv64-linux.target = "riscv64";
|
||||
};
|
||||
|
||||
canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
|
||||
|
||||
@ -1,25 +1,27 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, systemd }:
|
||||
{ lib, fetchgit, rustPlatform, pkg-config, openssl, systemd }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "journaldriver";
|
||||
version = "1.1.0";
|
||||
cargoSha256 = "1gzfwkcm63fn41jls16c5sqxz28b0hrfpjhwsvvbwcfv40qxjhsg";
|
||||
version = "5656.0.0";
|
||||
cargoSha256 = "0jxv7skqgkk2j28jzs0gqnic0pqbdpgy8ryhz613pn0cslgy1p5q";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tazjin";
|
||||
repo = "journaldriver";
|
||||
rev = "v${version}";
|
||||
sha256 = "0672iq6s9klb1p37hciyl7snbjgjw98kwrbfkypv07lplc5qcnrf";
|
||||
src = fetchgit {
|
||||
url = "https://code.tvl.fyi/depot.git:/ops/journaldriver.git";
|
||||
sha256 = "0bnf67k6pkw4rngn58b5zm19danr4sh2g6rfd4k5w2sa1lzqai04";
|
||||
|
||||
# TVL revision r/5656; as of 2023-01-13 the revision tag is
|
||||
# unavailable through git, hence the pinned hash.
|
||||
rev = "4e191353228197ce548d63cb9955e53661244f9c";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl systemd ];
|
||||
buildInputs = [ openssl systemd ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Log forwarder from journald to Stackdriver Logging";
|
||||
homepage = "https://github.com/tazjin/journaldriver";
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://code.tvl.fyi/about/ops/journaldriver";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.tazjin ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pspg";
|
||||
version = "5.6.4";
|
||||
version = "5.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-89dW4XILS+nlGgRRePyrSFVb1QR5KQL5OmHJAeyjrZw=";
|
||||
sha256 = "sha256-4h0W9jw95vOxpseyY7SydiWSFDArAY/ms4+Sk/1esHk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
|
||||
@ -1,35 +1,40 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub, makeWrapper }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "tewisay-unstable";
|
||||
version = "2017-04-14";
|
||||
|
||||
goPackagePath = "github.com/lucy/tewisay";
|
||||
buildGoModule rec {
|
||||
pname = "tewisay";
|
||||
version = "unstable-2022-11-04";
|
||||
|
||||
# lucy deleted the old repo, this is a fork/mirror
|
||||
src = fetchFromGitHub {
|
||||
owner = "lucy";
|
||||
owner = "raymond-w-ko";
|
||||
repo = "tewisay";
|
||||
rev = "e3fc38737cedb79d93b8cee07207c6c86db4e488";
|
||||
sha256 = "1na3xi4z90v8qydcvd3454ia9jg7qhinciy6kvgyz61q837cw5dk";
|
||||
rev = "caa5b0131dda868f656716d2107f02d04d1048d4";
|
||||
hash = "sha256-E492d8P/Bek9xZlJP+k9xvIJEFtA1YrIB/pogvz3wM4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
vendorHash = "sha256-WcpRJ31kqWA255zfjuWDj0honJgSGdm4ONx2yOKk7/g=";
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
# Currently hard-coded, will be fixed by developer
|
||||
postPatch = ''
|
||||
substituteInPlace main.go \
|
||||
--replace "/usr" "$out"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -D -t $out/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow
|
||||
mkdir -p $out/share
|
||||
mv {cows,zsh} $out/share
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/tewisay \
|
||||
--prefix COWPATH : $out/share/tewisay/cows
|
||||
'';
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/lucy/tewisay";
|
||||
homepage = "https://github.com/raymond-w-ko/tewisay";
|
||||
description = "Cowsay replacement with unicode and partial ansi escape support";
|
||||
license = licenses.cc0;
|
||||
license = with licenses; [ cc0 ];
|
||||
maintainers = with maintainers; [ Madouura ];
|
||||
};
|
||||
}
|
||||
|
||||
21
pkgs/tools/misc/tewisay/deps.nix
generated
21
pkgs/tools/misc/tewisay/deps.nix
generated
@ -1,21 +0,0 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d";
|
||||
sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/ogier/pflag";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/ogier/pflag";
|
||||
rev = "45c278ab3607870051a2ea9040bb85fcb8557481";
|
||||
sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.xelerance.com/software/xl2tpd/";
|
||||
homepage = src.meta.homepage;
|
||||
description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
buildGoModule rec {
|
||||
pname = "yubikey-agent";
|
||||
|
||||
version = "unstable-2022-03-17";
|
||||
version = "0.1.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "FiloSottile";
|
||||
repo = "yubikey-agent";
|
||||
rev = "205a7ef2554625c7494038600d963123d6311873";
|
||||
sha256 = "sha256-wJpN63KY5scmez6yYFsIr3JLEUB+YSl/XvoatIIeRI0=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Knk1ipBOzjmjrS2OFUMuxi1TkyDcSYlVKezDWT//ERY=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@ -21,7 +21,7 @@ buildGoModule rec {
|
||||
substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-SnjbkDPVjAnCbM2nLqBsuaPZwOmvDTKiUbi/93BlWVQ=";
|
||||
vendorSha256 = "sha256-+IRPs3wm3EvIgfQRpzcVpo2JBaFQlyY/RI1G7XfVS84=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -36441,13 +36441,8 @@ with pkgs;
|
||||
|
||||
inherit (callPackages ../applications/science/logic/z3 { python = python3; })
|
||||
z3_4_11
|
||||
z3_4_8
|
||||
z3_4_7;
|
||||
z3_4_8;
|
||||
z3 = z3_4_8;
|
||||
z3_4_4_0 = callPackage ../applications/science/logic/z3/4.4.0.nix {
|
||||
python = python2;
|
||||
stdenv = if stdenv.isDarwin then stdenv else gcc49Stdenv;
|
||||
};
|
||||
z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {};
|
||||
|
||||
zchaff = callPackage ../applications/science/logic/zchaff { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user