Merge branch 'master' into staging-next
This commit is contained in:
Weijia Wang
commit
bab247f2bb
33 changed files with 614 additions and 373 deletions
|
|
@ -35,7 +35,7 @@ in
|
|||
{
|
||||
services.httpd.virtualHosts =
|
||||
{ "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; });
|
||||
"wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; });
|
||||
"wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.org"; });
|
||||
};
|
||||
}
|
||||
```
|
||||
|
|
|
|||
|
|
@ -1,63 +1,43 @@
|
|||
{ mkDerivation
|
||||
, lib
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, extra-cmake-modules
|
||||
, kdoctools
|
||||
, wrapGAppsHook3
|
||||
, qtscript
|
||||
, kconfig
|
||||
, kcrash
|
||||
, kdbusaddons
|
||||
, kdelibs4support
|
||||
, kguiaddons
|
||||
, kiconthemes
|
||||
, kinit
|
||||
, khtml
|
||||
, konsole
|
||||
, kparts
|
||||
, ktexteditor
|
||||
, kwindowsystem
|
||||
, okular
|
||||
, poppler
|
||||
, cmake
|
||||
, kdePackages
|
||||
, qt6
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kile";
|
||||
version = "2.9.93";
|
||||
version = "2.9.94";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/kile/kile-${version}.tar.bz2";
|
||||
sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA=";
|
||||
sha256 = "U8Z0K9g/sJXL3ImLA/344Vq2gKgWk8yvnFB2uTrRo8o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
wrapGAppsHook3
|
||||
kdoctools
|
||||
cmake
|
||||
kdePackages.extra-cmake-modules
|
||||
qt6.wrapQtAppsHook
|
||||
kdePackages.kdoctools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kconfig
|
||||
kcrash
|
||||
kdbusaddons
|
||||
kdelibs4support
|
||||
kguiaddons
|
||||
kiconthemes
|
||||
kinit
|
||||
khtml
|
||||
kparts
|
||||
ktexteditor
|
||||
kwindowsystem
|
||||
okular
|
||||
poppler
|
||||
qtscript
|
||||
qt6.qtbase
|
||||
qt6.qtdeclarative
|
||||
qt6.qt5compat
|
||||
kdePackages.kconfig
|
||||
kdePackages.kcrash
|
||||
kdePackages.kdbusaddons
|
||||
kdePackages.kguiaddons
|
||||
kdePackages.kiconthemes
|
||||
kdePackages.konsole
|
||||
kdePackages.kparts
|
||||
kdePackages.ktexteditor
|
||||
kdePackages.kwindowsystem
|
||||
kdePackages.okular
|
||||
kdePackages.poppler
|
||||
];
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
propagatedUserEnvPkgs = [ konsole ];
|
||||
|
||||
meta = {
|
||||
description = "User-friendly TeX/LaTeX authoring tool for the KDE desktop environment";
|
||||
|
|
|
|||
|
|
@ -12,9 +12,11 @@
|
|||
, gobject-introspection
|
||||
, gtk-layer-shell
|
||||
, gtk3
|
||||
, gvfs
|
||||
, json-glib
|
||||
, libgee
|
||||
, libhandy
|
||||
, libnotify
|
||||
, libpulseaudio
|
||||
, librsvg
|
||||
, meson
|
||||
|
|
@ -65,9 +67,11 @@ stdenv.mkDerivation (finalAttrs: rec {
|
|||
glib
|
||||
gtk-layer-shell
|
||||
gtk3
|
||||
gvfs
|
||||
json-glib
|
||||
libgee
|
||||
libhandy
|
||||
libnotify
|
||||
libpulseaudio
|
||||
librsvg
|
||||
pantheon.granite
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kuttl";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
cli = "kubectl-kuttl";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kudobuilder";
|
||||
repo = "kuttl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u+j1ulM6B238qXvLMJZwLqglr9CGk81MsnBYiNiZVJQ=";
|
||||
sha256 = "sha256-Kz8+RsLpKwXk4f3k/kBqSFGB9AvA/D6kYBtPEl6aSH8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-taJAQPa0EA0Ph9OpCs7jzLqBV61kVstZrWyNEYc/GBk=";
|
||||
vendorHash = "sha256-IgfPXT4BhfZZVOa7eO1wKUKiDVMcN8vmH11qdWfvFww=";
|
||||
|
||||
subPackages = [ "cmd/kubectl-kuttl" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,147 +0,0 @@
|
|||
{ lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd
|
||||
, qrencode, libsodium, libtool, libunistring, pkg-config, postgresql
|
||||
, autoreconfHook, python3, recutils, wget, jq, gettext, texinfo
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.10.1";
|
||||
|
||||
taler-wallet-core = fetchgit {
|
||||
url = "https://git.taler.net/wallet-core.git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sgiJd1snN9JDqS7IUeORKL60Gcm7XwL/JCX3sNRDTdY=";
|
||||
};
|
||||
|
||||
taler-exchange = stdenv.mkDerivation {
|
||||
pname = "taler-exchange";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.taler.net/exchange.git";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-SKnMep8bMQaJt4r3u0SrzwYSuFbzv4RnflbutSqwtPg=";
|
||||
|
||||
# When fetching submodules without the .git folder we get the following error:
|
||||
# "Server does not allow request for unadvertised object"
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
libgcrypt
|
||||
libmicrohttpd
|
||||
jansson
|
||||
libsodium
|
||||
postgresql
|
||||
curl
|
||||
recutils
|
||||
gettext
|
||||
texinfo # Fix 'makeinfo' is missing on your system.
|
||||
libunistring
|
||||
python3.pkgs.jinja2
|
||||
# jq is necessary for some tests and is checked by configure script
|
||||
jq
|
||||
];
|
||||
propagatedBuildInputs = [ gnunet ];
|
||||
|
||||
# From ./bootstrap
|
||||
preAutoreconf = ''
|
||||
./contrib/gana-generate.sh
|
||||
pushd contrib
|
||||
find wallet-core/aml-backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext
|
||||
truncate -s -2 Makefile.am.ext
|
||||
cat Makefile.am.in Makefile.am.ext >> Makefile.am
|
||||
popd
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeCheckInputs = [ wget curl ];
|
||||
doInstallCheck = true;
|
||||
checkTarget = "check";
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Taler is an electronic payment system providing the ability to pay
|
||||
anonymously using digital cash. Taler consists of a network protocol
|
||||
definition (using a RESTful API over HTTP), a Exchange (which creates
|
||||
digital coins), a Wallet (which allows customers to manage, store and
|
||||
spend digital coins), and a Merchant website which allows customers to
|
||||
spend their digital coins. Naturally, each Merchant is different, but
|
||||
Taler includes code examples to help Merchants integrate Taler as a
|
||||
payment system.
|
||||
'';
|
||||
homepage = "https://taler.net/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
taler-merchant = stdenv.mkDerivation {
|
||||
pname = "taler-merchant";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.taler.net/merchant.git";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-8VpoyloLpd/HckSIRU6IclWUXQyEHqlcNdoJI9U3t0Y=";
|
||||
};
|
||||
postUnpack = ''
|
||||
ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = taler-exchange.buildInputs ++ [
|
||||
qrencode
|
||||
taler-exchange
|
||||
# for ltdl.h
|
||||
libtool
|
||||
];
|
||||
propagatedBuildInputs = [ gnunet ];
|
||||
|
||||
# From ./bootstrap
|
||||
preAutoreconf = ''
|
||||
pushd contrib
|
||||
find wallet-core/backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext
|
||||
truncate -s -2 Makefile.am.ext
|
||||
cat Makefile.am.in Makefile.am.ext >> Makefile.am
|
||||
popd
|
||||
'';
|
||||
configureFlags = [
|
||||
"--with-gnunet=${gnunet}"
|
||||
"--with-exchange=${taler-exchange}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeCheckInputs = [ jq ];
|
||||
doInstallCheck = true;
|
||||
checkTarget = "check";
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
This is the GNU Taler merchant backend. It provides the logic that should run
|
||||
at every GNU Taler merchant. The GNU Taler merchant is a RESTful backend that
|
||||
can be used to setup orders and process payments. This component allows
|
||||
merchants to receive payments without invading the customers' privacy. Of
|
||||
course, this applies mostly for digital goods, as the merchant does not need
|
||||
to know the customer's physical address.
|
||||
'';
|
||||
homepage = "https://taler.net/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
in {
|
||||
inherit taler-exchange taler-merchant;
|
||||
}
|
||||
|
|
@ -33,14 +33,14 @@ let
|
|||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-s/1XyEXOyvAQNf32ckKotQ4jYdlo/Y+O9PY3wIUs80A=";
|
||||
x86_64-linux = "sha256-3KMmMDoaYYMKuuqLof/LfdCs1d4I70L2TDxmzvx4Vq0=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
displayname = "XPipe";
|
||||
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
pname = "xpipe";
|
||||
version = "8.6";
|
||||
version = "9.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, pkg-config
|
||||
, curl
|
||||
, ffmpeg
|
||||
, openssl
|
||||
, qtbase
|
||||
, zlib
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
pkg-config,
|
||||
curl,
|
||||
ffmpeg,
|
||||
openssl,
|
||||
qtbase,
|
||||
zlib,
|
||||
|
||||
, withJava ? true
|
||||
, jre_headless
|
||||
withJava ? true,
|
||||
jre_headless,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -30,12 +31,15 @@ let
|
|||
];
|
||||
sha256 = "2dtNdyv0+QYWQrfrIu5RQKSN4scSWKuLFNlJZXpxDUM=";
|
||||
};
|
||||
|
||||
in mkDerivation {
|
||||
in
|
||||
mkDerivation {
|
||||
pname = "makemkv";
|
||||
inherit version;
|
||||
|
||||
srcs = [ src_bin src_oss ];
|
||||
srcs = [
|
||||
src_bin
|
||||
src_oss
|
||||
];
|
||||
|
||||
sourceRoot = "makemkv-oss-${version}";
|
||||
|
||||
|
|
@ -43,18 +47,25 @@ in mkDerivation {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ ffmpeg openssl qtbase zlib ];
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
openssl
|
||||
qtbase
|
||||
zlib
|
||||
];
|
||||
|
||||
runtimeDependencies = [ (lib.getLib curl) ];
|
||||
|
||||
qtWrapperArgs =
|
||||
let
|
||||
binPath = lib.makeBinPath [ jre_headless ];
|
||||
in lib.optionals withJava [
|
||||
"--prefix PATH : ${binPath}"
|
||||
];
|
||||
in
|
||||
lib.optionals withJava [ "--prefix PATH : ${binPath}" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
@ -84,9 +95,12 @@ in mkDerivation {
|
|||
expiration date.
|
||||
'';
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = [ licenses.unfree licenses.lgpl21 ];
|
||||
license = [
|
||||
licenses.unfree
|
||||
licenses.lgpl21
|
||||
];
|
||||
homepage = "http://makemkv.com";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ jchw ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-input-overlay";
|
||||
version = "5.0.4";
|
||||
version = "5.0.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "univrsal";
|
||||
repo = "input-overlay";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MON68yjHUOF/bggWqhw8D0+23HpKQN3jWs+5lLAacaQ=";
|
||||
sha256 = "sha256-9HqEz+KnTt8MyhwqFWjalbl3H/DCzumckXMctCGhs3o=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +1,68 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, pkgsCross
|
||||
, stdenv
|
||||
, bash
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
overrideCC,
|
||||
fetchFromGitHub,
|
||||
pkgsCross,
|
||||
bash,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs:
|
||||
stdenvNoCC.mkDerivation (
|
||||
finalAttrs:
|
||||
let
|
||||
dxvk32 = if stdenv.isDarwin
|
||||
then pkgsCross.mingw32.dxvk_1.override { enableMoltenVKCompat = true; }
|
||||
else pkgsCross.mingw32.dxvk_2;
|
||||
dxvk64 = if stdenv.isDarwin
|
||||
then pkgsCross.mingwW64.dxvk_1.override { enableMoltenVKCompat = true; }
|
||||
else pkgsCross.mingwW64.dxvk_2;
|
||||
useWin32ThreadModel =
|
||||
stdenv:
|
||||
overrideCC stdenv (
|
||||
stdenv.cc.override (old: {
|
||||
cc = old.cc.override {
|
||||
threadsCross = {
|
||||
model = "win32";
|
||||
package = null;
|
||||
};
|
||||
};
|
||||
})
|
||||
);
|
||||
|
||||
mingw32Stdenv = useWin32ThreadModel pkgsCross.mingw32.stdenv;
|
||||
mingwW64Stdenv = useWin32ThreadModel pkgsCross.mingwW64.stdenv;
|
||||
|
||||
dxvk32 =
|
||||
if stdenvNoCC.isDarwin then
|
||||
pkgsCross.mingw32.dxvk_1.override {
|
||||
stdenv = mingw32Stdenv;
|
||||
enableMoltenVKCompat = true;
|
||||
}
|
||||
else
|
||||
pkgsCross.mingw32.dxvk_2.override { stdenv = mingw32Stdenv; };
|
||||
|
||||
dxvk64 =
|
||||
if stdenvNoCC.isDarwin then
|
||||
pkgsCross.mingwW64.dxvk_1.override {
|
||||
stdenv = mingwW64Stdenv;
|
||||
enableMoltenVKCompat = true;
|
||||
}
|
||||
else
|
||||
pkgsCross.mingwW64.dxvk_2.override { stdenv = mingwW64Stdenv; };
|
||||
in
|
||||
{
|
||||
pname = "dxvk";
|
||||
inherit (dxvk64) version;
|
||||
|
||||
outputs = [ "out" "bin" "lib" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"bin"
|
||||
"lib"
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
strictDeps = true;
|
||||
|
||||
installPhase = ''
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin $bin $lib
|
||||
substitute ${./setup_dxvk.sh} $out/bin/setup_dxvk.sh \
|
||||
--subst-var-by bash ${bash} \
|
||||
--subst-var-by dxvk32 ${dxvk32} \
|
||||
--subst-var-by dxvk64 ${dxvk64} \
|
||||
--subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads_pre_gcc_13}" \
|
||||
--subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads_pre_gcc_13}"
|
||||
--subst-var-by version ${finalAttrs.version}
|
||||
chmod a+x $out/bin/setup_dxvk.sh
|
||||
declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} )
|
||||
for arch in "''${!dxvks[@]}"; do
|
||||
|
|
@ -41,6 +71,10 @@ stdenvNoCC.mkDerivation (finalAttrs:
|
|||
done
|
||||
'';
|
||||
|
||||
passthru = { inherit dxvk32 dxvk64; };
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "Setup script for DXVK";
|
||||
mainProgram = "setup_dxvk.sh";
|
||||
|
|
@ -48,6 +82,11 @@ stdenvNoCC.mkDerivation (finalAttrs:
|
|||
changelog = "https://github.com/doitsujin/dxvk/releases";
|
||||
maintainers = [ lib.maintainers.reckenrode ];
|
||||
license = lib.licenses.zlib;
|
||||
platforms = [ "x86_64-darwin" "i686-linux" "x86_64-linux" ];
|
||||
platforms = [
|
||||
"x86_64-darwin"
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
};
|
||||
})
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -6,11 +6,9 @@ set -eu -o pipefail
|
|||
{
|
||||
dxvk32_dir=@dxvk32@/bin
|
||||
dxvk64_dir=@dxvk64@/bin
|
||||
|
||||
mcfgthreads32_dir=@mcfgthreads32@/bin
|
||||
mcfgthreads64_dir=@mcfgthreads64@/bin
|
||||
}
|
||||
|
||||
|
||||
## Defaults
|
||||
|
||||
declare -A dlls=(
|
||||
|
|
@ -18,10 +16,23 @@ declare -A dlls=(
|
|||
[d3d10]="dxvk/d3d10.dll dxvk/d3d10_1.dll dxvk/d3d10core.dll"
|
||||
[d3d11]="dxvk/d3d11.dll"
|
||||
[dxgi]="dxvk/dxgi.dll"
|
||||
)
|
||||
|
||||
declare -A obsolete_dlls=(
|
||||
[mcfgthreads]="mcfgthreads/mcfgthread-12.dll"
|
||||
)
|
||||
|
||||
declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1 [mcfgthreads]=1)
|
||||
declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1)
|
||||
|
||||
|
||||
# Option variables
|
||||
|
||||
do_cleanup=false
|
||||
ignore_obsolete=false
|
||||
|
||||
do_symlink=false
|
||||
do_makeprefix=false
|
||||
|
||||
|
||||
## Command-line Parsing
|
||||
|
||||
|
|
@ -46,6 +57,10 @@ usage() {
|
|||
}
|
||||
|
||||
case "${1:-}" in
|
||||
cleanup)
|
||||
do_cleanup=true
|
||||
shift
|
||||
;;
|
||||
uninstall|install)
|
||||
action=$1
|
||||
shift
|
||||
|
|
@ -61,10 +76,6 @@ case "${1:-}" in
|
|||
;;
|
||||
esac
|
||||
|
||||
|
||||
do_symlink=false
|
||||
do_makeprefix=false
|
||||
|
||||
while [ -n "${1:-}" ]; do
|
||||
case "$1" in
|
||||
--with-dxgi)
|
||||
|
|
@ -100,6 +111,10 @@ while [ -n "${1:-}" ]; do
|
|||
usage
|
||||
fi
|
||||
;;
|
||||
--ignore-obsolete)
|
||||
shift
|
||||
ignore_obsolete=true
|
||||
;;
|
||||
-h|--help)
|
||||
usage
|
||||
;;
|
||||
|
|
@ -111,6 +126,7 @@ while [ -n "${1:-}" ]; do
|
|||
shift
|
||||
done
|
||||
|
||||
|
||||
## Get information on the Wine environment
|
||||
|
||||
export WINEPREFIX=${WINEPREFIX:-"$HOME/.wine"}
|
||||
|
|
@ -165,6 +181,7 @@ if [ -z "${win32_sys_path:-}" ] && [ -z "${win64_sys_path:-}" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
## Utility functions
|
||||
|
||||
install_file() {
|
||||
|
|
@ -200,6 +217,13 @@ install_file() {
|
|||
uninstall_file() {
|
||||
srcfile=$1
|
||||
dstfile=$2
|
||||
args=$3
|
||||
|
||||
if [ "${args}" = "-f" ]; then
|
||||
rm -v "${dstfile}"
|
||||
[ -e "${dstfile}.old" ] && rm -v "${dstfile}.old"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "${srcfile}.so" ]; then
|
||||
srcfile="${srcfile}.so"
|
||||
|
|
@ -239,6 +263,26 @@ uninstall_override() {
|
|||
fi
|
||||
}
|
||||
|
||||
print_cleanup_message() {
|
||||
declare -a obsolete_paths=($@)
|
||||
if ! $ignore_obsolete && [ -n "${obsolete_paths[@]}" ]; then
|
||||
fold -w $COLUMNS -s <<MSG >&2
|
||||
Obsolete DLLs detected at the specified Wine prefix. These DLLs are no longer needed \
|
||||
or managed by the \`setup_dxvk.sh\` script in nixpkgs. You should remove them manually, \
|
||||
use the cleanup command, or suppress this message using the \`--ignore-obsolete\` option.
|
||||
MSG
|
||||
for obspath in "${obsolete_paths[@]}"; do
|
||||
if $do_cleanup; then
|
||||
cleanup_file "$obspath"
|
||||
else
|
||||
echo " - ${obspath}"
|
||||
fi
|
||||
done
|
||||
! $do_cleanup && echo
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
## Perform the requested command
|
||||
|
||||
declare -A paths
|
||||
|
|
@ -260,7 +304,32 @@ for target in "${!targets[@]}"; do
|
|||
done
|
||||
done
|
||||
|
||||
for srcpath in "${!paths[@]}"; do
|
||||
"${action}_file" "$srcpath" "${paths["$srcpath"]}"
|
||||
declare -A obsolete_paths
|
||||
|
||||
for target in "${!obsolete_dlls[@]}"; do
|
||||
for dll in ${obsolete_dlls[$target]}; do
|
||||
dllname=$(basename "$dll")
|
||||
basedir=$(dirname "$dll")
|
||||
|
||||
if [ -e "${win32_sys_path:-}/$dllname" ]; then
|
||||
obsolete_paths["${basedir}32_dir/$dllname"]="${win32_sys_path:-}/$dllname"
|
||||
fi
|
||||
if [ -e "${win64_sys_path:-}/$dllname" ]; then
|
||||
obsolete_paths["${basedir}64_dir/$dllname"]="${win64_sys_path:-}/$dllname"
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
if $do_cleanup; then
|
||||
declare -n action_paths=obsolete_paths
|
||||
action=uninstall
|
||||
args=-f
|
||||
else
|
||||
declare -n action_paths=paths
|
||||
print_cleanup_message "${obsolete_paths[@]}"
|
||||
fi
|
||||
|
||||
for srcpath in "${!action_paths[@]}"; do
|
||||
"${action}_file" "$srcpath" "${action_paths["$srcpath"]}" "${args:-}"
|
||||
"${action}_override" "$(basename "$srcpath" .dll)"
|
||||
done
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, glslang
|
||||
, meson
|
||||
, ninja
|
||||
, windows
|
||||
, pkgsBuildHost
|
||||
, enableMoltenVKCompat ? false
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
glslang,
|
||||
meson,
|
||||
ninja,
|
||||
windows,
|
||||
enableMoltenVKCompat ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -21,7 +22,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
# These patches are required when using DXVK with Wine on Darwin.
|
||||
patches = lib.optionals enableMoltenVKCompat [
|
||||
patches =
|
||||
[
|
||||
# Fixes errors building with GCC 13.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a.patch";
|
||||
hash = "sha256-tTAsQOMAazgH/6laLNTuG2lki257VUR9EBivnD4vCuY=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals enableMoltenVKCompat [
|
||||
# Patch DXVK to work with MoltenVK even though it doesn’t support some required features.
|
||||
# Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well.
|
||||
./darwin-dxvk-compat.patch
|
||||
|
|
@ -30,13 +39,18 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
./darwin-thread-primitives.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ glslang meson ninja ];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
glslang
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
buildInputs = [ windows.pthreads ];
|
||||
|
||||
mesonFlags = [
|
||||
"--buildtype" "release"
|
||||
"--prefix" "${placeholder "out"}"
|
||||
];
|
||||
mesonBuildType = "release";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "A Vulkan-based translation layer for Direct3D 9/10/11";
|
||||
|
|
|
|||
|
|
@ -1,18 +1,19 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkgsBuildHost
|
||||
, glslang
|
||||
, meson
|
||||
, ninja
|
||||
, windows
|
||||
, spirv-headers
|
||||
, vulkan-headers
|
||||
, SDL2
|
||||
, glfw
|
||||
, gitUpdater
|
||||
, sdl2Support ? true
|
||||
, glfwSupport ? false
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkgsBuildHost,
|
||||
glslang,
|
||||
meson,
|
||||
ninja,
|
||||
windows,
|
||||
spirv-headers,
|
||||
vulkan-headers,
|
||||
SDL2,
|
||||
glfw,
|
||||
gitUpdater,
|
||||
sdl2Support ? true,
|
||||
glfwSupport ? false,
|
||||
}:
|
||||
|
||||
# SDL2 and GLFW support are mutually exclusive.
|
||||
|
|
@ -23,13 +24,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dxvk";
|
||||
version = "2.3";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doitsujin";
|
||||
repo = "dxvk";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-RU+B0XfphD5HHW/vSzqHLUaGS3E31d5sOLp3lMmrCB8=";
|
||||
hash = "sha256-lUzD1NHFLO4UqOg/BUr7PnYMJCMr1KBh3VNx8etbt8c=";
|
||||
fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info
|
||||
};
|
||||
|
||||
|
|
@ -38,8 +39,18 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--replace "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ glslang meson ninja ];
|
||||
buildInputs = [ spirv-headers vulkan-headers ]
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
glslang
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
spirv-headers
|
||||
vulkan-headers
|
||||
]
|
||||
++ lib.optionals (!isWindows && sdl2Support) [ SDL2 ]
|
||||
++ lib.optionals (!isWindows && glfwSupport) [ glfw ]
|
||||
++ lib.optionals isWindows [ windows.pthreads ];
|
||||
|
|
@ -50,15 +61,16 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
mkdir -p include/spirv/include include/vulkan/include
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"--buildtype" "release"
|
||||
"--prefix" "${placeholder "out"}"
|
||||
] ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw";
|
||||
mesonBuildType = "release";
|
||||
|
||||
mesonFlags = lib.optionals glfwSupport [ "-Ddxvk_native_wsi=glfw" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "A Vulkan-based translation layer for Direct3D 9/10/11";
|
||||
homepage = "https://github.com/doitsujin/dxvk";
|
||||
|
|
|
|||
49
pkgs/by-name/pa/parallel-hashmap/package.nix
Normal file
49
pkgs/by-name/pa/parallel-hashmap/package.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gtest
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "parallel-hashmap";
|
||||
version = "1.3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greg7mdp";
|
||||
repo = "parallel-hashmap";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-6KhzXUxa4WOsRrPmSSgguFxRGTOTIaxiJBFFSzOhch0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# don't download googletest, but build it from source
|
||||
# https://github.com/greg7mdp/parallel-hashmap/blob/be6a2c79857c9ea76760ca6ce782e1609713428e/CMakeLists.txt#L98
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "include(cmake/DownloadGTest.cmake)" "add_subdirectory(${gtest.src} ./googletest-build EXCLUDE_FROM_ALL)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPHMAP_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}"
|
||||
"-DPHMAP_BUILD_EXAMPLES=OFF"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A family of header-only, very fast and memory-friendly hashmap and btree containers";
|
||||
homepage = "https://github.com/greg7mdp/parallel-hashmap";
|
||||
changelog = "https://github.com/greg7mdp/parallel-hashmap/releases/tag/${finalAttrs.src.rev}";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
})
|
||||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quarkus-cli";
|
||||
version = "3.9.4";
|
||||
version = "3.9.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ez4D+czYDhs/GNrjRF8Bx999JRW0EigMxc39fOH54V8=";
|
||||
hash = "sha256-3vcuf49gutlXbFT5mUuZw9fDjyvb0Q+lXyn4n+RcLdU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
104
pkgs/by-name/ta/taler-exchange/package.nix
Normal file
104
pkgs/by-name/ta/taler-exchange/package.nix
Normal file
|
|
@ -0,0 +1,104 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
curl,
|
||||
gnunet,
|
||||
jansson,
|
||||
libgcrypt,
|
||||
libmicrohttpd,
|
||||
libsodium,
|
||||
libunistring,
|
||||
pkg-config,
|
||||
postgresql,
|
||||
autoreconfHook,
|
||||
python3,
|
||||
recutils,
|
||||
wget,
|
||||
jq,
|
||||
gettext,
|
||||
texinfo,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.10.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "taler-exchange";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.taler.net/exchange.git";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-SKnMep8bMQaJt4r3u0SrzwYSuFbzv4RnflbutSqwtPg=";
|
||||
|
||||
# When fetching submodules without the .git folder we get the following error:
|
||||
# "Server does not allow request for unadvertised object"
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgcrypt
|
||||
libmicrohttpd
|
||||
jansson
|
||||
libsodium
|
||||
postgresql
|
||||
curl
|
||||
recutils
|
||||
gettext
|
||||
texinfo # Fix 'makeinfo' is missing on your system.
|
||||
libunistring
|
||||
python3.pkgs.jinja2
|
||||
# jq is necessary for some tests and is checked by configure script
|
||||
jq
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ gnunet ];
|
||||
|
||||
# From ./bootstrap
|
||||
preAutoreconf = ''
|
||||
./contrib/gana-generate.sh
|
||||
pushd contrib
|
||||
find wallet-core/aml-backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext
|
||||
truncate -s -2 Makefile.am.ext
|
||||
cat Makefile.am.in Makefile.am.ext >> Makefile.am
|
||||
popd
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
wget
|
||||
curl
|
||||
];
|
||||
|
||||
checkTarget = "check";
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Taler is an electronic payment system providing the ability to pay
|
||||
anonymously using digital cash. Taler consists of a network protocol
|
||||
definition (using a RESTful API over HTTP), a Exchange (which creates
|
||||
digital coins), a Wallet (which allows customers to manage, store and
|
||||
spend digital coins), and a Merchant website which allows customers to
|
||||
spend their digital coins. Naturally, each Merchant is different, but
|
||||
Taler includes code examples to help Merchants integrate Taler as a
|
||||
payment system.
|
||||
'';
|
||||
homepage = "https://taler.net/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
88
pkgs/by-name/ta/taler-merchant/package.nix
Normal file
88
pkgs/by-name/ta/taler-merchant/package.nix
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
gnunet,
|
||||
qrencode,
|
||||
taler-exchange,
|
||||
libtool,
|
||||
pkg-config,
|
||||
autoreconfHook,
|
||||
jq,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.10.1";
|
||||
|
||||
taler-wallet-core = fetchgit {
|
||||
url = "https://git.taler.net/wallet-core.git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sgiJd1snN9JDqS7IUeORKL60Gcm7XwL/JCX3sNRDTdY=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "taler-merchant";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.taler.net/merchant.git";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-8VpoyloLpd/HckSIRU6IclWUXQyEHqlcNdoJI9U3t0Y=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = taler-exchange.buildInputs ++ [
|
||||
qrencode
|
||||
taler-exchange
|
||||
# for ltdl.h
|
||||
libtool
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ gnunet ];
|
||||
|
||||
# From ./bootstrap
|
||||
preAutoreconf = ''
|
||||
pushd contrib
|
||||
find wallet-core/backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext
|
||||
truncate -s -2 Makefile.am.ext
|
||||
cat Makefile.am.in Makefile.am.ext >> Makefile.am
|
||||
popd
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-gnunet=${gnunet}"
|
||||
"--with-exchange=${taler-exchange}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeCheckInputs = [ jq ];
|
||||
|
||||
checkTarget = "check";
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
This is the GNU Taler merchant backend. It provides the logic that should run
|
||||
at every GNU Taler merchant. The GNU Taler merchant is a RESTful backend that
|
||||
can be used to setup orders and process payments. This component allows
|
||||
merchants to receive payments without invading the customers' privacy. Of
|
||||
course, this applies mostly for digital goods, as the merchant does not need
|
||||
to know the customer's physical address.
|
||||
'';
|
||||
homepage = "https://taler.net/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fast-histogram";
|
||||
version = "0.12";
|
||||
version = "0.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -22,8 +22,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "astrofrog";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Cz4BgbtxbUPxL2NSzvZYjbYIN4KUuliUV0bXRRtyvfM=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-vIzDDzz6e7PXArHdZdSSgShuTjy3niVdGtXqgmyJl1w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,12 +9,13 @@
|
|||
, setuptools
|
||||
, pytestCheckHook
|
||||
, pythonRelaxDepsHook
|
||||
, writeScript
|
||||
}:
|
||||
|
||||
let
|
||||
self = buildPythonPackage rec {
|
||||
pname = "opentelemetry-api";
|
||||
version = "1.23.0";
|
||||
version = "1.24.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +25,7 @@ let
|
|||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ge/DjVG7ajoS0nJLZxtfn4Mmx0SffAE/91dViA5qWAA=";
|
||||
hash = "sha256-id5cwNl2idgZa1AFfolzEo5vzspv3V2c1Vtzg3EWDZs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/opentelemetry-api";
|
||||
|
|
@ -55,8 +56,18 @@ let
|
|||
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update
|
||||
|
||||
set -eu -o pipefail
|
||||
nix-update --version-regex 'v(.*)' python3Packages.opentelemetry-api
|
||||
nix-update python3Packages.opentelemetry-instrumentation
|
||||
'';
|
||||
# Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils.
|
||||
passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; };
|
||||
tests.${self.pname} = self.overridePythonAttrs { doCheck = true; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "opentelemetry-instrumentation";
|
||||
version = "0.44b0";
|
||||
version = "0.45b0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python-contrib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-r+k/YdK7YqYme8nKoy3ig3krvZjxYRKgLBkcdEtFy3k=";
|
||||
hash = "sha256-snpanTREdvfqpqPI8UWzm55pDK8Q77guqgT8kFULRKU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/opentelemetry-instrumentation";
|
||||
|
|
@ -44,6 +44,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.instrumentation" ];
|
||||
|
||||
passthru.updateScript = opentelemetry-api.updateScript;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation";
|
||||
description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python";
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "optimum";
|
||||
version = "1.18.1";
|
||||
version = "1.19.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
|||
owner = "huggingface";
|
||||
repo = "optimum";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Y+KWvpd/ULthCOr18hQjP0REQPcs2Ql2aUi3DIKIOpQ=";
|
||||
hash = "sha256-EHu3p3M7xBjMnf3tKsneYOZtd9YWsC0qok1fnk4TMAg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vitess";
|
||||
version = "19.0.1";
|
||||
version = "19.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vitessio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UDqSCAJObKh65/mDupuWzkYfqJyd6XZCi+qA7NwIO9M=";
|
||||
hash = "sha256-Zy54nZCnwyZ1JNPvaKi0/bRt5g5ucPANwer/3pl4dGU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YrgWrk+67Vx9L+uFLipyuousj5DQIleqyxbUSqalZyw=";
|
||||
vendorHash = "sha256-QUzBxYEvxVzv4c8tKiFb+4NLy8RsXh0QTn9twfstMtw=";
|
||||
|
||||
buildInputs = [ sqlite ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hcloud";
|
||||
version = "1.43.0";
|
||||
version = "1.43.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-czuMlnVhUDWGVbIZ0V7vaoOnT84WKPFjhcUvt5BzBXo=";
|
||||
hash = "sha256-XPDaywSCvXc9jo8bNxaF9Pj6Vs+Hz0MxDPbbnRNW3VI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0XFgi2cPlsL4zCbttGrEsm0j5ftB8MAuphu3YNlPbIs=";
|
||||
vendorHash = "sha256-pN+HMsZ2FpxwF/yPfYGwJNj9i4fgnE3cKo3mti3KoR0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -8,18 +8,18 @@
|
|||
}:
|
||||
mkYarnPackage rec {
|
||||
pname = "prettierd";
|
||||
version = "0.25.1";
|
||||
version = "0.25.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fsouza";
|
||||
repo = "prettierd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aoRfZ9SJazz0ir1fyHypn3aYqK9DJOLLVPMuFcOm/20=";
|
||||
hash = "sha256-3lvFZ5/p+1kPnHIR2PlQtCY3SVo1rs8IuBigLaabxAE=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/yarn.lock";
|
||||
hash = "sha256-HsWsRIONRNY9akZ2LXlWcPhH6N5qCKnesaDX1gQp+NU=";
|
||||
hash = "sha256-Ti2b102pzUKB6Xy3LwZ7DlrnW0cRscgNLTUIAKz+6Us=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@fsouza/prettierd",
|
||||
"version": "0.25.1",
|
||||
"version": "0.25.3",
|
||||
"description": "prettier, as a daemon",
|
||||
"bin": {
|
||||
"prettierd": "./bin/prettierd"
|
||||
|
|
@ -24,13 +24,13 @@
|
|||
},
|
||||
"homepage": "https://github.com/fsouza/prettierd",
|
||||
"devDependencies": {
|
||||
"@types/node": "^20.6.3",
|
||||
"@types/node": "^20.12.7",
|
||||
"@types/prettier": "^3.0.0",
|
||||
"typescript": "^5.2.2"
|
||||
"typescript": "^5.4.5"
|
||||
},
|
||||
"dependencies": {
|
||||
"core_d": "^6.0.0",
|
||||
"prettier": "^3.0.3"
|
||||
"core_d": "^6.1.0",
|
||||
"prettier": "^3.2.5"
|
||||
},
|
||||
"files": [
|
||||
"bin",
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
"README.md"
|
||||
],
|
||||
"optionalDependencies": {
|
||||
"@babel/parser": "^7.22.16",
|
||||
"@typescript-eslint/typescript-estree": "^6.7.2"
|
||||
"@babel/parser": "^7.24.4",
|
||||
"@typescript-eslint/typescript-estree": "^7.6.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "protoc-gen-entgrpc";
|
||||
version = "0.4.5";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ent";
|
||||
repo = "contrib";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bEJjVNWd4NsUdWPqMZQ86U9F32q5M1iBRcS9MYDp9GE=";
|
||||
sha256 = "sha256-fXvpPH4b1JG++z0KEm9BNu5pGkneefNVvi9R5R3FqB4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DgqCGXqEnLBxyLZJrTRZIeBIrHYA7TNMV4WTk/3IS8Y=";
|
||||
vendorHash = "sha256-SdUs2alcc4rA6CGIrnaLO7KCseP4a0v6WE58JcRGr0k=";
|
||||
|
||||
subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@ let
|
|||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-XzMd2NgMY8AUSjdYDyOEcK3HlZ5hl+L/ulHgy2iDtKg=";
|
||||
aarch64-linux = "sha256-ypjg73ciUhXIyiNSLzim8AZV0ByU27WRc3PJqTyTllg=";
|
||||
armv7l-linux = "sha256-VgVn5NsGpvGpkLQRZDphOgeZFQzhR2rVfcwi/EkJ/y4=";
|
||||
x86_64-linux = "sha256-cg/4BNjL0+Zl8AHJOK/vVutXrz1aLJ+4cHvzcx5iU/8=";
|
||||
aarch64-linux = "sha256-W+wTOZUYMqqAOrnhrWsnGYfz7FUQ7D/ssoMsZWrhTqw=";
|
||||
armv7l-linux = "sha256-Sgfrms2prm3VJECKoqb5NaTYkgGHTdfm2mcR+BIPm2U=";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zrok";
|
||||
version = "0.4.26";
|
||||
version = "0.4.27";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -94,10 +94,12 @@ buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd pdm \
|
||||
--bash <($out/bin/pdm completion bash) \
|
||||
--fish <($out/bin/pdm completion fish) \
|
||||
--zsh <($out/bin/pdm completion zsh)
|
||||
export PDM_LOG_DIR=/tmp/pdm/log
|
||||
$out/bin/pdm completion bash >pdm.bash
|
||||
$out/bin/pdm completion fish >pdm.fish
|
||||
$out/bin/pdm completion zsh >pdm.zsh
|
||||
installShellCompletion pdm.{bash,fish,zsh}
|
||||
unset PDM_LOG_DIR
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "cdxgen";
|
||||
version = "10.3.5";
|
||||
version = "10.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppThreat";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Tpmx94pQq7lqDvTtPY0chwcwAMmydkFFv2IlXb+q8EU=";
|
||||
sha256 = "sha256-m6AtAbsZ7zPu7MlwEt9+RBs11DAHNa3x0Nn7b3TWdAY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-V7eLhscu7gTLtfq0OI3yCfT5Xlkbj54WrgOM6WUArTU=";
|
||||
npmDepsHash = "sha256-z7tBghs2bg2eYNRkhe9J8/0rqaAXV5e5ZT9u5fdABe0=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.77.0";
|
||||
version = "0.77.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "grype";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EnAMAmoP8rbkOkdPPxkN14lOPVYPqVpmaekfXBboeyI=";
|
||||
hash = "sha256-Qfoo05MicnQ1shbEV/Rrz9TDrMBDvWBr0U/ZqnlnLTI=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -30,7 +30,7 @@ buildGoModule rec {
|
|||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-oJNTvbfVkz4fK+EsF2ZoFfBSlkt0pFT4r2QDyhZhv5Y=";
|
||||
vendorHash = "sha256-lAq1PRElWR0F+OfuSBpR/gnFOptFH33ObR8yd1k7oMk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pinentry-bemenu";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "t-8ch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-h+PC8IGwCW5ZroLGpypcmpejOo+JGM7zG4N5fguBWvM=";
|
||||
sha256 = "sha256-m6P8/cCdGH2c9ne8aLrh6pUJ6Ekn+CNyEn3WlD2LhU8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,31 +1,30 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, coreutils
|
||||
, pcsclite
|
||||
, PCSC
|
||||
, pkg-config
|
||||
, hsmSupport ? true
|
||||
, nixosTests
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
coreutils,
|
||||
pcsclite,
|
||||
PCSC,
|
||||
pkg-config,
|
||||
hsmSupport ? true,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "step-ca";
|
||||
version = "0.25.2";
|
||||
version = "0.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smallstep";
|
||||
repo = "certificates";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cP3QypBNWGbr7R7lJLfaoBh6C37ubGuaxnxWlZ1Z000=";
|
||||
hash = "sha256-yej7gzhaUPbcvqbse7Hh7Im38+DUfC9UZkpjpuG8ctk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AXMMpzXEhdKSGeVg/KK2NEgalxIXP6DUTcoxOQVqow4=";
|
||||
vendorHash = "sha256-XlfdIg8YHCeCvc7kZczUxlxUonyZSQATgsxLTMvNDk4=";
|
||||
|
||||
nativeBuildInputs = lib.optionals hsmSupport [
|
||||
pkg-config
|
||||
];
|
||||
nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ];
|
||||
|
||||
buildInputs =
|
||||
lib.optionals (hsmSupport && stdenv.isLinux) [ pcsclite ]
|
||||
|
|
@ -62,6 +61,10 @@ buildGoModule rec {
|
|||
homepage = "https://smallstep.com/certificates/";
|
||||
changelog = "https://github.com/smallstep/certificates/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cmcdragonkai mohe2015 techknowlogick ];
|
||||
maintainers = with maintainers; [
|
||||
cmcdragonkai
|
||||
mohe2015
|
||||
techknowlogick
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xjadeo";
|
||||
version = "0.8.13";
|
||||
version = "0.8.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x42";
|
||||
repo = "xjadeo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CSq11hFNmo41VXOndBoPxRc9NNUUBtzfWx14DCUFieQ=";
|
||||
sha256 = "sha256-GTg0W3D0BRSxsmeVsB4On3MfwncScEGFJGVJK7wflCM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -13513,9 +13513,6 @@ with pkgs;
|
|||
|
||||
tailer = callPackage ../tools/misc/tailer { };
|
||||
|
||||
inherit (callPackages ../applications/networking/taler { })
|
||||
taler-exchange taler-merchant;
|
||||
|
||||
tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { };
|
||||
|
||||
tango = callPackage ../applications/misc/tango { };
|
||||
|
|
@ -32308,7 +32305,7 @@ with pkgs;
|
|||
kid3-qt = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; };
|
||||
kid3 = kid3-kde;
|
||||
|
||||
kile = libsForQt5.callPackage ../applications/editors/kile { };
|
||||
kile = callPackage ../applications/editors/kile { };
|
||||
|
||||
kitsas = libsForQt5.callPackage ../applications/office/kitsas { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue