Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
40e266869f
|
|
@ -2420,6 +2420,12 @@
|
|||
githubId = 20808761;
|
||||
name = "cmfwyp";
|
||||
};
|
||||
cmm = {
|
||||
email = "repo@cmm.kakpryg.net";
|
||||
github = "cmm";
|
||||
githubId = 718298;
|
||||
name = "Michael Livshin";
|
||||
};
|
||||
cobbal = {
|
||||
email = "andrew.cobb@gmail.com";
|
||||
github = "cobbal";
|
||||
|
|
@ -7716,6 +7722,12 @@
|
|||
githubId = 31056089;
|
||||
name = "Tom Ho";
|
||||
};
|
||||
majiir = {
|
||||
email = "majiir@nabaal.net";
|
||||
github = "Majiir";
|
||||
githubId = 963511;
|
||||
name = "Majiir Paktu";
|
||||
};
|
||||
makefu = {
|
||||
email = "makefu@syntax-fehler.de";
|
||||
github = "makefu";
|
||||
|
|
@ -11756,6 +11768,12 @@
|
|||
githubId = 602439;
|
||||
name = "Serguei Narojnyi";
|
||||
};
|
||||
snapdgn = {
|
||||
email = "snapdgn@proton.me";
|
||||
name = "Nitish Kumar";
|
||||
github = "snapdgn";
|
||||
githubId = 85608760;
|
||||
};
|
||||
snicket2100 = {
|
||||
email = "57048005+snicket2100@users.noreply.github.com";
|
||||
github = "snicket2100";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,30 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
inherit (lib)
|
||||
mkEnableOption
|
||||
mkIf
|
||||
mkOption
|
||||
mkRenamedOptionModule
|
||||
teams
|
||||
types;
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "services" "flatpak" "extraPortals" ] [ "xdg" "portal" "extraPortals" ])
|
||||
|
||||
({ config, lib, options, ... }:
|
||||
let
|
||||
from = [ "xdg" "portal" "gtkUsePortal" ];
|
||||
fromOpt = lib.getAttrFromPath from options;
|
||||
in
|
||||
{
|
||||
warnings = lib.mkIf config.xdg.portal.gtkUsePortal [
|
||||
"The option `${lib.showOption from}' defined in ${lib.showFiles fromOpt.files} has been deprecated. Setting the variable globally with `environment.sessionVariables' NixOS option can have unforseen side-effects."
|
||||
];
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
@ -32,11 +52,12 @@ with lib;
|
|||
|
||||
gtkUsePortal = mkOption {
|
||||
type = types.bool;
|
||||
visible = false;
|
||||
default = false;
|
||||
description = ''
|
||||
Sets environment variable <literal>GTK_USE_PORTAL</literal> to <literal>1</literal>.
|
||||
This is needed for packages ran outside Flatpak to respect and use XDG Desktop Portals.
|
||||
For example, you'd need to set this for non-flatpak Firefox to use native filechoosers.
|
||||
This will force GTK-based programs ran outside Flatpak to respect and use XDG Desktop Portals
|
||||
for features like file chooser but it is an unsupported hack that can easily break things.
|
||||
Defaults to <literal>false</literal> to respect its opt-in nature.
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ config, lib, stdenv, fetchFromGitHub
|
||||
{ lib, config, clangStdenv, fetchFromGitHub
|
||||
, autoconf
|
||||
, automake
|
||||
, libtool
|
||||
, intltool
|
||||
, pkg-config
|
||||
, jansson
|
||||
, swift-corelibs-libdispatch
|
||||
# deadbeef can use either gtk2 or gtk3
|
||||
, gtk2Support ? false, gtk2
|
||||
, gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook
|
||||
|
|
@ -26,7 +27,7 @@
|
|||
, osdSupport ? true, dbus
|
||||
# output plugins
|
||||
, alsaSupport ? true, alsa-lib
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
|
||||
, pulseSupport ? config.pulseaudio or true, libpulseaudio
|
||||
# effect plugins
|
||||
, resamplerSupport ? true, libsamplerate
|
||||
, overloadSupport ? true, zlib
|
||||
|
|
@ -36,40 +37,70 @@
|
|||
|
||||
assert gtk2Support || gtk3Support;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
inherit (lib) optionals;
|
||||
|
||||
version = "1.9.1";
|
||||
in clangStdenv.mkDerivation {
|
||||
pname = "deadbeef";
|
||||
version = "1.8.4";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DeaDBeeF-Player";
|
||||
repo = "deadbeef";
|
||||
fetchSubmodules = true;
|
||||
rev = version;
|
||||
sha256 = "161b0ll8v4cjgwwmk137hzvh0jidlkx56vjkpnr70f0x4jzv2nll";
|
||||
sha256 = "sha256-e3bAGpkRPIqVWl0nvSZ61JpIQZw24mqE9218SWHBCFo=";
|
||||
};
|
||||
|
||||
buildInputs = with lib; [ jansson ]
|
||||
++ optional gtk2Support gtk2
|
||||
++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ]
|
||||
++ optional vorbisSupport libvorbis
|
||||
++ optional mp123Support libmad
|
||||
++ optional flacSupport flac
|
||||
++ optional wavSupport libsndfile
|
||||
++ optionals cdaSupport [ libcdio libcddb ]
|
||||
++ optional aacSupport faad2
|
||||
++ optional opusSupport opusfile
|
||||
++ optional zipSupport libzip
|
||||
++ optional ffmpegSupport ffmpeg
|
||||
++ optional apeSupport yasm
|
||||
++ optional artworkSupport imlib2
|
||||
++ optional hotkeysSupport libX11
|
||||
++ optional osdSupport dbus
|
||||
++ optional alsaSupport alsa-lib
|
||||
++ optional pulseSupport libpulseaudio
|
||||
++ optional resamplerSupport libsamplerate
|
||||
++ optional overloadSupport zlib
|
||||
++ optional wavpackSupport wavpack
|
||||
++ optional remoteSupport curl
|
||||
;
|
||||
buildInputs = [
|
||||
jansson
|
||||
swift-corelibs-libdispatch
|
||||
] ++ optionals gtk2Support [
|
||||
gtk2
|
||||
] ++ optionals gtk3Support [
|
||||
gtk3
|
||||
gsettings-desktop-schemas
|
||||
] ++ optionals vorbisSupport [
|
||||
libvorbis
|
||||
] ++ optionals mp123Support [
|
||||
libmad
|
||||
] ++ optionals flacSupport [
|
||||
flac
|
||||
] ++ optionals wavSupport [
|
||||
libsndfile
|
||||
] ++ optionals cdaSupport [
|
||||
libcdio
|
||||
libcddb
|
||||
] ++ optionals aacSupport [
|
||||
faad2
|
||||
] ++ optionals opusSupport [
|
||||
opusfile
|
||||
] ++ optionals zipSupport [
|
||||
libzip
|
||||
] ++ optionals ffmpegSupport [
|
||||
ffmpeg
|
||||
] ++ optionals apeSupport [
|
||||
yasm
|
||||
] ++ optionals artworkSupport [
|
||||
imlib2
|
||||
] ++ optionals hotkeysSupport [
|
||||
libX11
|
||||
] ++ optionals osdSupport [
|
||||
dbus
|
||||
] ++ optionals alsaSupport [
|
||||
alsa-lib
|
||||
] ++ optionals pulseSupport [
|
||||
libpulseaudio
|
||||
] ++ optionals resamplerSupport [
|
||||
libsamplerate
|
||||
] ++ optionals overloadSupport [
|
||||
zlib
|
||||
] ++ optionals wavpackSupport [
|
||||
wavpack
|
||||
] ++ optionals remoteSupport [
|
||||
curl
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
|
|
@ -77,7 +108,9 @@ stdenv.mkDerivation rec {
|
|||
intltool
|
||||
libtool
|
||||
pkg-config
|
||||
] ++ lib.optional gtk3Support wrapGAppsHook;
|
||||
] ++ optionals gtk3Support [
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,38 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, deadbeef, glib }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, deadbeef
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, glib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
pname = "deadbeef-mpris2-plugin";
|
||||
version = "1.12";
|
||||
version = "1.14";
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DeaDBeeF-Player";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-w7ccIhcPjbjs18kb3ZdM9JtSail9ik3uyAc40T8lHho=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ deadbeef glib ];
|
||||
buildInputs = [
|
||||
deadbeef
|
||||
glib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "MPRISv2 plugin for the DeaDBeeF music player";
|
||||
homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/";
|
||||
homepage = "https://github.com/DeaDBeeF-Player/deadbeef-mpris2-plugin/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.abbradar ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, deadbeef
|
||||
, gtk3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "deadbeef-playlist-manager-plugin";
|
||||
version = "unstable-2021-05-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kpcee";
|
||||
repo = "deadbeef-playlist-manager";
|
||||
rev = "b1393022b2d9ea0a19b845420146e0fc56cd9c0a";
|
||||
sha256 = "sha256-dsKthlQ0EuX4VhO8K9VTyX3zN8ytzDUbSi/xSMB4xRw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
deadbeef
|
||||
gtk3
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/deadbeef/
|
||||
cp *.so $out/lib/deadbeef/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
buildFlags = [
|
||||
"CFLAGS=-I${deadbeef}/include/deadbeef"
|
||||
"gtk3"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Removes duplicate and vanished files from the current playlist";
|
||||
homepage = "https://github.com/kpcee/deadbeef-playlist-manager";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.cmm ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,78 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, atkmm
|
||||
, cairo
|
||||
, cairomm
|
||||
, gtk3
|
||||
, gtkmm3
|
||||
, libnotify
|
||||
, libsecret
|
||||
, pangomm
|
||||
, xorg
|
||||
, libpulseaudio
|
||||
, librsvg
|
||||
, libzip
|
||||
, openssl
|
||||
, webkitgtk
|
||||
, libappindicator-gtk3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trillian-im";
|
||||
version = "6.3.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.trillian.im/get/linux/6.3/trillian_${version}_amd64.deb";
|
||||
sha256 = "42e3466ee236ac2644907059f0961eba3a6ed6b6156afb2c57f54ebe6065ac6f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
atkmm
|
||||
cairo
|
||||
cairomm
|
||||
gtk3
|
||||
gtkmm3
|
||||
libnotify
|
||||
libsecret
|
||||
pangomm
|
||||
xorg.libXScrnSaver
|
||||
libpulseaudio
|
||||
librsvg
|
||||
libzip
|
||||
openssl
|
||||
webkitgtk
|
||||
libappindicator-gtk3
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
dpkg -x $src $out
|
||||
cp -av $out/usr/* $out
|
||||
rm -rf $out/usr
|
||||
|
||||
rm $out/bin/trillian
|
||||
ln -s "$out/share/trillian/trillian" "$out/bin/trillian"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern instant messaging for home and work that prioritizes chat interoperability and security";
|
||||
homepage = "https://www.trillian.im/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ majiir ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
1206
pkgs/applications/networking/n8n/node-packages.nix
generated
1206
pkgs/applications/networking/n8n/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnunet";
|
||||
version = "0.16.3";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-MjkFLxNTepqrqqZuxCh12+4vaDjF8Ys674VOa1Mew4o=";
|
||||
sha256 = "sha256-dd4KcV4+lpKGSD7GrkslqHNlZk1CzftgbfjnRqFfEmU=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -36,24 +36,14 @@ in
|
|||
mkDerivation rec {
|
||||
pname = "scribus";
|
||||
|
||||
version = "1.5.7";
|
||||
version = "1.5.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4=";
|
||||
hash = "sha256-R4Fuj89tBXiP8WqkSZ+X/yJDHHd6d4kUmwqItFHha3Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# For harfbuzz >= 2.9.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch";
|
||||
sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4=";
|
||||
})
|
||||
# For harfbuzz >= 3.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch";
|
||||
sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y=";
|
||||
})
|
||||
# For Poppler 22.02
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch";
|
||||
|
|
@ -64,26 +54,10 @@ mkDerivation rec {
|
|||
sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c=";
|
||||
})
|
||||
# For Poppler 22.03
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch";
|
||||
sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch";
|
||||
sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch";
|
||||
sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch";
|
||||
sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch";
|
||||
sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ=";
|
||||
})
|
||||
# For Poppler 22.04
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch";
|
||||
|
|
|
|||
|
|
@ -158,6 +158,8 @@ stdenv.mkDerivation rec {
|
|||
cp -r $unpacked/sbin/* $out/bin/
|
||||
|
||||
cp -r $unpacked/lib/libconf $out/lib/vmware/
|
||||
rm $out/lib/vmware/libconf/etc/fonts/fonts.conf
|
||||
|
||||
cp -r $unpacked/lib/bin $out/lib/vmware/
|
||||
cp -r $unpacked/lib/lib $out/lib/vmware/
|
||||
cp -r $unpacked/lib/scripts $out/lib/vmware/
|
||||
|
|
|
|||
|
|
@ -62,10 +62,7 @@ grimshot = stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/swaywm/sway/tree/master/contrib";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [
|
||||
sway-unwrapped.meta.maintainers
|
||||
evils
|
||||
];
|
||||
maintainers = sway-unwrapped.meta.maintainers ++ (with maintainers; [ evils ]);
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drumstick";
|
||||
version = "2.5.1";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-V57YnyeOVBXL5qjuCO1j1Ozy9CeaXxadw6ed1suUUIU=";
|
||||
hash = "sha256-5O9yD3MexorJUm5tv6oghDb4J/b3SO10mDQR9dT2jlA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -81,7 +81,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Using install check so we do not have to manually set
|
||||
# LD_LIBRARY_PATH and GI_TYPELIB_PATH variables
|
||||
doInstallCheck = true;
|
||||
# Musl does not support TZDIR.
|
||||
doInstallCheck = !stdenv.hostPlatform.isMusl;
|
||||
enableParallelChecking = false;
|
||||
preInstallCheck = if stdenv.isDarwin then ''
|
||||
for testexe in $(find ./src/test -maxdepth 1 -type f -executable); do
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, clangStdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, libbsd
|
||||
, libsystemtap
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.5";
|
||||
in clangStdenv.mkDerivation {
|
||||
pname = "swift-corelibs-libdispatch";
|
||||
inherit version;
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apple";
|
||||
repo = "swift-corelibs-libdispatch";
|
||||
rev = "swift-${version}-RELEASE";
|
||||
sha256 = "sha256-MbLgmS6qRSRT+2dGqbYTNb5MTM4Wz/grDXFk1kup+jk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libbsd
|
||||
libsystemtap
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Grand Central Dispatch";
|
||||
homepage = "https://github.com/apple/swift-corelibs-libdispatch";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.cmm ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,21 +5,19 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "ke";
|
||||
version = "0.4";
|
||||
|
||||
useDune2 = true;
|
||||
version = "0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ke/releases/download/v${version}/ke-v${version}.tbz";
|
||||
sha256 = "13c9xy60vmq29mnwpg3h3zgl6gjbjfwbx1s0crfc6xwvark0zxnx";
|
||||
url = "https://github.com/mirage/ke/releases/download/v${version}/ke-${version}.tbz";
|
||||
sha256 = "sha256-YSFyB+IgCwSxd1lzZhD/kggmmmR/hUy1rnLNrA1nIwU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ bigarray-compat fmt ];
|
||||
propagatedBuildInputs = [ fmt ];
|
||||
|
||||
checkInputs = [ alcotest bigstringaf ];
|
||||
doCheck = true;
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
meta = {
|
||||
description = "Fast implementation of queue in OCaml";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
, aiohttp-cors
|
||||
, click
|
||||
, colorama
|
||||
, dataclasses
|
||||
, mypy-extensions
|
||||
, pathspec
|
||||
, parameterized
|
||||
|
|
@ -23,13 +22,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "black";
|
||||
version = "22.3.0";
|
||||
version = "22.6.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NQILiIbAIs7ZKCtRtah1ttGrDDh7MaBluE23wzCFynk=";
|
||||
hash = "sha256-bG054ortN5rsQNocZUNMd9deZbtZoeHCg95UX7Tnxsk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boxx";
|
||||
version = "0.10.1";
|
||||
version = "0.10.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YYR13JS9otoylS3ds0jK7d0jOxbhafaQd8fSxIiREi4=";
|
||||
hash = "sha256-HnEXvge1R2GAcrP+2yEecwIlT95/oKrWiK+TB9+CRxs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, black
|
||||
, jinja2
|
||||
, poetry-core
|
||||
, round
|
||||
|
|
@ -38,13 +37,14 @@ buildPythonPackage rec {
|
|||
patches = [
|
||||
# The build-system section is missing
|
||||
./build_poetry.patch
|
||||
./remove-black-requirement.patch
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
# Despite living in 'tool.poetry.dependencies',
|
||||
# these are only used at build time to process the image resource files
|
||||
nativeBuildInputs = [ black inkscape imagemagick jinja2 poetry-core round ];
|
||||
nativeBuildInputs = [ inkscape imagemagick jinja2 poetry-core round ];
|
||||
|
||||
propagatedBuildInputs = [ graphviz ];
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
diff --git a/autogen.sh b/autogen.sh
|
||||
index acbcacb..1f60b83 100755
|
||||
--- a/autogen.sh
|
||||
+++ b/autogen.sh
|
||||
@@ -21,11 +21,6 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-if ! [ -x "$(command -v black)" ]; then
|
||||
- echo 'black is not installed'
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
# preprocess the resources
|
||||
for pvd in "${providers[@]}"; do
|
||||
# convert the svg to png for azure provider
|
||||
@@ -55,7 +50,3 @@
|
||||
# Generate doc for custom module
|
||||
echo "generating the docs for custom"
|
||||
python -m scripts.generate "custom"
|
||||
-
|
||||
-# run black
|
||||
-echo "linting the all the diagram modules"
|
||||
-black "$app_root_dir"/**/*.py
|
||||
|
|
@ -15,11 +15,9 @@
|
|||
, entrypoints
|
||||
, tenacity
|
||||
, futures ? null
|
||||
, black
|
||||
, backports_tempfile
|
||||
, isPy27
|
||||
, pytest
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, pytest-mock
|
||||
}:
|
||||
|
||||
|
|
@ -46,20 +44,18 @@ buildPythonPackage rec {
|
|||
requests
|
||||
entrypoints
|
||||
tenacity
|
||||
black
|
||||
] ++ lib.optionals isPy27 [
|
||||
futures
|
||||
backports_tempfile
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
HOME=$(mktemp -d) pytest
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
# the test suite depends on cloud resources azure/aws
|
||||
|
|
|
|||
|
|
@ -13,15 +13,11 @@
|
|||
|
||||
|
||||
# for tests
|
||||
, tox
|
||||
, go
|
||||
, pulumictl
|
||||
, bash
|
||||
, pylint
|
||||
, pytest
|
||||
, pytest-timeout
|
||||
, coverage
|
||||
, black
|
||||
, wheel
|
||||
, pytest-asyncio
|
||||
|
||||
|
|
@ -55,15 +51,11 @@ buildPythonPackage rec {
|
|||
pulumi-bin
|
||||
pulumictl
|
||||
mypy
|
||||
bash
|
||||
go
|
||||
tox
|
||||
pytest
|
||||
pytest-timeout
|
||||
coverage
|
||||
pytest-asyncio
|
||||
wheel
|
||||
black
|
||||
];
|
||||
|
||||
sourceRoot="source/sdk/python/lib";
|
||||
|
|
|
|||
|
|
@ -32,9 +32,8 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
black
|
||||
pytestCheckHook
|
||||
];
|
||||
] ++ passthru.optional-dependencies.pycodegen;
|
||||
|
||||
disabledTests = [
|
||||
# Setup for these tests requires network access
|
||||
|
|
@ -48,6 +47,10 @@ buildPythonPackage rec {
|
|||
"schema_salad"
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
pycodegen = [ black ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Semantic Annotations for Linked Avro Data";
|
||||
homepage = "https://github.com/common-workflow-language/schema_salad";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "actionlint";
|
||||
version = "1.6.14";
|
||||
version = "1.6.15";
|
||||
|
||||
subPackages = [ "cmd/actionlint" ];
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
|||
owner = "rhysd";
|
||||
repo = "actionlint";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eBIAm+mgjOLePxJ6b9d3cr3k0vqaDqLzorZg/ZplpcM=";
|
||||
sha256 = "sha256-AhV5D0ujTjYvlcEbmqSZ2VPTKDQHZ6/lJpt9DlY2q7c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wKK597mk51jT6s1eKA4AjiCvI4IkZ9WjMXxaY8AWwkU=";
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://javacc.github.io/javacc";
|
||||
description = "A parser generator for building parsers from grammars";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ teams.deshaw.members ];
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
56
pkgs/misc/fastly/default.nix
Normal file
56
pkgs/misc/fastly/default.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
{ lib, fetchFromGitHub, installShellFiles, buildGoModule }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Su4ZwiuI+pMoLAGhc3dWcwgcfwe5cZGTg8kEnpM4JbA=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
# since it is not needed after that.
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
git rev-parse --short HEAD > $out/COMMIT
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/fastly" ];
|
||||
|
||||
vendorSha256 = "sha256-5MvJS10f7YLvO+wCmUJleU27hCJbsNrOIfUZnniGw+E=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# Flags as provided by the build automation of the project:
|
||||
# https://github.com/fastly/cli/blob/7844f9f54d56f8326962112b5534e5c40e91bf09/.goreleaser.yml#L14-L18
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/fastly/cli/pkg/revision.AppVersion=v${version}"
|
||||
"-X github.com/fastly/cli/pkg/revision.Environment=release"
|
||||
];
|
||||
preBuild = ''
|
||||
ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)"
|
||||
ldflags+=" -X 'github.com/fastly/cli/pkg/revision.GoVersion=$(go version)'"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
installShellCompletion --cmd fastly \
|
||||
--bash <($out/bin/fastly --completion-script-bash) \
|
||||
--zsh <($out/bin/fastly --completion-script-zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line tool for interacting with the Fastly API";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/fastly/cli";
|
||||
maintainers = with maintainers; [ ereslibre shyim ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "erofs-utils";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
src = fetchgit {
|
||||
url =
|
||||
"https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git";
|
||||
rev = "v" + version;
|
||||
sha256 = "sha256-yYMvtW6mQKGx+TZGzadbLX9pXU7vY5b4d1B8d5Ph6vk=";
|
||||
sha256 = "sha256-vMWAmGMJp0XDuc4sbo6Y7gfCQVAo4rETea0Tkdbg82U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.15.16";
|
||||
suffix = "lqx2";
|
||||
in
|
||||
|
||||
buildLinux (args // {
|
||||
modDirVersion = "${version}-${suffix}";
|
||||
inherit version;
|
||||
isZen = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
sha256 = "sha256-kdT/hiASZ72pkS0Igta0KT0GWTgDRjxBnd5CQ0eonfg=";
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
branch = "5.14/master";
|
||||
maintainers = with lib.maintainers; [ atemu ];
|
||||
description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)";
|
||||
};
|
||||
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
|
||||
|
||||
let
|
||||
# having the full version string here makes it easier to update
|
||||
modDirVersion = "5.18.5-zen1";
|
||||
parts = lib.splitString "-" modDirVersion;
|
||||
version = lib.elemAt parts 0;
|
||||
suffix = lib.elemAt parts 1;
|
||||
|
||||
numbers = lib.splitString "." version;
|
||||
branch = "${lib.elemAt numbers 0}.${lib.elemAt numbers 1}";
|
||||
rev = if ((lib.elemAt numbers 2) == "0") then "v${branch}-${suffix}" else "v${modDirVersion}";
|
||||
in
|
||||
|
||||
buildLinux (args // {
|
||||
inherit version modDirVersion;
|
||||
isZen = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
inherit rev;
|
||||
sha256 = "sha256-q6a8Wyzs6GNQ39mV+q/9N6yo/kXS9ZH+QTfGka42gk4=";
|
||||
};
|
||||
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
ZEN_INTERACTIVE = yes;
|
||||
# TODO: Remove once #175433 reaches master
|
||||
# https://nixpk.gs/pr-tracker.html?pr=175433
|
||||
WERROR = no;
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
inherit branch;
|
||||
maintainers = with lib.maintainers; [ atemu andresilva ];
|
||||
description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads.";
|
||||
};
|
||||
|
||||
} // (args.argsOverride or { }))
|
||||
97
pkgs/os-specific/linux/kernel/update-zen.py
Executable file
97
pkgs/os-specific/linux/kernel/update-zen.py
Executable file
|
|
@ -0,0 +1,97 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python3 -p python3 nix nix-prefetch-git
|
||||
|
||||
import fileinput
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import re
|
||||
import subprocess
|
||||
|
||||
from datetime import datetime
|
||||
from urllib.request import urlopen, Request
|
||||
|
||||
|
||||
def panic(exc):
|
||||
raise Exception(exc)
|
||||
|
||||
|
||||
DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
HEADERS = {'Accept': 'application/vnd.github.v3+json'}
|
||||
|
||||
|
||||
def github_api_request(endpoint):
|
||||
base_url = 'https://api.github.com/'
|
||||
request = Request(base_url + endpoint, headers=HEADERS)
|
||||
with urlopen(request) as http_response:
|
||||
return json.loads(http_response.read().decode('utf-8'))
|
||||
|
||||
|
||||
def get_commit_date(repo, sha):
|
||||
url = f'https://api.github.com/repos/{repo}/commits/{sha}'
|
||||
request = Request(url, headers=HEADERS)
|
||||
with urlopen(request) as http_response:
|
||||
commit = json.loads(http_response.read().decode())
|
||||
date = commit['commit']['committer']['date'].rstrip('Z')
|
||||
date = datetime.fromisoformat(date).date().isoformat()
|
||||
return 'unstable-' + date
|
||||
|
||||
|
||||
def nix_prefetch_git(url, rev):
|
||||
"""Prefetches the requested Git revision (incl. submodules) of the given repository URL."""
|
||||
print(f'nix-prefetch-git {url} {rev}')
|
||||
out = subprocess.check_output([
|
||||
'nix-prefetch-git', '--quiet',
|
||||
'--url', url,
|
||||
'--rev', rev,
|
||||
'--fetch-submodules'])
|
||||
return json.loads(out)['sha256']
|
||||
|
||||
|
||||
def nix_prefetch_url(url, unpack=False):
|
||||
"""Prefetches the content of the given URL."""
|
||||
print(f'nix-prefetch-url {url}')
|
||||
options = ['--type', 'sha256']
|
||||
if unpack:
|
||||
options += ['--unpack']
|
||||
out = subprocess.check_output(['nix-prefetch-url'] + options + [url])
|
||||
return out.decode('utf-8').rstrip()
|
||||
|
||||
|
||||
def update_file(relpath, variant, version, suffix, sha256):
|
||||
file_path = os.path.join(DIR, relpath)
|
||||
with fileinput.FileInput(file_path, inplace=True) as f:
|
||||
for line in f:
|
||||
result = line
|
||||
result = re.sub(
|
||||
fr'^ version = ".+"; #{variant}',
|
||||
f' version = "{version}"; #{variant}',
|
||||
result)
|
||||
result = re.sub(
|
||||
fr'^ suffix = ".+"; #{variant}',
|
||||
f' suffix = "{suffix}"; #{variant}',
|
||||
result)
|
||||
result = re.sub(
|
||||
fr'^ sha256 = ".+"; #{variant}',
|
||||
f' sha256 = "{sha256}"; #{variant}',
|
||||
result)
|
||||
print(result, end='')
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if len(sys.argv) == 1:
|
||||
panic("Update variant expected")
|
||||
variant = sys.argv[1]
|
||||
if variant not in ("zen", "lqx"):
|
||||
panic(f"Unexepected variant instead of 'zen' or 'lqx': {sys.argv[1]}")
|
||||
pattern = re.compile(fr"v(\d+\.\d+\.?\d*)-({variant}\d+)")
|
||||
zen_tags = github_api_request('repos/zen-kernel/zen-kernel/releases')
|
||||
for tag in zen_tags:
|
||||
zen_match = pattern.match(tag['tag_name'])
|
||||
if zen_match:
|
||||
zen_tag = zen_match.group(0)
|
||||
zen_version = zen_match.group(1)
|
||||
zen_suffix = zen_match.group(2)
|
||||
break
|
||||
zen_hash = nix_prefetch_git('https://github.com/zen-kernel/zen-kernel.git', zen_tag)
|
||||
update_file('zen-kernels.nix', variant, zen_version, zen_suffix, zen_hash)
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -I nixpkgs=../../../.. -i bash -p nix-prefetch git gnused gnugrep nix curl
|
||||
set -euo pipefail -x
|
||||
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
old=$(nix-instantiate --eval -A linuxPackages_zen.kernel.modDirVersion "$nixpkgs")
|
||||
old="${old%\"}"
|
||||
old="${old#\"}"
|
||||
new=$(curl https://github.com/zen-kernel/zen-kernel/releases.atom | grep -m1 -o -E '[0-9.]+-zen[0-9]+')
|
||||
# add ".0" patch to modDirVersion when minor only
|
||||
new=$(echo "$new" | sed -E 's/^([0-9]+)\.([0-9]+)-(\w+)$/\1.\2.0-\3/')
|
||||
if [[ "$new" == "$old" ]]; then
|
||||
echo "already up-to-date"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
path="$nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix"
|
||||
|
||||
sed -i -e "s!modDirVersion = \".*\"!modDirVersion = \"${new}\"!" "$path"
|
||||
checksum=$(nix-prefetch "(import ${nixpkgs} {}).linuxPackages_zen.kernel")
|
||||
sed -i -e "s!sha256 = \".*\"!sha256 = \"${checksum}\"!" "$path"
|
||||
|
||||
git commit -m "linuxKernel.kernels.linux_zen: ${old} -> ${new}" $path
|
||||
45
pkgs/os-specific/linux/kernel/zen-kernels.nix
Normal file
45
pkgs/os-specific/linux/kernel/zen-kernels.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
|
||||
|
||||
let
|
||||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "5.18.7"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "1dxiwrbf15njqcq2kxbsg22hllpcvdwjhdf0gs3xx0xyjbwjyd26"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "5.18.7"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "0gyp4x8rlsg5bjr9c8qq0mk3wckyg0navc1sripkj8hrl51vm28c"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
inherit version;
|
||||
modDirVersion = "${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version ++ [ "0" "0" ]))}-${suffix}";
|
||||
isZen = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
passthru.updateScript = [ ./update-zen.py (if isLqx then "lqx" else "zen") ];
|
||||
|
||||
extraMeta = {
|
||||
branch = lib.versions.majorMinor version + "/master";
|
||||
maintainers = with lib.maintainers; [ atemu andresilva psydvl ];
|
||||
description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads." +
|
||||
lib.optionalString isLqx " (Same as linux_zen but less aggressive release schedule)";
|
||||
};
|
||||
|
||||
} // (args.argsOverride or { }));
|
||||
in
|
||||
{
|
||||
zen = zenKernelsFor zenVariant;
|
||||
lqx = zenKernelsFor lqxVariant;
|
||||
}
|
||||
2273
pkgs/servers/binserve/Cargo.lock
generated
Normal file
2273
pkgs/servers/binserve/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
37
pkgs/servers/binserve/default.nix
Normal file
37
pkgs/servers/binserve/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "binserve";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mufeedvh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Chm2xPB0BrLXSZslg9wnbDyHSJRQAvOtpH0Rw6w1q1s=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
];
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast production-ready static web server";
|
||||
homepage = "https://github.com/mufeedvh/binserve";
|
||||
longDescription = ''
|
||||
A fast production-ready static web server with TLS
|
||||
(HTTPS), routing, hot reloading, caching, templating, and security in a
|
||||
single-binary you can set up with zero code
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ snapdgn ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule, nixosTests }:
|
||||
{ lib, fetchzip, buildGoModule, nixosTests }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "traefik";
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "traefik";
|
||||
repo = "traefik";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uTE0Z7lgxKNq1wQSMUSp9dMfxV+aIm7cwYSkZBUdnug=";
|
||||
# Archive with static assets for webui
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
|
||||
sha256 = "sha256-AJbvK3hr+cNYcoN+3Zz5WruTvWfh1junEnhRzvXVN+U=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-WlLntYrXs1kOu26yNeZI1xpb6FsHPiA/bNzaxCZTG4Y=";
|
||||
vendorSha256 = "sha256-T36d8mjbThlH1mukcHgaYlhq/P46ShTHgM9zcH4L7dc=";
|
||||
|
||||
subPackages = [ "cmd/traefik" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,15 @@
|
|||
{ lib, buildGoModule, makeWrapper, fetchFromGitHub, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, makeWrapper
|
||||
, fetchFromGitHub
|
||||
, pythonPackages
|
||||
, pkg-config
|
||||
, systemd
|
||||
, hostname
|
||||
, withSystemd ? stdenv.isLinux
|
||||
, extraTags ? [ ]
|
||||
}:
|
||||
|
||||
let
|
||||
# keep this in sync with github.com/DataDog/agent-payload dependency
|
||||
|
|
@ -30,19 +41,28 @@ in buildGoModule rec {
|
|||
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
buildInputs = [ systemd ];
|
||||
buildInputs = lib.optionals withSystemd [ systemd ];
|
||||
PKG_CONFIG_PATH = "${python}/lib/pkgconfig";
|
||||
|
||||
preBuild = let
|
||||
ldFlags = lib.concatStringsSep " " [
|
||||
"-X ${goPackagePath}/pkg/version.Commit=${src.rev}"
|
||||
"-X ${goPackagePath}/pkg/version.AgentVersion=${version}"
|
||||
"-X ${goPackagePath}/pkg/serializer.AgentPayloadVersion=${payloadVersion}"
|
||||
"-X ${goPackagePath}/pkg/collector/py.pythonHome=${python}"
|
||||
"-r ${python}/lib"
|
||||
];
|
||||
in ''
|
||||
buildFlagsArray=( "-tags" "ec2 systemd cpython process log secrets ${lib.concatStringsSep " " extraTags}" "-ldflags" "${ldFlags}")
|
||||
tags = [
|
||||
"ec2"
|
||||
"cpython"
|
||||
"process"
|
||||
"log"
|
||||
"secrets"
|
||||
]
|
||||
++ lib.optionals withSystemd [ "systemd" ]
|
||||
++ extraTags;
|
||||
|
||||
ldflags = [
|
||||
"-X ${goPackagePath}/pkg/version.Commit=${src.rev}"
|
||||
"-X ${goPackagePath}/pkg/version.AgentVersion=${version}"
|
||||
"-X ${goPackagePath}/pkg/serializer.AgentPayloadVersion=${payloadVersion}"
|
||||
"-X ${goPackagePath}/pkg/collector/py.pythonHome=${python}"
|
||||
"-r ${python}/lib"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# Keep directories to generate in sync with tasks/go.py
|
||||
go generate ./pkg/status ./cmd/agent/gui
|
||||
'';
|
||||
|
|
@ -66,7 +86,7 @@ in buildGoModule rec {
|
|||
cp -R $src/pkg/status/templates $out/share/datadog-agent
|
||||
|
||||
wrapProgram "$out/bin/agent" \
|
||||
--set PYTHONPATH "$out/${python.sitePackages}" \
|
||||
--set PYTHONPATH "$out/${python.sitePackages}"'' + lib.optionalString withSystemd '' \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.getLib systemd}/lib
|
||||
'';
|
||||
|
||||
|
|
@ -77,6 +97,6 @@ in buildGoModule rec {
|
|||
'';
|
||||
homepage = "https://www.datadoghq.com";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ thoughtpolice domenkozar rvl ];
|
||||
maintainers = with maintainers; [ thoughtpolice domenkozar rvl viraptor ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sile";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "09mvydgv81pkp2nz9rkz32n3df21cfc2aslpqrivf3svr6sp9hxy";
|
||||
sha256 = "023vxyryk1clkb2lx8n31m8lnfsc27z7h7kvss2vrvqc20i1y2kx";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-6FdZ3UToeIAARxrOqSWBX+ALrlr4s2J0bj9c3l9ZTyQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/sov/main.c --replace '/usr' $out
|
||||
'';
|
||||
nativeBuildInputs = [ meson pkg-config wayland-scanner ninja ];
|
||||
buildInputs = [ wayland wayland-protocols freetype ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,21 +2,24 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swayr";
|
||||
version = "0.16.1";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~tsdh";
|
||||
repo = "swayr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-c/VHD5VceddhKanuId4rG1Tl+9Bg7zUmIqq4gMsy1e0=";
|
||||
rev = "swayr-${version}";
|
||||
sha256 = "sha256-ubindhU3G1iHqf/yiXIJk87uI3o5y2lfs22tbIfiqv4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-0aGMWuU6DvBr9tvgDd1GZqhlY8bGCuPs8pSc5A03L3w=";
|
||||
cargoSha256 = "sha256-X6BYLD7YmlHCO+3b3Ubai222tvsZUmZrwm3vS2PeqDY=";
|
||||
|
||||
patches = [
|
||||
./icon-paths.patch
|
||||
];
|
||||
|
||||
# don't build swayrbar
|
||||
buildAndTestSubdir = pname;
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/src/config.rs b/src/config.rs
|
||||
index de7d04b..291114b 100644
|
||||
--- a/src/config.rs
|
||||
+++ b/src/config.rs
|
||||
@@ -197,6 +197,12 @@ impl Default for Format {
|
||||
diff --git a/swayr/src/config.rs b/swayr/src/config.rs
|
||||
index bc6ec98..48cdc65 100644
|
||||
--- a/swayr/src/config.rs
|
||||
+++ b/swayr/src/config.rs
|
||||
@@ -271,6 +271,12 @@ impl Default for Format {
|
||||
),
|
||||
urgency_end: Some("</span>".to_string()),
|
||||
icon_dirs: Some(vec![
|
||||
|
|
@ -13,5 +13,5 @@ index de7d04b..291114b 100644
|
|||
+ "~/.nix-profile/share/icons/hicolor/48x48/apps".to_string(),
|
||||
+ "~/.nix-profile/share/pixmaps".to_string(),
|
||||
"/usr/share/icons/hicolor/scalable/apps".to_string(),
|
||||
"/usr/share/icons/hicolor/64x64/apps".to_string(),
|
||||
"/usr/share/icons/hicolor/48x48/apps".to_string(),
|
||||
"/usr/share/pixmaps".to_string(),
|
||||
|
|
|
|||
|
|
@ -275,6 +275,10 @@ with pkgs;
|
|||
|
||||
bingo = callPackage ../development/tools/bingo {};
|
||||
|
||||
binserve = callPackage ../servers/binserve {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
bootstrap-studio = callPackage ../development/web/bootstrap-studio {};
|
||||
|
||||
breakpad = callPackage ../development/misc/breakpad { };
|
||||
|
|
@ -3630,6 +3634,8 @@ with pkgs;
|
|||
|
||||
extrude = callPackage ../tools/security/extrude { };
|
||||
|
||||
fastly = callPackage ../misc/fastly {};
|
||||
|
||||
f2 = callPackage ../tools/misc/f2 {};
|
||||
|
||||
f3 = callPackage ../tools/filesystems/f3 { };
|
||||
|
|
@ -26118,6 +26124,7 @@ with pkgs;
|
|||
mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { };
|
||||
musical-spectrum = callPackage ../applications/audio/deadbeef/plugins/musical-spectrum.nix { };
|
||||
statusnotifier = callPackage ../applications/audio/deadbeef/plugins/statusnotifier.nix { };
|
||||
playlist-manager = callPackage ../applications/audio/deadbeef/plugins/playlist-manager.nix { };
|
||||
};
|
||||
|
||||
deadbeef-with-plugins = callPackage ../applications/audio/deadbeef/wrapper.nix {
|
||||
|
|
@ -30487,6 +30494,8 @@ with pkgs;
|
|||
|
||||
tribler = callPackage ../applications/networking/p2p/tribler { };
|
||||
|
||||
trillian-im = callPackage ../applications/networking/instant-messengers/trillian-im { };
|
||||
|
||||
trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
|
||||
|
||||
ttyper = callPackage ../applications/misc/ttyper { };
|
||||
|
|
@ -35801,4 +35810,6 @@ with pkgs;
|
|||
honeyvent = callPackage ../servers/tracing/honeycomb/honeyvent { };
|
||||
|
||||
mictray = callPackage ../tools/audio/mictray { };
|
||||
|
||||
swift-corelibs-libdispatch = callPackage ../development/libraries/swift-corelibs-libdispatch { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,6 +59,34 @@ let
|
|||
} // attrs.meta;
|
||||
});
|
||||
|
||||
format = buildHaxeLib {
|
||||
libname = "format";
|
||||
version = "3.5.0";
|
||||
sha256 = "sha256-5vZ7b+P74uGx0Gb7X/+jbsx5048dO/jv5nqCDtw5y/A=";
|
||||
meta.description = "A Haxe Library for supporting different file formats";
|
||||
};
|
||||
|
||||
heaps = buildHaxeLib {
|
||||
libname = "heaps";
|
||||
version = "1.9.1";
|
||||
sha256 = "sha256-i5EIKnph80eEEHvGXDXhIL4t4+RW7OcUV5zb2f3ItlI=";
|
||||
meta.description = "The GPU Game Framework";
|
||||
};
|
||||
|
||||
hlopenal = buildHaxeLib {
|
||||
libname = "hlopenal";
|
||||
version = "1.5.0";
|
||||
sha256 = "sha256-mJWFGBJPPAhVwsB2HzMfk4szSyjMT4aw543YhVqIan4=";
|
||||
meta.description = "OpenAL support for Haxe/HL";
|
||||
};
|
||||
|
||||
hlsdl = buildHaxeLib {
|
||||
libname = "hlsdl";
|
||||
version = "1.10.0";
|
||||
sha256 = "sha256-kmC2EMDy1mv0jFjwDj+m0CUvKal3V7uIGnMxJBRYGms=";
|
||||
meta.description = "SDL/GL support for Haxe/HL";
|
||||
};
|
||||
|
||||
hxcpp = buildHaxeLib rec {
|
||||
libname = "hxcpp";
|
||||
version = "4.1.15";
|
||||
|
|
|
|||
|
|
@ -196,19 +196,23 @@ in {
|
|||
];
|
||||
};
|
||||
|
||||
linux_zen = callPackage ../os-specific/linux/kernel/linux-zen.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
];
|
||||
};
|
||||
# Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version
|
||||
# https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708
|
||||
zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix;
|
||||
|
||||
linux_lqx = callPackage ../os-specific/linux/kernel/linux-lqx.nix {
|
||||
linux_zen = (zenKernels {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
];
|
||||
};
|
||||
}).zen;
|
||||
|
||||
linux_lqx = (zenKernels {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
];
|
||||
}).lqx;
|
||||
|
||||
# This contains both the STABLE and EDGE variants of the XanMod kernel
|
||||
xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix;
|
||||
|
|
|
|||
Loading…
Reference in a new issue