Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
e859576396
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
@ -107,7 +107,7 @@
|
||||
/pkgs/top-level/python-packages.nix @FRidh @jonringer
|
||||
/pkgs/development/interpreters/python @FRidh
|
||||
/pkgs/development/python-modules @FRidh @jonringer
|
||||
/doc/languages-frameworks/python.section.md @FRidh
|
||||
/doc/languages-frameworks/python.section.md @FRidh @mweinelt
|
||||
/pkgs/development/tools/poetry2nix @adisbladis
|
||||
/pkgs/development/interpreters/python/hooks @FRidh @jonringer
|
||||
|
||||
|
||||
@ -571,7 +571,7 @@ in
|
||||
defaultText = literalExpression "pkgs.nginxStable";
|
||||
type = types.package;
|
||||
apply = p: p.override {
|
||||
modules = p.modules ++ cfg.additionalModules;
|
||||
modules = lib.unique (p.modules ++ cfg.additionalModules);
|
||||
};
|
||||
description = lib.mdDoc ''
|
||||
Nginx package to use. This defaults to the stable version. Note
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchurl, appimageTools, imagemagick, systemd }:
|
||||
{ lib, fetchurl, appimageTools, imagemagick }:
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
|
||||
@ -1,34 +1,44 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, mkDerivation
|
||||
, stdenv
|
||||
, cmake
|
||||
, libepoxy
|
||||
, extra-cmake-modules
|
||||
, libarchive
|
||||
, libpcap
|
||||
, libslirp
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, SDL2
|
||||
, wayland
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "melonDS";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Arisotura";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FSacau7DixU6R4eKNIYVRZiMb/GhijTzHbcGlZ6WG/I=";
|
||||
sha256 = "sha256-n4Vkxb/7fr214PgB6VFNgH1tMDgTBS/UHUQ6V4uGkDA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libepoxy
|
||||
libarchive
|
||||
libslirp
|
||||
qtbase
|
||||
qtmultimedia
|
||||
SDL2
|
||||
wayland
|
||||
];
|
||||
|
||||
qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" ];
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wibo";
|
||||
version = "0.2.4";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "decompals";
|
||||
repo = "wibo";
|
||||
rev = version;
|
||||
hash = "sha256-dpfKSiIWE9L5BLPH2t8RsUz7Ufkdo/5zn1dewaEgJl0=";
|
||||
hash = "sha256-J5h/RpF+twb5fBjSDQMVB5SoTWWs8VD/EUuikuj73YA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
meta.license = lib.licenses.unfree;
|
||||
};
|
||||
in lib.optionalString doCheck ''
|
||||
MWCIncludes=. ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c
|
||||
MWCIncludes=../test ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c
|
||||
file test.o | grep "ELF 32-bit"
|
||||
'';
|
||||
|
||||
|
||||
@ -28,11 +28,12 @@
|
||||
, qtkeychain
|
||||
, qt3d
|
||||
, qscintilla
|
||||
, qtlocation
|
||||
, qtserialport
|
||||
, qtxmlpatterns
|
||||
, withGrass ? true
|
||||
, grass
|
||||
, withWebKit ? true
|
||||
, withWebKit ? false
|
||||
, qtwebkit
|
||||
, pdal
|
||||
, zstd
|
||||
@ -109,6 +110,7 @@ in mkDerivation rec {
|
||||
qca-qt5
|
||||
qtkeychain
|
||||
qscintilla
|
||||
qtlocation
|
||||
qtserialport
|
||||
qtxmlpatterns
|
||||
qt3d
|
||||
@ -132,7 +134,11 @@ in mkDerivation rec {
|
||||
"-DWITH_3D=True"
|
||||
"-DWITH_PDAL=TRUE"
|
||||
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
|
||||
++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78";
|
||||
++ lib.optional withGrass (let
|
||||
gmajor = lib.versions.major grass.version;
|
||||
gminor = lib.versions.minor grass.version;
|
||||
in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}"
|
||||
);
|
||||
|
||||
dontWrapGApps = true; # wrapper params passed below
|
||||
|
||||
|
||||
@ -28,11 +28,12 @@
|
||||
, qtkeychain
|
||||
, qt3d
|
||||
, qscintilla
|
||||
, qtlocation
|
||||
, qtserialport
|
||||
, qtxmlpatterns
|
||||
, withGrass ? true
|
||||
, grass
|
||||
, withWebKit ? true
|
||||
, withWebKit ? false
|
||||
, qtwebkit
|
||||
, pdal
|
||||
, zstd
|
||||
@ -109,6 +110,7 @@ in mkDerivation rec {
|
||||
qca-qt5
|
||||
qtkeychain
|
||||
qscintilla
|
||||
qtlocation
|
||||
qtserialport
|
||||
qtxmlpatterns
|
||||
qt3d
|
||||
@ -132,7 +134,11 @@ in mkDerivation rec {
|
||||
"-DWITH_3D=True"
|
||||
"-DWITH_PDAL=TRUE"
|
||||
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
|
||||
++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78";
|
||||
++ lib.optional withGrass (let
|
||||
gmajor = lib.versions.major grass.version;
|
||||
gminor = lib.versions.minor grass.version;
|
||||
in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}"
|
||||
);
|
||||
|
||||
dontWrapGApps = true; # wrapper params passed below
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, boost
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, mkDerivation
|
||||
, muparser
|
||||
@ -15,38 +14,42 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "librecad";
|
||||
version = "2.2.0-rc2";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibreCAD";
|
||||
repo = "LibreCAD";
|
||||
rev = version;
|
||||
sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE=";
|
||||
sha256 = "sha256-horKTegmvcMg4m5NbZ4nzy4J6Ac/6+E5OkiZl0v6TBc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/LibreCAD/LibreCAD/pull/1465/commits/4edcbe72679f95cb60979c77a348c1522a20b0f4.patch";
|
||||
sha256 = "sha256-P0G2O5sL7Ip860ByxFQ87TfV/lq06wCQnzPxADGqFPs=";
|
||||
name = "CVE-2021-45342.patch";
|
||||
})
|
||||
buildInputs = [
|
||||
boost
|
||||
muparser
|
||||
qtbase
|
||||
qtsvg
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pkg-config
|
||||
qmake
|
||||
qttools
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
"MUPARSER_DIR=${muparser}"
|
||||
"BOOST_DIR=${boost.dev}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/postprocess-unix.sh \
|
||||
--replace /bin/sh ${runtimeShell}
|
||||
|
||||
substituteInPlace librecad/src/lib/engine/rs_system.cpp \
|
||||
--replace /usr/share $out/share
|
||||
|
||||
substituteInPlace librecad/src/main/qc_applicationwindow.cpp \
|
||||
--replace __DATE__ 0
|
||||
'';
|
||||
|
||||
qmakeFlags = [
|
||||
"MUPARSER_DIR=${muparser}"
|
||||
"BOOST_DIR=${boost.dev}"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -65,20 +68,6 @@ mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
muparser
|
||||
qtbase
|
||||
qtsvg
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pkg-config
|
||||
qmake
|
||||
qttools
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "2D CAD package based on Qt";
|
||||
homepage = "https://librecad.org";
|
||||
|
||||
@ -90,11 +90,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.46.133";
|
||||
version = "1.46.144";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "sha256-362XVFFsVWR/H0mcn1XQh3tsemksEnqR5quOIwf2QQE=";
|
||||
sha256 = "sha256-RivuyMPrqBXeTENrH4wApqHglPAZHVXMd863Wlh+EHY=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -19,9 +19,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "109.0.5414.46",
|
||||
"sha256": "17wzll9024c80fhgxi33ix1rpmqh9sbpx6qvw9cvhdlmhn0b5017",
|
||||
"sha256bin64": "199n8a7pjnhbgkm2dwh9hq7pzf39x932bh6b056jqp032d5c00ns",
|
||||
"version": "109.0.5414.61",
|
||||
"sha256": "1dk832ishjhba0rnf57w7vqrr8dyqga6zsgw9945i7zz997fpjyi",
|
||||
"sha256bin64": "1s1d7h9ygzpa5b39pdivn5vvpm7fpnhw5p3lz8blrgn61m8h6jg6",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-11-10",
|
||||
|
||||
36
pkgs/applications/networking/cluster/karmor/default.nix
Normal file
36
pkgs/applications/networking/cluster/karmor/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "karmor";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubearmor";
|
||||
repo = "kubearmor-client";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-s1G5ZcXtjL9TxYpEUvnqiQXaY7OFUwCDXFongRM48Xk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VvjcGiBxK2OVvIEc/ScwUT6zJZTccnXu/JfXKXc5WNY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# integration tests require network access
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/{kubearmor-client,karmor}
|
||||
installShellCompletion --cmd karmor \
|
||||
--bash <($out/bin/karmor completion bash) \
|
||||
--fish <($out/bin/karmor completion fish) \
|
||||
--zsh <($out/bin/karmor completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A client tool to help manage KubeArmor";
|
||||
homepage = "https://kubearmor.io";
|
||||
changelog = "https://github.com/kubearmor/kubearmor-client/releases/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
};
|
||||
}
|
||||
@ -128,4 +128,5 @@ symlinkJoin {
|
||||
name = "msmtp-${version}";
|
||||
inherit version meta;
|
||||
paths = [ binaries scripts ];
|
||||
passthru = { inherit binaries scripts; };
|
||||
}
|
||||
|
||||
39
pkgs/applications/networking/netmaker/default.nix
Normal file
39
pkgs/applications/networking/netmaker/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ buildGoModule, fetchFromGitHub, installShellFiles, lib, libglvnd, pkg-config, xorg }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "netmaker";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gravitl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8uxPPhy1/FqPGouqzUxY2lGnO/giqH9bJbAqQ9rZI0g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4LaGwwDu3pKd6I6r/F3isCi9CuFqPGvc5SdVTV34qOI=";
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
"netclient"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
libglvnd
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXinerama
|
||||
xorg.libXrandr
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "WireGuard automation from homelab to enterprise";
|
||||
homepage = "https://netmaker.io";
|
||||
changelog = "https://github.com/gravitl/netmaker/-/releases/v${version}";
|
||||
license = licenses.sspl;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
};
|
||||
}
|
||||
@ -1,17 +1,17 @@
|
||||
{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
|
||||
{ lib, fetchFromGitHub, buildGoModule, installShellFiles, testers, gh }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.21.1";
|
||||
version = "2.21.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DVdbyHGBnbFkKu0h01i0d1qw5OuBYydyP7qHc6B1qs0=";
|
||||
sha256 = "sha256-syd7OMBEMv9uJUDjIIqVkJ3pvuyKnD5pubG4d3TbkY8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-b4pNcOfG+W+l2cqn4ncvR47zJltKYIcE3W1GvrWEOFY=";
|
||||
vendorSha256 = "sha256-m9K43Ns8j82nMkz+zkmC7HueOA6q6T4mFPQ1GSdqo24=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -42,6 +42,10 @@ buildGoModule rec {
|
||||
# most tests require network access
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = gh;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "GitHub CLI tool";
|
||||
homepage = "https://cli.github.com/";
|
||||
|
||||
@ -47,13 +47,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkvtoolnix";
|
||||
version = "71.1.0";
|
||||
version = "72.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mbunkus";
|
||||
repo = "mkvtoolnix";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-JHbnjcXOctB6HQeHXykWbykdn35S2fCYegMkc3GLmAI=";
|
||||
sha256 = "sha256-3XKvcV6vwXrn2mf8ziclKgEPOwn3IPyLYy6+d0DscHs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, ffmpeg
|
||||
, ffmpeg_5
|
||||
, freefont_ttf
|
||||
, freetype
|
||||
, libass
|
||||
@ -129,7 +129,7 @@ in stdenv.mkDerivation rec {
|
||||
++ lib.optionals waylandSupport [ wayland-scanner ];
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
ffmpeg_5
|
||||
freetype
|
||||
libass
|
||||
libpthreadstubs
|
||||
|
||||
@ -33,6 +33,7 @@ in stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBoost_ROOT=${boost}"
|
||||
"-DUSE_BOOST_WAVE=ON"
|
||||
"-DENABLE_RTTI=ON"
|
||||
|
||||
@ -73,7 +74,6 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "Advanced shading language for production GI renderers";
|
||||
homepage = "https://opensource.imageworks.com/osl.html";
|
||||
maintainers = with maintainers; [ hodapp ];
|
||||
|
||||
@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
fixupPhase = ''
|
||||
wrapProgram "$out/bin/chibi-scheme" \
|
||||
--prefix CHIBI_MODULE_PATH : "$out/share/chibi:$out/lib/chibi"
|
||||
--prefix CHIBI_MODULE_PATH : "$out/share/chibi:$out/lib/chibi" \
|
||||
${lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib"}
|
||||
|
||||
for f in chibi-doc chibi-ffi snow-chibi; do
|
||||
substituteInPlace "$out/bin/$f" \
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch2
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -37,6 +38,13 @@ stdenv.mkDerivation rec {
|
||||
# but not from its own datadr (it assumes it will be in XDG_DATA_DIRS).
|
||||
# Since this is not generally true with Nix, let’s add $out/share unconditionally.
|
||||
./4.x-nix_share_path.patch
|
||||
|
||||
# Add Nix syntax highlighting.
|
||||
# https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/303
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/2cc7fd079f9fc8b593c727c68a2c783c82299562.patch";
|
||||
sha256 = "bTYWjEDpdbnUxcYNKl2YtSLfYlMfcbQSSYQjhixOGS8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
|
||||
"-DLINK_PYTHON_LIBRARY=${onOff pythonSupport}"
|
||||
"-DPYTHON_BINDINGS=${onOff pythonSupport}"
|
||||
"-DDOCUMENTATION=${onOff docSupport}"
|
||||
] ++ lib.optionals pythonSupport [
|
||||
"-DPYTHON_EXECUTABLE=${python3.pythonForBuild.interpreter}"
|
||||
"-DPYTHON_LIBRARY=${python3}/lib/libpython${python3.pythonVersion}${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lime";
|
||||
version = "5.1.61";
|
||||
version = "5.2.6";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-cgc3123UvOzasBp/ImzXjt1JCkdqwPLnnk0PiStVcB8=";
|
||||
sha256 = "sha256-WQ6AcJpQSvWR5m2edVNji5u6ZiS4QOH45vQN2q+39NU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
|
||||
find $dev/include -type f -a ! -iname '*.h' -delete
|
||||
|
||||
install -D -m755 -t $out/lib ../bin/Release/libopenfec${so}
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -id $out/lib/libopenfec${so} $out/lib/libopenfec${so}
|
||||
'' + ''
|
||||
ln -s libopenfec${so} $out/lib/libopenfec${so}.1
|
||||
'';
|
||||
|
||||
|
||||
@ -3,19 +3,29 @@
|
||||
stdenv.mkDerivation rec
|
||||
{
|
||||
pname = "openvdb";
|
||||
version = "9.1.0";
|
||||
version = "10.0.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dreamworksanimation";
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "openvdb";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OP1xCR1YW60125mhhrW5+8/4uk+EBGIeoWGEU9OiIGY=";
|
||||
sha256 = "sha256-kaf5gpGYVWinmnRwR/IafE1SJcwmP2psfe/UZdtH1Og=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ];
|
||||
|
||||
cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" ];
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $dev/lib/cmake/OpenVDB/FindOpenVDB.cmake \
|
||||
--replace \''${OPENVDB_LIBRARYDIR} $out/lib \
|
||||
--replace \''${OPENVDB_INCLUDEDIR} $dev/include
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open framework for voxel";
|
||||
homepage = "https://www.openvdb.org";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl, nimPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tkrzw";
|
||||
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = false; # memory intensive
|
||||
|
||||
passthru.tests.nim = nimPackages.tkrzw;
|
||||
meta = with lib; {
|
||||
description = "A set of implementations of DBM";
|
||||
homepage = "https://dbmx.net/tkrzw/";
|
||||
|
||||
18
pkgs/development/nim-packages/base32/default.nix
Normal file
18
pkgs/development/nim-packages/base32/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ lib, buildNimPackage, fetchFromGitHub }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "base32";
|
||||
version = "0.1.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenSystemsLab";
|
||||
repo = "${pname}.nim";
|
||||
rev = version;
|
||||
hash = "sha256-BsDly13xsY2bu4N9LGHB0OGej/JhAx3B01TDdF0M8Jk=";
|
||||
};
|
||||
doCheck = true;
|
||||
meta = src.meta // {
|
||||
description = "Base32 library for Nim";
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
21
pkgs/development/nim-packages/cbor/default.nix
Normal file
21
pkgs/development/nim-packages/cbor/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, buildNimPackage, fetchFromSourcehut }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "cbor";
|
||||
version = "20221007";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ehmry";
|
||||
repo = "nim_${pname}";
|
||||
rev = version;
|
||||
hash = "sha256-zFkYsXFRAiBrfz3VNML3l+rYrdJmczl0bfZcJSbHHbM=";
|
||||
};
|
||||
doCheck = true;
|
||||
meta = with lib;
|
||||
src.meta // {
|
||||
description =
|
||||
"Concise Binary Object Representation decoder and encoder (RFC8949)";
|
||||
license = licenses.unlicense;
|
||||
maintainers = [ maintainers.ehmry ];
|
||||
mainProgram = "cbordiag";
|
||||
};
|
||||
}
|
||||
18
pkgs/development/nim-packages/nimSHA2/default.nix
Normal file
18
pkgs/development/nim-packages/nimSHA2/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ lib, buildNimPackage, fetchFromGitHub }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "nimSHA2";
|
||||
version = "unstable-2021-09-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jangko";
|
||||
repo = pname;
|
||||
rev = "b8f666069dff1ed0c5142dd1ca692f0e71434716";
|
||||
hash = "sha256-Wqb3mQ7638UOTze71mf6WMyGiw9qTwhbJiGGb+9OR2k=";
|
||||
};
|
||||
doCheck = true;
|
||||
meta = src.meta // {
|
||||
description = "Secure Hash Algorithm 2";
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
18
pkgs/development/nim-packages/npeg/default.nix
Normal file
18
pkgs/development/nim-packages/npeg/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ lib, buildNimPackage, fetchFromGitHub }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "npeg";
|
||||
version = "1.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zevv";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-EN3wTSa+WveO7V29A2lJgWLwIlHzQE8t7T2m4u7niMc=";
|
||||
};
|
||||
doCheck = true;
|
||||
meta = src.meta // {
|
||||
description = "NPeg is a pure Nim pattern matching library";
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
19
pkgs/development/nim-packages/taps/default.nix
Normal file
19
pkgs/development/nim-packages/taps/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ lib, buildNimPackage, fetchFromSourcehut, getdns }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "taps";
|
||||
version = "20221228";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ehmry";
|
||||
repo = "nim_${pname}";
|
||||
rev = version;
|
||||
hash = "sha256-0EjMP5pIPJg4/3nzj6ECC68f709TS06OrJlTZ0tavEo=";
|
||||
};
|
||||
propagatedBuildInputs = [ getdns ];
|
||||
doCheck = false;
|
||||
meta = src.meta // {
|
||||
description = "Transport Services Interface";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = [ lib.maintainers.ehmry ];
|
||||
};
|
||||
}
|
||||
21
pkgs/development/nim-packages/tkrzw/default.nix
Normal file
21
pkgs/development/nim-packages/tkrzw/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, buildNimPackage, fetchFromSourcehut, pkg-config, tkrzw }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "tkrzw";
|
||||
version = "20220922";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ehmry";
|
||||
repo = "nim-${pname}";
|
||||
rev = version;
|
||||
hash = "sha256-66rUuK+wUrqs1QYjteZcaIrfg+LHQNcR+XM+EtVuGsA=";
|
||||
};
|
||||
propagatedNativeBuildInputs = [ pkg-config ];
|
||||
propagatedBuildInputs = [ tkrzw ];
|
||||
doCheck = true;
|
||||
meta = with lib;
|
||||
src.meta // {
|
||||
description = "Nim wrappers over some of the Tkrzw C++ library";
|
||||
license = lib.licenses.apsl20;
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
}
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioaladdinconnect";
|
||||
version = "0.1.48";
|
||||
version = "0.1.50";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "AIOAladdinConnect";
|
||||
inherit version;
|
||||
hash = "sha256-FrefWV42+DqvuAVScavwqtCfiCRXacuCruqGP0Gks6Y=";
|
||||
hash = "sha256-5IeqIEIQzPq5GkuAf/92J0SBI3Lu1ftJ4UOj4oQLQC4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bincopy";
|
||||
version = "17.11.0";
|
||||
version = "17.14.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-rk7jYr9jUz7TUckoYkv74rr5D9fJLD3h7UFBH0XeleE=";
|
||||
sha256 = "sha256-sx+0sBbY2P6vQt38e2M72GLU8tRwKOMpVWNNNtEXx0k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -43,14 +43,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "4.1.4";
|
||||
version = "4.1.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-04pOEI0jhsuWN9pmqC3I0HM8rt5Mg8Sv29p4r0IUIRs=";
|
||||
hash = "sha256-/1br1+rQ/V2+Bv4VewAkp6rqLgWTuzeF+1lM+U2tWO8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = pname;
|
||||
rev = "${version}";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-uJgm8l1SxIRC5PV6BIH/ht/1ucGT5UaUhkFMdusejgA=";
|
||||
};
|
||||
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mailchecker";
|
||||
version = "5.0.5";
|
||||
version = "5.0.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-RtARu9+EKUMOOJjUdkEZ5KYz9DzzlLeNhkRMLSm4AYo=";
|
||||
hash = "sha256-g70FjY0tc4KjgdVweuBBkFrByt8xlGPJEPz/OvTtjZk=";
|
||||
};
|
||||
|
||||
# Module has no tests
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "motionblinds";
|
||||
version = "0.6.14";
|
||||
version = "0.6.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "starkillerOG";
|
||||
repo = "motion-blinds";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-OHFOV0vOAw54XOfgDUSARKIAgkWFnvf8O9xXJYZHPFE=";
|
||||
hash = "sha256-OTnlfJeE64tURR5YrTXjzTHbvGnbeEWu9UHGynzmSiQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "9.2.2";
|
||||
version = "9.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Azco/ZFWDqb+gTskW3V44YJ9Zi3Fg2nYLY4PXvqOrRo=";
|
||||
hash = "sha256-/NsPRspe/Q1hgcgMatFUPWuSfNz0rnmQ2k2fYDo5CnQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytibber";
|
||||
version = "0.26.6";
|
||||
version = "0.26.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyTibber";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-A/P59fhXlMu1QF1Nc7zeE9q4KgS6ABe7FraZWZPYDys=";
|
||||
hash = "sha256-T2J31+H/cO000qi2AlEGaFtAu0fl7u1LAA/QUxRAiK8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
54
pkgs/development/python-modules/quadprog/default.nix
Normal file
54
pkgs/development/python-modules/quadprog/default.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, cython
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, scipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "quadprog";
|
||||
version = "0.1.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/suv1KbG3HbiYqEiuCtB/ia3xbxAO5AMuWx1Svy0rMw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
cython quadprog/quadprog.pyx
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
scipy
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# test fails on aarch64-darwin
|
||||
"--deselect=tests/test_1.py::test_5"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/quadprog/quadprog";
|
||||
changelog = "https://github.com/quadprog/quadprog/releases/tag/v${version}";
|
||||
description = "Quadratic Programming Solver";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
};
|
||||
}
|
||||
67
pkgs/development/python-modules/reolink-aio/default.nix
Normal file
67
pkgs/development/python-modules/reolink-aio/default.nix
Normal file
@ -0,0 +1,67 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, aiounittest
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, ffmpeg-python
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-KUsBCV8OVPj0QC1DKUBVRqtt1dpGq+JunuBZsZKfQno=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
ffmpeg-python
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aiounittest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Packages in nixpkgs is different than the module name
|
||||
substituteInPlace setup.py \
|
||||
--replace "ffmpeg" "ffmpeg-python"
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests/test.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test1_settings"
|
||||
"test2_states"
|
||||
"test3_images"
|
||||
"test4_properties"
|
||||
"test_succes"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"reolink_aio"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to interact with the Reolink IP camera API";
|
||||
homepage = "https://github.com/starkillerOG/reolink_aio";
|
||||
changelog = "https://github.com/starkillerOG/reolink_aio/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "fwestenberg";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-XUYTDHh0oTro6BT+h4LjRdMukOZTlWP+giFpjLciZNQ=";
|
||||
hash = "sha256-XUYTDHh0oTro6BT+h4LjRdMukOZTlWP+giFpjLciZNQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -61,8 +61,9 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to interact with the Reolink IP camera API";
|
||||
description = "Module to interact with the Reolink IP camera API";
|
||||
homepage = "https://github.com/fwestenberg/reolink";
|
||||
changelog = "https://github.com/fwestenberg/reolink/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -167,7 +167,7 @@ in buildPythonPackage rec {
|
||||
] ++ lib.optionals cudaSupport [ cudatoolkit_joined ];
|
||||
|
||||
buildInputs = [ blas blas.provider pybind11 ]
|
||||
++ [ linuxHeaders_5_19 ] # TMP: avoid "flexible array member" errors for now
|
||||
++ lib.optionals stdenv.isLinux [ linuxHeaders_5_19 ] # TMP: avoid "flexible array member" errors for now
|
||||
++ lib.optionals cudaSupport [ cudnn magma nccl ]
|
||||
++ lib.optionals stdenv.isLinux [ numactl ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreServices libobjc ];
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
, kio
|
||||
, kitemmodels
|
||||
, kitemviews
|
||||
, kparts
|
||||
, kwindowsystem
|
||||
, libelf
|
||||
, qtbase
|
||||
@ -21,13 +22,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "hotspot";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDAB";
|
||||
repo = "hotspot";
|
||||
rev = "v${version}";
|
||||
sha256 = "1f68bssh3p387hkavfjkqcf7qf7w5caznmjfjldicxphap4riqr5";
|
||||
hash = "sha256-7GuIe8F3QqosW/XaN3KC1WeWcI7woUiEc9Nw0b+fSk0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -36,12 +37,13 @@ mkDerivation rec {
|
||||
extra-cmake-modules
|
||||
];
|
||||
buildInputs = [
|
||||
elfutils
|
||||
(elfutils.override { enableDebuginfod = true; }) # perfparser needs to find debuginfod.h
|
||||
kconfigwidgets
|
||||
ki18n
|
||||
kio
|
||||
kitemmodels
|
||||
kitemviews
|
||||
kparts
|
||||
kwindowsystem
|
||||
libelf
|
||||
qtbase
|
||||
@ -60,11 +62,6 @@ mkDerivation rec {
|
||||
mkdir -p 3rdparty/{perfparser,PrefixTickLabels}/.git
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DRUSTC_DEMANGLE_INCLUDE_DIR=${rustc-demangle}/include"
|
||||
"-DRUSTC_DEMANGLE_LIBRARY=${rustc-demangle}/lib/librustc_demangle.so"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A GUI for Linux perf";
|
||||
longDescription = ''
|
||||
|
||||
@ -1,18 +1,29 @@
|
||||
{ lib, buildGoPackage, fetchFromGitLab }:
|
||||
buildGoPackage rec {
|
||||
{ lib, buildGoModule, fetchFromGitLab, python3 }:
|
||||
buildGoModule rec {
|
||||
pname = "loccount";
|
||||
version = "1.2";
|
||||
|
||||
goPackagePath = "gitlab.com/esr/loccount";
|
||||
excludedPackages = "tests";
|
||||
version = "2.14";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "esr";
|
||||
repo = "loccount";
|
||||
rev = version;
|
||||
sha256 = "18z7ai7wy2k9yd3w65d37apfqs3h9bc2c15y7v1bydppi44zfsdk";
|
||||
hash = "sha256-9tzDNwWM4uzxC+xqM603l8EIqYrGUUvZgSe6r1EyHi8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
|
||||
excludedPackages = "tests";
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs --build tablegen.py
|
||||
|
||||
go generate
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Re-implementation of sloccount in Go";
|
||||
longDescription = ''
|
||||
@ -26,10 +37,9 @@ buildGoPackage rec {
|
||||
an exception; loccount corrects buggy counting of single-quote multiline
|
||||
literals in sloccount 2.26.
|
||||
'';
|
||||
homepage="https://gitlab.com/esr/loccount";
|
||||
downloadPage="https://gitlab.com/esr/loccount/tree/master";
|
||||
homepage = "https://gitlab.com/esr/loccount";
|
||||
downloadPage = "https://gitlab.com/esr/loccount/tree/master";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ calvertvl ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
, yabai
|
||||
, xxd
|
||||
, xcodebuild
|
||||
# These all need to be from SDK 11.0 or later starting with yabai 5.0.0
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, ScriptingBridge
|
||||
# This needs to be from SDK 10.13 or higher, SLS APIs introduced in that version get used
|
||||
, SkyLight
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "yabai";
|
||||
version = "4.0.4";
|
||||
version = "5.0.2";
|
||||
|
||||
test-version = testers.testVersion {
|
||||
package = yabai;
|
||||
@ -52,7 +52,7 @@ in
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
|
||||
sha256 = "sha256-NS8tMUgovhWqc6WdkNI4wKee411i/e/OE++JVc86kFE=";
|
||||
sha256 = "sha256-wL6N2+mfFISrOFn4zaCQI+oH6ixwUMRKRi1dAOigBro=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -81,14 +81,14 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
x86_64-darwin = stdenv.mkDerivation rec {
|
||||
x86_64-darwin = stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koekeishiya";
|
||||
repo = "yabai";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TeT+8UAV2jR60XvTs4phkp611Gi0nzLmQnezLA0xb44=";
|
||||
sha256 = "sha256-/HS8TDzDA4Zvmm56ZZeMXyCKHRRTcucd7qDHT0qbrQg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -128,50 +128,15 @@ in
|
||||
mkdir -p $out/{bin,share/icons/hicolor/scalable/apps}
|
||||
|
||||
cp ./bin/yabai $out/bin/yabai
|
||||
ln -s ${loadScriptingAddition} $out/bin/yabai-load-sa
|
||||
cp ./assets/icon/icon.svg $out/share/icons/hicolor/scalable/apps/yabai.svg
|
||||
installManPage ./doc/yabai.1
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Defining this here exposes it as a passthru attribute, which is useful because it allows us to run `builtins.hashFile` on it in pure-eval mode.
|
||||
# With that we can programmatically generate an `/etc/sudoers.d` entry which disables the password requirement, so that a user-agent can run it at login.
|
||||
loadScriptingAddition = writeShellScript "yabai-load-sa" ''
|
||||
# For whatever reason the regular commands to load the scripting addition do not work, yabai will throw an error.
|
||||
# The installation command mutably installs binaries to '/System', but then fails to start them. Manually running
|
||||
# the bins as root does start the scripting addition, so this serves as a more user-friendly way to do that.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if [[ "$EUID" != 0 ]]; then
|
||||
echo "error: the scripting-addition loader must ran as root. try 'sudo $0'"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
loaderPath="/Library/ScriptingAdditions/yabai.osax/Contents/MacOS/mach_loader";
|
||||
|
||||
if ! test -x "$loaderPath"; then
|
||||
echo "could not locate the scripting-addition loader at '$loaderPath', installing it..."
|
||||
echo "note: this may display an error"
|
||||
|
||||
eval "$(dirname "''${BASH_SOURCE[0]}")/yabai --install-sa" || true
|
||||
sleep 1
|
||||
fi
|
||||
|
||||
echo "executing loader..."
|
||||
eval "$loaderPath"
|
||||
echo "scripting-addition started"
|
||||
'';
|
||||
|
||||
passthru.tests.version = test-version;
|
||||
|
||||
meta = _meta // {
|
||||
longDescription = _meta.longDescription + ''
|
||||
Note that due to a nix-only bug the scripting addition cannot be launched using the regular
|
||||
procedure. Instead, you can use the provided `yabai-load-sa` script.
|
||||
'';
|
||||
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
];
|
||||
|
||||
@ -1,15 +1,12 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
, bash
|
||||
, dnsmasq
|
||||
, gawk
|
||||
, getent
|
||||
, kmod
|
||||
, lxc
|
||||
, iproute2
|
||||
, iptables
|
||||
, nftables
|
||||
, util-linux
|
||||
, which
|
||||
|
||||
@ -8,13 +8,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bazarr";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
|
||||
sha256 = "sha256-jt6E+VtD7JdPIJdWBkVrQyiNfT7vxSYz4kXrFQAdpXE=";
|
||||
sha256 = "sha256-eitChQTTkiNY/NbDM+u2ZlyuczzJ9nVjIS1sS05DO3Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gonic";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sentriz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xq2Xk5iAKq+ttYYDNef0P3ewURmn/arTNhVc0I5gHLY=";
|
||||
sha256 = "sha256-lyKKD6Rxr4psFUxqGTtqQ3M/vQXoNPbcg0cTam9MkXk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
, zlib
|
||||
, liburing
|
||||
, gnutls
|
||||
, libunwind
|
||||
, systemd
|
||||
, samba
|
||||
, jansson
|
||||
@ -41,6 +40,7 @@
|
||||
, enableCephFS ? false, ceph
|
||||
, enableGlusterFS ? false, glusterfs, libuuid
|
||||
, enableAcl ? (!stdenv.isDarwin), acl
|
||||
, enableLibunwind ? (!stdenv.isDarwin), libunwind
|
||||
, enablePam ? (!stdenv.isDarwin), pam
|
||||
}:
|
||||
|
||||
@ -75,11 +75,12 @@ stdenv.mkDerivation rec {
|
||||
perl.pkgs.ParseYapp
|
||||
perl.pkgs.JSON
|
||||
libxslt
|
||||
buildPackages.stdenv.cc
|
||||
docbook_xsl
|
||||
docbook_xml_dtd_45
|
||||
cmocka
|
||||
rpcsvc-proto
|
||||
] ++ optionals stdenv.isLinux [
|
||||
buildPackages.stdenv.cc
|
||||
] ++ optional (stdenv.buildPlatform != stdenv.hostPlatform) samba # asn1_compile/compile_et
|
||||
++ optionals stdenv.isDarwin [
|
||||
fixDarwinDylibNames
|
||||
@ -98,7 +99,6 @@ stdenv.mkDerivation rec {
|
||||
libbsd
|
||||
libarchive
|
||||
zlib
|
||||
libunwind
|
||||
gnutls
|
||||
libtasn1
|
||||
tdb
|
||||
@ -113,6 +113,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional (enableCephFS && stdenv.isLinux) (lib.getDev ceph)
|
||||
++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ]
|
||||
++ optional enableAcl acl
|
||||
++ optional enableLibunwind libunwind
|
||||
++ optional enablePam pam;
|
||||
|
||||
postPatch = ''
|
||||
@ -133,7 +134,6 @@ stdenv.mkDerivation rec {
|
||||
wafConfigureFlags = [
|
||||
"--with-static-modules=NONE"
|
||||
"--with-shared-modules=ALL"
|
||||
"--with-libunwind"
|
||||
"--enable-fhs"
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
@ -143,7 +143,8 @@ stdenv.mkDerivation rec {
|
||||
++ optionals (!enableLDAP) [
|
||||
"--without-ldap"
|
||||
"--without-ads"
|
||||
] ++ optional enableProfiling "--with-profiling-data"
|
||||
] ++ optional enableLibunwind "--with-libunwind"
|
||||
++ optional enableProfiling "--with-profiling-data"
|
||||
++ optional (!enableAcl) "--without-acl-support"
|
||||
++ optional (!enablePam) "--without-pam"
|
||||
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
@ -175,16 +176,25 @@ stdenv.mkDerivation rec {
|
||||
# Use find -type f -executable -exec echo {} \; -exec sh -c 'ldd {} | grep "not found"' \;
|
||||
# Looks like a bug in installer scripts.
|
||||
postFixup = ''
|
||||
export SAMBA_LIBS="$(find $out -type f -regex '.*\.so\(\..*\)?' -exec dirname {} \; | sort | uniq)"
|
||||
export SAMBA_LIBS="$(find $out -type f -regex '.*\${stdenv.hostPlatform.extensions.sharedLibrary}\(\..*\)?' -exec dirname {} \; | sort | uniq)"
|
||||
read -r -d "" SCRIPT << EOF || true
|
||||
[ -z "\$SAMBA_LIBS" ] && exit 1;
|
||||
BIN='{}';
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
OLD_LIBS="\$(patchelf --print-rpath "\$BIN" 2>/dev/null | tr ':' '\n')";
|
||||
ALL_LIBS="\$(echo -e "\$SAMBA_LIBS\n\$OLD_LIBS" | sort | uniq | tr '\n' ':')";
|
||||
patchelf --set-rpath "\$ALL_LIBS" "\$BIN" 2>/dev/null || exit $?;
|
||||
patchelf --shrink-rpath "\$BIN";
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -id \$BIN \$BIN
|
||||
for old_rpath in \$(otool -L \$BIN | grep /private/tmp/ | awk '{print \$1}'); do
|
||||
new_rpath=\$(find \$SAMBA_LIBS -name \$(basename \$old_rpath) | head -n 1)
|
||||
install_name_tool -change \$old_rpath \$new_rpath \$BIN
|
||||
done
|
||||
'' + ''
|
||||
EOF
|
||||
find $out -type f -regex '.*\.so\(\..*\)?' -exec $SHELL -c "$SCRIPT" \;
|
||||
find $out -type f -regex '.*\${stdenv.hostPlatform.extensions.sharedLibrary}\(\..*\)?' -exec $SHELL -c "$SCRIPT" \;
|
||||
find $out/bin -type f -exec $SHELL -c "$SCRIPT" \;
|
||||
|
||||
# Fix PYTHONPATH for some tools
|
||||
wrapPythonPrograms
|
||||
@ -209,10 +219,7 @@ stdenv.mkDerivation rec {
|
||||
description = "The standard Windows interoperability suite of programs for Linux and Unix";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
# N.B. enableGlusterFS does not build
|
||||
# TODO: darwin support needs newer SDK for "_futimens" and "_utimensat"
|
||||
# see https://github.com/NixOS/nixpkgs/issues/101229
|
||||
broken = stdenv.isDarwin || enableGlusterFS;
|
||||
broken = enableGlusterFS;
|
||||
maintainers = with maintainers; [ aneeshusa ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,13 +6,7 @@ set -u
|
||||
set -o pipefail
|
||||
set -x
|
||||
|
||||
NIX_VERSION=$(nix --version|cut -d ' ' -f 3|cut -c -3)
|
||||
if [[ "$NIX_VERSION" > 2.3 ]]; then
|
||||
nixFlags="--option experimental-features nix-command eval --raw --impure --expr"
|
||||
else
|
||||
nixFlags="eval --raw"
|
||||
fi
|
||||
|
||||
nixFlags="--option experimental-features nix-command eval --raw --impure --expr"
|
||||
export WP_VERSION=$(nix $nixFlags '(import <nixpkgs> {}).wordpress.version')
|
||||
|
||||
PLUGINS=`cat wordpress-plugins.json | jq -r '.[]' | sed -z 's/\n/,/g;s/,$/\n/'`
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{
|
||||
"de_DE": {
|
||||
"path": "de_DE",
|
||||
"rev": "970135",
|
||||
"sha256": "1kd05aihdcf8bqrci50wg4i61mqrjhd6z5d5yb05p4ivaiirak6x",
|
||||
"version": "5.8"
|
||||
"rev": "1010364",
|
||||
"sha256": "0viir2hyfvf8vbnfz8hzijsbdqqqigd887risvdsy8w8ysd71f8r",
|
||||
"version": "6.0"
|
||||
},
|
||||
"fr_FR": {
|
||||
"path": "fr_FR",
|
||||
"rev": "968330",
|
||||
"sha256": "12mzr1i2dl1hh7p93zda6af0xi49mw31v79gg0qgqsnhd5adrlgm",
|
||||
"version": "5.8"
|
||||
"rev": "1004765",
|
||||
"sha256": "0g8h21hi4p0vl6pa57656lm508ycdyhpadq1liwk2d4x183avygh",
|
||||
"version": "6.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,16 +18,16 @@
|
||||
"version": "2.21.08.31"
|
||||
},
|
||||
"breeze": {
|
||||
"path": "breeze/tags/2.0.10",
|
||||
"rev": "2799885",
|
||||
"sha256": "00d36s6ws8bd8qj33nq090lplw2fqj9zz1yzfky4w74lyabih0hw",
|
||||
"version": "2.0.10"
|
||||
"path": "breeze/tags/2.0.14",
|
||||
"rev": "2822681",
|
||||
"sha256": "1c47yw802yrkmbsa922xvh08x0wvcgqdy11j55qr4l9dsk9ljbv3",
|
||||
"version": "2.0.14"
|
||||
},
|
||||
"co-authors-plus": {
|
||||
"path": "co-authors-plus/tags/3.5.2",
|
||||
"rev": "2735979",
|
||||
"sha256": "0ph3iskixi2j6bsnlpd4x8wixzm2hbdzchnyfz9mxzzys93qb41k",
|
||||
"version": "3.5.2"
|
||||
"path": "co-authors-plus/tags/3.5.6",
|
||||
"rev": "2819241",
|
||||
"sha256": "02na4smh9mba8bpksmcbj6k8q2k0024ax40p1k7zs8s22s70nkc1",
|
||||
"version": "3.5.6"
|
||||
},
|
||||
"code-syntax-block": {
|
||||
"path": "code-syntax-block/tags/3.1.1",
|
||||
@ -36,10 +36,10 @@
|
||||
"version": "3.1.1"
|
||||
},
|
||||
"cookie-notice": {
|
||||
"path": "cookie-notice/tags/2.4.1",
|
||||
"rev": "2790369",
|
||||
"sha256": "1a1qnmi81z8c30d6zgcd5xqd08cxkq71g2hzb6xcbdv04036nf77",
|
||||
"version": "2.4.1"
|
||||
"path": "cookie-notice/tags/2.4.4",
|
||||
"rev": "2833482",
|
||||
"sha256": "03ip3yxg8151snbrzmyxxlflrlhdd9gppnlhjlsg46m5760c5bxw",
|
||||
"version": "2.4.4"
|
||||
},
|
||||
"disable-xml-rpc": {
|
||||
"path": "disable-xml-rpc/tags/1.0.1",
|
||||
@ -48,16 +48,16 @@
|
||||
"version": "1.0.1"
|
||||
},
|
||||
"gutenberg": {
|
||||
"path": "gutenberg/tags/14.3.1",
|
||||
"rev": "2800224",
|
||||
"sha256": "1irs8slis4vax8l5pnal6zlaxs6487xh84kq1c89azf9raqx4h0z",
|
||||
"version": "14.3.1"
|
||||
"path": "gutenberg/tags/14.8.4",
|
||||
"rev": "2841225",
|
||||
"sha256": "1nyyqrf61l17crw6pjq5pf9wa657sm0r85b0lxp0vzlpsfsvvw47",
|
||||
"version": "14.8.4"
|
||||
},
|
||||
"jetpack": {
|
||||
"path": "jetpack/tags/11.4",
|
||||
"rev": "2794223",
|
||||
"sha256": "123kfn6wn23sz7zv8yk8rszrxwnjgjfrm0cqpwmrs3h1plfqv7kg",
|
||||
"version": "11.4"
|
||||
"path": "jetpack/tags/11.6",
|
||||
"rev": "2829451",
|
||||
"sha256": "0hfsjcfd10mplsh4k78mmag9nh2zl0m42vrgrykdaw58zwjis2fj",
|
||||
"version": "11.6"
|
||||
},
|
||||
"jetpack-lite": {
|
||||
"path": "jetpack-lite/tags/3.0.3",
|
||||
@ -72,10 +72,10 @@
|
||||
"version": "5.0.18"
|
||||
},
|
||||
"mailpoet": {
|
||||
"path": "mailpoet/tags/3.101.0",
|
||||
"rev": "2800580",
|
||||
"sha256": "050ip4vd514nlfw69ax9x8acszlcsqzd7zw5bdvy1xk3dlva6fkb",
|
||||
"version": "3.101.0"
|
||||
"path": "mailpoet/tags/4.3.0",
|
||||
"rev": "2836720",
|
||||
"sha256": "0igaq34gq5ysk5ai39b641kx7rqsj052m6r55zl6z7xjpxhf37aw",
|
||||
"version": "4.3.0"
|
||||
},
|
||||
"merge-minify-refresh": {
|
||||
"path": "merge-minify-refresh/trunk",
|
||||
@ -85,15 +85,15 @@
|
||||
},
|
||||
"opengraph": {
|
||||
"path": "opengraph/tags/1.11.0",
|
||||
"rev": "2730257",
|
||||
"sha256": "133mzlccbdpppps1aq83n2az4xzikak61k4rdzg9aax23l5ggss6",
|
||||
"rev": "2815207",
|
||||
"sha256": "08fs38gkrfy4i3gx5lpw95hhdqfnzybzxds2ipmpdildx31i9qy1",
|
||||
"version": "1.11.0"
|
||||
},
|
||||
"simple-login-captcha": {
|
||||
"path": "simple-login-captcha/tags/1.3.3",
|
||||
"rev": "2729196",
|
||||
"sha256": "1wy9cbibbngjarc8c9qn4bil3qc8i0h2kz0k364zcsnfpwi8jk3c",
|
||||
"version": "1.3.3"
|
||||
"path": "simple-login-captcha/tags/1.3.4",
|
||||
"rev": "2827561",
|
||||
"sha256": "11lrhgyfas2gxdc8jfckzr9dr0i0cws4gz029gj9zi9n031fr5wc",
|
||||
"version": "1.3.4"
|
||||
},
|
||||
"static-mail-sender-configurator": {
|
||||
"path": "static-mail-sender-configurator/tags/0.9.3",
|
||||
@ -102,10 +102,10 @@
|
||||
"version": "0.9.3"
|
||||
},
|
||||
"webp-converter-for-media": {
|
||||
"path": "webp-converter-for-media/tags/5.3.1",
|
||||
"rev": "2798010",
|
||||
"sha256": "1flggxd6hw0ps3b0y32a2aj9g3zfpzbaiwzx1zn2s7zpxn508y1b",
|
||||
"version": "5.3.1"
|
||||
"path": "webp-converter-for-media/tags/5.6.1",
|
||||
"rev": "2840699",
|
||||
"sha256": "1srrlrwxkv00j0wj0br5xjzfgwa2n4n0qr6b7xyzavxf7v0lnm7q",
|
||||
"version": "5.6.1"
|
||||
},
|
||||
"webp-express": {
|
||||
"path": "webp-express/tags/0.25.5",
|
||||
@ -114,28 +114,28 @@
|
||||
"version": "0.25.5"
|
||||
},
|
||||
"wordpress-seo": {
|
||||
"path": "wordpress-seo/tags/19.8",
|
||||
"rev": "2796969",
|
||||
"sha256": "0vnj7b37s9rra2m957baz8ki4z6x6acl76wgx8yj2063823q0pl2",
|
||||
"version": "19.8"
|
||||
"path": "wordpress-seo/tags/19.13",
|
||||
"rev": "2836498",
|
||||
"sha256": "1ajfxw0fhx0lispcmlcm6wlgfml6kq2315gfdnlf41ai8rl3lpkh",
|
||||
"version": "19.13"
|
||||
},
|
||||
"worker": {
|
||||
"path": "worker/tags/4.9.14",
|
||||
"rev": "2739771",
|
||||
"sha256": "14bq99cdpdqp1vydhgk3n4gyi99w1b0x1xkz1rnalj0xgqiq19hd",
|
||||
"version": "4.9.14"
|
||||
"path": "worker/tags/4.9.16",
|
||||
"rev": "2839308",
|
||||
"sha256": "0dg3ibzjfxsg7qqk9fbinc9q2hz5iin1qidb7ggvd48y9rbjb2s9",
|
||||
"version": "4.9.16"
|
||||
},
|
||||
"wp-change-email-sender": {
|
||||
"path": "wp-change-email-sender/trunk",
|
||||
"rev": "2796798",
|
||||
"sha256": "1wkj15vclbh4l38fkrmbmc4w7lapfydq9rrpn508ki19f4544dam",
|
||||
"rev": "2812298",
|
||||
"sha256": "1ibdj2yv572pk21pr313pdrqxi2f9vawwd0byb0s38224jjx4plh",
|
||||
"version": "1.0"
|
||||
},
|
||||
"wp-fastest-cache": {
|
||||
"path": "wp-fastest-cache/tags/1.0.6",
|
||||
"rev": "2793013",
|
||||
"sha256": "14xqqnv1snc2nc4y7cc6mmjkfkds18lk4xh7x75cbhy5cd8nqx8x",
|
||||
"version": "1.0.6"
|
||||
"path": "wp-fastest-cache/tags/1.0.9",
|
||||
"rev": "2833576",
|
||||
"sha256": "00jajz49lqgcl83hkiis9qf3h4zh7xzpnwi17hrmnarrqss9z7q2",
|
||||
"version": "1.0.9"
|
||||
},
|
||||
"wp-gdpr-compliance": {
|
||||
"path": "wp-gdpr-compliance/tags/2.0.20",
|
||||
@ -144,16 +144,16 @@
|
||||
"version": "2.0.20"
|
||||
},
|
||||
"wp-mail-smtp": {
|
||||
"path": "wp-mail-smtp/tags/3.6.1",
|
||||
"rev": "2795051",
|
||||
"sha256": "14ry7302c4h7d7lrasiql9jiy3x54ylim3y7j5b633g5lyzadynl",
|
||||
"version": "3.6.1"
|
||||
"path": "wp-mail-smtp/tags/3.7.0",
|
||||
"rev": "2834385",
|
||||
"sha256": "1qrmdz2qb0qz2qf5zxf3vs3a1cgnpmi0xlbm7wpxq45bg6qziwzr",
|
||||
"version": "3.7.0"
|
||||
},
|
||||
"wp-statistics": {
|
||||
"path": "wp-statistics/tags/13.2.7",
|
||||
"rev": "2803072",
|
||||
"sha256": "001b9q8vmpj3rvlv2s8h7c9m2xvd58mcvcas99n4bmllzrxy2pji",
|
||||
"version": "13.2.7"
|
||||
"path": "wp-statistics/tags/13.2.10",
|
||||
"rev": "2838980",
|
||||
"sha256": "02wg8y4zfx0h87k38dy21gfys1g99r4dswwv6g308vflcml68ma1",
|
||||
"version": "13.2.10"
|
||||
},
|
||||
"wp-user-avatars": {
|
||||
"path": "wp-user-avatars/trunk",
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{
|
||||
"twentytwentyone": {
|
||||
"path": "twentytwentyone/1.6",
|
||||
"rev": "168450",
|
||||
"sha256": "0wfqdyd59hifnncjv59ywjak050gaggsvjx7r01agh44nzkr84fs",
|
||||
"version": "1.6"
|
||||
"path": "twentytwentyone/1.7",
|
||||
"rev": "178738",
|
||||
"sha256": "090j6xb2hpq4qjis4yismgzip893ihdqs5r58a13nngl17xilmxw",
|
||||
"version": "1.7"
|
||||
},
|
||||
"twentytwentytwo": {
|
||||
"path": "twentytwentytwo/1.2",
|
||||
"rev": "168451",
|
||||
"sha256": "0ry7h5bd9h97q38jmsgymm05dfml0ycdhqn7iskpdlc1nnrjrk04",
|
||||
"version": "1.2"
|
||||
"path": "twentytwentytwo/1.3",
|
||||
"rev": "178733",
|
||||
"sha256": "11lwmirh83yv8wlgacrb9w1qmczkfqxpnl3dn15n38z494kx7zdg",
|
||||
"version": "1.3"
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,19 +2,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hilbish";
|
||||
version = "1.2.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rosettea";
|
||||
repo = "Hilbish";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fUGeQM+7FRGTRL3J4c2+c+NTwrM6d99F2ucKsou2kRk=";
|
||||
sha256 = "sha256-5GPJVusF3/WbEE5VH45Wyxq40wbNxgjO8QI2cLMpdN0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-j7YAt7+kUJXdd/9LaRZny3MxYdd+0n5G3AffeDMo5DY=";
|
||||
vendorSha256 = "sha256-Kiy1JR3X++naY2XNLpnGujrNQt7qlL0zxv8E96cHmHo=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@ -28,7 +28,7 @@ buildGoModule rec {
|
||||
cp .hilbishrc.lua $out/share/hilbish/
|
||||
cp -r docs -t $out/share/hilbish/
|
||||
cp -r libs -t $out/share/hilbish/
|
||||
cp -r prelude/ $out/share/hilbish/
|
||||
cp -r nature $out/share/hilbish/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.48.1";
|
||||
version = "0.48.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-areQ9otV3Ws/D34ocuyZ72i/PqPHK+l4l2J2jLFQU18=";
|
||||
hash = "sha256-cAIEfkWCRvYcoDshQDye3lPebMsBAsF4/nfPsP6xnB8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6/TT3/98wBH9oMbPOzgvwN2nxj4RSbL2vxSMFlM5sgo=";
|
||||
|
||||
@ -1,23 +1,23 @@
|
||||
{ buildGoPackage, lib, fetchurl }:
|
||||
{ buildGoModule, lib, fetchurl }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "filegive";
|
||||
version = "0.7.4";
|
||||
version = "unstable-2022-05-29";
|
||||
rev = "5b28e7087a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://viric.name/soft/filegive/filegive-${version}.tar.gz";
|
||||
sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy";
|
||||
url = "https://viric.name/cgi-bin/filegive/tarball/${rev}/filegive-${rev}.tar.gz";
|
||||
hash = "sha256-A69oys59GEysZvQLaYsfoX/X2ENMMH2BGfJqXohQjpc=";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorHash = "sha256-l7FRl58NWGBynMlGu1SCxeVBEzTdxREvUWzmJDiliZM=";
|
||||
|
||||
goPackagePath = "viric.name/soft/filegive";
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://viric.name/cgi-bin/filegive";
|
||||
description = "Easy p2p file sending program";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = [ maintainers.viric ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ viric ];
|
||||
};
|
||||
}
|
||||
|
||||
12
pkgs/tools/networking/filegive/deps.nix
generated
12
pkgs/tools/networking/filegive/deps.nix
generated
@ -1,12 +0,0 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "code.google.com/p/go-nat-pmp";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/jackpal/go-nat-pmp";
|
||||
rev = "e04deda90d5683d6e375732740814a89eea7bafd";
|
||||
sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, pcsclite , libusb-compat-0_1, IOKit }:
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, pcsclite , libusb-compat-0_1, IOKit }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "1.7.11";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ pcsclite libusb-compat-0_1 ]
|
||||
++ lib.optional stdenv.isDarwin IOKit;
|
||||
|
||||
@ -38,7 +38,5 @@ stdenv.mkDerivation {
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ berce ];
|
||||
platforms = with platforms; unix;
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "frawk";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-yEdfMikMcsQePxQL1+lma95O1x5z1B7aXAEf8apuGaU=";
|
||||
sha256 = "sha256-fqOFFkw+mV9QLTH3K6Drk3kDqU4wrQTj7OQrtgYuD7M=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-osi77Fx8jSfIvAIpThgPbnuJVF/Ydr2/+ROHcDG5ZbA=";
|
||||
cargoSha256 = "sha256-G39/CESjMouwPQJBdsmd+MBusGNQmyNjw3PJSFBCdSk=";
|
||||
|
||||
buildInputs = [ libxml2 ncurses zlib ];
|
||||
|
||||
@ -36,8 +36,8 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "A small programming language for writing short programs processing textual data";
|
||||
homepage = "https://github.com/ezrosent/frawk";
|
||||
changelog = "https://github.com/ezrosent/frawk/releases/tag/v${version}";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
platforms = platforms.x86;
|
||||
};
|
||||
}
|
||||
|
||||
@ -10348,7 +10348,7 @@ with pkgs;
|
||||
oshka = callPackage ../development/tools/oshka {};
|
||||
|
||||
osl = libsForQt5.callPackage ../development/compilers/osl {
|
||||
boost = boost165;
|
||||
boost = boost17x;
|
||||
};
|
||||
|
||||
osqp = callPackage ../development/libraries/science/math/osqp { };
|
||||
@ -24866,7 +24866,7 @@ with pkgs;
|
||||
|
||||
deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { };
|
||||
|
||||
samba4 = callPackage ../servers/samba/4.x.nix { };
|
||||
samba4 = darwin.apple_sdk_11_0.callPackage ../servers/samba/4.x.nix { };
|
||||
|
||||
samba = samba4;
|
||||
|
||||
@ -30360,6 +30360,8 @@ with pkgs;
|
||||
|
||||
kiln = callPackage ../applications/misc/kiln { };
|
||||
|
||||
karmor = callPackage ../applications/networking/cluster/karmor {};
|
||||
|
||||
kubernetes-code-generator = callPackage ../development/tools/kubernetes-code-generator {};
|
||||
|
||||
kubernetes-controller-tools = callPackage ../development/tools/kubernetes-controller-tools { };
|
||||
@ -31083,6 +31085,8 @@ with pkgs;
|
||||
|
||||
nerd-font-patcher = callPackage ../applications/misc/nerd-font-patcher { };
|
||||
|
||||
netmaker = callPackage ../applications/networking/netmaker {};
|
||||
|
||||
newsflash = callPackage ../applications/networking/feedreaders/newsflash {
|
||||
webkitgtk = webkitgtk_5_0;
|
||||
};
|
||||
@ -38050,8 +38054,7 @@ with pkgs;
|
||||
xzoom = callPackage ../tools/X11/xzoom {};
|
||||
|
||||
yabai = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/yabai {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa Carbon ScriptingBridge;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) SkyLight;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) SkyLight Cocoa Carbon ScriptingBridge;
|
||||
};
|
||||
|
||||
yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { };
|
||||
|
||||
@ -14,12 +14,16 @@ lib.makeScope newScope (self:
|
||||
astpatternmatching =
|
||||
callPackage ../development/nim-packages/astpatternmatching { };
|
||||
|
||||
base32 = callPackage ../development/nim-packages/base32 { };
|
||||
|
||||
bumpy = callPackage ../development/nim-packages/bumpy { };
|
||||
|
||||
chroma = callPackage ../development/nim-packages/chroma { };
|
||||
|
||||
c2nim = callPackage ../development/nim-packages/c2nim { };
|
||||
|
||||
cbor = callPackage ../development/nim-packages/cbor { };
|
||||
|
||||
chroma = callPackage ../development/nim-packages/chroma { };
|
||||
|
||||
docopt = callPackage ../development/nim-packages/docopt { };
|
||||
|
||||
flatty = callPackage ../development/nim-packages/flatty { };
|
||||
@ -47,10 +51,14 @@ lib.makeScope newScope (self:
|
||||
|
||||
nimbox = callPackage ../development/nim-packages/nimbox { };
|
||||
|
||||
nimSHA2 = callPackage ../development/nim-packages/nimSHA2 { };
|
||||
|
||||
nimsimd = callPackage ../development/nim-packages/nimsimd { };
|
||||
|
||||
noise = callPackage ../development/nim-packages/noise { };
|
||||
|
||||
npeg = callPackage ../development/nim-packages/npeg { };
|
||||
|
||||
packedjson = callPackage ../development/nim-packages/packedjson { };
|
||||
|
||||
pixie = callPackage ../development/nim-packages/pixie { };
|
||||
@ -82,8 +90,12 @@ lib.makeScope newScope (self:
|
||||
|
||||
supersnappy = callPackage ../development/nim-packages/supersnappy { };
|
||||
|
||||
taps = callPackage ../development/nim-packages/taps { };
|
||||
|
||||
tempfile = callPackage ../development/nim-packages/tempfile { };
|
||||
|
||||
tkrzw = callPackage ../development/nim-packages/tkrzw { inherit (pkgs) tkrzw; };
|
||||
|
||||
ui = callPackage ../development/nim-packages/ui { inherit (pkgs) libui; };
|
||||
|
||||
unicodedb = callPackage ../development/nim-packages/unicodedb { };
|
||||
|
||||
@ -9605,6 +9605,8 @@ self: super: with self; {
|
||||
|
||||
qtpy = callPackage ../development/python-modules/qtpy { };
|
||||
|
||||
quadprog = callPackage ../development/python-modules/quadprog { };
|
||||
|
||||
qualysclient = callPackage ../development/python-modules/qualysclient { };
|
||||
|
||||
quamash = callPackage ../development/python-modules/quamash { };
|
||||
@ -9760,6 +9762,8 @@ self: super: with self; {
|
||||
|
||||
reolink = callPackage ../development/python-modules/reolink { };
|
||||
|
||||
reolink-aio = callPackage ../development/python-modules/reolink-aio { };
|
||||
|
||||
reparser = callPackage ../development/python-modules/reparser { };
|
||||
|
||||
repeated-test = callPackage ../development/python-modules/repeated-test { };
|
||||
|
||||
@ -92,7 +92,7 @@ let
|
||||
# with their host distribution's versions of nix's numerous
|
||||
# build dependencies.
|
||||
nixCrossStatic = {
|
||||
nixStatic = nativePlatforms;
|
||||
nixStatic = platforms.linux; # no need for buildPlatform=*-darwin
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
Loading…
Reference in New Issue
Block a user