Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
d8f2a7bf5c
@ -1603,12 +1603,6 @@
|
||||
githubId = 89596;
|
||||
name = "Florian Friesdorf";
|
||||
};
|
||||
charvp = {
|
||||
email = "nixpkgs@cvpetegem.be";
|
||||
github = "charvp";
|
||||
githubId = 42220376;
|
||||
name = "Charlotte Van Petegem";
|
||||
};
|
||||
chattered = {
|
||||
email = "me@philscotted.com";
|
||||
name = "Phil Scott";
|
||||
@ -1717,6 +1711,12 @@
|
||||
githubId = 2245737;
|
||||
name = "Christopher Mark Poole";
|
||||
};
|
||||
chvp = {
|
||||
email = "nixpkgs@cvpetegem.be";
|
||||
github = "chvp";
|
||||
githubId = 42220376;
|
||||
name = "Charlotte Van Petegem";
|
||||
};
|
||||
ciil = {
|
||||
email = "simon@lackerbauer.com";
|
||||
github = "ciil";
|
||||
@ -8331,6 +8331,12 @@
|
||||
githubId = 2320433;
|
||||
name = "Sam Boosalis";
|
||||
};
|
||||
sbruder = {
|
||||
email = "nixos@sbruder.de";
|
||||
github = "sbruder";
|
||||
githubId = 15986681;
|
||||
name = "Simon Bruder";
|
||||
};
|
||||
scalavision = {
|
||||
email = "scalavision@gmail.com";
|
||||
github = "scalavision";
|
||||
|
||||
@ -16,6 +16,6 @@
|
||||
On images where the installation media also becomes an installation target,
|
||||
copying over <literal>configuration.nix</literal> should be disabled by
|
||||
setting <literal>installer.cloneConfig</literal> to <literal>false</literal>.
|
||||
For example, this is done in <literal>sd-image-aarch64.nix</literal>.
|
||||
For example, this is done in <literal>sd-image-aarch64-installer.nix</literal>.
|
||||
</para>
|
||||
</section>
|
||||
|
||||
@ -3,4 +3,8 @@
|
||||
../../profiles/installation-device.nix
|
||||
./sd-image-aarch64.nix
|
||||
];
|
||||
|
||||
# the installation media is also the installation target,
|
||||
# so we don't want to provide the installation configuration.nix.
|
||||
installer.cloneConfig = false;
|
||||
}
|
||||
|
||||
@ -3,4 +3,8 @@
|
||||
../../profiles/installation-device.nix
|
||||
./sd-image-aarch64-new-kernel.nix
|
||||
];
|
||||
|
||||
# the installation media is also the installation target,
|
||||
# so we don't want to provide the installation configuration.nix.
|
||||
installer.cloneConfig = false;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# To build, use:
|
||||
# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-aarch64.nix -A config.system.build.sdImage
|
||||
# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-aarch64.nix -A config.system.build.sdImage
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
@ -72,8 +72,4 @@
|
||||
${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
|
||||
'';
|
||||
};
|
||||
|
||||
# the installation media is also the installation target,
|
||||
# so we don't want to provide the installation configuration.nix.
|
||||
installer.cloneConfig = false;
|
||||
}
|
||||
|
||||
@ -3,4 +3,8 @@
|
||||
../../profiles/installation-device.nix
|
||||
./sd-image-armv7l-multiplatform.nix
|
||||
];
|
||||
|
||||
# the installation media is also the installation target,
|
||||
# so we don't want to provide the installation configuration.nix.
|
||||
installer.cloneConfig = false;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# To build, use:
|
||||
# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix -A config.system.build.sdImage
|
||||
# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix -A config.system.build.sdImage
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
@ -49,8 +49,4 @@
|
||||
${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
|
||||
'';
|
||||
};
|
||||
|
||||
# the installation media is also the installation target,
|
||||
# so we don't want to provide the installation configuration.nix.
|
||||
installer.cloneConfig = false;
|
||||
}
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
{
|
||||
imports = [
|
||||
../../profiles/installation-device.nix
|
||||
./sd-image-raspberrypi4.nix
|
||||
];
|
||||
}
|
||||
@ -3,4 +3,8 @@
|
||||
../../profiles/installation-device.nix
|
||||
./sd-image-raspberrypi.nix
|
||||
];
|
||||
|
||||
# the installation media is also the installation target,
|
||||
# so we don't want to provide the installation configuration.nix.
|
||||
installer.cloneConfig = false;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# To build, use:
|
||||
# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix -A config.system.build.sdImage
|
||||
# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-raspberrypi.nix -A config.system.build.sdImage
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
@ -38,8 +38,4 @@
|
||||
${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
|
||||
'';
|
||||
};
|
||||
|
||||
# the installation media is also the installation target,
|
||||
# so we don't want to provide the installation configuration.nix.
|
||||
installer.cloneConfig = false;
|
||||
}
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
{
|
||||
imports = [
|
||||
../../profiles/installation-device.nix
|
||||
./sd-image-raspberrypi4.nix
|
||||
];
|
||||
|
||||
# the installation media is also the installation target,
|
||||
# so we don't want to provide the installation configuration.nix.
|
||||
installer.cloneConfig = false;
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
# To build, use:
|
||||
# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix -A config.system.build.sdImage
|
||||
# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix -A config.system.build.sdImage
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
|
||||
@ -37,7 +37,8 @@ in {
|
||||
services.pipewire.media-session = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
default = config.services.pipewire.enable;
|
||||
defaultText = "config.services.pipewire.enable";
|
||||
description = "Example pipewire session manager";
|
||||
};
|
||||
|
||||
|
||||
@ -38,6 +38,14 @@ in
|
||||
|
||||
enable = mkEnableOption "Plymouth boot splash screen";
|
||||
|
||||
font = mkOption {
|
||||
default = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf";
|
||||
type = types.path;
|
||||
description = ''
|
||||
Font file made available for displaying text on the splash screen.
|
||||
'';
|
||||
};
|
||||
|
||||
themePackages = mkOption {
|
||||
default = [ nixosBreezePlymouth ];
|
||||
type = types.listOf types.package;
|
||||
@ -113,7 +121,7 @@ in
|
||||
|
||||
mkdir -p $out/lib/plymouth/renderers
|
||||
# module might come from a theme
|
||||
cp ${themesEnv}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth
|
||||
cp ${themesEnv}/lib/plymouth/{text,details,label,$moduleName}.so $out/lib/plymouth
|
||||
cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/lib/plymouth/renderers
|
||||
|
||||
mkdir -p $out/share/plymouth/themes
|
||||
@ -133,6 +141,17 @@ in
|
||||
|
||||
cp -r themes/* $out/share/plymouth/themes
|
||||
cp ${cfg.logo} $out/share/plymouth/logo.png
|
||||
|
||||
mkdir -p $out/share/fonts
|
||||
cp ${cfg.font} $out/share/fonts
|
||||
mkdir -p $out/etc/fonts
|
||||
cat > $out/etc/fonts/fonts.conf <<EOF
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
|
||||
<fontconfig>
|
||||
<dir>$out/share/fonts</dir>
|
||||
</fontconfig>
|
||||
EOF
|
||||
'';
|
||||
|
||||
boot.initrd.extraUtilsCommandsTest = ''
|
||||
@ -154,6 +173,7 @@ in
|
||||
ln -s $extraUtils/share/plymouth/logo.png /etc/plymouth/logo.png
|
||||
ln -s $extraUtils/share/plymouth/themes /etc/plymouth/themes
|
||||
ln -s $extraUtils/lib/plymouth /etc/plymouth/plugins
|
||||
ln -s $extraUtils/etc/fonts /etc/fonts
|
||||
|
||||
plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session
|
||||
plymouth show-splash
|
||||
|
||||
@ -11,8 +11,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
environment.systemPackages = [ pkgs.curl ];
|
||||
};
|
||||
traefik = { config, pkgs, ... }: {
|
||||
docker-containers.nginx = {
|
||||
extraDockerOptions = [
|
||||
virtualisation.oci-containers.containers.nginx = {
|
||||
extraOptions = [
|
||||
"-l" "traefik.enable=true"
|
||||
"-l" "traefik.http.routers.nginx.entrypoints=web"
|
||||
"-l" "traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)"
|
||||
|
||||
@ -1,17 +1,27 @@
|
||||
{ fetchFromGitHub, lib, rustPlatform }:
|
||||
{ fetchFromGitHub, installShellFiles, lib, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mmtc";
|
||||
version = "0.2.12";
|
||||
version = "0.2.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "figsoda";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1chcnv8wql6v2vckpzvq6sxgpss7mnxaj008jdm8xalhw9d496s4";
|
||||
sha256 = "0ag87hgdg6fvk80fgznba0xjlcajks5w5s6y8lvwhz9irn2kq2rz";
|
||||
};
|
||||
|
||||
cargoSha256 = "06b0hag3s5irvi57n0hc97agfw4sw783lkkl1b26iap6mfbvrqma";
|
||||
cargoSha256 = "06xqh0mqbik00qyg8mn1ddbn15v3pdwvh1agghg22xgx53kmnxb3";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
preFixup = ''
|
||||
completions=($releaseDir/build/mmtc-*/out/completions)
|
||||
installShellCompletion ''${completions[0]}/mmtc.{bash,fish}
|
||||
installShellCompletion --zsh ''${completions[0]}/_mmtc
|
||||
'';
|
||||
|
||||
GEN_COMPLETIONS = "1";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minimal mpd terminal client that aims to be simple yet highly configurable";
|
||||
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A simple integrated development environment for Java";
|
||||
homepage = "https://www.bluej.org/";
|
||||
license = licenses.gpl2ClasspathPlus;
|
||||
maintainers = [ maintainers.charvp ];
|
||||
maintainers = [ maintainers.chvp ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -113,6 +113,21 @@
|
||||
|
||||
jam-mode = callPackage ./jam-mode { };
|
||||
|
||||
llvm-mode = trivialBuild {
|
||||
pname = "llvm-mode";
|
||||
inherit (external.llvmPackages.llvm) src version;
|
||||
|
||||
dontConfigure = true;
|
||||
buildPhase = ''
|
||||
cp utils/emacs/*.el .
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (external.llvmPackages.llvm.meta) homepage license;
|
||||
description = "Major mode for the LLVM assembler language.";
|
||||
};
|
||||
};
|
||||
|
||||
org-mac-link =
|
||||
callPackage ./org-mac-link { };
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A simple integrated development environment for Java";
|
||||
homepage = "https://www.greenfoot.org/";
|
||||
license = licenses.gpl2ClasspathPlus;
|
||||
maintainers = [ maintainers.charvp ];
|
||||
maintainers = [ maintainers.chvp ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ pkgs, parinfer-rust, rep }:
|
||||
{ pkgs, parinfer-rust, rep, kak-lsp }:
|
||||
|
||||
{
|
||||
inherit parinfer-rust rep;
|
||||
inherit parinfer-rust rep kak-lsp;
|
||||
|
||||
case-kak = pkgs.callPackage ./case.kak.nix { };
|
||||
kak-ansi = pkgs.callPackage ./kak-ansi.nix { };
|
||||
|
||||
@ -5,19 +5,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taskwarrior-tui";
|
||||
version = "0.9.10";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kdheepak";
|
||||
repo = "taskwarrior-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NQzZhWoLeDF7iTgIljbVi0ULAe7DeIn45Cu6bgFCfKQ=";
|
||||
sha256 = "1rs6xpnmqzp45jkdzi8x06i8764gk7zl86sp6s0hiirbfqf7vwsy";
|
||||
};
|
||||
|
||||
# Because there's a test that requires terminal access
|
||||
doCheck = false;
|
||||
|
||||
cargoSha256 = "sha256-9qfqQ7zFw+EwY7o35Y6RhBJ8h5eXnTAsdbqo/w0zO5w=";
|
||||
cargoSha256 = "0xblxsp7jgqbb3kr5k7yy6ziz18a8wlkrhls0vz9ak2n0ngddg3r";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A terminal user interface for taskwarrior ";
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gomuks";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tulir";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "169xyd44jyfh5njwmhsmkah8njfgnp9q9c2b13p0ry5saicwm5h5";
|
||||
sha256 = "0g0aa6h6bm00mdgkb38wm66rcrhqfvs2xj9rl04bwprsa05q5lca";
|
||||
};
|
||||
|
||||
vendorSha256 = "1l8qnz0qy90zpywfx7pbkqpxg7rkvc9j622zcmkf38kdc1z6w20a";
|
||||
vendorSha256 = "14ya5advpv4q5il235h5dxy8c2ap2yzrvqs0sjqgw0v1vm6vpwdx";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -55,8 +55,8 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://maunium.net/go/gomuks/";
|
||||
description = "A terminal based Matrix client written in Go";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ charvp emily ];
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ chvp emily ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://libsigcplusplus.github.io/libsigcplusplus/";
|
||||
description = "A typesafe callback system for standard C++";
|
||||
license = licenses.lgpl21;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -70,8 +70,8 @@ in
|
||||
|
||||
{
|
||||
name = "G4PARTICLEXS";
|
||||
version = "3.1";
|
||||
sha256 = "1kg9y0kqn4lma7b0yjpgj7s9n317yqi54ydvq365qphnmm7ahka0";
|
||||
version = "3.1.1";
|
||||
sha256 = "1nmgy8w1s196php7inrkbsi0f690qa2dsyj9s1sp75mndkfpxhb6";
|
||||
envvar = "PARTICLEXS";
|
||||
}
|
||||
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
|
||||
# For enableQT.
|
||||
, qtbase
|
||||
, wrapQtAppsHook
|
||||
|
||||
# For enableXM.
|
||||
, motif
|
||||
@ -48,12 +49,12 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "10.7.0";
|
||||
version = "10.7.1";
|
||||
pname = "geant4";
|
||||
|
||||
src = fetchurl{
|
||||
url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.tar.gz";
|
||||
sha256 = "0jmdxb8z20d4l6sf2w0gk9ska48kylm38yngy3mzyvyj619a8vkp";
|
||||
url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.p01.tar.gz";
|
||||
sha256 = "07if874aljizkjyp21qj6v193pmyifyfmwi5kg8jm71x79sn2laj";
|
||||
};
|
||||
|
||||
boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}";
|
||||
@ -87,7 +88,13 @@ stdenv.mkDerivation rec {
|
||||
"-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
] ++ lib.optionals enableQT [
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
dontWrapQtApps = !enableQT;
|
||||
|
||||
buildInputs = [ libGLU xlibsWrapper libXmu ]
|
||||
++ lib.optionals enableInventor [ libXpm coin3d soxt motif ]
|
||||
@ -101,6 +108,8 @@ stdenv.mkDerivation rec {
|
||||
postFixup = ''
|
||||
# Don't try to export invalid environment variables.
|
||||
sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
|
||||
'' + lib.optionalString enableQT ''
|
||||
wrapQtAppsHook
|
||||
'';
|
||||
|
||||
setupHook = ./geant4-hook.sh;
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
, glib
|
||||
, dbus
|
||||
, alsaLib
|
||||
, SDL2
|
||||
, libjack2
|
||||
, udev
|
||||
, libva
|
||||
@ -43,7 +42,7 @@ let
|
||||
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "pipewire";
|
||||
version = "0.3.22";
|
||||
version = "0.3.21";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@ -61,7 +60,7 @@ let
|
||||
owner = "pipewire";
|
||||
repo = "pipewire";
|
||||
rev = version;
|
||||
hash = "sha256:1ywna5f5v8s79ivrqfwwc8vy6sn3a2zvfwqyalf1fypj5d90w8g9";
|
||||
hash = "sha256:2YJzPTMPIoQQeNja3F53SD4gtpdSlbD/i77hBWiQfuQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -87,7 +86,6 @@ let
|
||||
alsaLib
|
||||
dbus
|
||||
glib
|
||||
SDL2
|
||||
libjack2
|
||||
libsndfile
|
||||
ncurses
|
||||
|
||||
@ -0,0 +1,74 @@
|
||||
From 9b05a6f331506afa5aca8865677af83403d2a32d Mon Sep 17 00:00:00 2001
|
||||
From: Tadeo Kondrak <me@tadeo.ca>
|
||||
Date: Mon, 25 Jan 2021 11:17:44 -0700
|
||||
Subject: [PATCH] Call weak function to allow adding preloaded plugins after
|
||||
compile
|
||||
|
||||
---
|
||||
src/core/vscore.cpp | 19 +++++++++++++++++++
|
||||
src/core/vscore.h | 5 +++++
|
||||
2 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/src/core/vscore.cpp b/src/core/vscore.cpp
|
||||
index 2d29844d..35c509ed 100644
|
||||
--- a/src/core/vscore.cpp
|
||||
+++ b/src/core/vscore.cpp
|
||||
@@ -1229,6 +1229,20 @@ void VSCore::destroyFilterInstance(VSNode *node) {
|
||||
freeDepth--;
|
||||
}
|
||||
|
||||
+extern "C" {
|
||||
+void __attribute__((weak)) VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data);
|
||||
+
|
||||
+struct VSLoadPluginsNixCallbackData {
|
||||
+ VSCore *core;
|
||||
+ const char *filter;
|
||||
+};
|
||||
+
|
||||
+static void VSLoadPluginsNixCallback(void *data, const char *path) {
|
||||
+ auto callbackData = static_cast<VSLoadPluginsNixCallbackData *>(data);
|
||||
+ callbackData->core->loadAllPluginsInPath(path, callbackData->filter);
|
||||
+}
|
||||
+}
|
||||
+
|
||||
VSCore::VSCore(int threads) :
|
||||
coreFreed(false),
|
||||
numFilterInstances(1),
|
||||
@@ -1351,6 +1365,11 @@ VSCore::VSCore(int threads) :
|
||||
} // If neither exists, an empty string will do.
|
||||
#endif
|
||||
|
||||
+ if (VSLoadPluginsNix != nullptr) {
|
||||
+ VSLoadPluginsNixCallbackData data{this, filter.c_str()};
|
||||
+ VSLoadPluginsNix(VSLoadPluginsNixCallback, &data);
|
||||
+ }
|
||||
+
|
||||
VSMap *settings = readSettings(configFile);
|
||||
const char *error = vs_internal_vsapi.getError(settings);
|
||||
if (error) {
|
||||
diff --git a/src/core/vscore.h b/src/core/vscore.h
|
||||
index 74df8a84..3efac811 100644
|
||||
--- a/src/core/vscore.h
|
||||
+++ b/src/core/vscore.h
|
||||
@@ -582,6 +582,9 @@ public:
|
||||
VSFunction() : functionData(nullptr), func(nullptr) {}
|
||||
};
|
||||
|
||||
+extern "C" {
|
||||
+static void VSLoadPluginsNixCallback(void *data, const char *path);
|
||||
+}
|
||||
|
||||
struct VSPlugin {
|
||||
private:
|
||||
@@ -683,6 +686,8 @@ public:
|
||||
|
||||
explicit VSCore(int threads);
|
||||
void freeCore();
|
||||
+
|
||||
+ friend void VSLoadPluginsNixCallback(void *data, const char *path);
|
||||
};
|
||||
|
||||
#endif // VSCORE_H
|
||||
--
|
||||
2.30.0
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper
|
||||
, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv
|
||||
, zimg, libass, python3, libiconv
|
||||
, ApplicationServices
|
||||
, ocrSupport ? false, tesseract ? null
|
||||
@ -21,6 +22,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ];
|
||||
buildInputs = [
|
||||
zimg libass
|
||||
@ -36,12 +41,17 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
passthru = rec {
|
||||
# If vapoursynth is added to the build inputs of mpv and then
|
||||
# used in the wrapping of it, we want to know once inside the
|
||||
# wrapper, what python3 version was used to build vapoursynth so
|
||||
# the right python3.sitePackages will be used there.
|
||||
inherit python3;
|
||||
|
||||
withPlugins = import ./plugin-interface.nix {
|
||||
inherit lib python3 buildEnv writeText runCommandCC stdenv runCommand
|
||||
vapoursynth makeWrapper withPlugins;
|
||||
};
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
@ -54,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.vapoursynth.com/";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.x86_64;
|
||||
maintainers = with maintainers; [ rnhmjoj tadeokondrak ];
|
||||
maintainers = with maintainers; [ rnhmjoj sbruder tadeokondrak ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,43 +1,59 @@
|
||||
{ lib, mkDerivation, fetchFromBitbucket
|
||||
{ lib, stdenv, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand
|
||||
, python3, vapoursynth
|
||||
, qmake, qtbase, qtwebsockets
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "vapoursynth-editor";
|
||||
version = "R19";
|
||||
let
|
||||
unwrapped = mkDerivation rec {
|
||||
pname = "vapoursynth-editor";
|
||||
version = "R19";
|
||||
|
||||
src = fetchFromBitbucket {
|
||||
owner = "mystery_keeper";
|
||||
repo = pname;
|
||||
rev = lib.toLower version;
|
||||
sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n";
|
||||
src = fetchFromBitbucket {
|
||||
owner = "mystery_keeper";
|
||||
repo = pname;
|
||||
rev = lib.toLower version;
|
||||
sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ qtbase vapoursynth qtwebsockets ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preConfigure = "cd pro";
|
||||
|
||||
preFixup = ''
|
||||
cd ../build/release*
|
||||
mkdir -p $out/bin
|
||||
for bin in vsedit{,-job-server{,-watcher}}; do
|
||||
mv $bin $out/bin
|
||||
wrapQtApp $out/bin/$bin
|
||||
done
|
||||
'';
|
||||
|
||||
passthru = { inherit withPlugins; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform editor for VapourSynth scripts";
|
||||
homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tadeokondrak ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ qtbase vapoursynth qtwebsockets ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preConfigure = "cd pro";
|
||||
|
||||
preFixup = ''
|
||||
cd ../build/release*
|
||||
withPlugins = plugins: let
|
||||
vapoursynthWithPlugins = vapoursynth.withPlugins plugins;
|
||||
in runCommand "${unwrapped.name}-with-plugins" {
|
||||
buildInputs = [ makeWrapper ];
|
||||
passthru = { withPlugins = plugins': withPlugins (plugins ++ plugins'); };
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
for bin in vsedit{,-job-server{,-watcher}}; do
|
||||
mv $bin $out/bin
|
||||
|
||||
wrapQtApp $out/bin/$bin \
|
||||
--prefix PYTHONPATH : ${vapoursynth}/${python3.sitePackages} \
|
||||
--prefix LD_LIBRARY_PATH : ${vapoursynth}/lib
|
||||
makeWrapper ${unwrapped}/bin/$bin $out/bin/$bin \
|
||||
--prefix PYTHONPATH : ${vapoursynthWithPlugins}/${python3.sitePackages} \
|
||||
--prefix LD_LIBRARY_PATH : ${vapoursynthWithPlugins}/lib
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform editor for VapourSynth scripts";
|
||||
homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tadeokondrak ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
in
|
||||
withPlugins []
|
||||
|
||||
112
pkgs/development/libraries/vapoursynth/plugin-interface.nix
Normal file
112
pkgs/development/libraries/vapoursynth/plugin-interface.nix
Normal file
@ -0,0 +1,112 @@
|
||||
{ lib, python3, buildEnv, writeText, runCommandCC, stdenv, runCommand
|
||||
, vapoursynth, makeWrapper, withPlugins }:
|
||||
|
||||
plugins: let
|
||||
pythonEnvironment = python3.buildEnv.override {
|
||||
extraLibs = plugins;
|
||||
};
|
||||
|
||||
getRecursivePropagatedBuildInputs = pkgs: lib.flatten
|
||||
(map
|
||||
(pkg: pkg.propagatedBuildInputs ++ (getRecursivePropagatedBuildInputs pkg.propagatedBuildInputs))
|
||||
pkgs);
|
||||
|
||||
deepPlugins = plugins ++ (getRecursivePropagatedBuildInputs plugins);
|
||||
|
||||
pluginsEnv = buildEnv {
|
||||
name = "vapoursynth-plugins-env";
|
||||
pathsToLink = [ "/lib/vapoursynth" ];
|
||||
paths = deepPlugins;
|
||||
};
|
||||
|
||||
pluginLoader = let
|
||||
source = writeText "vapoursynth-nix-plugins.c" ''
|
||||
void VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data) {
|
||||
${lib.concatMapStringsSep "" (path: "load(data, \"${path}/lib/vapoursynth\");") deepPlugins}
|
||||
}
|
||||
'';
|
||||
in
|
||||
runCommandCC "vapoursynth-plugin-loader" {
|
||||
executable = true;
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
} ''
|
||||
mkdir -p $out/lib
|
||||
$CC -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}"
|
||||
'';
|
||||
|
||||
ext = stdenv.targetPlatform.extensions.sharedLibrary;
|
||||
in
|
||||
runCommand "${vapoursynth.name}-with-plugins" {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
passthru = {
|
||||
inherit python3;
|
||||
withPlugins = plugins': withPlugins (plugins ++ plugins');
|
||||
};
|
||||
} ''
|
||||
mkdir -p \
|
||||
$out/bin \
|
||||
$out/lib/pkgconfig \
|
||||
$out/lib/vapoursynth \
|
||||
$out/${python3.sitePackages}
|
||||
|
||||
for textFile in \
|
||||
lib/pkgconfig/vapoursynth{,-script}.pc \
|
||||
lib/libvapoursynth.la \
|
||||
lib/libvapoursynth-script.la \
|
||||
${python3.sitePackages}/vapoursynth.la
|
||||
do
|
||||
substitute ${vapoursynth}/$textFile $out/$textFile \
|
||||
--replace "${vapoursynth}" "$out"
|
||||
done
|
||||
|
||||
for binaryPlugin in ${pluginsEnv}/lib/vapoursynth/*; do
|
||||
ln -s $binaryPlugin $out/''${binaryPlugin#"${pluginsEnv}/"}
|
||||
done
|
||||
|
||||
for pythonPlugin in ${pythonEnvironment}/${python3.sitePackages}/*; do
|
||||
ln -s $pythonPlugin $out/''${pythonPlugin#"${pythonEnvironment}/"}
|
||||
done
|
||||
|
||||
for binaryFile in \
|
||||
lib/libvapoursynth${ext} \
|
||||
lib/libvapoursynth-script${ext}.0.0.0
|
||||
do
|
||||
old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile)
|
||||
new_rpath="$old_rpath:$out/lib"
|
||||
patchelf \
|
||||
--set-rpath "$new_rpath" \
|
||||
--output $out/$binaryFile \
|
||||
${vapoursynth}/$binaryFile
|
||||
patchelf \
|
||||
--add-needed libvapoursynth-nix-plugins${ext} \
|
||||
$out/$binaryFile
|
||||
done
|
||||
|
||||
for binaryFile in \
|
||||
${python3.sitePackages}/vapoursynth${ext} \
|
||||
bin/.vspipe-wrapped
|
||||
do
|
||||
old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile)
|
||||
new_rpath="''${old_rpath//"${vapoursynth}"/"$out"}"
|
||||
patchelf \
|
||||
--set-rpath "$new_rpath" \
|
||||
--output $out/$binaryFile \
|
||||
${vapoursynth}/$binaryFile
|
||||
done
|
||||
|
||||
ln -s \
|
||||
${pluginLoader}/lib/libvapoursynth-nix-plugins${ext} \
|
||||
$out/lib/libvapoursynth-nix-plugins${ext}
|
||||
ln -s ${vapoursynth}/include $out/include
|
||||
ln -s ${vapoursynth}/lib/vapoursynth/* $out/lib/vapoursynth
|
||||
ln -s \
|
||||
libvapoursynth-script${ext}.0.0.0 \
|
||||
$out/lib/libvapoursynth-script${ext}
|
||||
ln -s \
|
||||
libvapoursynth-script${ext}.0.0.0 \
|
||||
$out/lib/libvapoursynth-script${ext}.0
|
||||
|
||||
makeWrapper $out/bin/.vspipe-wrapped $out/bin/vspipe \
|
||||
--prefix PYTHONPATH : $out/${python3.sitePackages}
|
||||
''
|
||||
@ -22,6 +22,8 @@
|
||||
, "cdktf-cli"
|
||||
, "clean-css-cli"
|
||||
, "clubhouse-cli"
|
||||
, "coc-clangd"
|
||||
, "coc-cmake"
|
||||
, "coc-css"
|
||||
, "coc-diagnostic"
|
||||
, "coc-emmet"
|
||||
@ -48,6 +50,7 @@
|
||||
, "coc-solargraph"
|
||||
, "coc-stylelint"
|
||||
, "coc-tabnine"
|
||||
, "coc-texlab"
|
||||
, "coc-tslint"
|
||||
, "coc-tslint-plugin"
|
||||
, "coc-tsserver"
|
||||
|
||||
2091
pkgs/development/node-packages/node-packages.nix
generated
2091
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,19 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy3k
|
||||
, beautifulsoup4, bottle, chardet, dateutil
|
||||
, google_api_python_client, lxml, oauth2client
|
||||
, ply, python_magic, pytest, requests }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, beautifulsoup4
|
||||
, bottle
|
||||
, chardet
|
||||
, dateutil
|
||||
, google_api_python_client
|
||||
, lxml
|
||||
, oauth2client
|
||||
, ply
|
||||
, pytest
|
||||
, python_magic
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.3.3";
|
||||
@ -29,7 +41,7 @@ buildPythonPackage rec {
|
||||
python_magic
|
||||
requests
|
||||
# pytest really is a runtime dependency
|
||||
# https://bitbucket.org/blais/beancount/commits/554e13057551951e113835196770847c788dd592
|
||||
# https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82
|
||||
pytest
|
||||
];
|
||||
|
||||
@ -41,8 +53,7 @@ buildPythonPackage rec {
|
||||
financial transaction records in a text file, read them in memory,
|
||||
generate a variety of reports from them, and provides a web interface.
|
||||
'';
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ bhipple ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3";
|
||||
pname = "boto3";
|
||||
version = "1.17.5"; # N.B: if you change this, change botocore too
|
||||
|
||||
src = fetchPypi {
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, protobuf, six }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "protobuf3-to-dict";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0nibblvj3n20zvq6d73zalbjqjby0w8ji5mim7inhn7vb9dw4hhy";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "protobuf_to_dict" ];
|
||||
|
||||
propagatedBuildInputs = [ protobuf six ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A teeny Python library for creating Python dicts from protocol buffers and the reverse";
|
||||
homepage = "https://github.com/kaporzhu/protobuf-to-dict";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ nequissimus ];
|
||||
};
|
||||
}
|
||||
34
pkgs/development/python-modules/sagemaker/default.nix
Normal file
34
pkgs/development/python-modules/sagemaker/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, attrs, boto3, google-pasta
|
||||
, importlib-metadata, numpy, protobuf, protobuf3-to-dict, smdebug-rulesconfig }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.24.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1j1a058ic00yxnf0cc364fzn82pacih5ffrh5s4dw1q4s3by4cvd";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "sagemaker" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
boto3
|
||||
google-pasta
|
||||
importlib-metadata
|
||||
numpy
|
||||
protobuf
|
||||
protobuf3-to-dict
|
||||
smdebug-rulesconfig
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for training and deploying machine learning models on Amazon SageMaker";
|
||||
homepage = "https://github.com/aws/sagemaker-python-sdk/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nequissimus ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "smdebug-rulesconfig";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "smdebug_rulesconfig";
|
||||
sha256 = "1mpwjfvpmryqqwlbyf500584jclgm3vnxa740yyfzkvb5vmyc6bs";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "smdebug_rulesconfig" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "These builtin rules are available in Amazon SageMaker";
|
||||
homepage = "https://github.com/awslabs/sagemaker-debugger-rulesconfig";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nequissimus ];
|
||||
};
|
||||
}
|
||||
@ -35,6 +35,6 @@ buildPythonPackage rec {
|
||||
description = "Library to get the currently playing song and artist from Spotify";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Assembler and linker for the Z80";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ buildGoModule, lib, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "mockgen";
|
||||
version = "1.4.4";
|
||||
version = "1.5.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "mock";
|
||||
rev = "v${version}";
|
||||
sha256 = "1lj0dvd6div4jaq1s0afpwqaq9ah8cxhkq93wii2ably1xmp2l0a";
|
||||
sha256 = "sha256-YSPfe8/Ra72qk12+T78mTppvkag0Hw6O7WNyfhG4h4o=";
|
||||
};
|
||||
vendorSha256 = "1md4cg1zzhc276sc7i2v0xvg5pf6gzy0n9ga2g1lx3d572igq1wy";
|
||||
vendorSha256 = "sha256-cL4a7iOSeaQiG6YO0im9bXxklCL1oyKhEDmB1BtEmEw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sd-local";
|
||||
version = "1.0.21";
|
||||
version = "1.0.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "screwdriver-cd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cYglIobBldfFNavso8sLdqHzoWcl6qTurxGRMdoLqGc=";
|
||||
sha256 = "sha256-oOLNLyQjuLhSfIaiIavuJ1qWWLI0RWp7L9c0m6m5owY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20=";
|
||||
|
||||
@ -16,13 +16,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "osu-lazer";
|
||||
version = "2021.212.0";
|
||||
version = "2021.220.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ppy";
|
||||
repo = "osu";
|
||||
rev = version;
|
||||
sha256 = "JQUQEAZlVdyKhazhr7aI2I0+cHMQ303DZXUVgQiMaNs=";
|
||||
sha256 = "XGwG/1cWSUNniCrUY1/18KHRtumxIWjfW5x+aYQ6RKU=";
|
||||
};
|
||||
|
||||
patches = [ ./bypass-tamper-detection.patch ];
|
||||
|
||||
16
pkgs/games/osu-lazer/deps.nix
generated
16
pkgs/games/osu-lazer/deps.nix
generated
@ -366,8 +366,8 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.Build.Locator";
|
||||
version = "1.2.6";
|
||||
sha256 = "1rnfd7wq2bkynqj767xmq9ha38mz010fmqvvvrgb4v86gd537737";
|
||||
version = "1.4.1";
|
||||
sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.CodeAnalysis.Analyzers";
|
||||
@ -556,8 +556,8 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.Extensions.ObjectPool";
|
||||
version = "5.0.1";
|
||||
sha256 = "012klayhnnygncdi9zzq32vballb2wbknk91g2ziz5mhdhg38lr8";
|
||||
version = "5.0.2";
|
||||
sha256 = "0asbw0l5syfgk2qb26czggvdix43d6043kl25ihdqdlhghcyy806";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.Extensions.Options";
|
||||
@ -721,13 +721,13 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NUnit";
|
||||
version = "3.12.0";
|
||||
sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2";
|
||||
version = "3.13.1";
|
||||
sha256 = "07156gr0yl9rqhyj44cp1xz9jpngbl5kb7ci3qfy9fcp01dczmm9";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "ppy.osu.Framework";
|
||||
version = "2021.128.0";
|
||||
sha256 = "19c0bj9d0hjcyhaf04aapyzyd4yrzhc61k89z2il7y32841vnzg6";
|
||||
version = "2021.220.0";
|
||||
sha256 = "0lsv1xl4wav9wv50d1aba56sf6dgqa5qsx4lfn81azy3lzpcbzpp";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "ppy.osu.Framework.NativeLibs";
|
||||
|
||||
39
pkgs/games/wargus/default.nix
Normal file
39
pkgs/games/wargus/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ stdenv, lib, callPackage, fetchFromGitHub
|
||||
, cmake, pkg-config, makeWrapper
|
||||
, zlib, bzip2, libpng
|
||||
, dialog, python3, cdparanoia
|
||||
}:
|
||||
|
||||
let
|
||||
stratagus = callPackage ./stratagus.nix {};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wargus";
|
||||
inherit (stratagus) version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wargus";
|
||||
repo = "wargus";
|
||||
rev = "v${version}";
|
||||
sha256 = "0dibm68jxaqzgzcyblfj2bmwyz9v5ax0njnnbvak7xjk1zlh11sx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||
buildInputs = [ zlib bzip2 libpng ];
|
||||
cmakeFlags = [
|
||||
"-DSTRATAGUS=${stratagus}/games/stratagus"
|
||||
"-DSTRATAGUS_INCLUDE_DIR=${stratagus.src}/gameheaders"
|
||||
];
|
||||
postInstall = ''
|
||||
makeWrapper $out/games/wargus $out/bin/wargus \
|
||||
--prefix PATH : ${lib.makeBinPath [ "$out" cdparanoia python3 ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Importer and scripts for Warcraft II: Tides of Darkness, the expansion Beyond the Dark Portal, and Aleonas Tales";
|
||||
homepage = "https://wargus.github.io/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.astro ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
35
pkgs/games/wargus/stratagus.nix
Normal file
35
pkgs/games/wargus/stratagus.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, pkg-config, makeWrapper
|
||||
, zlib, bzip2, libpng, lua5_1, toluapp
|
||||
, SDL, SDL_mixer, SDL_image, libGL
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stratagus";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wargus";
|
||||
repo = "stratagus";
|
||||
rev = "v${version}";
|
||||
sha256 = "128m5n9axq007xi8a002ig7d4dyw8j060542x220ld66ibfprhcn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [
|
||||
zlib bzip2 libpng
|
||||
lua5_1 toluapp
|
||||
SDL.dev SDL_image SDL_mixer libGL
|
||||
];
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-Wno-error=format-overflow"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "strategy game engine";
|
||||
homepage = "https://wargus.github.io/stratagus.html";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.astro ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -21,13 +21,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "dolphin-emu";
|
||||
version = "5.0-13178";
|
||||
version = "5.0-13603";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolphin-emu";
|
||||
repo = "dolphin";
|
||||
rev = "a34823df61df65168aa40ef5e82e44defd4a0138";
|
||||
sha256 = "0j6hnj60iai366kl0kdbn1jkwc183l02g65mp2vq4qb2yd4399l1";
|
||||
rev = "7250d6e4e091f4b5b4f2289c2c732349b69a2e8a";
|
||||
sha256 = "0l4vvxmc79x0b5p8k4km7p380wv8wsbmxjnif08rj0p3brbavc1i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ]
|
||||
|
||||
@ -1,20 +1,27 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "darkhttpd";
|
||||
version = "1.12";
|
||||
version = "1.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://unix4lyfe.org/darkhttpd/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emikulic";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0w11xq160q9yyffv4mw9ncp1n0dl50d9plmwxb0yijaaxls9i4sk";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm555 -t $out/bin darkhttpd
|
||||
install -Dm444 -t $out/share/doc/${pname} README
|
||||
install -Dm444 -t $out/share/doc/${pname} README.md
|
||||
head -n 18 darkhttpd.c > $out/share/doc/${pname}/LICENSE
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2021-02-14T04-01-33Z";
|
||||
version = "2021-02-19T04-38-02Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-Su3BkVZJ4c5T829/1TNQi7b0fZhpG/Ly80ynt5Po+Qs=";
|
||||
sha256 = "sha256-Swm8gQeSN84SYE0M03Se9n/clYVT/W/v0GAmRRsL674=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-r0QtgpIfDYu2kSy6/wSAExc3Uwd62sDEi1UZ8XzTBoU=";
|
||||
vendorSha256 = "sha256-7WvR6WHiaFHHBhpPoqnkr9pzFxNpLpZuaB1a/SkLBtc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, nixosTests, fetchpatch }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "telegraf";
|
||||
version = "1.17.2";
|
||||
version = "1.17.3";
|
||||
|
||||
excludedPackages = "test";
|
||||
|
||||
@ -12,14 +12,14 @@ buildGoModule rec {
|
||||
owner = "influxdata";
|
||||
repo = "telegraf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-R0RYiVVS1ce2xabPBTEmOxBNlknP4iXkbVy412whrFw=";
|
||||
sha256 = "sha256-DJvXGjh1FN6SHcfVUlbfoKgBD1ThaJMvKUqvIKCyzeI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3cELah9i2rY563QQOYt7ke0HEUR1By74vTgl+UbOHwc=";
|
||||
vendorSha256 = "sha256-UTdJT4cwRCqkn01YXB1KYc7hp1smpZFke9aAODd/2x0=";
|
||||
|
||||
buildFlagsArray = [ ''-ldflags=
|
||||
-w -s -X main.version=${version}
|
||||
'' ];
|
||||
preBuild = ''
|
||||
buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}")
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) telegraf; };
|
||||
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.21.3.4046-3c1c83ba4";
|
||||
version = "1.21.4.4054-bab510e86";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "1ikv75pgircqnllimx3yszihpfaj8blhrmgvli0lagirx6sg22zl";
|
||||
sha256 = "1vxh9yihwxv610q10sak3n8jrq7il6ryhqi6j10nmm7mxn1nkqcx";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "1fywpkchpc726a66q7xpqrn92g73v4941df19glscrrvy7808f8n";
|
||||
sha256 = "0dxch4m3ywndrwys2rfvh34p6nsx0w2f6k7xvs7hi20biz6bd344";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p "$out/lib"
|
||||
cp -dr --no-preserve='ownership' usr/lib/plexmediaserver $out/lib/
|
||||
|
||||
@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
|
||||
# to the '/db' file; we create this path in the FHS userenv (see the "plex"
|
||||
# package).
|
||||
ln -fs /db $f
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# We're running in a FHS userenv; don't patch anything
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kak-lsp";
|
||||
version = "8.0.0";
|
||||
version = "9.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ul";
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0nka51szivwhlfkimjiyzj67nxh75m784c28ass6ihlfax631w9m";
|
||||
sha256 = "1wfv2fy5ga6kc51zka3pak0hq97csm2l11bz74w3n1hrf5q9nnf8";
|
||||
};
|
||||
|
||||
cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c";
|
||||
cargoSha256 = "0g67s6n45rxvv1q5s7x5ajh5n16p68bhlsrsjp46qamrraz63d68";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin [ Security ];
|
||||
|
||||
|
||||
@ -11,17 +11,29 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-Yv1XjD8sZcmGr2SVD6TEElUH7vspJ61WwQwfXLOrao0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace mysqltuner.pl \
|
||||
--replace '$basic_password_files = "/usr/share/mysqltuner/basic_passwords.txt"' "\$basic_password_files = \"$out/share/basic_passwords.txt\"" \
|
||||
--replace '$opt{cvefile} = "/usr/share/mysqltuner/vulnerabilities.csv"' "\$opt{cvefile} = \"$out/share/vulnerabilities.csv\""
|
||||
'';
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install -m0755 mysqltuner.pl $out/bin/mysqltuner
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
install -Dm 0755 mysqltuner.pl "$out/bin/mysqltuner"
|
||||
install -Dm 0644 basic_passwords.txt "$out/share/basic_passwords.txt"
|
||||
install -Dm 0644 vulnerabilities.csv "$out/share/vulnerabilities.csv"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Make recommendations for increased performance and stability of MariaDB/MySQL";
|
||||
homepage = "http://mysqltuner.com";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ peterhoeg shamilton ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -42,6 +42,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
homepage = "https://github.com/SwagLyrics/SwagLyrics-For-Spotify";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,11 +18,11 @@ buildPythonPackage rec {
|
||||
# The websites youtube-dl deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2021.02.10";
|
||||
version = "2021.02.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "08liybkivqb32nbrzvvlv56yw6418zwmml7p6dbqcivhdgvas1yn";
|
||||
sha256 = "19j4kfqln1yk47dpid9j4z3zvgxy6xar1mpfsadifikfdgbmsq7x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2021-02-14T04-28-06Z";
|
||||
version = "2021-02-19T05-34-40Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-Wef8HyJVffDb+ZdVPZOxguIFBC0B9s/1u39j7uXWSnw=";
|
||||
sha256 = "sha256-tkNGWX0QyMlMw+wB8wkYuGfveln6NUoIBLPscRHnQT4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-V/fsFfc1QbPR/ouW/9AqGeVhLSbDg6NHPqZYa4Fpx6I=";
|
||||
vendorSha256 = "sha256-6l8VcHTSZBbFe96rzumMCPIVFVxUMIWoqiBGMtrx75U=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "consul-template";
|
||||
version = "0.25.1";
|
||||
version = "0.25.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "consul-template";
|
||||
rev = "v${version}";
|
||||
sha256 = "1205rhv4mizpb1nbc2sry52n7wljcwb8xp7lpazh1r1cldfayr5b";
|
||||
sha256 = "sha256-r9/CxXFaeod48NgOFWhl+axiNqjaU+RIEHI71fmYzP8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0hv4b6k8k7xkzkjgzcm5y8pqyiwyk790a1qw18gjslkwkyw5hjf2";
|
||||
vendorSha256 = "sha256-DLjaDj3fJYl5ICxJuaCLKdd/AfwfUIM8teJLs3a2MHo=";
|
||||
|
||||
# consul-template tests depend on vault and consul services running to
|
||||
# execute tests so we skip them here
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
let
|
||||
version = "7.2";
|
||||
|
||||
dbrev = "5164";
|
||||
dbrev = "5171";
|
||||
drivedbBranch = "RELEASE_7_2_DRIVEDB";
|
||||
driverdb = fetchurl {
|
||||
url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw";
|
||||
sha256 = "1vj0sv3bgcd0lwk5x450brfyxksa5fn1mjgvmj994ab8spmicc43";
|
||||
sha256 = "0vncr98xagbcfsxgfgxsip2qrl9q3y8va19qhv6yknlwbdfap4mn";
|
||||
name = "smartmontools-drivedb.h";
|
||||
};
|
||||
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shipyard";
|
||||
version = "0.1.18";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "shipyard-run";
|
||||
repo = pname;
|
||||
sha256 = "sha256-ZrzW1sx0wCuaICONS3SR0VsqDj2ZUM53LaB5Wj1s9uc=";
|
||||
sha256 = "sha256-eTwl2tMrhLPeHI0C76Rvm/OOt02OtDtejXYr4N6IWcg=";
|
||||
};
|
||||
vendorSha256 = "sha256-eeR316CKlAqWxlYcPZVlP260NR7WHfmCVE3PywMay/w=";
|
||||
vendorSha256 = "sha256-rglpY7A0S56slL+mXFRgaZwS0bF1b9zxxmNYiX6TJzs=";
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags=-s -w -X main.version=${version}"
|
||||
|
||||
@ -27443,6 +27443,8 @@ in
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
wargus = callPackage ../games/wargus { };
|
||||
|
||||
warmux = callPackage ../games/warmux { };
|
||||
|
||||
warsow-engine = callPackage ../games/warsow/engine.nix { };
|
||||
|
||||
@ -5137,6 +5137,8 @@ in {
|
||||
protobuf = pkgs.protobuf;
|
||||
};
|
||||
|
||||
protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { };
|
||||
|
||||
prov = callPackage ../development/python-modules/prov { };
|
||||
|
||||
prox-tv = callPackage ../development/python-modules/prox-tv { };
|
||||
@ -7018,6 +7020,8 @@ in {
|
||||
|
||||
safety = callPackage ../development/python-modules/safety { };
|
||||
|
||||
sagemaker = callPackage ../development/python-modules/sagemaker { };
|
||||
|
||||
salmon-mail = callPackage ../development/python-modules/salmon-mail { };
|
||||
|
||||
sane = callPackage ../development/python-modules/sane {
|
||||
@ -7330,6 +7334,8 @@ in {
|
||||
|
||||
smbus-cffi = callPackage ../development/python-modules/smbus-cffi { };
|
||||
|
||||
smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { };
|
||||
|
||||
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
|
||||
|
||||
smmap = callPackage ../development/python-modules/smmap { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user